diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 302272626..4601f10bd 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -1066,8 +1066,10 @@ export default { middle.push(item.name); files.push(item.response.data.id); }); - this.fileListName = middle; - this.fileIds = files; + this.listForm.fileName = middle.join(','); + this.listForm.fileId = files.join(','); + // this.fileListName = middle; + // this.fileIds = files; }, fileUpload() { this.fileMadel = true; @@ -1081,12 +1083,17 @@ export default { }); this.fileListName = middle; this.fileIds.push(file.response.data.id); - if(this.listForm.fileName === null ){ + if(this.listForm.fileName === null || this.listForm.fileName === undefined){ this.listForm.fileName = this.fileListName.join(',') - }else { + } else { this.listForm.fileName = this.listForm.fileName + ',' + this.fileListName.join(','); } - this.listForm.fileId = this.listForm.fileId + ',' + this.fileIds.join(',') + if(this.listForm.fileId === null || this.listForm.fileId === undefined){ + this.listForm.fileId = this.fileIds.join(',') + }else { + this.listForm.fileId = this.listForm.fileId + ',' + this.fileIds.join(',') + } + console.log(this.listForm); this.$message.success("上传成功"); } else { this.$message.error(res.message); @@ -1205,7 +1212,11 @@ export default { exits.push(item.id) } }); - this.listForm.inforlist = this.listForm.inforlist + ',' + exits.join(',') + if(this.listForm.inforlist === null || this.listForm.inforlist === undefined){ + this.listForm.inforlist = exits.join(',') + } else { + this.listForm.inforlist = this.listForm.inforlist + ',' + exits.join(',') + } this.standardData = []; this.standModel = false; } diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue index 617b6018c..b72ea854f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue @@ -78,13 +78,8 @@ width="180px" label="标准号"> @@ -187,9 +187,7 @@ export default { }, getFormFieldList (item) { this.$nextTick(() => { - console.log(item) this.dataList = JSON.parse(JSON.stringify(item)).info.fileDataList - console.log(this.dataList) }) }, @@ -266,14 +264,8 @@ export default { this.getData() }, download(row) { - // window.open(process.env.VUE_APP_BASE_API + "/hospital/file/downloadFile?tPath=" + tPath) - var name = row.fileText; - var url = row.fileTextPath; - const a = document.createElement('a') - a.setAttribute('download', name) - a.setAttribute('target', '_blank') - a.setAttribute('href', process.env.VUE_APP_BASE_API + "/hospital/file/downloadFile?tPath=" + url) - a.click() + let attId = row.fileTextId + window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; }, // 分页事件 pageChange (page) { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index 81a044722..c1c65b777 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -28,16 +28,16 @@ @@ -93,13 +93,22 @@ + + + + + + + + + + @@ -113,7 +122,7 @@ :model="roleForm" :rules="roleFormRules" class="label-input-form"> - +

标准法规工程师

