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]; 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 dbd0abf53..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="请选择结束日期"> @@ -814,6 +815,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/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 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index 44b936952..1f35a9bb8 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,49 @@ }, //保存事件 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++ + 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 @@ -586,6 +606,41 @@ this.isSubmit = false; }); }, + // 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({ @@ -613,6 +668,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 +688,7 @@ item.responUser = item.userId item.state = '1' item.source = '2' + item.sourceType = '公开' this.data.push(item); }); }); 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 + v-model="sarAccessInfo.seniorStandNumber" + :placeholder="'请输入' + standLabelNum"/> + v-model="sarAccessInfo.seniorLawsNumber" + :placeholder="'请输入' + standLabelNum"/> + v-model="sarAccessInfo.seniorStandCode" + :placeholder="'请输入' + standLabelNum"/> @@ -569,7 +569,7 @@ - + @@ -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) }, // 删除上传的文件 @@ -1212,8 +1217,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 +1259,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 +1273,7 @@ export default { item.sycpx = '' } }) - this.sarAccessInfoList = this.sarAccessInfoLists + // this.sarAccessInfoList = this.sarAccessInfoLists } }) } else { @@ -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) } }, 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 } 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 @@
- + 添加 导出