diff --git a/src/assets/languages/cn.js b/src/assets/languages/cn.js index ee1dbbd3d..648cb25fc 100644 --- a/src/assets/languages/cn.js +++ b/src/assets/languages/cn.js @@ -260,6 +260,7 @@ export const m = { findByTheResponsibilityDepartment: '根据责任部门查找', findByNormativeReferenceStandard: '根据规范性引用标准查找', lookupByStandardStatus: '根据标准状态查找', + lookupByStandardStatusText: '根据文本状态查找', findByPrincipalCompiler: '根据主要编制者查找', contentInThisPaper: '内容摘要', substituteForStandNumber: '代替标准号', diff --git a/src/components/roleTree/index.vue b/src/components/roleTree/index.vue index 52e99ada9..3b912a230 100644 --- a/src/components/roleTree/index.vue +++ b/src/components/roleTree/index.vue @@ -125,6 +125,7 @@ data () { return { visible: false, + selectList: [], nodeList2: [], delList: [], roleList: [], @@ -300,7 +301,21 @@ this.delList = [data] } } else { // 多选 - this.roleList = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()) + if (this.roleList.length === 0) { + this.roleList.push(data) + } else { + let delFlag = true + this.roleList.forEach((item, index) => { + if (item.id === data.id) { + this.roleList.splice(index, 1) + delFlag = false + } + }) + if (delFlag) { + this.roleList.push(data) + } + } + // this.roleList = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()) } }, loadNode(node, resolve) { diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index b86d6a15d..e6dd6ee42 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -64,15 +64,15 @@ sarStandardsInfoEO.standEnName || '-' }}
{{ child.attrName }} - {{ file.oldFileName | ellipsis50}} - - + + + + + + + { if (res.data) { this.batchDeleteItem() + } else if(this.selectedList != null && this.selectedList.length > 20){ + this.$message.warning('单次最多删除20个条款') } else { this.deleteItemsModal = true } diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index e4b81cf05..129867b83 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -500,7 +500,10 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) + console.log(data); this.form.itemsNum = data.itemsNum || data.form.itemsNum + this.form.deptUserId = data.form ? data.form.deptUserId : data.deptUserId + this.form.deptUserIdName = data.form ? data.form.deptUserIdName : data.deptUserIdName this.form.itemsName = data.itemsName || data.form.itemsName this.commentText2 = data.commentText2 || '' this.form.endTime = data.endTime || data.form.endTime diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index 9d413ce8b..2a113aaf8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -905,6 +905,8 @@ this.AOLIGEI = data.AOLIGEI this.commentText3 = data.commentText3 || '' this.todoId = res.id + this.form.deptUserId = data.form ? data.form.deptUserId : data.deptUserId + this.form.deptUserIdName = data.form ? data.form.deptUserIdName : data.deptUserIdName this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsName = data.itemsName || data.form.itemsName if (data.form) { diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue index 0ed030c01..a73dec473 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue @@ -486,6 +486,8 @@ }).then(res => { let data = JSON.parse(res.mesg) this.form.endTime = data.endTime || data.form.endTime + this.form.deptUserId = data.form ? data.form.deptUserId : data.deptUserId + this.form.deptUserIdName = data.form ? data.form.deptUserIdName : data.deptUserIdName this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsName = data.itemsName || data.form.itemsName this.commentText4 = data.commentText4 || '' diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue index effb025f2..3ba94cc91 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue @@ -442,6 +442,8 @@ var json = this.json json.zrApplyFlag = 1 json.commentText = this.commentText5 + json.deptUserId = this.form.deptUserId + json.deptUserIdName = this.form.deptUserIdName this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, @@ -482,9 +484,12 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) + console.log(data); this.form.endTime = data.endTime || data.form.endTime this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsName = data.itemsName || data.form.itemsName + this.form.deptUserId = data.form ? data.form.deptUserId : data.deptUserId + this.form.deptUserIdName = data.form ? data.form.deptUserIdName : data.deptUserIdName this.commentText5 = data.commentText5 || '' if (data.form) { this.form.itemsName1 = data.form.itemsName1 || '' diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue index 82b76cca8..e95490ffc 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue @@ -486,6 +486,8 @@ this.form.endTime = data.endTime || data.form.endTime this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsName = data.itemsName || data.form.itemsName + this.form.deptUserId = data.form ? data.form.deptUserId : data.deptUserId + this.form.deptUserIdName = data.form ? data.form.deptUserIdName : data.deptUserIdName this.commentText6 = data.commentText6 || '' if (data.form) { this.form.itemsName1 = data.form.itemsName1 || '' diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue index 8ea4d056a..eb6f21c9e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue @@ -378,6 +378,8 @@ export default { }).then(res => { let data = JSON.parse(res.mesg) this.commentText2 = data.commentText2 || '' + this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser + this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName this.form.startUserName = data.form ? data.form.startUserName : data.startUserName this.form.startUser = data.form ? data.form.startUser : data.startUser this.form.cid = data.form ? data.form.cid : data.cid diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index bbdfbec0b..6e876e8b2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -701,6 +701,8 @@ this.submitShow = true } this.commentText3 = data.commentText3 || '' + this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser + this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName this.form.fjList = data.form ? data.form.fjList : (data.fjList ? data.fjList : [] ) this.form.modelList = data.form ? data.form.modelList : (data.modelList ? data.modelList : [] ) this.form.textType = data.form ? data.form.textType : data.textType diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue index 2842bf7de..ee6c9d4e7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue @@ -455,6 +455,8 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) + this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser + this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName this.form.fjList = data.fjList || data.form.fjList this.form.cid = data.cid || data.form.cid this.form.endTime = data.endTime || data.form.endTime diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue index 3f274da50..f305809b4 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue @@ -440,6 +440,8 @@ }).then(res => { let data = JSON.parse(res.mesg) this.form.fjList = data.fjList || data.form.fjList + this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser + this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName this.commentText42 = data.commentText42 || '' this.form.cid = data.cid || data.form.cid this.form.endTime = data.endTime || data.form.endTime diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue index 222a4795c..12a5a2ebe 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue @@ -703,6 +703,8 @@ export default { this.submitShow = true } this.commentText4 = data.commentText || data.commentText4 || '' + this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser + this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName this.form.fjList = data.fjList || data.form.fjList this.form.spId = data.form ? data.form.spId : '' this.form.spName = data.form ? data.form.spName : '' diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index 8a1e1a8cc..2caa67e8c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -619,6 +619,8 @@ let data = JSON.parse(res.mesg); console.log(data); this.commentText5 = data.commentText5 || '' + this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser + this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName this.form.fjList = data.form ? data.form.fjList : (data.fjList ? data.fjList : [] ) this.form.modelList = data.form ? data.form.modelList : (data.modelList ? data.modelList : [] ) this.form.textType = data.form ? data.form.textType : data.textType diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue index 36a6218ce..94c00c6a9 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -530,6 +530,8 @@ }).then(res => { let data = JSON.parse(res.mesg); this.commentText6 = data.commentText6 || '' + this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser + this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName this.form.fjList = data.fjList || data.form.fjList this.form.cid = data.cid || data.form.cid; this.form.endTime = data.endTime || data.form.endTime; diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue index c44978deb..740498b71 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue @@ -491,6 +491,8 @@ export default { }).then(res => { let data = JSON.parse(res.mesg) this.commentText7 = data.commentText7 || '' + this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser + this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName this.form.fjList = data.fjList || data.form.fjList this.form.cid = data.cid || data.form.cid; this.form.endTime = data.endTime || data.form.endTime; diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue index fef5ad6d0..36b705625 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue @@ -491,6 +491,8 @@ export default { }).then(res => { let data = JSON.parse(res.mesg) this.commentText8 = data.commentText8 || '' + this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser + this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName this.form.fjList = data.fjList || data.form.fjList this.form.cid = data.cid || data.form.cid; this.form.endTime = data.endTime || data.form.endTime; diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue index 1a39fa879..9b62938e4 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue @@ -491,6 +491,8 @@ export default { }).then(res => { let data = JSON.parse(res.mesg) this.commentText9 = data.commentText9 || '' + this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser + this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName this.form.fjList = data.fjList || data.form.fjList this.form.cid = data.cid || data.form.cid; this.form.endTime = data.endTime || data.form.endTime; diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index aeac07c9e..7c4f27e3f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -283,6 +283,7 @@ export default { qbfsForm: {}, formLoading: false, approvalFlag: false, + saveFlag: false, showFlag: true, taskIds: '', bpnId: '', @@ -333,6 +334,7 @@ export default { this.taskIds = this.$route.query.taskIds this.bpnId = this.$route.query.bpnId if (this.bpnId !== undefined) { + this.saveFlag = true this.getData() } if(this.taskIds){ @@ -387,6 +389,7 @@ export default { * @description: 动态表单读取 */ getFormFieldList(item) { + console.log(item); this.toggleType= item.type || item.qbfsForm.type this.$nextTick(() => { switch (this.toggleType){ @@ -440,28 +443,7 @@ export default { }, //流程保存 handleSave() { - if(!this.approvalFlag){ - //第一次正常保存 - let qbzxdFrom = this.$refs["childForm"].qbfsForm; - qbzxdFrom.type = this.toggleType - this.saveLoading = true - let _formData = new FormData() - _formData.append('createUser', this.$store.getters.userInfo.userId) - _formData.append('createUserName', this.$store.getters.userInfo.userName) - _formData.append('prcType', '25') - _formData.append('json', JSON.stringify({ - roleForm: this.roleForm, - qbfsForm: qbzxdFrom, - commentText: this.commentText - })) - saveTaskFirst(_formData).then(res => { - this.saveLoading = false - this.$message.success('保存成功') - this.bpnId = res.result - }).catch(e => { - this.saveLoading = false - }) - }else{ + if(this.approvalFlag || this.saveFlag){ //被驳回后的保存 this.saveLoading = true; let qbzxdFrom = this.$refs["childForm"].qbfsForm; @@ -484,7 +466,27 @@ export default { }).catch(e => { this.saveLoading = false; }); - + }else{ + //第一次正常保存 + let qbzxdFrom = this.$refs["childForm"].qbfsForm; + qbzxdFrom.type = this.toggleType + this.saveLoading = true + let _formData = new FormData() + _formData.append('createUser', this.$store.getters.userInfo.userId) + _formData.append('createUserName', this.$store.getters.userInfo.userName) + _formData.append('prcType', '25') + _formData.append('json', JSON.stringify({ + roleForm: this.roleForm, + qbfsForm: qbzxdFrom, + commentText: this.commentText + })) + saveTaskFirst(_formData).then(res => { + this.saveLoading = false + this.$message.success('保存成功') + this.bpnId = res.result + }).catch(e => { + this.saveLoading = false + }) } }, //流程提交 diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue index 456f2430c..c09761aaa 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue @@ -825,8 +825,8 @@ export default { let routeUrl = this.$router.resolve({ name: "OtherStandardDetails", params: { - id: item.id, - pageType: "INLAND_STAND" + id: item.id || item.standId, + pageType: item.standType + '_STAND' } }); window.open(routeUrl.href, "_blank"); diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue index a2415001b..bb37f80bd 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue @@ -925,8 +925,8 @@ export default { let routeUrl = this.$router.resolve({ name: "OtherStandardDetails", params: { - id: item.id, - pageType: "INLAND_STAND" + id: item.id || item.standId, + pageType: item.standType + '_STAND' } }); window.open(routeUrl.href, "_blank"); diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue index f423ef050..4c6689c4e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue @@ -832,8 +832,8 @@ export default { let routeUrl = this.$router.resolve({ name: "OtherStandardDetails", params: { - id: item.id, - pageType: "INLAND_STAND" + id: item.id || item.standId, + pageType: item.standType + '_STAND' } }); window.open(routeUrl.href, "_blank"); @@ -919,7 +919,9 @@ export default { //提交事件 handleSubmit() { this.dataList.forEach(item => { - this.$set(item, 'standId', item.id) + if(!item.standId){ + this.$set(item, 'standId', item.id) + } }) this.isSubmit = true; this.qdform.commentText = this.commentText; diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue index 59ed78827..622a7657e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue @@ -832,8 +832,8 @@ export default { let routeUrl = this.$router.resolve({ name: "OtherStandardDetails", params: { - id: item.id, - pageType: "INLAND_STAND" + id: item.id || item.standId, + pageType: item.standType + '_STAND' } }); window.open(routeUrl.href, "_blank"); @@ -919,7 +919,9 @@ export default { //提交事件 handleSubmit() { this.dataList.forEach(item => { - this.$set(item, 'standId', item.id) + if(!item.standId){ + this.$set(item, 'standId', item.id) + } }) this.isSubmit = true; this.qdform.commentText = this.commentText; diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue index 26f79189d..ef94c6db9 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue @@ -824,8 +824,8 @@ export default { let routeUrl = this.$router.resolve({ name: "OtherStandardDetails", params: { - id: item.id, - pageType: "INLAND_STAND" + id: item.id || item.standId, + pageType: item.standType + '_STAND' } }); window.open(routeUrl.href, "_blank"); @@ -891,7 +891,9 @@ export default { //提交事件 handleSubmit() { this.dataList.forEach(item => { - this.$set(item, 'standId', item.id) + if(!item.standId){ + this.$set(item, 'standId', item.id) + } }) this.isSubmit = true; this.qdform.commentText = this.commentText; diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step2.vue b/src/pages/processCenter/pages/phone/bzzqyj/step2.vue index 6225edc9c..9af50f9d4 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step2.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step2.vue @@ -165,7 +165,7 @@ import axios from "axios"; export default { - name: "bzzqyjStep2", + name: "phoneBzzqyjStep2", data() { return { drawerModal: false, diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue index 2fbd9eba5..51e09cd22 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue @@ -3,7 +3,7 @@ 标准征求意见流程 - 审批人审批 + 意见审批 基础信息 @@ -396,26 +396,28 @@ } }) }, - handleSubmitNo() { - if (this.commentText41) { - var json = this.json - json.spFlag = '1' - json.commentText = this.commentText41 - 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') - } - }) - } else { - this.$message.warning('请输入反馈意见') + handleSubmitNo() { + if (this.commentText41) { + this.isSubmit = true + var json = this.json + json.spFlag = '1' + json.commentText = this.commentText41 + 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({ diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 1e15fb23d..c8cb033ba 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -105,7 +105,7 @@ size="mini" class="common-button-primary" v-btn-permission="'967c8b1402459951b5f75fcd1c548665'" - @click="searchBtnClick(standCommonlySearch)"> + @click="searchBtnClick(standCommonlySearch, 1)"> 查询 - {{ opt.label }} @@ -3723,9 +3723,9 @@ export default { this.getDomesticStandardTable(this.standCommonlySearch) }, // 点击搜索按钮 - searchBtnClick(standCommonlySearch) { + searchBtnClick(standCommonlySearch, type) { let item = this.standCommonlySearch - this.getDomesticStandardTable(item) + this.getDomesticStandardTable(item, type) }, // 搜索 getDomesticStandardTableBtn(item) { @@ -3823,7 +3823,7 @@ export default { // 高级检索 selectMoreBtn() { this.isAdvancedSearch = true - this.sarStandardsSearch = {} + // this.sarStandardsSearch = {} }, treeCollapse() { this.sideClose = !this.sideClose @@ -4547,7 +4547,7 @@ export default { // 此处需要调用接口,修改个人配置 }, // 分页查询国内标准 - getDomesticStandardTable(item) { + getDomesticStandardTable(item, type) { if (item !== '' && item !== null && item !== undefined) { item.pageSize = this.$store.getters.userInfo.configContent } @@ -4670,6 +4670,9 @@ export default { if ((this.stahndinfoList.length === 0 || this.stahndinfoList === []) && this.sarStandardsSearch.page !== 1) { this.pageChange(1) } + if (type === 1) { + this.sarStandardsSearch = {} + } } else { this.$message.error(res.message) }
{ if (res.data) { this.batchDeleteItem() + } else if(this.selectedList != null && this.selectedList.length > 20){ + this.$message.warning('单次最多删除20个条款') } else { this.deleteItemsModal = true } diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index e4b81cf05..129867b83 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -500,7 +500,10 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) + console.log(data); this.form.itemsNum = data.itemsNum || data.form.itemsNum + this.form.deptUserId = data.form ? data.form.deptUserId : data.deptUserId + this.form.deptUserIdName = data.form ? data.form.deptUserIdName : data.deptUserIdName this.form.itemsName = data.itemsName || data.form.itemsName this.commentText2 = data.commentText2 || '' this.form.endTime = data.endTime || data.form.endTime diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index 9d413ce8b..2a113aaf8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -905,6 +905,8 @@ this.AOLIGEI = data.AOLIGEI this.commentText3 = data.commentText3 || '' this.todoId = res.id + this.form.deptUserId = data.form ? data.form.deptUserId : data.deptUserId + this.form.deptUserIdName = data.form ? data.form.deptUserIdName : data.deptUserIdName this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsName = data.itemsName || data.form.itemsName if (data.form) { diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue index 0ed030c01..a73dec473 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue @@ -486,6 +486,8 @@ }).then(res => { let data = JSON.parse(res.mesg) this.form.endTime = data.endTime || data.form.endTime + this.form.deptUserId = data.form ? data.form.deptUserId : data.deptUserId + this.form.deptUserIdName = data.form ? data.form.deptUserIdName : data.deptUserIdName this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsName = data.itemsName || data.form.itemsName this.commentText4 = data.commentText4 || '' diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue index effb025f2..3ba94cc91 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue @@ -442,6 +442,8 @@ var json = this.json json.zrApplyFlag = 1 json.commentText = this.commentText5 + json.deptUserId = this.form.deptUserId + json.deptUserIdName = this.form.deptUserIdName this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, @@ -482,9 +484,12 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) + console.log(data); this.form.endTime = data.endTime || data.form.endTime this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsName = data.itemsName || data.form.itemsName + this.form.deptUserId = data.form ? data.form.deptUserId : data.deptUserId + this.form.deptUserIdName = data.form ? data.form.deptUserIdName : data.deptUserIdName this.commentText5 = data.commentText5 || '' if (data.form) { this.form.itemsName1 = data.form.itemsName1 || '' diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue index 82b76cca8..e95490ffc 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue @@ -486,6 +486,8 @@ this.form.endTime = data.endTime || data.form.endTime this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsName = data.itemsName || data.form.itemsName + this.form.deptUserId = data.form ? data.form.deptUserId : data.deptUserId + this.form.deptUserIdName = data.form ? data.form.deptUserIdName : data.deptUserIdName this.commentText6 = data.commentText6 || '' if (data.form) { this.form.itemsName1 = data.form.itemsName1 || '' diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue index 8ea4d056a..eb6f21c9e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue @@ -378,6 +378,8 @@ export default { }).then(res => { let data = JSON.parse(res.mesg) this.commentText2 = data.commentText2 || '' + this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser + this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName this.form.startUserName = data.form ? data.form.startUserName : data.startUserName this.form.startUser = data.form ? data.form.startUser : data.startUser this.form.cid = data.form ? data.form.cid : data.cid diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index bbdfbec0b..6e876e8b2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -701,6 +701,8 @@ this.submitShow = true } this.commentText3 = data.commentText3 || '' + this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser + this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName this.form.fjList = data.form ? data.form.fjList : (data.fjList ? data.fjList : [] ) this.form.modelList = data.form ? data.form.modelList : (data.modelList ? data.modelList : [] ) this.form.textType = data.form ? data.form.textType : data.textType diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue index 2842bf7de..ee6c9d4e7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue @@ -455,6 +455,8 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) + this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser + this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName this.form.fjList = data.fjList || data.form.fjList this.form.cid = data.cid || data.form.cid this.form.endTime = data.endTime || data.form.endTime diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue index 3f274da50..f305809b4 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue @@ -440,6 +440,8 @@ }).then(res => { let data = JSON.parse(res.mesg) this.form.fjList = data.fjList || data.form.fjList + this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser + this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName this.commentText42 = data.commentText42 || '' this.form.cid = data.cid || data.form.cid this.form.endTime = data.endTime || data.form.endTime diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue index 222a4795c..12a5a2ebe 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue @@ -703,6 +703,8 @@ export default { this.submitShow = true } this.commentText4 = data.commentText || data.commentText4 || '' + this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser + this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName this.form.fjList = data.fjList || data.form.fjList this.form.spId = data.form ? data.form.spId : '' this.form.spName = data.form ? data.form.spName : '' diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index 8a1e1a8cc..2caa67e8c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -619,6 +619,8 @@ let data = JSON.parse(res.mesg); console.log(data); this.commentText5 = data.commentText5 || '' + this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser + this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName this.form.fjList = data.form ? data.form.fjList : (data.fjList ? data.fjList : [] ) this.form.modelList = data.form ? data.form.modelList : (data.modelList ? data.modelList : [] ) this.form.textType = data.form ? data.form.textType : data.textType diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue index 36a6218ce..94c00c6a9 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -530,6 +530,8 @@ }).then(res => { let data = JSON.parse(res.mesg); this.commentText6 = data.commentText6 || '' + this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser + this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName this.form.fjList = data.fjList || data.form.fjList this.form.cid = data.cid || data.form.cid; this.form.endTime = data.endTime || data.form.endTime; diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue index c44978deb..740498b71 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue @@ -491,6 +491,8 @@ export default { }).then(res => { let data = JSON.parse(res.mesg) this.commentText7 = data.commentText7 || '' + this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser + this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName this.form.fjList = data.fjList || data.form.fjList this.form.cid = data.cid || data.form.cid; this.form.endTime = data.endTime || data.form.endTime; diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue index fef5ad6d0..36b705625 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue @@ -491,6 +491,8 @@ export default { }).then(res => { let data = JSON.parse(res.mesg) this.commentText8 = data.commentText8 || '' + this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser + this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName this.form.fjList = data.fjList || data.form.fjList this.form.cid = data.cid || data.form.cid; this.form.endTime = data.endTime || data.form.endTime; diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue index 1a39fa879..9b62938e4 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue @@ -491,6 +491,8 @@ export default { }).then(res => { let data = JSON.parse(res.mesg) this.commentText9 = data.commentText9 || '' + this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser + this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName this.form.fjList = data.fjList || data.form.fjList this.form.cid = data.cid || data.form.cid; this.form.endTime = data.endTime || data.form.endTime; diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index aeac07c9e..7c4f27e3f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -283,6 +283,7 @@ export default { qbfsForm: {}, formLoading: false, approvalFlag: false, + saveFlag: false, showFlag: true, taskIds: '', bpnId: '', @@ -333,6 +334,7 @@ export default { this.taskIds = this.$route.query.taskIds this.bpnId = this.$route.query.bpnId if (this.bpnId !== undefined) { + this.saveFlag = true this.getData() } if(this.taskIds){ @@ -387,6 +389,7 @@ export default { * @description: 动态表单读取 */ getFormFieldList(item) { + console.log(item); this.toggleType= item.type || item.qbfsForm.type this.$nextTick(() => { switch (this.toggleType){ @@ -440,28 +443,7 @@ export default { }, //流程保存 handleSave() { - if(!this.approvalFlag){ - //第一次正常保存 - let qbzxdFrom = this.$refs["childForm"].qbfsForm; - qbzxdFrom.type = this.toggleType - this.saveLoading = true - let _formData = new FormData() - _formData.append('createUser', this.$store.getters.userInfo.userId) - _formData.append('createUserName', this.$store.getters.userInfo.userName) - _formData.append('prcType', '25') - _formData.append('json', JSON.stringify({ - roleForm: this.roleForm, - qbfsForm: qbzxdFrom, - commentText: this.commentText - })) - saveTaskFirst(_formData).then(res => { - this.saveLoading = false - this.$message.success('保存成功') - this.bpnId = res.result - }).catch(e => { - this.saveLoading = false - }) - }else{ + if(this.approvalFlag || this.saveFlag){ //被驳回后的保存 this.saveLoading = true; let qbzxdFrom = this.$refs["childForm"].qbfsForm; @@ -484,7 +466,27 @@ export default { }).catch(e => { this.saveLoading = false; }); - + }else{ + //第一次正常保存 + let qbzxdFrom = this.$refs["childForm"].qbfsForm; + qbzxdFrom.type = this.toggleType + this.saveLoading = true + let _formData = new FormData() + _formData.append('createUser', this.$store.getters.userInfo.userId) + _formData.append('createUserName', this.$store.getters.userInfo.userName) + _formData.append('prcType', '25') + _formData.append('json', JSON.stringify({ + roleForm: this.roleForm, + qbfsForm: qbzxdFrom, + commentText: this.commentText + })) + saveTaskFirst(_formData).then(res => { + this.saveLoading = false + this.$message.success('保存成功') + this.bpnId = res.result + }).catch(e => { + this.saveLoading = false + }) } }, //流程提交 diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue index 456f2430c..c09761aaa 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue @@ -825,8 +825,8 @@ export default { let routeUrl = this.$router.resolve({ name: "OtherStandardDetails", params: { - id: item.id, - pageType: "INLAND_STAND" + id: item.id || item.standId, + pageType: item.standType + '_STAND' } }); window.open(routeUrl.href, "_blank"); diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue index a2415001b..bb37f80bd 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue @@ -925,8 +925,8 @@ export default { let routeUrl = this.$router.resolve({ name: "OtherStandardDetails", params: { - id: item.id, - pageType: "INLAND_STAND" + id: item.id || item.standId, + pageType: item.standType + '_STAND' } }); window.open(routeUrl.href, "_blank"); diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue index f423ef050..4c6689c4e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue @@ -832,8 +832,8 @@ export default { let routeUrl = this.$router.resolve({ name: "OtherStandardDetails", params: { - id: item.id, - pageType: "INLAND_STAND" + id: item.id || item.standId, + pageType: item.standType + '_STAND' } }); window.open(routeUrl.href, "_blank"); @@ -919,7 +919,9 @@ export default { //提交事件 handleSubmit() { this.dataList.forEach(item => { - this.$set(item, 'standId', item.id) + if(!item.standId){ + this.$set(item, 'standId', item.id) + } }) this.isSubmit = true; this.qdform.commentText = this.commentText; diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue index 59ed78827..622a7657e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue @@ -832,8 +832,8 @@ export default { let routeUrl = this.$router.resolve({ name: "OtherStandardDetails", params: { - id: item.id, - pageType: "INLAND_STAND" + id: item.id || item.standId, + pageType: item.standType + '_STAND' } }); window.open(routeUrl.href, "_blank"); @@ -919,7 +919,9 @@ export default { //提交事件 handleSubmit() { this.dataList.forEach(item => { - this.$set(item, 'standId', item.id) + if(!item.standId){ + this.$set(item, 'standId', item.id) + } }) this.isSubmit = true; this.qdform.commentText = this.commentText; diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue index 26f79189d..ef94c6db9 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue @@ -824,8 +824,8 @@ export default { let routeUrl = this.$router.resolve({ name: "OtherStandardDetails", params: { - id: item.id, - pageType: "INLAND_STAND" + id: item.id || item.standId, + pageType: item.standType + '_STAND' } }); window.open(routeUrl.href, "_blank"); @@ -891,7 +891,9 @@ export default { //提交事件 handleSubmit() { this.dataList.forEach(item => { - this.$set(item, 'standId', item.id) + if(!item.standId){ + this.$set(item, 'standId', item.id) + } }) this.isSubmit = true; this.qdform.commentText = this.commentText; diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step2.vue b/src/pages/processCenter/pages/phone/bzzqyj/step2.vue index 6225edc9c..9af50f9d4 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step2.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step2.vue @@ -165,7 +165,7 @@ import axios from "axios"; export default { - name: "bzzqyjStep2", + name: "phoneBzzqyjStep2", data() { return { drawerModal: false, diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue index 2fbd9eba5..51e09cd22 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue @@ -3,7 +3,7 @@ 标准征求意见流程 - 审批人审批 + 意见审批 基础信息 @@ -396,26 +396,28 @@ } }) }, - handleSubmitNo() { - if (this.commentText41) { - var json = this.json - json.spFlag = '1' - json.commentText = this.commentText41 - 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') - } - }) - } else { - this.$message.warning('请输入反馈意见') + handleSubmitNo() { + if (this.commentText41) { + this.isSubmit = true + var json = this.json + json.spFlag = '1' + json.commentText = this.commentText41 + 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({ diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 1e15fb23d..c8cb033ba 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -105,7 +105,7 @@ size="mini" class="common-button-primary" v-btn-permission="'967c8b1402459951b5f75fcd1c548665'" - @click="searchBtnClick(standCommonlySearch)"> + @click="searchBtnClick(standCommonlySearch, 1)"> 查询 - {{ opt.label }} @@ -3723,9 +3723,9 @@ export default { this.getDomesticStandardTable(this.standCommonlySearch) }, // 点击搜索按钮 - searchBtnClick(standCommonlySearch) { + searchBtnClick(standCommonlySearch, type) { let item = this.standCommonlySearch - this.getDomesticStandardTable(item) + this.getDomesticStandardTable(item, type) }, // 搜索 getDomesticStandardTableBtn(item) { @@ -3823,7 +3823,7 @@ export default { // 高级检索 selectMoreBtn() { this.isAdvancedSearch = true - this.sarStandardsSearch = {} + // this.sarStandardsSearch = {} }, treeCollapse() { this.sideClose = !this.sideClose @@ -4547,7 +4547,7 @@ export default { // 此处需要调用接口,修改个人配置 }, // 分页查询国内标准 - getDomesticStandardTable(item) { + getDomesticStandardTable(item, type) { if (item !== '' && item !== null && item !== undefined) { item.pageSize = this.$store.getters.userInfo.configContent } @@ -4670,6 +4670,9 @@ export default { if ((this.stahndinfoList.length === 0 || this.stahndinfoList === []) && this.sarStandardsSearch.page !== 1) { this.pageChange(1) } + if (type === 1) { + this.sarStandardsSearch = {} + } } else { this.$message.error(res.message) }