From c8a0c5dd59c8d34aede7bfb272e9507ca802ddb6 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 29 八月 2025 22:34:20 +0800
Subject: [PATCH] 工艺版次改名，标题禁用
---
src/views/flowmgr/taskassigntemp.vue | 41 +++++++++++++++++++-
src/views/flowmgr/exceptiontask.vue | 2
src/views/flowmgr/taskassign.vue | 11 +++--
src/views/flow/components/TodolistRightTop.vue | 2
src/views/flow/donelist.vue | 2
src/views/flowmgr/processQuery3.vue | 4 +-
src/views/flowmgr/processQuery1.vue | 4 +-
src/views/flowmgr/processQuery2.vue | 38 ++++++++++++++++---
src/views/wel/components/TodolistRightTop.vue | 2
9 files changed, 84 insertions(+), 22 deletions(-)
diff --git a/src/views/flow/components/TodolistRightTop.vue b/src/views/flow/components/TodolistRightTop.vue
index f65ed89..3f2826f 100644
--- a/src/views/flow/components/TodolistRightTop.vue
+++ b/src/views/flow/components/TodolistRightTop.vue
@@ -25,7 +25,7 @@
<el-form-item label="鍥惧彿鐗堟">
<el-input v-model="formInline.drawingNoEdition" placeholder="" style="width: 200px"></el-input>
</el-form-item>
- <el-form-item label="宸ヨ壓鐗堟">
+ <el-form-item label="鎵规鍙�">
<el-input v-model="formInline.craftEdition" placeholder="" style="width: 200px"></el-input>
</el-form-item>
diff --git a/src/views/flow/donelist.vue b/src/views/flow/donelist.vue
index a5c2966..892e10e 100644
--- a/src/views/flow/donelist.vue
+++ b/src/views/flow/donelist.vue
@@ -71,7 +71,7 @@
}
},
{
- label: '宸ヨ壓鐗堟',
+ label: '鎵规鍙�',
prop: 'variables.craftEdition',
render: ({ row }) => {
return h('p',{'class': 'margin0'}, row?.variables?.craftEdition || '');
diff --git a/src/views/flowmgr/exceptiontask.vue b/src/views/flowmgr/exceptiontask.vue
index f92d22c..4232f08 100644
--- a/src/views/flowmgr/exceptiontask.vue
+++ b/src/views/flowmgr/exceptiontask.vue
@@ -97,7 +97,7 @@
prop: 'processName',
},
{
- label: '宸ヨ壓鐗堟',
+ label: '鎵规鍙�',
width:85,
prop: 'craftEdition'
},
diff --git a/src/views/flowmgr/processQuery1.vue b/src/views/flowmgr/processQuery1.vue
index 631940a..43bf3d3 100644
--- a/src/views/flowmgr/processQuery1.vue
+++ b/src/views/flowmgr/processQuery1.vue
@@ -160,7 +160,7 @@
}
},
{
- label: '宸ヨ壓鐗堟',
+ label: '鎵规鍙�',
prop: 'variables.craftEdition',
width: 80,
render: ({ row }) => {
@@ -334,7 +334,7 @@
},
{
- label: '宸ヨ壓鐗堟',
+ label: '鎵规鍙�',
prop: 'variables.craftEdition',
render: ({ row }) => {
return h('p',{'class': 'margin0'}, row?.variables?.craftEdition || '');
diff --git a/src/views/flowmgr/processQuery2.vue b/src/views/flowmgr/processQuery2.vue
index 16e6177..9b09370 100644
--- a/src/views/flowmgr/processQuery2.vue
+++ b/src/views/flowmgr/processQuery2.vue
@@ -12,16 +12,19 @@
@selection-change="selectionChange">
<template #menu-left>
- <!-- <el-button type="primary" plain @click="exportWebSite">瀵煎嚭鍥炰紶娑夊瘑缃�</el-button> -->
+ <!-- <el-button type="primary" plain @click="exportWebSite">瀵煎嚭鍥炰紶娑夊瘑缃�</el-button>
+ v-if="scope.row.processDefinitionKey === 'program-cure'"-->
</template>
<template #menu="scope">
<el-button type="primary" text size="default" @click.stop="customView(scope.row, scope.index, 0)">鏌ョ湅
</el-button>
<el-button type="primary" text size="default" v-if="scope.row.processDefinitionKey === 'dispatch'"
- @click.stop="handleApproveTable(scope.row, scope.index)">瀹℃壒琛ㄦ墦鍗�
+ @click.stop="handleApproveTable(scope.row, scope.index)">瀹℃壒琛�
</el-button>
-
+ <el-button type="primary" text size="default"
+ @click.stop="handleConfirmTable(scope.row, scope.index)">纭琛�
+ </el-button>
</template>
</avue-crud>
<el-dialog title="鎸囨淳" append-to-body v-model="reassignBox" width="30%">
@@ -150,7 +153,7 @@
}
},
{
- label: '宸ヨ壓鐗堟',
+ label: '鎵规鍙�',
prop: 'variables.craftEdition',
width: 80,
render: ({ row }) => {
@@ -324,7 +327,7 @@
},
{
- label: '宸ヨ壓鐗堟',
+ label: '鎵规鍙�',
prop: 'variables.craftEdition',
render: ({ row }) => {
return h('p',{'class': 'margin0'}, row?.variables?.craftEdition || '');
@@ -565,7 +568,6 @@
},
handleApproveTable(row, index,) {
//瀹℃壒琛ㄤ笅杞�
-
this.$confirm('鏄惁瀵煎嚭瀹℃壒琛�?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
@@ -587,6 +589,30 @@
},
+ handleConfirmTable(row, index,) {
+ //纭琛ㄤ笅杞�
+ this.$confirm('鏄惁瀵煎嚭纭琛�?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning',
+ }).then(() => {
+ console.log(this.selection)
+ NProgress.start();
+ exportBlobPost(
+ `/blade-mdm/flow/mgr/export-confirm-table`,
+ { processInstanceId: row.processInstanceId }
+ ).then(res => {
+ let name = res.headers['content-disposition'].split('filename=')[1]
+ console.log(res.headers['content-disposition'].split('filename=')[1]);
+ name = decodeURI(name)
+ downloadFile(res.data, `${name}`);
+ NProgress.done();
+ });
+ });
+
+
+ },
+
selectionChange(list) {
console.log('selectionChange', list);
this.selectedList = list;
diff --git a/src/views/flowmgr/processQuery3.vue b/src/views/flowmgr/processQuery3.vue
index ee0bbbf..567692f 100644
--- a/src/views/flowmgr/processQuery3.vue
+++ b/src/views/flowmgr/processQuery3.vue
@@ -162,7 +162,7 @@
}
},
{
- label: '宸ヨ壓鐗堟',
+ label: '鎵规鍙�',
prop: 'variables.craftEdition',
width: 80,
render: ({ row }) => {
@@ -342,7 +342,7 @@
}
},
{
- label: '宸ヨ壓鐗堟',
+ label: '鎵规鍙�',
prop: 'variables.craftEdition',
render: ({ row }) => {
return h('p',{'class': 'margin0'}, row?.variables?.craftEdition || '');
diff --git a/src/views/flowmgr/taskassign.vue b/src/views/flowmgr/taskassign.vue
index 0ce10ea..eab0580 100644
--- a/src/views/flowmgr/taskassign.vue
+++ b/src/views/flowmgr/taskassign.vue
@@ -21,19 +21,19 @@
watch: {
'attachForm.drawingNo': function (val) {
if(val && this.attachForm.processNo && this.attachForm.processEdition) {
- this.attachForm.title = `${val}-${this.attachForm.processNo}-${this.attachForm.processEdition}-鏁版帶绋嬪簭缂栧埗`;
+ this.attachForm.title = `${val}-${this.attachForm.processNo}-${this.attachForm.processEdition}-璁″垝浠诲姟`;
}
},
'attachForm.processNo': function (val) {
if(val && this.attachForm.drawingNo && this.attachForm.processEdition) {
//this.attachForm.title = `${val}-${this.attachForm.processNo}-鏁版帶绋嬪簭缂栧埗`;
- this.attachForm.title = `${this.attachForm.drawingNo}-${val}-${this.attachForm.processEdition}-鏁版帶绋嬪簭缂栧埗`;
+ this.attachForm.title = `${this.attachForm.drawingNo}-${val}-${this.attachForm.processEdition}-璁″垝浠诲姟`;
}
},
'attachForm.processEdition': function (val) {
if(val && this.attachForm.drawingNo && this.attachForm.processNo ) {
//this.attachForm.title = `${val}-${this.attachForm.processNo}-鏁版帶绋嬪簭缂栧埗`;
- this.attachForm.title = `${this.attachForm.drawingNo}-${this.attachForm.processNo}-${val}-鏁版帶绋嬪簭缂栧埗`;
+ this.attachForm.title = `${this.attachForm.drawingNo}-${this.attachForm.processNo}-${val}-璁″垝浠诲姟`;
}
},
},
@@ -57,6 +57,7 @@
prop: 'title',
type: 'input',
span: 24,
+ disabled:true,
dataType: 'string',
rules: [{ required: true, message: '蹇呭～'}],
blur: (col) => {
@@ -132,14 +133,13 @@
},
},
{
- label: '宸ヨ壓鐗堟',
+ label: '鎵规鍙�',
prop: 'craftEdition',
placeholder:'濡�"A"',
type: 'input',
span: 12,
dataType: 'string',
maxlength: 10,
- rules: [{ required: true, message: '蹇呭～', trigger: 'blur' }],
blur: (col) => {
this.handleTrim(col)
},
@@ -189,6 +189,7 @@
type: 'input',
span: 12,
dataType: 'string',
+ placeholder:'闈炲亸绂诲崟浠诲姟璇风暀绌�',
blur: (col) => {
this.handleTrim(col)
},
diff --git a/src/views/flowmgr/taskassigntemp.vue b/src/views/flowmgr/taskassigntemp.vue
index 41292bb..ccbf89b 100644
--- a/src/views/flowmgr/taskassigntemp.vue
+++ b/src/views/flowmgr/taskassigntemp.vue
@@ -33,7 +33,7 @@
'attachForm.processEdition': function (val) {
if(val && this.attachForm.drawingNo && this.attachForm.processNo ) {
//this.attachForm.title = `${val}-${this.attachForm.processNo}-鏁版帶绋嬪簭缂栧埗`;
- this.attachForm.title = `${this.attachForm.drawingNo}-${this.attachForm.processNo}-${val}-鏁版帶绋嬪簭缂栧埗琛ュ厖`;
+ this.attachForm.title = `${this.attachForm.drawingNo}-${this.attachForm.processNo}-${val}-鏁版帶绋嬪簭琛ュ厖`;
}
},
},
@@ -55,7 +55,11 @@
type: 'input',
span: 24,
dataType: 'string',
+ disabled:true,
rules: [{ required: true, message: '蹇呭～', trigger: 'blur' }],
+ blur: (col) => {
+ this.handleTrim(col)
+ },
},
{
label: '闆剁粍浠跺彿',
@@ -64,6 +68,9 @@
span: 12,
dataType: 'string',
rules: [{ required: true, message: '蹇呭～', trigger: 'blur' }],
+ blur: (col) => {
+ this.handleTrim(col)
+ },
},
{
label: '鍥惧彿鐗堟',
@@ -72,6 +79,9 @@
span: 12,
dataType: 'string',
rules: [{ required: true, message: '蹇呭～', trigger: 'blur' }],
+ blur: (col) => {
+ this.handleTrim(col)
+ },
},
{
label: '浜у搧鍨嬪彿',
@@ -80,6 +90,9 @@
span: 12,
dataType: 'string',
rules: [{ required: true, message: '蹇呭～', trigger: 'blur' }],
+ blur: (col) => {
+ this.handleTrim(col)
+ },
},
{
label: '宸ュ簭鍙�',
@@ -91,6 +104,9 @@
dataType: 'string',
max: 999,
rules: [{ required: true, message: '蹇呭～', trigger: 'blur' }],
+ blur: (col) => {
+ this.handleTrim(col)
+ },
},
{
label: '宸ュ簭鍚嶇О',
@@ -99,6 +115,9 @@
span: 12,
dataType: 'string',
rules: [{ required: true, message: '蹇呭～', trigger: 'blur' }],
+ blur: (col) => {
+ this.handleTrim(col)
+ },
},
{
label: '宸ュ簭鐗堟',
@@ -107,16 +126,21 @@
span: 12,
dataType: 'string',
rules: [{ required: true, message: '蹇呭～', trigger: 'blur' }],
+ blur: (col) => {
+ this.handleTrim(col)
+ },
},
{
- label: '宸ヨ壓鐗堟',
+ label: '鎵规鍙�',
prop: 'craftEdition',
placeholder:'濡�"A"',
type: 'input',
span: 12,
dataType: 'string',
maxlength: 10,
- rules: [{ required: true, message: '蹇呭～', trigger: 'blur' }],
+ blur: (col) => {
+ this.handleTrim(col)
+ },
},
{
label: '鍔犲伐鏈哄簥',
@@ -170,6 +194,17 @@
};
},
methods: {
+ handleTrim(col){
+ //console.log(col)
+ let value = this.attachForm[col.column.prop];
+ if (typeof value === 'string') {
+ const trimmedValue = value.trim();
+ // 鍙湁褰撳�肩‘瀹炲彂鐢熷彉鍖栨椂鎵嶆洿鏂�
+ if (trimmedValue !== value) {
+ this.attachForm[col.column.prop] = trimmedValue;
+ }
+ }
+ },
formSubmit(form, done) {
var form = { ...form };
this.machineCodeList.forEach(item => {
diff --git a/src/views/wel/components/TodolistRightTop.vue b/src/views/wel/components/TodolistRightTop.vue
index 50e82de..5d590ae 100644
--- a/src/views/wel/components/TodolistRightTop.vue
+++ b/src/views/wel/components/TodolistRightTop.vue
@@ -10,7 +10,7 @@
<el-form-item label="鍥惧彿鐗堟">
<el-input v-model="formInline.drawingNoEdition" placeholder=""></el-input>
</el-form-item>
- <el-form-item label="宸ヨ壓鐗堟">
+ <el-form-item label="鎵规鍙�">
<el-input v-model="formInline.craftEdition" placeholder=""></el-input>
</el-form-item>
<el-form-item label="浠诲姟杞﹂棿">
--
Gitblit v1.9.3