- {{ item.name }}
+ {{ item.name | ellipsis22 }}
- {{ textStatusMap[scope.row.textStatus] }}
+ {{ textStatusMap[scope.row.textStatusBuss] }}
@@ -697,14 +696,21 @@
- {{ item.name }}
+ {{ item.name | ellipsis22 }}
- {{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
- {{ scope.row.standSort }} {{ scope.row.standNumber }}
+ {{ scope.row.standCode}}
{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}
- {{ textStatusMap[scope.row.textStatus] }}
+ {{ textStatusMap[scope.row.textStatusBuss] }}
@@ -1925,10 +1923,14 @@
let textArr2 = []
this.selectedListRep.map((item) => {
let texts = ''
- if (item.standYear != null && item.standYear !== '') {
- texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
- } else {
- texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+ if(item.standCode !== null && item.standCode !== ''){
+ texts = item.standCode
+ }else {
+ if (item.standYear != null && item.standYear !== '') {
+ texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+ } else {
+ texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+ }
}
textArr2.push(item.standNumber)
textArr.push(texts)
@@ -1939,14 +1941,14 @@
// this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
// 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
if(this.replaceLawType === 'DTQBBHBUSS'){
- this.form.DTQBBHBUSS = textArr.join(',')
+ this.form.DTQBBHBUSS = this.filterSetData(textArr.join(','))
}else if(this.replaceLawType === 'yybj'){
this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'cbbh'){
this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'BDTQBBHBUSS'){
- this.form.BDTQBBHBUSS = textArr.join(',')
- this.form.standNum = textArr2.join(',')
+ this.form.BDTQBBHBUSS = this.filterSetData(textArr.join(','))
+ this.form.standNum = this.filterSetData(textArr2.join(','))
}else {
this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',')
}
@@ -1954,6 +1956,14 @@
this.$refs.selections.clearSelection()
this.formKey++
},
+ filterSetData(data){
+ const arr=new Set()
+ let permission = data.split(",");
+ permission.forEach((item, index) => {
+ arr.add(item)
+ })
+ return Array.from(arr).join(',');
+ },
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
@@ -2110,9 +2120,9 @@
this.LSBBBUSSFileList = this.LSBBBUSSFileList.filter ( item => item.response === undefined);
this.LSBBBUSSFileList.push(fileObj)
break;
- case 'GLWJLAWS':
- this.GLWJLAWSFileList = this.GLWJLAWSFileList.filter ( item => item.response === undefined);
- this.GLWJLAWSFileList.push(fileObj)
+ case 'QTWJBUSS':
+ this.QTWJBUSSFileList = this.QTWJBUSSFileList.filter ( item => item.response === undefined);
+ this.QTWJBUSSFileList.push(fileObj)
break;
case 'GLWJBUSS':
this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined);
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue
index a59798972..eb76b7f79 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue
@@ -1218,19 +1218,21 @@
})
},
checkedRoleTransfer (data) {
- this.assigneeNewLoading = true
+ this.isSubmit = true
+ this.saveLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人
assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例
}).then(res => {
- this.assigneeNewLoading = false
+ this.isSubmit = false
+ this.saveLoading = false
if (res.success) {
this.drawerModal = false
this.$message.success('调整成功')
- this.processNum()
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+ this.processNum()
} else {
this.$message.warning(res.message)
}
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue
index 63ec93ed1..511ff637d 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue
@@ -1308,6 +1308,10 @@
this.previewShow(attId)
},
showDrawerClose () {
+ this.showForm.modelNum = ""
+ this.showForm.modelUpdBefore = ""
+ this.showForm.modelUpdAfter = ""
+ this.showForm.modelContent = ""
this.showDrawer = false
},
filterData2(){
@@ -1477,6 +1481,10 @@
};
this.form.modelData.push(list);
this.$message.success("新增成功！")
+ this.showForm.modelNum = ""
+ this.showForm.modelUpdBefore = ""
+ this.showForm.modelUpdAfter = ""
+ this.showForm.modelContent = ""
}
})
},
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
index 1bc1ffe3c..39a7eabd1 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
@@ -400,20 +400,19 @@
+ 查询
@@ -436,8 +435,7 @@
- {{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
- {{ scope.row.standSort }} {{ scope.row.standNumber }}
+ {{ scope.row.standCode}}
{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}
- {{ textStatusMap[scope.row.textStatus] }}
+ {{ textStatusMap[scope.row.textStatusBuss] }}
@@ -2017,10 +2015,14 @@
let textArr2 = []
this.selectedListRep.map((item) => {
let texts = ''
- if (item.standYear != null && item.standYear !== '') {
- texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
- } else {
- texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+ if(item.standCode !== null && item.standCode !== ''){
+ texts = item.standCode
+ }else {
+ if (item.standYear != null && item.standYear !== '') {
+ texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+ } else {
+ texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+ }
}
textArr2.push(item.standNumber)
textArr.push(texts)
@@ -2031,14 +2033,14 @@
// this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
// 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
if(this.replaceLawType === 'DTQBBHBUSS'){
- this.form.DTQBBHBUSS = textArr.join(',')
+ this.form.DTQBBHBUSS = this.filterSetData(textArr.join(','))
}else if(this.replaceLawType === 'yybj'){
this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'cbbh'){
this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'BDTQBBHBUSS'){
- this.form.BDTQBBHBUSS = textArr.join(',')
- this.form.standNum = textArr2.join(',')
+ this.form.BDTQBBHBUSS = this.filterSetData(textArr.join(','))
+ this.form.standNum = this.filterSetData(textArr2.join(','))
}else {
this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',')
}
@@ -2046,6 +2048,14 @@
this.$refs.selections.clearSelection()
this.formKey++
},
+ filterSetData(data){
+ const arr=new Set()
+ let permission = data.split(",");
+ permission.forEach((item, index) => {
+ arr.add(item)
+ })
+ return Array.from(arr).join(',');
+ },
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
@@ -2202,9 +2212,9 @@
this.LSBBBUSSFileList = this.LSBBBUSSFileList.filter ( item => item.response === undefined);
this.LSBBBUSSFileList.push(fileObj)
break;
- case 'GLWJLAWS':
- this.GLWJLAWSFileList = this.GLWJLAWSFileList.filter ( item => item.response === undefined);
- this.GLWJLAWSFileList.push(fileObj)
+ case 'QTWJBUSS':
+ this.QTWJBUSSFileList = this.QTWJBUSSFileList.filter ( item => item.response === undefined);
+ this.QTWJBUSSFileList.push(fileObj)
break;
case 'GLWJBUSS':
this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined);
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue
index dbad140ce..33fe91876 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue
@@ -2283,19 +2283,21 @@
}
},
checkedRoleTransfer (data) {
- this.assigneeNewLoading = true
+ this.isSubmit = true
+ this.saveLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人
assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例
}).then(res => {
- this.assigneeNewLoading = false
+ this.isSubmit = false
+ this.saveLoading = false
if (res.success) {
this.drawerModal = false
this.$message.success('调整成功')
- this.processNum()
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+ this.processNum()
} else {
this.$message.warning(res.message)
}
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue
index 28e966a37..c82f9be88 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue
@@ -1219,19 +1219,21 @@
})
},
checkedRoleTransfer (data) {
- this.assigneeNewLoading = true
+ this.isSubmit = true
+ this.saveLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人
assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例
}).then(res => {
- this.assigneeNewLoading = false
+ this.isSubmit = false
+ this.saveLoading = false
if (res.success) {
this.drawerModal = false
this.$message.success('调整成功')
- this.processNum()
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+ this.processNum()
} else {
this.$message.warning(res.message)
}
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue
index 6d5885bba..8e6550331 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue
@@ -1219,19 +1219,21 @@
})
},
checkedRoleTransfer (data) {
- this.assigneeNewLoading = true
+ this.isSubmit = true
+ this.saveLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人
assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例
}).then(res => {
- this.assigneeNewLoading = false
+ this.isSubmit = false
+ this.saveLoading = false
if (res.success) {
this.drawerModal = false
this.$message.success('调整成功')
- this.processNum()
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+ this.processNum()
} else {
this.$message.warning(res.message)
}
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
index 900467814..c963f5382 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
@@ -330,20 +330,19 @@
+ 查询
@@ -366,8 +365,7 @@
- {{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
- {{ scope.row.standSort }} {{ scope.row.standNumber }}
+ {{ scope.row.standCode}}
{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}
- {{ textStatusMap[scope.row.textStatus] }}
+ {{ textStatusMap[scope.row.textStatusBuss] }}
@@ -1926,10 +1924,14 @@
let textArr2 = []
this.selectedListRep.map((item) => {
let texts = ''
- if (item.standYear != null && item.standYear !== '') {
- texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
- } else {
- texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+ if(item.standCode !== null && item.standCode !== ''){
+ texts = item.standCode
+ }else {
+ if (item.standYear != null && item.standYear !== '') {
+ texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+ } else {
+ texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+ }
}
textArr2.push(item.standNumber)
textArr.push(texts)
@@ -1940,14 +1942,14 @@
// this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
// 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
if(this.replaceLawType === 'DTQBBHBUSS'){
- this.form.DTQBBHBUSS = textArr.join(',')
+ this.form.DTQBBHBUSS = this.filterSetData(textArr.join(','))
}else if(this.replaceLawType === 'yybj'){
this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'cbbh'){
this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'BDTQBBHBUSS'){
- this.form.BDTQBBHBUSS = textArr.join(',')
- this.form.standNum = textArr2.join(',')
+ this.form.BDTQBBHBUSS = this.filterSetData(textArr.join(','))
+ this.form.standNum = this.filterSetData(textArr2.join(','))
}else {
this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',')
}
@@ -1955,6 +1957,14 @@
this.$refs.selections.clearSelection()
this.formKey++
},
+ filterSetData(data){
+ const arr=new Set()
+ let permission = data.split(",");
+ permission.forEach((item, index) => {
+ arr.add(item)
+ })
+ return Array.from(arr).join(',');
+ },
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
@@ -2111,9 +2121,9 @@
this.LSBBBUSSFileList = this.LSBBBUSSFileList.filter ( item => item.response === undefined);
this.LSBBBUSSFileList.push(fileObj)
break;
- case 'GLWJLAWS':
- this.GLWJLAWSFileList = this.GLWJLAWSFileList.filter ( item => item.response === undefined);
- this.GLWJLAWSFileList.push(fileObj)
+ case 'QTWJBUSS':
+ this.QTWJBUSSFileList = this.QTWJBUSSFileList.filter ( item => item.response === undefined);
+ this.QTWJBUSSFileList.push(fileObj)
break;
case 'GLWJBUSS':
this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined);
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
index eab0cd50b..5ba8f9c27 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
@@ -400,20 +400,19 @@
+ 查询
@@ -451,11 +450,11 @@
{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}
- {{ item.name }}
+ {{ item.name | ellipsis22 }}
+ 查询
@@ -776,8 +775,7 @@
- {{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
- {{ scope.row.standSort }} {{ scope.row.standNumber }}
+ {{ scope.row.standCode}}
{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}
- {{ textStatusMap[scope.row.textStatus] }}
+ {{ textStatusMap[scope.row.textStatusBuss] }}
@@ -2437,10 +2435,14 @@
let textArr2 = []
this.selectedListRep.map((item) => {
let texts = ''
- if (item.standYear != null && item.standYear !== '') {
- texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
- } else {
- texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+ if(item.standCode !== null && item.standCode !== ''){
+ texts = item.standCode
+ }else {
+ if (item.standYear != null && item.standYear !== '') {
+ texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+ } else {
+ texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+ }
}
textArr2.push(item.standNumber)
textArr.push(texts)
@@ -2451,20 +2453,28 @@
// this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
// 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
if(this.replaceLawType === 'DTQBBHBUSS'){
- this.form.DTQBBHBUSS = textArr.join(',')
+ this.form.DTQBBHBUSS = this.filterSetData(textArr.join(','))
}else if(this.replaceLawType === 'yybj'){
this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'cbbh'){
this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'BDTQBBHBUSS'){
- this.form.BDTQBBHBUSS = textArr.join(',')
- this.form.standNum = textArr2.join(',')
+ this.form.BDTQBBHBUSS = this.filterSetData(textArr.join(','))
+ this.form.standNum = this.filterSetData(textArr2.join(','))
}else {
this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',')
}
// this.$emit('input', textArr.join(','))
this.$refs.selections.clearSelection()
},
+ filterSetData(data){
+ const arr=new Set()
+ let permission = data.split(",");
+ permission.forEach((item, index) => {
+ arr.add(item)
+ })
+ return Array.from(arr).join(',');
+ },
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
@@ -2604,9 +2614,9 @@
this.LSBBBUSSFileList = this.LSBBBUSSFileList.filter ( item => item.response === undefined);
this.LSBBBUSSFileList.push(fileObj)
break;
- case 'GLWJLAWS':
- this.GLWJLAWSFileList = this.GLWJLAWSFileList.filter ( item => item.response === undefined);
- this.GLWJLAWSFileList.push(fileObj)
+ case 'QTWJBUSS':
+ this.QTWJBUSSFileList = this.QTWJBUSSFileList.filter ( item => item.response === undefined);
+ this.QTWJBUSSFileList.push(fileObj)
break;
case 'GLWJBUSS':
this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined);
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue
index e91d77e4f..c2dad4274 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue
@@ -1219,19 +1219,21 @@
})
},
checkedRoleTransfer (data) {
- this.assigneeNewLoading = true
+ this.isSubmit = true
+ this.saveLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人
assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例
}).then(res => {
- this.assigneeNewLoading = false
+ this.isSubmit = false
+ this.saveLoading = false
if (res.success) {
this.drawerModal = false
this.$message.success('调整成功')
- this.processNum()
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+ this.processNum()
} else {
this.$message.warning(res.message)
}
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue
index adae7face..55c112319 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue
@@ -1219,19 +1219,21 @@
})
},
checkedRoleTransfer (data) {
- this.assigneeNewLoading = true
+ this.isSubmit = true
+ this.saveLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人
assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例
}).then(res => {
- this.assigneeNewLoading = false
+ this.isSubmit = false
+ this.saveLoading = false
if (res.success) {
this.drawerModal = false
this.$message.success('调整成功')
- this.processNum()
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+ this.processNum()
} else {
this.$message.warning(res.message)
}
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue
index f324ba803..57892b124 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue
@@ -1219,19 +1219,21 @@
})
},
checkedRoleTransfer (data) {
- this.assigneeNewLoading = true
+ this.isSubmit = true
+ this.saveLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人
assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例
}).then(res => {
- this.assigneeNewLoading = false
+ this.isSubmit = false
+ this.saveLoading = false
if (res.success) {
this.drawerModal = false
this.$message.success('调整成功')
- this.processNum()
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+ this.processNum()
} else {
this.$message.warning(res.message)
}
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
index 1bdad3732..2d970258b 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
@@ -288,20 +288,19 @@
+ 查询
@@ -324,8 +323,7 @@
- {{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
- {{ scope.row.standSort }} {{ scope.row.standNumber }}
+ {{ scope.row.standCode}}
{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}
- {{ textStatusMap[scope.row.textStatus] }}
+ {{ textStatusMap[scope.row.textStatusBuss] }}
@@ -859,8 +857,8 @@
// 适用范围
QCDW: '',
QCRBUSS: '',
- WJSCRYBUSS: this.$store.getters.userInfo.userId,
- WJSCRYBUSSName: this.$store.getters.userInfo.userName,
+ WJSCRYBUSS: this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')',
+ WJSCRYBUSSName: this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')',
SYCXCLASS: '',
NYLXCLASS: '',
SYCPXCLASS: '',
@@ -1376,6 +1374,8 @@
let mes = JSON.parse(res.mes)
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
this.form = mes.form
+ this.form['WJSCRYBUSS'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')',
+ this.form['WJSCRYBUSSName'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')',
this.getStandInfoByReviseStatus()
this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
@@ -1866,10 +1866,14 @@
let textArr2 = []
this.selectedListRep.map((item) => {
let texts = ''
- if (item.standYear != null && item.standYear !== '') {
- texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
- } else {
- texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+ if(item.standCode !== null && item.standCode !== ''){
+ texts = item.standCode
+ }else {
+ if (item.standYear != null && item.standYear !== '') {
+ texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+ } else {
+ texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+ }
}
textArr2.push(item.standNumber)
textArr.push(texts)
@@ -1880,14 +1884,14 @@
// this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
// 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
if(this.replaceLawType === 'DTQBBHBUSS'){
- this.form.DTQBBHBUSS = textArr.join(',')
+ this.form.DTQBBHBUSS = this.filterSetData(textArr.join(','))
}else if(this.replaceLawType === 'yybj'){
this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'cbbh'){
this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'BDTQBBHBUSS'){
- this.form.BDTQBBHBUSS = textArr.join(',')
- this.form.standNum = textArr2.join(',')
+ this.form.BDTQBBHBUSS = this.filterSetData(textArr.join(','))
+ this.form.standNum = this.filterSetData(textArr2.join(','))
}else {
this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',')
}
@@ -1895,6 +1899,14 @@
this.$refs.selections.clearSelection()
this.formKey++
},
+ filterSetData(data){
+ const arr=new Set()
+ let permission = data.split(",");
+ permission.forEach((item, index) => {
+ arr.add(item)
+ })
+ return Array.from(arr).join(',');
+ },
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
@@ -2044,9 +2056,9 @@
this.LSBBBUSSFileList = this.LSBBBUSSFileList.filter ( item => item.response === undefined);
this.LSBBBUSSFileList.push(fileObj)
break;
- case 'GLWJLAWS':
- this.GLWJLAWSFileList = this.GLWJLAWSFileList.filter ( item => item.response === undefined);
- this.GLWJLAWSFileList.push(fileObj)
+ case 'QTWJBUSS':
+ this.QTWJBUSSFileList = this.QTWJBUSSFileList.filter ( item => item.response === undefined);
+ this.QTWJBUSSFileList.push(fileObj)
break;
case 'GLWJBUSS':
this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined);
@@ -2507,6 +2519,8 @@
this.form.prcName = this.prcName
this.form.issueTime = this.dateFormatter()
this.form['id'] = item.id
+ this.form['WJSCRYBUSS'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')',
+ this.form['WJSCRYBUSSName'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')',
this.FBGBUSSFileList=this.assemble(item.FBGBUSS,item.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(item.BZSMBUSS,item.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(item.LSBBBUSS,item.LSBBBUSSName);
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue
index 5a17b5e0b..b130f6d1e 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue
@@ -233,6 +233,8 @@
ref="importfile"
name="file"
accept=".pdf, .PDF, .ppt, .PPT, .pptx,.PPTX, .doc, .DOC, .docx, .DOCX, .xls, .xlsx"
+ :limit="1"
+ :on-exceed="handleExceed"
:before-upload="beginImportFile"
:on-success="importFileSuccess"
:on-preview="handleFilePreview"
@@ -1814,6 +1816,9 @@
}, e => {
})
},
+ handleExceed(files, fileList) {
+ this.$message.warning(`当前限制上传 1 个文件，本次上传了 ${files.length} 个文件，共上传了 ${files.length + fileList.length} 个文件`);
+ },
beginImportFile (file) {
var filename = file.name
var index1 = filename.lastIndexOf('.')
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
index 00e164603..f0b8a7d9d 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
@@ -330,20 +330,19 @@
+ 查询
@@ -366,8 +365,7 @@
- {{ item.name }}
+ {{ item.name | ellipsis22 }}
+
+
+
@@ -664,19 +677,6 @@
-
-
-
-
- {{ item.name }}
+ {{ item.name | ellipsis22 }}
+
+
+
+
+
-
-
-
-