diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue index 517a91b42..4891306dc 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue @@ -46,7 +46,6 @@ row-key="standId" height="70%" border - @selection-change="selectStandChange" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" > @@ -175,6 +174,12 @@ + +
@@ -387,6 +392,7 @@ export default { this.listForm.bzFlag = "1"; this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); + console.log(json) this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue index f560b2da8..ecd157571 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue @@ -46,7 +46,6 @@ row-key="standId" height="70%" border - @selection-change="selectStandChange" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" > @@ -175,6 +174,12 @@ + +
@@ -335,6 +340,7 @@ export default { taskIds: this.taskIds, pId: this.pId }).then(res => { + console.log(res.mesg) if (res) { const processForm = JSON.parse(res.mesg); this.getFormFieldList(processForm); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue index 800bc166b..5cb4a140c 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue @@ -46,7 +46,6 @@ row-key="standId" height="70%" border - @selection-change="selectStandChange" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" > @@ -175,6 +174,12 @@ + +
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue index f44146803..d00f00f00 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue @@ -312,42 +312,50 @@ export default { }, //驳回事件 beforeBack() { - this.listForm.BZFlag = "2"; - this.listForm.commentText = this.commentText; - const json = JSON.stringify(this.listForm); - this.$http.post("lawss/activiti/completeTask", { - taskIds: this.taskIds, - userId: this.userId, - json: json - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); - } - }, e => { - }); + if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ + this.$message.warning('审批意见不能为空') + }else{ + this.listForm.BZFlag = "2"; + this.listForm.commentText = this.commentText; + const json = JSON.stringify(this.listForm); + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.taskIds, + userId: this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + }, e => { + }); + } }, //提交事件 handleSubmit() { - this.listForm.BZFlag = "1"; - this.listForm.commentText = this.commentText; - const json = JSON.stringify(this.listForm); - this.$http.post("lawss/activiti/completeTask", { - taskIds: this.taskIds, - userId: this.userId, - json: json - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message); - this.$router.push("/processCenter"); - } - }, e => { - }); - } + if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ + this.$message.warning('审批意见不能为空') + }else{ + this.listForm.BZFlag = "1"; + this.listForm.commentText = this.commentText; + const json = JSON.stringify(this.listForm); + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.taskIds, + userId: this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + this.$router.push("/processCenter"); + } + }, e => { + }); + } + } }, computed: { listNoDataText() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue index ac7e9a61e..1043c1f48 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue @@ -46,7 +46,6 @@ row-key="standId" height="70%" border - @selection-change="selectStandChange" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" > @@ -175,6 +174,12 @@ + +
@@ -335,6 +340,7 @@ taskIds: this.taskIds, pId: this.pId }).then(res => { + console.log(res.mesg) if (res) { const processForm = JSON.parse(res.mesg); this.getFormFieldList(processForm); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue index 7b02fb449..06afbaec8 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue @@ -46,7 +46,6 @@ row-key="standId" height="70%" border - @selection-change="selectStandChange" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" > @@ -175,6 +174,12 @@ + +
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue index 5ab76b5c5..a88631f58 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue @@ -46,7 +46,6 @@ row-key="standId" height="70%" border - @selection-change="selectStandChange" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" > @@ -175,6 +174,12 @@ + +
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index e8a607477..2c860654c 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -1173,7 +1173,6 @@ export default { return items.id == item.id }) if(addList > -1){ - this.$message.warning('请勿添加重复数据') // this.$refs.accessTypeSelect.clearSelection() this.$refs.entryTable.clearSelection() this.$refs.searchTable.clearSelection() @@ -1184,6 +1183,7 @@ export default { this.$refs.searchTable.clearSelection() } }) + this.$message.warning('请勿添加重复数据') } else { this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)') } diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index ebae46d8b..4a1bebbc0 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -1142,7 +1142,6 @@ export default { return items.id == item.id }) if(addList > -1){ - this.$message.warning('请勿添加重复数据') // this.$refs.accessTypeSelect.clearSelection() this.$refs.entryTable.clearSelection() this.$refs.searchTable.clearSelection() @@ -1153,6 +1152,7 @@ export default { this.$refs.searchTable.clearSelection() } }) + this.$message.warning('请勿添加重复数据') this.selectedAccInfoSearchList = [] this.$refs.entryTable.clearSelection() this.$refs.searchTable.clearSelection() @@ -1326,7 +1326,6 @@ export default { loading: 'loadData' }, res => { if (res.ok) { - this.$message.success('编辑成功') this.isNext = true this.$router.push({ name: 'AccessStandardsAndRegulations' diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index a1baae20a..8adf94499 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -1141,7 +1141,6 @@ export default { return items.id == item.id }) if(addList > -1){ - this.$message.warning('请勿添加重复数据') // this.$refs.accessTypeSelect.clearSelection() this.$refs.entryTable.clearSelection() this.$refs.searchTable.clearSelection() @@ -1152,6 +1151,7 @@ export default { this.$refs.searchTable.clearSelection() } }) + this.$message.warning('请勿添加重复数据') this.selectedAccInfoSearchList = [] this.$refs.entryTable.clearSelection() this.$refs.searchTable.clearSelection() @@ -1325,7 +1325,6 @@ export default { loading: 'loadData' }, res => { if (res.ok) { - this.$message.success('编辑成功') this.isNext = true this.$router.push({ name: 'AccessStandardsAndRegulations'