From e5988362cbeeb75322214c0cb8175ed214ba410f Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 16 Nov 2022 17:03:28 +0800 Subject: [PATCH 01/51] =?UTF-8?q?=E5=88=B6=E4=BF=AE=E8=AE=A2=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk/step1.vue | 6362 +++++++++-------- .../pages/creatProcess/qbzxdlx/step2.vue | 96 +- .../pages/creatProcess/xmqdqr/step1.vue | 15 +- .../tabComponents/newProcess/index.vue | 5 +- .../regulatoryRepository/dataCenter/index.vue | 220 +- 5 files changed, 3442 insertions(+), 3256 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index d742dd1b1..1afbe241d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -1,3161 +1,3299 @@ diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue index 92c969dcf..52a1f82f3 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue @@ -193,19 +193,19 @@ v-model="qbfsForm.esMatingRelations" > - - - - - - - + + + + + + +
{{ item.name }} - - - + + + @@ -842,51 +842,51 @@ export default { if (res.success) { const _formData = new FormData() _formData.append('infoJson', JSON.stringify(this.qbfsForm)) - processCreatePlan(_formData).then(res => { - this.qbfsForm.planId = res.data - if (res.code === '200' || res.message === '入库成功'){ - this.isSubmit = true; - this.qbfsForm.type = '5' - this.qbfsForm.commentText = this.commentText; - let json = Object.assign(this.qbfsForm, this.roleForm); - this.$http.post("lawss/activiti/startProcessRollBack", { - createUser: this.$store.getters.userInfo.userId, - createUserName: this.$store.getters.userInfo.userName, - type: '25', - json: JSON.stringify({ - roleForm: this.roleForm, - qbfsForm: this.qbfsForm, - commentText: this.commentText - }) + // processCreatePlan(_formData).then(res => { + // this.qbfsForm.planId = res.data + // if (res.code === '200' || res.message === '入库成功'){ + this.isSubmit = true; + this.qbfsForm.type = '5' + this.qbfsForm.commentText = this.commentText; + let json = Object.assign(this.qbfsForm, this.roleForm); + this.$http.post("lawss/activiti/startProcessRollBack", { + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '25', + json: JSON.stringify({ + roleForm: this.roleForm, + qbfsForm: this.qbfsForm, + commentText: this.commentText + }) + }, { + _this: this + }, res => { + if (res.ok) { + this.$http.post("lawss/activiti/completeTask", { + taskIds: res.data, + userId: this.$store.getters.userInfo.userId, + json: JSON.stringify(json) }, { _this: this }, res => { - if (res.ok) { - this.$http.post("lawss/activiti/completeTask", { - taskIds: res.data, - userId: this.$store.getters.userInfo.userId, - json: JSON.stringify(json) - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success("企标制修订立项计划-立项已完成"); - if (this.bpnId !== '') { - let taskId = { - id: this.bpnId - } - taskDel(taskId).then(res=>{ - return res - }) - } - this.isSubmit = false; - this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" }); + if (res.success) { + this.$message.success("企标制修订立项计划-立项已完成"); + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId } - }); + taskDel(taskId).then(res=>{ + return res + }) + } + this.isSubmit = false; + this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" }); } }); } - }) + }); + // } + // }) } this.isSubmit = false }, e => { diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue index 26cdb6e2d..9ce27d44d 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue @@ -282,6 +282,18 @@ placeholder="请输入项目名称" > + + + + + + - + + + + + + + + + - + + + + + + + + + + + + type="date" + value-format="yyyy-MM-dd" + placeholder="请选择上传开始时间"> + + + + @@ -231,21 +255,21 @@
@@ -267,61 +291,61 @@ + class="upload-demo" + action="/api/att/attFile/uploadNew" + :before-upload="beginImportFile" + :on-preview="handlePreview" + :on-remove="handleRemove" + multiple + :limit="50" + :on-exceed="handleExceed" + :on-success="uploadSuccess" + :file-list="fileList"> 点击上传 @@ -409,6 +433,7 @@ export default { total: 0 }, dataCenterTable: [], + cbcdOptions: [], productModelAdd: { name: '', parentId: '', @@ -730,12 +755,17 @@ export default { }, searchInfo() { this.loading = true - if(this.dataCenterSearch.dataUploadTime && this.dataCenterSearch.dataUploadTime.length !== 0){ - this.dataCenterSearch.startDataUploadTime = this.dataCenterSearch.dataUploadTime[0] - this.dataCenterSearch.endDataUploadTime = this.dataCenterSearch.dataUploadTime[1] - }else{ - this.dataCenterSearch.startDataUploadTime ='' - this.dataCenterSearch.endDataUploadTime = '' + // if(this.dataCenterSearch.dataUploadTime && this.dataCenterSearch.dataUploadTime.length !== 0){ + // this.dataCenterSearch.startDataUploadTime = this.dataCenterSearch.dataUploadTime[0] + // this.dataCenterSearch.endDataUploadTime = this.dataCenterSearch.dataUploadTime[1] + // }else{ + // this.dataCenterSearch.startDataUploadTime ='' + // this.dataCenterSearch.endDataUploadTime = '' + // } + if(this.dataCenterSearch.endDataUploadTime < this.dataCenterSearch.startDataUploadTime){ + this.$message.warning('结束时间不能小于开始时间') + this.loading = false + return } this.$http.get('fileMaterialCenter/file-material', this.dataCenterSearch, { _this: this @@ -806,35 +836,35 @@ export default { if (valid) { if (this.attributeTitle === '新增'){ this.$http.postData( - 'fileMaterialCenter/file-material', - this.attributeEO, - { - _this: this, - }, - (res) => { - if (res.ok) { - this.$message.success('新增成功') - this.submitLoading = false - this.cancelModel() - this.searchInfo() - } + 'fileMaterialCenter/file-material', + this.attributeEO, + { + _this: this, + }, + (res) => { + if (res.ok) { + this.$message.success('新增成功') + this.submitLoading = false + this.cancelModel() + this.searchInfo() } + } ) }else { this.$http.putData( - 'fileMaterialCenter/file-material', - this.attributeEO, - { - _this: this, - }, - (res) => { - if (res.ok) { - this.$message.success('修改成功') - this.submitLoading = false - this.cancelModel() - this.searchInfo() - } + 'fileMaterialCenter/file-material', + this.attributeEO, + { + _this: this, + }, + (res) => { + if (res.ok) { + this.$message.success('修改成功') + this.submitLoading = false + this.cancelModel() + this.searchInfo() } + } ) } }else{ @@ -868,7 +898,7 @@ export default { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index 1afbe241d..e9d405ece 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -3088,6 +3088,7 @@ export default { json.prcCreateUser = this.form.prcCreateUser json.prcCreateUserName = this.form.prcCreateUserName json.standCode = this.tableData.standardData[0].standCode + json.id = this.tableData.standardData[0].id this.$http.post('lawss/activiti/startProcessRollBack', { createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, diff --git a/src/router/index.js b/src/router/index.js index 10ab0fb5b..3a7b52ef7 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1115,6 +1115,14 @@ const routes = [ requireAuth: true, title: '企标制修订流程及企业标准库流程' } + },{ + path: '/bussLibrarys1', + name: 'bussLibrarys1', + component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue'), + meta: { + requireAuth: true, + title: '企标制修订流程及企业标准库流程' + } }, { path: '/bussLibraryC1', name: 'bussLibraryC1', From 4041ba351749580e2f78a47cc20c9b01547035c1 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 17 Nov 2022 17:14:21 +0800 Subject: [PATCH 03/51] =?UTF-8?q?=E7=AE=A1=E6=8E=A7=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../creatProcess/qbzxdjhgk/component/cancel.vue | 2 +- .../creatProcess/qbzxdjhgk/component/delay.vue | 2 +- .../creatProcess/qbzxdjhgk/component/merge.vue | 2 +- .../creatProcess/qbzxdjhgk/component/rename.vue | 2 +- src/router/index.js | 17 +++++++++-------- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue index dbad7223a..803054ff1 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue @@ -423,7 +423,7 @@ export default { this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{ reviseStatus: this.standardSearch.reviseStatus || '', esName: this.standardSearch.standName, - planStatus: '0', + planStatus: '1,2,3,6', page: this.page, pageSize: this.pageSize, }, { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue index 47e1ded37..3dbed2130 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue @@ -445,7 +445,7 @@ export default { this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{ reviseStatus: this.standardSearch.reviseStatus || '', esName: this.standardSearch.standName, - planStatus: '0', + planStatus: '1,2,3,6', page: this.page, pageSize: this.pageSize, }, { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue index 763437848..2c714b464 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue @@ -1081,7 +1081,7 @@ export default { this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{ reviseStatus: this.standardSearch.reviseStatus || '', esName: this.standardSearch.standName, - planStatus: '0', + planStatus: '1,2,3,6', page: this.page, pageSize: this.pageSize, }, { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue index b0e02f917..a79fc8435 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue @@ -432,7 +432,7 @@ export default { this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{ reviseStatus: this.standardSearch.reviseStatus || '', esName: this.standardSearch.standName, - planStatus: '0', + planStatus: '1,2,3,6', page: this.page, pageSize: this.pageSize, }, { diff --git a/src/router/index.js b/src/router/index.js index 3a7b52ef7..74bf74c88 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1115,14 +1115,6 @@ const routes = [ requireAuth: true, title: '企标制修订流程及企业标准库流程' } - },{ - path: '/bussLibrarys1', - name: 'bussLibrarys1', - component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue'), - meta: { - requireAuth: true, - title: '企标制修订流程及企业标准库流程' - } }, { path: '/bussLibraryC1', name: 'bussLibraryC1', @@ -2283,6 +2275,15 @@ const routes = [ title: '企标制修订计划管控流程' } }, + { + path: '/qbzxdjhgkStep6', + name: 'qbzxdjhgkStep6', + component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue'), + meta: { + requireAuth: true, + title: '企标制修订计划管控流程' + } + }, { path: '/qbzxdjhgkStep1-5', name: 'qbzxdjhgkStep1-5', From 01ed5b553f355a66b93e08094b1c372a3208d1e0 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 17 Nov 2022 17:37:18 +0800 Subject: [PATCH 04/51] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E6=A0=87=E5=87=86=20?= =?UTF-8?q?=E4=BF=AE=E8=AE=A2=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk/common/formEditList.vue | 5 ++++- .../pages/creatProcess/qbrk/common/formEditListFb.vue | 5 ++++- .../pages/creatProcess/qbrk/common/formList.vue | 5 ++++- .../pages/creatProcess/qbrk/common/formListIn.vue | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue index 1377682b5..fe11b3b53 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue @@ -31,7 +31,10 @@ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue index 83a9d0a52..35dc30415 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue @@ -19,7 +19,10 @@ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue index c41296a3e..29da1d30b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue @@ -24,7 +24,10 @@ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue index a0dc670d0..ec908f63c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue @@ -18,7 +18,10 @@ From 8c8947f23003a17db9e9e1354e3ca9084af3efcd Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 17 Nov 2022 18:40:19 +0800 Subject: [PATCH 05/51] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E6=A0=87=E5=87=86=20?= =?UTF-8?q?=E4=BF=AE=E8=AE=A2=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/qbrk/step13.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index 78080358a..741892a8f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -2683,6 +2683,7 @@ */ getFormFieldList (item) { this.$nextTick(() => { + console.log(item); this.form = JSON.parse(JSON.stringify(item)) this.form.topId = this.pId this.form.prcNum = this.prcNum @@ -2801,7 +2802,10 @@ this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) } this.formKey++ - }else { + } else if(this.form.reviseStatus === '3'){ + this.form.standCode = this.form.standCode + this.formKey++ + } else { this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss1_'+this.form.reviseStatus,standSort:this.form.standSort,taskId: this.taskIds}, { _this: this }, res => { From 06b3fa934d50f6e12088a2faa239d0d28f2604e2 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 18 Nov 2022 15:20:53 +0800 Subject: [PATCH 06/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk/step1-2.vue | 266 +++++++++--------- .../pages/creatProcess/qbrk/step1.vue | 4 +- .../qbzxdjhgk/component/establish.vue | 6 +- .../pages/creatProcess/qbzxdjhgk/step1.vue | 2 + .../pages/creatProcess/qbzxdjhgk/step5.vue | 28 +- .../pages/creatProcess/qbzxdlx/step2.vue | 1 + .../tabComponents/processCenter/index.vue | 12 + .../enterpriseStandardPlan/index.vue | 2 +- 8 files changed, 172 insertions(+), 149 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue index d02e8c805..60d90b52a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue @@ -893,14 +893,14 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1204,7 +1205,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,taskDel} from "api/process"; +import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,taskDel,inboundLiaisonDetail} from "api/process"; import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; import treeSelectModule from "@/components/treeSelect/treeSelectModule.vue"; @@ -2273,9 +2274,6 @@ export default { } }, handleSearchStandard () { - if(!this.form.reviseStatus){ - this.$message.warning('请先选择制修订类型') - }else { this.tableData.standardData = [] this.standardDrawer = true this.$nextTick(() => { @@ -2286,7 +2284,6 @@ export default { } }) this.getDomesticStandardTable() - } }, saveUserInfo () { this.filterText = '' @@ -3088,51 +3085,61 @@ export default { json.prcCreateUser = this.form.prcCreateUser json.prcCreateUserName = this.form.prcCreateUserName json.standCode = this.tableData.standardData[0].standCode - this.$http.post('lawss/activiti/startProcessRollBack', { - createUser: this.$store.getters.userInfo.userId, - createUserName: this.$store.getters.userInfo.userName, - type: 'buss1', - json: JSON.stringify({ - form: this.form, - roleForm: this.roleForm, - commentText: this.commentText - }) - }, {}, res => { - if (res.ok) { - this.$http.post('lawss/activiti/completeTask', { - taskIds: res.data, - userId : this.$store.getters.userInfo.userId, - json: JSON.stringify(json) - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message) - const planForm = {} - planForm.id = this.form.planId - planForm.reviseStatus = this.form.reviseStatus - planForm.standCode = this.form.DTQBBHBUSS - planForm.processType = "buss1" - this.$http.post("esRevisePlan/es-revise-plan/modPlanByState", planForm, { + this.$http.post('lawss/activiti/completeTask', { + taskIds: res.data, + userId : this.$store.getters.userInfo.userId, + json: JSON.stringify(json) + }, { + _this: this + }, res => { + if (res.success) { + this.$http.post('lawss/activiti/startProcessRollBack', { + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: 'buss1', + json: JSON.stringify({ + form: this.form, + roleForm: this.roleForm, + commentText: this.commentText + }) + }, {}, res => { + if (res.ok) { + this.$http.post('lawss/activiti/completeTask', { + taskIds: res.data, + userId : this.$store.getters.userInfo.userId, + json: JSON.stringify(json) + }, { _this: this }, res => { - if (res.ok) { - if (res.data === '操作成功') { - this.submitLoading = false - this.isSubmit = false - if (this.$route.query.bpnId !== '') { - let taskId = { - id: this.$route.query.bpnId + if (res.success) { + this.$message.success(res.message) + const planForm = {} + planForm.id = this.form.planId + planForm.reviseStatus = this.form.reviseStatus + planForm.standCode = this.form.DTQBBHBUSS + planForm.processType = "buss1" + this.$http.post("esRevisePlan/es-revise-plan/modPlanByState", planForm, { + _this: this + }, res => { + if (res.ok) { + if (res.data === '操作成功') { + this.submitLoading = false + this.isSubmit = false + if (this.$route.query.bpnId !== '') { + let taskId = { + id: this.$route.query.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } + // 流程提交之后，应该流转至待办任务页面 + this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) } else { } - taskDel(taskId).then(res=>{ - return res - }) + } else { + this.$message.warning(res.data) } - // 流程提交之后，应该流转至待办任务页面 - this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) } else { - } - } else { - this.$message.warning(res.data) + }) } }) } @@ -3177,6 +3184,7 @@ export default { }) }, }, + mounted () { this.getTaskId() this.getTree() diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index e9d405ece..6d05c73e1 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -3087,8 +3087,8 @@ export default { json.applyUpdUserId = this.form.applyUpdUserId json.prcCreateUser = this.form.prcCreateUser json.prcCreateUserName = this.form.prcCreateUserName - json.standCode = this.tableData.standardData[0].standCode - json.id = this.tableData.standardData[0].id + json.standCode = this.standardCheckedList[0].standCode + json.id = this.standardCheckedList[0].id this.$http.post('lawss/activiti/startProcessRollBack', { createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index 3459fd0fd..416b51a05 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -583,9 +583,9 @@ export default { newReason: [ {required: true, message: '请输入立项原因', trigger: 'blur'}, ], - LXDName: [ - { required: true, validator: validateFsOnlineFile, trigger: 'blur' } - ], + // LXDName: [ + // { required: true, validator: validateFsOnlineFile, trigger: 'blur' } + // ], }, } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index ae0f7f488..61d160641 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -534,6 +534,7 @@ export default { if (valid) { this.isSubmit = true; qbzxdFrom.commentText = this.commentText; + qbzxdFrom.addFlag = '0' let json = Object.assign(qbzxdFrom, this.roleForm); this.$http.post("lawss/activiti/startProcessRollBack", { createUser: this.$store.getters.userInfo.userId, @@ -588,6 +589,7 @@ export default { if (valid) { this.isSubmit = true; qbzxdFrom.commentText = this.commentText; + qbzxdFrom.addFlag = '0' var json = Object.assign(qbzxdFrom, this.roleForm); this.$http.post("lawss/activiti/completeTask", { taskIds: this.$route.query.taskIds, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue index 4f87ae865..480282332 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue @@ -519,20 +519,20 @@ export default { } this.qbfsForm.commentText = this.commentText let json = JSON.stringify(this.qbfsForm); - this.$http.post('lawss/activiti/completeTask', { - taskIds: this.$route.query.taskIds, - userId: this.$store.getters.userInfo.userId, - json: json, - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message) - this.$router.push('/processCenter') - } - this.isSubmit = false - }, e => { - }); + this.$http.post('lawss/activiti/completeTask', { + taskIds: this.$route.query.taskIds, + userId: this.$store.getters.userInfo.userId, + json: json, + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message) + this.$router.push('/processCenter') + } + this.isSubmit = false + }, e => { + }); }, beforeBack(){ if(!this.commentText){ diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue index 52a1f82f3..41ac95f8c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue @@ -848,6 +848,7 @@ export default { this.isSubmit = true; this.qbfsForm.type = '5' this.qbfsForm.commentText = this.commentText; + this.qbfsForm.addFlag = '0' let json = Object.assign(this.qbfsForm, this.roleForm); this.$http.post("lawss/activiti/startProcessRollBack", { createUser: this.$store.getters.userInfo.userId, diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 755c85930..1cbe90e56 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -2200,6 +2200,18 @@ export default { } }) } + else if(row.taskInfo === '技术标准起草') { + this.$router.push({ + name: 'qbzxdjhgkStep6', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } break } }, diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue index b65f62fa4..950d2b3c9 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -11,7 +11,7 @@ - + From 6a7f520a8cf202165e26b80eb9fd4ac8aa77e4a5 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 18 Nov 2022 17:26:54 +0800 Subject: [PATCH 07/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk/step1-2.vue | 2 +- .../pages/creatProcess/qbzxdlx/step2.vue | 4 ++-- .../enterpriseStandardPlan/index.vue | 24 +++++++++++++++++++ 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue index 60d90b52a..b935476ea 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue @@ -3086,7 +3086,7 @@ export default { json.prcCreateUserName = this.form.prcCreateUserName json.standCode = this.tableData.standardData[0].standCode this.$http.post('lawss/activiti/completeTask', { - taskIds: res.data, + taskIds: this.$route.query.taskIds, userId : this.$store.getters.userInfo.userId, json: JSON.stringify(json) }, { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue index 41ac95f8c..bc81813ad 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue @@ -125,7 +125,7 @@ placeholder="请选择立项完成时间"> - + @@ -757,7 +757,7 @@ export default { endTime: [ { required: true, message: "请选择立项完成时间", trigger: "change" } ], - tsJson: [ + tsJsonName: [ { required: true, message: "请选择体系结构", trigger: "change" } ], area: [ diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue index 950d2b3c9..969a4e66f 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -1230,6 +1230,30 @@ this.addDrawer = false this.$message.success(tips + '成功') this.getData() + this.addForm.addFlag = '1' + var json = Object.assign(this.addForm) + this.$http.post('lawss/activiti/startProcessRollBack', { + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '25', + json: JSON.stringify({ + addForm: this.addForm + }) + }, {}, res => { + if (res.ok) { + this.$http.post('lawss/activiti/completeTask', { + taskIds: res.data, + userId : this.$store.getters.userInfo.userId, + json: JSON.stringify(json) + }, { + _this: this + }, res => { + if (res.success) { + // this.$message.success(res.message) + } + }) + } + }) } else { this.addDrawer = false this.$message.warning(res.data) From d6c25cced64a0d3f74dbb1e48c050c91a31b8a8a Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Sun, 20 Nov 2022 11:33:16 +0800 Subject: [PATCH 08/51] =?UTF-8?q?=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3=E5=8F=91=E8=B5=B7=E5=BE=85?= =?UTF-8?q?=E5=8A=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk/step1-2.vue | 17 +++++++++++++++++ .../enterpriseStandardPlan/index.vue | 5 ++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue index b935476ea..e1d3b128a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue @@ -3183,11 +3183,28 @@ export default { this.modelOptions = res.data }) }, + getData() { + if(this.$route.query.taskIds && this.$route.query.prcId){ + return new Promise((resolve, reject) => { + inboundLiaisonDetail({ + taskIds: this.$route.query.taskIds, + pId: this.$route.query.prcId + }).then(res => { + if (res) { + const processForm = JSON.parse(res.mesg) + this.form.reviseStatus = processForm.reviseStatus + } + }).catch(e => { + }) + }) + } + }, }, mounted () { this.getTaskId() this.getTree() + this.getData() if(this.$route.query){ this.form.reviseStatus = this.$route.query.reviseStatus } diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue index 969a4e66f..76b9bca00 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -1231,13 +1231,16 @@ this.$message.success(tips + '成功') this.getData() this.addForm.addFlag = '1' + this.addForm.prcCreateUser = this.$store.getters.userInfo.userId + this.addForm.prcCreateUserName = this.$store.getters.userInfo.userName + this.addForm.type = '5' var json = Object.assign(this.addForm) this.$http.post('lawss/activiti/startProcessRollBack', { createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, type: '25', json: JSON.stringify({ - addForm: this.addForm + qbfsForm: this.addForm }) }, {}, res => { if (res.ok) { From 80ff6deb1e2f9695f9ff00fb88ffb4d359a5c8e2 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Sun, 20 Nov 2022 13:00:49 +0800 Subject: [PATCH 09/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk/step1-2.vue | 6 +- .../pages/creatProcess/qbrk/step1.vue | 7 ++- .../enterpriseStandardPlan/index.vue | 55 ++++++++++--------- 3 files changed, 39 insertions(+), 29 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue index e1d3b128a..c04b17fbc 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue @@ -3084,7 +3084,11 @@ export default { json.applyUpdUserId = this.form.applyUpdUserId json.prcCreateUser = this.form.prcCreateUser json.prcCreateUserName = this.form.prcCreateUserName - json.standCode = this.tableData.standardData[0].standCode + if(this.form.reviseStatus == '1' || this.form.reviseStatus == '2'){ + json.nowEsId = this.tableData.standardData[0].id + }else if(this.form.reviseStatus == '3'){ + json.standCode = this.tableData.standardData[0].standCode + } this.$http.post('lawss/activiti/completeTask', { taskIds: this.$route.query.taskIds, userId : this.$store.getters.userInfo.userId, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index 6d05c73e1..83c318d8c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -3087,8 +3087,11 @@ export default { json.applyUpdUserId = this.form.applyUpdUserId json.prcCreateUser = this.form.prcCreateUser json.prcCreateUserName = this.form.prcCreateUserName - json.standCode = this.standardCheckedList[0].standCode - json.id = this.standardCheckedList[0].id + if(this.form.reviseStatus == '3'){ + json.standCode = this.standardCheckedList[0].standCode + json.id = this.standardCheckedList[0].id + } + this.$http.post('lawss/activiti/startProcessRollBack', { createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue index 76b9bca00..9f5cdc10b 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -1230,33 +1230,36 @@ this.addDrawer = false this.$message.success(tips + '成功') this.getData() - this.addForm.addFlag = '1' - this.addForm.prcCreateUser = this.$store.getters.userInfo.userId - this.addForm.prcCreateUserName = this.$store.getters.userInfo.userName - this.addForm.type = '5' - var json = Object.assign(this.addForm) - this.$http.post('lawss/activiti/startProcessRollBack', { - createUser: this.$store.getters.userInfo.userId, - createUserName: this.$store.getters.userInfo.userName, - type: '25', - json: JSON.stringify({ - qbfsForm: this.addForm - }) - }, {}, res => { - if (res.ok) { - this.$http.post('lawss/activiti/completeTask', { - taskIds: res.data, - userId : this.$store.getters.userInfo.userId, - json: JSON.stringify(json) - }, { - _this: this - }, res => { - if (res.success) { - // this.$message.success(res.message) - } - }) - } + if(this.DrawerType === 'add'){ + this.addForm.addFlag = '1' + this.addForm.prcCreateUser = this.$store.getters.userInfo.userId + this.addForm.prcCreateUserName = this.$store.getters.userInfo.userName + this.addForm.esId = res.message + this.addForm.type = '5' + var json = Object.assign(this.addForm) + this.$http.post('lawss/activiti/startProcessRollBack', { + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '25', + json: JSON.stringify({ + qbfsForm: this.addForm }) + }, {}, res => { + if (res.ok) { + this.$http.post('lawss/activiti/completeTask', { + taskIds: res.data, + userId : this.$store.getters.userInfo.userId, + json: JSON.stringify(json) + }, { + _this: this + }, res => { + if (res.success) { + // this.$message.success(res.message) + } + }) + } + }) + } } else { this.addDrawer = false this.$message.warning(res.data) From 62016272840bdecefdcef68fad9e2cfd23f03d99 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Mon, 21 Nov 2022 09:29:58 +0800 Subject: [PATCH 10/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk/step1-2.vue | 19 ++++++++++++++++++- .../enterpriseStandardPlan/index.vue | 2 +- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue index c04b17fbc..9c168226c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue @@ -695,9 +695,11 @@ v-show="verifySarStandard && !disabledXX" show-save show-submit + show-confirm :submitLoading="isSubmit" :saveLoading="saveLoading" @save="handleSave" + @accept="handleAccept" @submit="handleSubmit" > @@ -1205,7 +1207,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,taskDel,inboundLiaisonDetail} from "api/process"; +import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,taskDel,inboundLiaisonDetail,execTask} from "api/process"; import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; import treeSelectModule from "@/components/treeSelect/treeSelectModule.vue"; @@ -1334,6 +1336,7 @@ export default { kwjFileList: [], glwjFileList: [], filterText:'', + todoId:'', textStatusMap: {}, // 文本状态id与name对应 standardDrawer: false, loadSarStandard: false, @@ -3055,6 +3058,19 @@ export default { return arr; }, + // 接受按钮 + handleAccept(){ + this.isSubmit = true + execTask({ + todoId: this.todoId // 当前节点ID + }).then(res => { + if (res.sign && res.sign === '0') { + this.$message.success('接收成功') + this.$router.push('/processCenter') + } + this.isSubmit = false + }) + }, handleSubmit() { // this.form.country=this.countryArr; // test @@ -3196,6 +3212,7 @@ export default { }).then(res => { if (res) { const processForm = JSON.parse(res.mesg) + this.todoId = res.id this.form.reviseStatus = processForm.reviseStatus } }).catch(e => { diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue index 9f5cdc10b..441d4f9ab 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -1234,7 +1234,7 @@ this.addForm.addFlag = '1' this.addForm.prcCreateUser = this.$store.getters.userInfo.userId this.addForm.prcCreateUserName = this.$store.getters.userInfo.userName - this.addForm.esId = res.message + this.addForm.nowEsId = res.message this.addForm.type = '5' var json = Object.assign(this.addForm) this.$http.post('lawss/activiti/startProcessRollBack', { From 4900de76297494925e7d0207c82f4354e9f946f4 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Mon, 21 Nov 2022 10:09:06 +0800 Subject: [PATCH 11/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/components/ProcessFooter.vue | 16 ++++++++++++++++ .../pages/creatProcess/qbrk/step1-2.vue | 9 ++++++--- .../enterpriseStandardPlan/index.vue | 2 ++ 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/pages/processCenter/pages/components/ProcessFooter.vue b/src/pages/processCenter/pages/components/ProcessFooter.vue index 6dc105371..1c2d9b5e7 100644 --- a/src/pages/processCenter/pages/components/ProcessFooter.vue +++ b/src/pages/processCenter/pages/components/ProcessFooter.vue @@ -97,6 +97,15 @@ v-if="showOver3" >驳回 + 接收任务 @@ -1421,6 +1421,7 @@ export default { zrIndex: '', zrIdList: [], type: '', + taskType:'', defaultUserProps: { children: 'children', label: 'name' @@ -3059,7 +3060,7 @@ export default { return arr; }, // 接受按钮 - handleAccept(){ + handleReceive(){ this.isSubmit = true execTask({ todoId: this.todoId // 当前节点ID @@ -3097,6 +3098,7 @@ export default { json.zrUserId = this.form.zrUserId json.jlUserId = this.form.jlUserId json.commentText = this.commentText + json.type = this.taskType json.applyUpdUserId = this.form.applyUpdUserId json.prcCreateUser = this.form.prcCreateUser json.prcCreateUserName = this.form.prcCreateUserName @@ -3214,6 +3216,7 @@ export default { const processForm = JSON.parse(res.mesg) this.todoId = res.id this.form.reviseStatus = processForm.reviseStatus + this.taskType = processForm.type } }).catch(e => { }) diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue index 441d4f9ab..8c58a940b 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -1220,7 +1220,9 @@ tips = '添加' } let arr = JSON.parse(JSON.stringify(this.addForm)) + this.addForm.unitName = arr.unitName arr.area = arr.area.join(',') + this.addForm = {...this.addForm} this.$http.post(url, this.addForm, { _this: this }, res => { From 7dc428df87308054435b9729664d41bad41e5605 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Mon, 21 Nov 2022 11:55:19 +0800 Subject: [PATCH 12/51] =?UTF-8?q?=E7=AE=A1=E6=8E=A7=E6=B5=81=E7=A8=8B=20?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../creatProcess/qbzxdjhgk/component/merge.vue | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue index 2c714b464..729f642f2 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue @@ -1087,13 +1087,14 @@ export default { }, { _this: this, }, res => { - this.standinfoList = [] - //展示的数据只能是未开始的 - res.data.list.forEach(item => { - if(item.planStatus === '0'){ - this.standinfoList.push(item) - } - }) + this.standinfoList = res.data.list + // this.standinfoList = [] + // //展示的数据只能是未开始的 + // res.data.list.forEach(item => { + // if(item.planStatus === '0'){ + // this.standinfoList.push(item) + // } + // }) this.total = this.standinfoList.length this.replaceLoading = false }) From 5e1e3dbd3b718d7881b8594885261e724979c205 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Mon, 21 Nov 2022 13:54:52 +0800 Subject: [PATCH 13/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B=20es?= =?UTF-8?q?Id1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk/step1-2.vue | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue index 657758b46..90525c5f5 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue @@ -1337,6 +1337,8 @@ export default { glwjFileList: [], filterText:'', todoId:'', + esId1:'', + esId2:'', textStatusMap: {}, // 文本状态id与name对应 standardDrawer: false, loadSarStandard: false, @@ -3094,11 +3096,17 @@ export default { this.isSubmit = true this.saveLoading = true this.form.country=this.countryArr; + console.log(this.form); + return var json = Object.assign(this.form, this.roleForm) json.zrUserId = this.form.zrUserId json.jlUserId = this.form.jlUserId json.commentText = this.commentText json.type = this.taskType + if(this.taskType == '1'){ + json.esId1 = this.esId1 + json.esId2 = this.esId2 + } json.applyUpdUserId = this.form.applyUpdUserId json.prcCreateUser = this.form.prcCreateUser json.prcCreateUserName = this.form.prcCreateUserName @@ -3215,7 +3223,16 @@ export default { if (res) { const processForm = JSON.parse(res.mesg) this.todoId = res.id + if(processForm.reviseStatus == '制定'){ + processForm.reviseStatus = '1' + } else if(processForm.reviseStatus == '修订'){ + processForm.reviseStatus = '2' + } this.form.reviseStatus = processForm.reviseStatus + if(processForm.type == '1'){ + this.esId1 = processForm.esId1 + this.esId2 = processForm.esId2 + } this.taskType = processForm.type } }).catch(e => { From d8a7922e6fd97d276a8654d842901b182be0e227 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Mon, 21 Nov 2022 16:25:07 +0800 Subject: [PATCH 14/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk/step1-2.vue | 34 ++++++++++++------- .../qbzxdjhgk/component/cancel.vue | 18 +++++----- .../qbzxdjhgk/component/delay.vue | 16 +++++---- 3 files changed, 40 insertions(+), 28 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue index 90525c5f5..32ba73884 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue @@ -1,8 +1,8 @@