@@ -241,17 +250,26 @@ > + + + { - this.showColumn = true - }) + this.showColumn = true; + }); } this.modalshowflag = false; }, @@ -521,7 +540,7 @@ export default { this.active = name; }, typeChange(type) { - this.standardSearch.standType = type + this.standardSearch.standType = type; }, choiceShow() { this.ListModel = true; @@ -542,32 +561,32 @@ export default { //点击添加事件 addList() { this.standModel = true; - this.$refs.projectTable.clearSelection() + this.$refs.projectTable.clearSelection(); }, // 点击批量删除事件 deleteList() { - if(this.selectList.length < 1){ - this.$message.warning('请选择一条数据进行删除') - }else { - this.$confirm('您确认删除这些数据？', '提示', { - confirmButtonText: "确认", - confirmButtonClass: "common-button-primary", - cancelButtonText: "取消", - type: "warning" - }). then(() => { - this.selectList.map(item => { - let index; - index = this.dataList.findIndex(items => { - return items.productLine = item - }) - if (index > -1) { - this.dataList.splice(index, 1); - } + if (this.selectList.length < 1) { + this.$message.warning("请选择一条数据进行删除"); + } else { + this.$confirm("您确认删除这些数据？", "提示", { + confirmButtonText: "确认", + confirmButtonClass: "common-button-primary", + cancelButtonText: "取消", + type: "warning" + }).then(() => { + this.selectList.map(item => { + let index; + index = this.dataList.findIndex(items => { + return items.productLine = item; }); - this.selectList = []; - }).catch(() => { - }) - } + if (index > -1) { + this.dataList.splice(index, 1); + } + }); + this.selectList = []; + }).catch(() => { + }); + } }, //取消添加事件 cancelStand() { @@ -576,21 +595,21 @@ export default { //确认添加事件 okStand() { let proData = []; - if(this.dataList.length >= 1){ - this.dataList.forEach(item => { - if(proData.length === 0){ - proData.push(item.productLine) - }else if(!proData.includes(item.productLine)){ - proData.push(item.productLine) - } - }) - this.standList.forEach(items => { - if(!proData.includes(items.productLine)){ - this.dataList.push(items) + if (this.dataList.length >= 1) { + this.dataList.forEach(item => { + if (proData.length === 0) { + proData.push(item.productLine); + } else if (!proData.includes(item.productLine)) { + proData.push(item.productLine); } - }) + }); + this.standList.forEach(items => { + if (!proData.includes(items.productLine)) { + this.dataList.push(items); + } + }); this.standModel = false; - }else{ + } else { if (this.standList.length >= 1) { this.dataList = this.standList; this.roleForm.directorUser = this.dataList[0].uname; @@ -607,7 +626,7 @@ export default { let _formData = new FormData(); _formData.append("createUser", this.$store.getters.userInfo.userId); _formData.append("createUserName", this.$store.getters.userInfo.uName); - _formData.append("prcType", '5'); + _formData.append("prcType", "5"); _formData.append("json", JSON.stringify({ prcForm: this.prcForm, sarAccessInfoList: this.sarAccessInfoList, @@ -625,19 +644,17 @@ export default { }, //提交事件 handleSubmit() { + if (this.dataList.length < 1) { + this.$message.warning("请添加产品线信息"); + } this.dataList.forEach(item => { - if(item.distributePerson === '' || item.distributePerson === null || item.distributePerson === undefined){ - this.$message.warning('请选择分发责任人') + if (item.distributePerson === "" || item.distributePerson === null || item.distributePerson === undefined) { + this.$message.warning("请选择分发责任人"); } else { - var json = Object.assign(this.listForm, this.roleForm) - json.prcCreateUser = this.$store.getters.userInfo.userId; - json.prcCreateUserName = this.$store.getters.userInfo.uName; - json.standId = this.listForm.standId; - json.XCXSSRQ = this.sarAccessListDatas[0].xcxssrqgj - json.ZCCSSRQ = this.sarAccessListDatas[0].zccssrqgj - this.$refs['listForm'].validate((valid) => { + var json = Object.assign(this.listForm, this.roleForm); + this.$refs["listForm"].validate((valid) => { if (valid) { - this.$refs['roleForm'].validate((valid) => { + this.$refs["roleForm"].validate((valid) => { if (valid) { this.$http.get("lawss/activiti/startProcess", { type: "5" }, { _this: this @@ -666,7 +683,7 @@ export default { } }); } - }) + }); }, //选择拆分标准取消事件 @@ -723,8 +740,8 @@ export default { selectThree(data) { this.standList = data; }, - choiceZRR(scope,type, title, id) { - if(scope!=null){ + choiceZRR(scope, type, title, id) { + if (scope != null) { this.dsadadadsada = scope.$index; } this.nodeList = []; @@ -740,19 +757,19 @@ export default { }, pageChange(page) { this.page = page; - this.getStandData() + this.getStandData(); }, pageSizeChange(pageSize) { this.pageSize = this.$store.getters.userInfo.configContent; - this.getStandData() + this.getStandData(); }, pageChangeNo(page) { this.pageNO = page; - this.getProductData() + this.getProductData(); }, pageSizeChangeNo(pageSize) { this.pageSizeNo = this.$store.getters.userInfo.configContent; - this.getProductData() + this.getProductData(); }, //获取产品线数据 getProductData() { @@ -769,27 +786,27 @@ export default { }); }, //获取标准数据 - getStandData(){ - this.$http.post('SarStandItems/sar-stand-items/findStand',{ + getStandData() { + this.$http.post("SarStandItems/sar-stand-items/findStand", { page: this.page, size: this.pageSize, - ...this.standardSearch, - },{ - _this: this, + ...this.standardSearch + }, { + _this: this }, res => { this.sarAccessListDatas = res.records; - this.total = res.total + this.total = res.total; }, e => { - }) + }); }, clearSearch() { this.standardSearch = { standName: "", - standType:"", + standType: "" }; this.getStandData(); - }, + } }, computed: {}, mounted() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue index 7c9ef4c0b..123463a43 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue @@ -25,14 +25,14 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index fbe139e45..439803ab4 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -25,14 +25,14 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index 420fd9107..97fe79a24 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -25,14 +25,14 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue index f5d42974e..8e59d2f47 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue @@ -25,14 +25,14 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue index eaa28bcd6..ea95b1152 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue @@ -25,14 +25,14 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue index 467b93137..7540a8b3a 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue @@ -25,14 +25,14 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue index b9053c236..517a91b42 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue @@ -41,92 +41,98 @@ + :data="dataList" + style="width: 100%; border: 1px solid #cccccc" + row-key="standId" + height="70%" + border + @selection-change="selectStandChange" + :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', + fontWeight: 'bold', height: '48px'}" + > + type="selection" + width="55" + align="center"> + prop="standEnName" + label="标准编号" + width="180" + fixed="left" + align="center" + > + prop="standName" + fixed="left" + width="180" + align="center" + label="标准名称" + > + prop="itemsNum" + align="center" + width="200" + label="条款号"> + prop="itemsName" + width="200" + align="center" + label="条款名称"> + prop="xcxssrqgj" + width="200" + align="center" + label="新车型实施日期"> + prop="zccssrqgj" + width="200" + align="center" + label="在产车实施日期"> + prop="productType" + align="center" + label="在研产品"> + prop="complianceReasons" + align="center" + width="160" + label="合规"> + align="center" + width="160" + prop="researchNonCompliance" + label="不合规"> + prop="noCompliance" + align="center" + width="160" + label="不合规项目"> + prop="countermeasures" + align="center" + width="160" + label="应对措施"> + prop="completionTime" + align="center" + width="160" + label="完成时间"> @@ -134,48 +140,41 @@ + align="center" + label="在产产品"> + prop="zcComplianceReasons" + align="center" + width="160" + label="合规(具体情况)"> + align="center" + width="160" + label="不合规"> + prop="zcNoCompliance" + align="center" + width="160" + label="不合规项目"> + prop="zcCountermeasures" + align="center" + width="160" + label="应对措施"> + prop="zcCompletionTime" + align="center" + width="160" + label="完成时间"> - -
@@ -297,7 +296,7 @@ export default { saveLoading: false, //表单的数据 listForm: { - BZFlag: " ", //1审批通过 其他为驳回 + bzFlag: " ", //1审批通过 其他为驳回 projectNumber: "", //项目编号 projectName: "", //项目名称 dataList: [], //项目下的标准数据 @@ -359,42 +358,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/step11.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue index 5831d1333..f560b2da8 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue @@ -41,92 +41,98 @@ + :data="dataList" + style="width: 100%; border: 1px solid #cccccc" + row-key="standId" + height="70%" + border + @selection-change="selectStandChange" + :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', + fontWeight: 'bold', height: '48px'}" + > + type="selection" + width="55" + align="center"> + prop="standEnName" + label="标准编号" + width="180" + fixed="left" + align="center" + > + prop="standName" + fixed="left" + width="180" + align="center" + label="标准名称" + > + prop="itemsNum" + align="center" + width="200" + label="条款号"> + prop="itemsName" + width="200" + align="center" + label="条款名称"> + prop="xcxssrqgj" + width="200" + align="center" + label="新车型实施日期"> + prop="zccssrqgj" + width="200" + align="center" + label="在产车实施日期"> + prop="productType" + align="center" + label="在研产品"> + prop="complianceReasons" + align="center" + width="160" + label="合规"> + align="center" + width="160" + prop="researchNonCompliance" + label="不合规"> + prop="noCompliance" + align="center" + width="160" + label="不合规项目"> + prop="countermeasures" + align="center" + width="160" + label="应对措施"> + prop="completionTime" + align="center" + width="160" + label="完成时间"> @@ -134,48 +140,41 @@ + align="center" + label="在产产品"> + prop="zcComplianceReasons" + align="center" + width="160" + label="合规(具体情况)"> + align="center" + width="160" + label="不合规"> + prop="zcNoCompliance" + align="center" + width="160" + label="不合规项目"> + prop="zcCountermeasures" + align="center" + width="160" + label="应对措施"> + prop="zcCompletionTime" + align="center" + width="160" + label="完成时间"> - -
@@ -297,7 +296,7 @@ export default { saveLoading: false, //表单的数据 listForm: { - BZFlag: " ", //1审批通过 其他为驳回 + bzFlag: " ", //1审批通过 其他为驳回 projectNumber: "", //项目编号 projectName: "", //项目名称 dataList: [], //项目下的标准数据 @@ -359,43 +358,52 @@ 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() { return this.processType === 1 ? "暂无待办流程" : "暂无已办流程"; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue index f3aa290cc..800bc166b 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue @@ -41,92 +41,98 @@ + :data="dataList" + style="width: 100%; border: 1px solid #cccccc" + row-key="standId" + height="70%" + border + @selection-change="selectStandChange" + :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', + fontWeight: 'bold', height: '48px'}" + > + type="selection" + width="55" + align="center"> + prop="standEnName" + label="标准编号" + width="180" + fixed="left" + align="center" + > + prop="standName" + fixed="left" + width="180" + align="center" + label="标准名称" + > + prop="itemsNum" + align="center" + width="200" + label="条款号"> + prop="itemsName" + width="200" + align="center" + label="条款名称"> + prop="xcxssrqgj" + width="200" + align="center" + label="新车型实施日期"> + prop="zccssrqgj" + width="200" + align="center" + label="在产车实施日期"> + prop="productType" + align="center" + label="在研产品"> + prop="complianceReasons" + align="center" + width="160" + label="合规"> + align="center" + width="160" + prop="researchNonCompliance" + label="不合规"> + prop="noCompliance" + align="center" + width="160" + label="不合规项目"> + prop="countermeasures" + align="center" + width="160" + label="应对措施"> + prop="completionTime" + align="center" + width="160" + label="完成时间"> @@ -134,48 +140,41 @@ + align="center" + label="在产产品"> + prop="zcComplianceReasons" + align="center" + width="160" + label="合规(具体情况)"> + align="center" + width="160" + label="不合规"> + prop="zcNoCompliance" + align="center" + width="160" + label="不合规项目"> + prop="zcCountermeasures" + align="center" + width="160" + label="应对措施"> + prop="zcCompletionTime" + align="center" + width="160" + label="完成时间"> - -
@@ -297,7 +296,7 @@ export default { saveLoading: false, //表单的数据 listForm: { - BZFlag: " ", //1审批通过 其他为驳回 + dlFlag: " ", //1审批通过 其他为驳回 projectNumber: "", //项目编号 projectName: "", //项目名称 dataList: [], //项目下的标准数据 @@ -359,42 +358,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.dlFlag = "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.dlFlag = "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() { @@ -404,7 +411,7 @@ export default { mounted() { this.processTable(); this.getData(); - } + }, }; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue index 05e761fd8..632d439fa 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue @@ -72,7 +72,7 @@ > @@ -84,21 +84,21 @@ label="条款名称">