From 1aa123d14bae3ec283cd6d739d76edd02119ac93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Mon, 28 Mar 2022 14:31:46 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=20=E8=B5=B7=E8=8D=89=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E5=92=8C=E9=83=A8=E5=88=86=E4=BB=A3=E6=9B=BF=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=8F=B7=E5=9B=9E=E6=98=BE=2051999?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1.vue | 24 ++++--------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index c25feaa1a..94a2cc0be 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -653,27 +653,10 @@ - - + + - @@ -2247,7 +2230,7 @@ export default { this.form = JSON.parse(JSON.stringify(json)) this.getListTree(bringData) this.form.standId = bringData.id - this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw && JSON.parse(JSON.stringify(json)).qcdw !== '[]' ? JSON.parse(JSON.stringify(json)).qcdw : '' + this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw && JSON.parse(JSON.stringify(json)).qcdw !== '[]' ? JSON.parse(JSON.stringify(json)).qcdw.split(',') : '' this.form.wssmr = JSON.parse(JSON.stringify(json)).wssmr && JSON.parse(JSON.stringify(json)).wssmr !== '[]' ? JSON.parse(JSON.stringify(json)).wssmr : '' this.form.zrgcs = JSON.parse(JSON.stringify(json)).zrgcs && JSON.parse(JSON.stringify(json)).zrgcs !== '[]' ? JSON.parse(JSON.stringify(json)).zrgcs : '' this.form.zrbm = JSON.parse(JSON.stringify(json)).zrbm && JSON.parse(JSON.stringify(json)).zrbm !== '[]' ? JSON.parse(JSON.stringify(json)).zrbm : '' @@ -2255,6 +2238,7 @@ export default { this.form.sycpx = JSON.parse(JSON.stringify(json)).sycpx && JSON.parse(JSON.stringify(json)).sycpx !== '[]' ? JSON.parse(JSON.stringify(json)).sycpx : '' this.form.nylx = JSON.parse(JSON.stringify(json)).nylx && JSON.parse(JSON.stringify(json)).nylx !== '[]' ? JSON.parse(JSON.stringify(json)).nylx : '' this.form.cllx = JSON.parse(JSON.stringify(json)).cllx && JSON.parse(JSON.stringify(json)).cllx !== '[]' ? JSON.parse(JSON.stringify(json)).cllx : '' + this.form.bfbdtbzh = JSON.parse(JSON.stringify(json)).bfdtbz && JSON.parse(JSON.stringify(json)).bfdtbz !== '[]' ? JSON.parse(JSON.stringify(json)).bfdtbz : '' this.defaultCheckedKeys = [this.form.standSystem]; this.defaultCheckedKeys1 = [this.form.cycvppsbm]; this.defaultCheckedKeys2 = [this.form.kccvppsbm]; From 1f1b8d78f62d5dbd3d46dacac95154f5cc0994ed Mon Sep 17 00:00:00 2001 From: zhangyichen <5277314+zacty@user.noreply.gitee.com> Date: Mon, 28 Mar 2022 14:35:09 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052184=20=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95--=E7=BC=96=E8=BE=91=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E5=9C=A8=E8=AF=A5=E6=B8=85=E5=8D=95=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E4=B8=80=E4=B8=AA=E6=A0=87=E5=87=86=E7=9A=84=E6=83=85?= =?UTF-8?q?=E5=86=B5=E4=B8=8B=EF=BC=8C=E7=AC=AC=E4=B8=80=E6=AC=A1=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=B8=80=E4=B8=AA=E6=A0=87=E5=87=86=EF=BC=8C=E4=B8=8B?= =?UTF-8?q?=E9=9D=A2=E5=8F=AA=E6=98=BE=E7=A4=BA=E6=B7=BB=E5=8A=A0=E7=9A=84?= =?UTF-8?q?=E6=A0=87=E5=87=86=EF=BC=88=E7=AC=AC=E4=B8=80=E6=AC=A1=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=A0=87=E5=87=86=E4=B8=8D=E6=98=AF=E8=BF=BD=E5=8A=A0?= =?UTF-8?q?=EF=BC=8C=E8=80=8C=E6=98=AF=E8=A6=86=E7=9B=96=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accessStandardsAndRegulations/pages/addEdit.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 2b7d4d474..c8933c290 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -1212,8 +1212,8 @@ export default { this.$refs.searchTable.clearSelection() this.$message.warning('请勿添加重复数据') } else { - this.sarAccessInfoLists.push(item) - this.sarAccessInfoLists.forEach(item => { + this.sarAccessInfoList.push(item) + this.sarAccessInfoList.forEach(item => { if (item.lawsNumber) { item.standNumber = item.lawsNumber } @@ -1254,7 +1254,7 @@ export default { // this.$refs.accessTypeSelect.clearSelection() this.$refs.entryTable.clearSelection() this.$refs.searchTable.clearSelection() - this.sarAccessInfoLists.forEach(item => { + this.sarAccessInfoList.forEach(item => { if (item.nylx === '[]') { item.nylx = '' } @@ -1268,7 +1268,7 @@ export default { item.sycpx = '' } }) - this.sarAccessInfoList = this.sarAccessInfoLists + // this.sarAccessInfoList = this.sarAccessInfoLists } }) } else { From aefa691bcaeb68c2b867cbb074b874a2311ab3b4 Mon Sep 17 00:00:00 2001 From: zhangyichen <5277314+zacty@user.noreply.gitee.com> Date: Mon, 28 Mar 2022 14:46:51 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052182=20=E6=A0=87?= =?UTF-8?q?=E5=87=86=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95--=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9D=A5=E6=BA=90=E9=80=89=E6=8B=A9=E6=B5=B7=E5=A4=96?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E9=AB=98=E7=BA=A7=E6=A3=80=E7=B4=A2=E5=86=85?= =?UTF-8?q?=EF=BC=8C=E5=9C=88=E4=BD=8F=E7=9A=84=E5=9C=B0=E6=96=B9=E6=94=B9?= =?UTF-8?q?=E4=B8=8B=E5=90=8D=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accessStandardsAndRegulations/pages/addEdit.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index c8933c290..688a29fde 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -569,7 +569,7 @@ - + From 922ffeb0c14df093c9ba1a2d566cf400ba3f313d Mon Sep 17 00:00:00 2001 From: zhangyichen <5277314+zacty@user.noreply.gitee.com> Date: Mon, 28 Mar 2022 15:33:19 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052181=20=E6=A0=87?= =?UTF-8?q?=E5=87=86=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95--=E5=9C=A8?= =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=9F=A5=E8=AF=A2=E5=86=85=E7=9A=84=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=8F=B7=E8=BE=93=E5=85=A5=E4=BF=A1=E6=81=AF=EF=BC=8C?= =?UTF-8?q?=E7=9B=AE=E5=89=8D=E5=A4=96=E4=BE=A7=E7=9A=84=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=8F=B7=E4=B9=9F=E4=BC=9A=E8=87=AA=E5=8A=A8=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/addEdit.vue | 46 +++++++++++++------ 1 file changed, 31 insertions(+), 15 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 688a29fde..303d501de 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -503,16 +503,16 @@ + v-model="sarAccessInfo.seniorStandNumber" + :placeholder="'请输入' + standLabelNum"/> + v-model="sarAccessInfo.seniorLawsNumber" + :placeholder="'请输入' + standLabelNum"/> + v-model="sarAccessInfo.seniorStandCode" + :placeholder="'请输入' + standLabelNum"/> @@ -845,9 +845,14 @@ export default { id: '', standName: '', standNumber: '', + lawsNumber: '', standCode: '', // 政策编号 textStatus: '', + seniorStandNumber: '', + seniorLawsNumber: '', + seniorStandCode: '', + textStatusBuss: '', CLLX: '', SYRZ: '', @@ -1032,7 +1037,7 @@ export default { }*/ this.sarAccessInfo = formData this.showQueryMore = false - this.selectLawsStands() + this.selectLawsStands(1) }, // 删除上传的文件 @@ -1508,9 +1513,20 @@ export default { } }) }, - pageInfo() { + pageInfo(type) { if (this.sarAccessInfo.dataSource === 'INLAND_STAND' || this.sarAccessInfo.dataSource === 'FOREIGN_STAND') { - StandardsInfoPage((this.sarAccessInfo)).then(res => { + if (type === 1) { + delete this.sarAccessInfo.standNumber + delete this.sarAccessInfo.lawsNumber + delete this.sarAccessInfo.standCode + } + console.log('this.sarAccessInfo===' , this.sarAccessInfo) + StandardsInfoPage(type === 1 ? ({...this.sarAccessInfo, standNumber: this.sarAccessInfo.seniorStandNumber, lawsNumber: this.sarAccessInfo.seniorLawsNumber, standCode: this.sarAccessInfo.seniorStandCode}) : (this.sarAccessInfo)).then(res => { + // if (type === 1) { + // this.sarAccessInfo.standNumber = '' + // this.sarAccessInfo.lawsNumber = '' + // this.sarAccessInfo.standCode = '' + // } this.sarAccessInfoSearchList = res.data.list this.sarAccessInfoSearchList.forEach(item => { if (item.standYear === null) { @@ -1544,20 +1560,20 @@ export default { }) } }, - // 查询数据搜索 table 数据 - selectLawsStands() { + // 查询数据搜索 table 数据 type === 1为高级搜索 + selectLawsStands(type) { if (this.sarAccessInfo.dataSource === 'INLAND_STAND') { this.sarAccessInfo.standType = 'INLAND' - this.pageInfo() + this.pageInfo(type) } else if (this.sarAccessInfo.dataSource === 'FOREIGN_STAND') { this.sarAccessInfo.standType = 'FOREIGN' - this.pageInfo() + this.pageInfo(type) } else if (this.sarAccessInfo.dataSource === 'FOREIGN_LAWS') { this.sarAccessInfo.standType = 'LAWS' - this.pageInfo() + this.pageInfo(type) } else if (this.sarAccessInfo.dataSource === 'BUSINESS') { this.sarAccessInfo.standType = 'BUSINESS' - this.pageInfo() + this.pageInfo(type) } }, From 01924334dd7a6f2c7268327a789886767ac6b162 Mon Sep 17 00:00:00 2001 From: zhangyichen <5277314+zacty@user.noreply.gitee.com> Date: Mon, 28 Mar 2022 16:09:21 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052195=20=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95-=E9=A1=B9=E7=9B=AE=E6=B8=85?= =?UTF-8?q?=E5=8D=95=EF=BC=8C=E5=8F=91=E8=B5=B7=E7=A1=AE=E8=AE=A4=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=EF=BC=8C=E6=97=A0=E6=B3=95=E5=8F=91=E8=B5=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/xmqdqr/step1.vue | 9 +++++++++ .../localProductsOrProjectLibrary/index.vue | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue index 56e05d585..71487bf3d 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue @@ -1413,6 +1413,15 @@ export default { this.commentText = mes.commentText; }); } + if (this.$route.query.row) { + let data = this.$route.query.row + this.qdform.projectId = data.id + this.qdform.projectName = data.projectName + this.qdform.projectNumber = data.projectNumber + this.qdform.detailedListName = data.projectGroup + this.qdform.endTime = data.projectEndDate + this.getStandData(this.qdform.projectId) + } // 查询各下拉框数据 this.$http.get("sys/dictype/getDicTypeListCode", "", { _this: this, diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue index b84c9949b..1c1546a74 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue @@ -1341,7 +1341,7 @@ export default { handleProcess(row) { // 项目清单确认流程 this.$router.push({ - name: 'xmqdqrStep1-4', + name: 'xmqdqrStep1', query: { row } From 29e3248958a8e8fd1a120f3ee1a86198db16aa19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Mon, 28 Mar 2022 16:47:08 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzzqyj/step5.vue | 128 +++++++++++------- .../pags/consultationDetails.vue | 2 +- 2 files changed, 82 insertions(+), 48 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index 44b936952..c353e724b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -349,6 +349,7 @@ name: "bzzqyjStep5", data() { return { + clickFlag: false, commentText5: '', options: [], itemId: '', @@ -460,35 +461,47 @@ this.modalshowflag2 = false }, itemEdit (row, index) { - this.itemId = row.id - this.modalshowflag2 = true - this.editForm = { - chapterNumber: row.chapterNumber, - chapterName: row.chapterName, - oldText: row.oldText, - newText: row.newText, - reason: row.reason, - cause: row.cause, - department: row.department, - responUserName: row.responUserName, - responUser: row.responUser, - state: row.state, - source: row.source, - id: row.id, + if(this.clickFlag){ + this.itemId = row.id + this.modalshowflag2 = true + this.editForm = { + chapterNumber: row.chapterNumber, + chapterName: row.chapterName, + oldText: row.oldText, + newText: row.newText, + reason: row.reason, + cause: row.cause, + department: row.department, + responUserName: row.responUserName, + responUser: row.responUser, + state: row.state, + source: row.source, + id: row.id, + } + }else{ + this.$message.warning('公开征求意见未结束，无法操作') } }, itermsConditionsClose () { this.itermsConditionsFlag = false }, itermsConditionsOpen (row) { - this.itermsConditionsFlag = true - this.itermsConditionsTitle = row + if(this.clickFlag){ + this.itermsConditionsFlag = true + this.itermsConditionsTitle = row + }else{ + this.$message.warning('公开征求意见未结束，无法操作') + } }, downloadFile (attId) { window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId }, handleTransfer() { - this.drawerModal = true + if(this.clickFlag){ + this.drawerModal = true + }else{ + this.$message.warning('公开征求意见未结束，无法操作') + } }, checkedRole (data) { changeAssigneeNew({ @@ -539,42 +552,50 @@ }, //保存事件 handleSave() { - this.saveLoading = true; - let _formData = new FormData(); - let json = this.form; - json.data = this.data; - _formData.append("id", this.bpnId || ""); - _formData.append("prcType", "3"); - _formData.append("taskIds", this.taskIds); - _formData.append("json", JSON.stringify({ - form: json, - commentText5: this.commentText5 - })); - saveTaskForPub(_formData).then(res => { - this.saveLoading = false; - this.$message.success("保存成功"); - this.bpnId = res.result; - }).catch(e => { - this.saveLoading = false; - }); + if(this.clickFlag){ + this.saveLoading = true; + let _formData = new FormData(); + let json = this.form; + json.data = this.data; + _formData.append("id", this.bpnId || ""); + _formData.append("prcType", "3"); + _formData.append("taskIds", this.taskIds); + _formData.append("json", JSON.stringify({ + form: json, + commentText5: this.commentText5 + })); + saveTaskForPub(_formData).then(res => { + this.saveLoading = false; + this.$message.success("保存成功"); + this.bpnId = res.result; + }).catch(e => { + this.saveLoading = false; + }); + }else{ + this.$message.warning('公开征求意见未结束，无法操作') + } }, handleSubmit() { - let a = 0 - for (let b = 0; b < this.data.length;b++) { - if (this.data[b].state === '3' && !this.data[b].cause) { - a++ + if(this.clickFlag){ + let a = 0 + for (let b = 0; b < this.data.length;b++) { + if (this.data[b].state === '3' && !this.data[b].cause) { + a++ + } + if(!this.data[b].sourceType){ + this.data[b].sourceType = '定向' + } } - } - if (a > 0) { - this.$message.warning('请输入不上报原因') - return; - } - this.isSubmit = true; + if (a > 0) { + this.$message.warning('请输入不上报原因') + return; + } + this.isSubmit = true; var json = this.json; json.oldinfo = this.oldData; json.commentText = this.commentText5; json.introduce = true; - this.$http.post("lawss/activiti/completeTask", { + this.$http.post("lawss/activiti/completeTask", { json: JSON.stringify(json), taskId: this.taskIds, userId: this.$store.getters.userInfo.userId @@ -585,6 +606,9 @@ } this.isSubmit = false; }); + }else{ + this.$message.warning('公开征求意见未结束，无法操作') + } }, getData() { return new Promise((resolve, reject) => { @@ -613,6 +637,15 @@ this.json = data; this.getItemList(data.standId,this.form.textValue) this.data = newArr + this.$http.get('slrs/sar-public-idea-all/checkIsShow', { + endTime: this.form.endTime + }, {}, res => { + if (res.message === '1') { + this.clickFlag = false + } else { + this.clickFlag = true + } + }) if (data.introduce) { } else { this.$http.get("slrs/sar-public-idea-all/getPublicIdea", { @@ -624,6 +657,7 @@ item.responUser = item.userId item.state = '1' item.source = '2' + item.sourceType = '公开' this.data.push(item); }); }); diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index 5b2f29743..4751f7e17 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -79,7 +79,7 @@
- + 添加 导出 From 168c5b0dd94ef5725f5464aa5ccf11cbbaa7ca0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Mon, 28 Mar 2022 17:16:43 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BF=9D=E5=AD=98=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzzqyj/step1.vue | 1 + .../pages/creatProcess/bzzqyj/step5.vue | 39 +++++++++++++++++-- 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index dbd0abf53..042c058ec 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -814,6 +814,7 @@ export default { _formData.append('json', JSON.stringify({ form: this.form, roleForm: this.roleForm, + filesId: this.addFjList, commentText1: this.commentText1 })) saveTaskFirst(_formData).then(res => { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index c353e724b..1f35a9bb8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -576,7 +576,6 @@ } }, handleSubmit() { - if(this.clickFlag){ let a = 0 for (let b = 0; b < this.data.length;b++) { if (this.data[b].state === '3' && !this.data[b].cause) { @@ -606,10 +605,42 @@ } this.isSubmit = false; }); - }else{ - this.$message.warning('公开征求意见未结束，无法操作') - } }, + // handleSubmit() { + // if(this.clickFlag){ + // let a = 0 + // for (let b = 0; b < this.data.length;b++) { + // if (this.data[b].state === '3' && !this.data[b].cause) { + // a++ + // } + // if(!this.data[b].sourceType){ + // this.data[b].sourceType = '定向' + // } + // } + // if (a > 0) { + // this.$message.warning('请输入不上报原因') + // return; + // } + // this.isSubmit = true; + // var json = this.json; + // json.oldinfo = this.oldData; + // json.commentText = this.commentText5; + // json.introduce = true; + // this.$http.post("lawss/activiti/completeTask", { + // json: JSON.stringify(json), + // taskId: this.taskIds, + // userId: this.$store.getters.userInfo.userId + // }, {}, res => { + // if (res.success) { + // this.$message.success("提交成功"); + // this.$router.push("/processCenter"); + // } + // this.isSubmit = false; + // }); + // }else{ + // this.$message.warning('公开征求意见未结束，无法操作') + // } + // }, getData() { return new Promise((resolve, reject) => { inboundLiaisonDetail({ From ee7270dfd26666d6d99d31bd97c84faf3026e4f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Mon, 28 Mar 2022 17:33:37 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E6=97=A5?= =?UTF-8?q?=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue | 1 + src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue | 1 + src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue | 1 + src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue | 1 + src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue | 1 + src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue | 1 + src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue | 1 + 7 files changed, 7 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue index 79c79f8e8..ce998676c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue @@ -39,6 +39,7 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index 042c058ec..9198200ca 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -40,6 +40,7 @@ v-model="form.endTime" :picker-options="pickerOptions" type="date" + value-format="yyyy-MM-dd" placeholder="请选择结束日期"> diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue index 8c2db2005..a3f211cd2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue @@ -37,6 +37,7 @@ disabled v-model="form.endTime" type="date" + value-format="yyyy-MM-dd" placeholder="请选择结束日期"> diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index de8c04d7d..08b58bf4a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -35,6 +35,7 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue index 79e60c2ce..dcc64a98d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue @@ -34,6 +34,7 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue index 5c9c0f7f6..9c62744e6 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue @@ -35,6 +35,7 @@ From 2560750e86e09c40804bcd9f6d2c7d50fdf5e93b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Mon, 28 Mar 2022 17:50:23 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=B5=81=E7=A8=8B-=E5=90=88=E8=A7=84=E6=8E=92=E6=9F=A5?= =?UTF-8?q?=E8=8A=82=E7=82=B9=EF=BC=8C=E8=A2=AB=E8=BD=AC=E5=8A=9E=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E6=95=B0=E6=8D=AE=E6=B2=A1=E6=9C=89=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/wfhxzg/step3.vue | 34 +++++++++++-------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue index 9b7eaca53..03c6e5861 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -261,22 +261,28 @@ export default { if (item.passInfo !== 0) { this.passInfo = JSON.parse(JSON.stringify(item)).passInfo let fileData = JSON.parse(JSON.stringify(item)).dockUserList - for (let i = 0; i