diff --git a/src/components/CustomFormComponents/InputForAllStandards.vue b/src/components/CustomFormComponents/InputForAllStandards.vue index ed9bae380..d33c1a176 100644 --- a/src/components/CustomFormComponents/InputForAllStandards.vue +++ b/src/components/CustomFormComponents/InputForAllStandards.vue @@ -5,6 +5,7 @@ :prop="config.attrField" :label-width="labelWidth" class="add-form-item" + style="width: 100%;" :class="{'form-item-disabled': disabled}" > - + @@ -125,8 +126,8 @@ @pageChange="pageChangeReplace" @pageSizeChange="pageSizeChangeReplace"> @@ -176,7 +177,7 @@ export default { page: 1, pageSize: this.$store.getters.userInfo.configContent, total: 0, - standType: 'ALL', + standType: '', quoteIdList: '', validFlag: '0', menuId: 'nomenu' diff --git a/src/components/CustomFormComponents/InputForAllStandards2.vue b/src/components/CustomFormComponents/InputForAllStandards2.vue new file mode 100644 index 000000000..48ffe0938 --- /dev/null +++ b/src/components/CustomFormComponents/InputForAllStandards2.vue @@ -0,0 +1,349 @@ + + + + + {{config.attrField === 'releventStand' ? '选择标准' :'手动查找'}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }} + {{ scope.row.standSort }} {{ scope.row.standNumber }} + + + + + + + + + + + + + + {{$t('m.dataAcquisition')}} + + + + + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue index 1aa12e4be..6950b24f7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue @@ -244,7 +244,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="commentText"> + v-model="commentInfo"> @@ -538,7 +538,7 @@ export default { isSubmit: false, saveLoading: false, - commentText: '', + commentInfo: '', bpnId: '' } }, @@ -585,6 +585,7 @@ export default { }).then(res => { let mes = JSON.parse(res.mes) this.rh_pageData = mes.rh_pageData + this.commentInfo = mes.commentInfo this.roleForm = mes.roleForm }); }, @@ -804,7 +805,7 @@ export default { _formData.append('json', JSON.stringify({ roleForm: this.roleForm, rh_pageData: this.rh_pageData, - commentText: this.commentText + commentInfo: this.commentInfo })) saveTaskFirst(_formData).then(res => { this.saveLoading = false @@ -821,7 +822,8 @@ export default { prcCreateUserName: this.$store.getters.userInfo.userName, roleList: this.roleForm, rh_pageData: this.rh_pageData, - commentText: this.commentText, + commentText: this.commentInfo, + roleForm: this.roleForm, directorList: this.roleForm.dockUser, } this.$refs['rh_pageData'].validate((valid) => { @@ -830,15 +832,11 @@ export default { if (valid) { this.isSubmit = true let paramsInfo = new FormData() - paramsInfo.append('id', this.bpnId || '') + // paramsInfo.append('id', this.bpnId || '') paramsInfo.append('createUser', this.$store.getters.userInfo.userId) paramsInfo.append('createUserName', this.$store.getters.userInfo.userName) paramsInfo.append('type', '20') - paramsInfo.append('json', JSON.stringify({ - roleForm: this.roleForm, - rh_pageData: this.rh_pageData, - commentText: this.commentText - })) + paramsInfo.append('json', JSON.stringify({json})) processBack(paramsInfo).then(res => { this.taskID = res.data const params = new FormData(); diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue index 995e2cb6d..1ef79891d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue @@ -219,7 +219,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="commentText"> + v-model="commentStep3"> @@ -379,7 +379,7 @@ export default { taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, - commentText: '', + commentStep3: '', infoSourcesLength: '', /** 上传相关 */ @@ -435,6 +435,7 @@ export default { if (this.rh_pageData.fillFile !== undefined) { this.fillFileList = this.rh_pageData.fillFile } + this.commentStep3 = JSON.parse(JSON.stringify(item)).commentStep3 this.rh_pageData.fillPeopleId = this.$store.getters.userInfo.userId this.roleForm = JSON.parse(JSON.stringify(item)).roleList this.infoSourcesLength = this.rh_pageData.infoSources.length @@ -471,6 +472,7 @@ export default { selfUser: this.$store.getters.userInfo.userId, charge: this.rh_pageData.fillLeaderId, rh_pageData: this.rh_pageData, + commentStep3: this.commentStep3 })) saveTaskForPub(_formData).then(res => { this.saveLoading = false @@ -486,7 +488,7 @@ export default { roleList: this.roleForm, selfUser: this.$store.getters.userInfo.userId, charge: this.rh_pageData.fillLeaderId, - commentText: this.commentText, + commentText: this.commentStep3, rh_pageData: this.rh_pageData, } this.$refs['rh_pageData'].validate((valid) => { diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue index 35749dc51..5ccfc4e93 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue @@ -221,7 +221,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="commentText"> + v-model="commentStep5"> @@ -458,7 +458,7 @@ export default { deleteDataList: [], infoSourcesLength: '', - commentText: '', + commentStep5: '', editFlag: false, editForm: { @@ -522,6 +522,7 @@ export default { this.$nextTick(() => { this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData this.roleForm = JSON.parse(JSON.stringify(item)).roleList + this.commentStep5 = JSON.parse(JSON.stringify(item)).commentStep5 this.infoSourcesLength = this.rh_pageData.infoSources.length // this.rh_pageData.comityFileNum = this.fileTextList }) @@ -702,7 +703,7 @@ export default { _formData.append('json', JSON.stringify({ rh_pageData: this.rh_pageData, roleList: this.roleForm, - commentText: this.commentText + commentStep5: this.commentStep5 })) saveTaskForPub(_formData).then(res => { this.saveLoading = false @@ -718,7 +719,7 @@ export default { leader: this.roleForm.leaderUserId, rh_pageData: this.rh_pageData, roleList: this.roleForm, - commentText: this.commentText + commentText: this.commentStep5 } this.$refs['rh_pageData'].validate((valid) => { if (valid) { diff --git a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue index 617fc8efe..a4061068a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue @@ -242,7 +242,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import { saveTaskFirst, completeTask, inboundLiaisonDetail,upFile} from '@/api/process.js' +import { saveTaskForPub, completeTask, inboundLiaisonDetail,upFile,taskDel} from '@/api/process.js' export default { components: { @@ -652,15 +652,16 @@ export default { handleSave() { this.saveLoading = true let _formData = new FormData() - _formData.append('id', this.bpnId || '') - _formData.append('createUser', this.$store.getters.userInfo.userId) - _formData.append('createUserName', this.$store.getters.userInfo.userName) - _formData.append('prcType', '22') + // _formData.append('id', this.bpnId || '') + // _formData.append('createUser', this.$store.getters.userInfo.userId) + // _formData.append('createUserName', this.$store.getters.userInfo.userName) + // _formData.append('prcType', '22') + _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ roleForm: this.roleForm, - hh_pageData: this.hh_pageData + hh_pageData: this.hh_pageData, })) - saveTaskFirst(_formData).then(res => { + saveTaskForPub(_formData).then(res => { this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue index 77a5e0115..31875535c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue @@ -175,7 +175,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="commentText"> + v-model="commentStep1"> @@ -452,7 +452,7 @@ export default { roleShowflagOne: false, isSubmit: false, saveLoading: false, - commentText: '', + commentInfo: '', bpnId: '' } }, @@ -513,7 +513,7 @@ export default { }).then(res => { let mes = JSON.parse(res.mes) this.ch_pageData = mes.ch_pageData - this.commentText = mes.commentText + this.commentInfo = mes.commentInfo this.roleForm = mes.roleForm }); }, @@ -709,7 +709,7 @@ export default { _formData.append('json', JSON.stringify({ roleForm: this.roleForm, ch_pageData: this.ch_pageData, - commentText: this.commentText + commentInfo: this.commentInfo })) saveTaskFirst(_formData).then(res => { @@ -727,8 +727,9 @@ export default { prcCreateUserName: this.$store.getters.userInfo.userName, roleList: this.roleForm, ch_pageData: this.ch_pageData, - commentText: this.commentText, + commentText: this.commentInfo, directorList: this.roleForm.dockUser, + roleForm: this.roleForm, } this.$refs['ch_pageData'].validate((valid) => { if (valid) { @@ -736,16 +737,11 @@ export default { if (valid) { this.isSubmit = true let paramsInfo = new FormData() - paramsInfo.append('id', this.bpnId || '') + // paramsInfo.append('id', this.bpnId || '') paramsInfo.append('createUser', this.$store.getters.userInfo.userId) paramsInfo.append('createUserName', this.$store.getters.userInfo.userName) paramsInfo.append('type', '21') - paramsInfo.append('json', JSON.stringify({ - roleForm: this.roleForm, - ch_pageData: this.ch_pageData, - commentText: this.commentText - - })) + paramsInfo.append('json', JSON.stringify({json})) processBack(paramsInfo).then(res => { this.taskID = res.data const params = new FormData(); diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue index b7503a739..3fe8cfa32 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue @@ -181,7 +181,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="commentText"> + v-model="commentStep3"> @@ -323,7 +323,7 @@ export default { pId: this.$route.query.prcId, uploadFileLength: '', - commentText: '' + commentStep3: '' } }, computed: { @@ -374,6 +374,7 @@ export default { this.ch_pageData.fillPeopleId = this.$store.getters.userInfo.userId this.ch_pageData.fillPeople = this.$store.getters.userInfo.userName + '(' + this.$store.getters.userInfo.userId + ')' this.roleForm = JSON.parse(JSON.stringify(item)).roleList + this.commentStep3 = JSON.parse(JSON.stringify(item)).commentStep3 // this.rh_pageData.comityFileNum = this.fileTextList }) }, @@ -400,7 +401,7 @@ export default { _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ roleList: this.roleForm, - commentText: this.commentText, + commentStep3: this.commentStep3, selfUser: this.$store.getters.userInfo.userId, charge: this.ch_pageData.fillLeaderId, ch_pageData: this.ch_pageData, @@ -418,7 +419,7 @@ export default { let json = { roleList: this.roleForm, selfUser: this.$store.getters.userInfo.userId, - commentText: this.commentText, + commentText: this.commentStep3, charge: this.ch_pageData.fillLeaderId, ch_pageData: this.ch_pageData, } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue index fce417416..f1a972017 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue @@ -183,7 +183,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="commentText"> + v-model="commentStep5"> @@ -345,7 +345,7 @@ export default { pId: this.$route.query.prcId, uploadFileLength: '', - commentText: '', + commentStep5: '', roleShowflag: false, nodeList: [], // 人员编辑 @@ -402,6 +402,7 @@ export default { this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData this.uploadFileLength = this.ch_pageData.fileTextList.length this.roleForm = JSON.parse(JSON.stringify(item)).roleList + this.commentStep5 = JSON.parse(JSON.stringify(item)).commentStep5 // this.ch_pageData.comityFileNum = this.fileTextList }) }, @@ -491,7 +492,7 @@ export default { _formData.append('json', JSON.stringify({ ch_pageData: this.ch_pageData, roleList: this.roleForm, - commentText: this.commentText + commentStep5: this.commentStep5 })) saveTaskForPub(_formData).then(res => { this.saveLoading = false @@ -506,7 +507,7 @@ export default { let json = { leader: this.roleForm.leaderUserId, ch_pageData: this.ch_pageData, - commentText: this.commentText, + commentText: this.commentStep5, roleList: this.roleForm, } this.$refs['ch_pageData'].validate((valid) => { diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index 3d6f1cccd..2c79ed7ac 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -1134,7 +1134,6 @@ export default { if (valid) { this.isSubmit = true this.$http.post("lawss/activiti/startProcessRollBack", { - id: this.bpnId || '', createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, type: '4', @@ -1157,6 +1156,14 @@ export default { }, res => { if (res.success) { this.$message.success(res.message); + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } this.$router.push("/processCenter"); } this.isSubmit = false diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 412e435de..3707f0182 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -690,7 +690,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import {saveTaskFirst} from "api/process"; +import { saveTaskFirst, taskDel } from "api/process"; import seeDatalis from "@/pages/localTool/standContrast/pages/seeDatalis"; export default { @@ -1064,7 +1064,6 @@ export default { if (valid) { this.isSubmit = true this.$http.post("lawss/activiti/startProcessRollBack", { - id: this.bpnId || '', createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, type: '4', @@ -1087,6 +1086,14 @@ export default { }, res => { if (res.success) { this.$message.success(res.message); + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } this.$router.push("/processCenter"); } this.isSubmit = false diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index a5b345fb9..a4475fb17 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -2929,7 +2929,7 @@ export default { this.saveLoading = true let _formData = new FormData() - // _formData.append('id', this.bpnId) + _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('prcType', '1') diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index 398ec19b8..49a58d99f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -749,7 +749,7 @@ export default { }) if (this.type2 === '1') { this.roleForm.dockUserList = idList - this.roleForm.dockUserName = nameList + this.roleForm.dockUserListName = nameList } else { this.roleForm.directorUser = idList this.roleForm.directorUserName = nameList diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue index c1af624bd..893c90db0 100644 --- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue @@ -187,7 +187,6 @@ export default { if (valid) { this.isSubmit = true this.$http.post("lawss/activiti/startProcessRollBack", { - id: this.bpnId || '', createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, type: '14', diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue index 99c95e502..0e330888d 100644 --- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue @@ -186,7 +186,6 @@ export default { if (valid) { this.isSubmit = true this.$http.post("lawss/activiti/startProcessRollBack", { - id: this.bpnId || '', createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, type: '15', diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue index 6fec2b2d0..0f0a0c050 100644 --- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue @@ -49,7 +49,7 @@ :value="item.id"> - + + @click.native="choiceZRRS(scope.row, scope.$index)" readonly/> - + @@ -217,7 +216,6 @@ @@ -229,7 +227,6 @@ @@ -369,6 +366,7 @@ export default { recordLoading: false, loading: false, modalshowflag: false, + fileIds: "", comityOptionsOne: [], //工作组数据 comityOptionsTwo: [], //分标委数据 comityOptionsOneThree: [], //工作组数据 @@ -441,6 +439,7 @@ export default { bpnId: this.$route.query.bpnId }).then(res => { let mes = JSON.parse(res.mes); + console.log(mes); this.wbbzform = mes.form this.associationData = mes.form.associationData this.getFileInfo(); @@ -471,7 +470,7 @@ export default { this.$nextTick(() => { res.data.map(item => { // 赋值要回显的上传文件内容 - this.fileList.push({ + this.fileInfoList.push({ name: item.oldFileName, uid: item.uid, status: item.status, @@ -486,32 +485,62 @@ export default { * @description: 动态表单读取 */ getFormFieldList(item) { + console.log(item); this.$nextTick(() => { if(!item.directorUser){ - this.wbbzform = JSON.parse(JSON.stringify(item)); - this.associationData = item.associationData - this.participantsData = item.participantsData + this.wbbzform = JSON.parse(JSON.stringify(item.form)); + this.wbbzform.comityOptionsOne.forEach(item =>{ + if(this.wbbzform.associationName === item.id){ + this.wbbzform.associationName = item.name + } + }) + this.wbbzform.comityOptionsTwo.forEach(item =>{ + if(this.wbbzform.committee === item.id){ + this.wbbzform.committee = item.name + } + }) + this.wbbzform.comityOptionsOneThree.forEach(item =>{ + if(this.wbbzform.workingGroup === item.id){ + this.wbbzform.workingGroup = item.name + } + }) + if (item.form.associationData) { + this.associationData = item.form.associationData + } + if (item.form.participantsData) { + this.participantsData = item.form.participantsData + } + item.form.fileName.forEach(fileId => { + this.fileIds = fileId.id + this.getFileInfo(); + }) }else{ - + this.wbbzform = JSON.parse(JSON.stringify(item)); + if (item.associationData) { + this.associationData = item.associationData + } + if (item.participantsData) { + this.participantsData = item.participantsData + } } }); }, choiceZRRS(row, index) { - this.selectedId = index; - this.drawerTitle = "选择责任人"; - this.nodeList = []; - this.zrIndex = index; - this.nodeList.push(row); - this.modalshowflag = true; - }, + this.selectedId = index; + this.drawerTitle = "选择责任人"; + this.nodeList = []; + this.zrIndex = index; + this.nodeList.push(row); + this.modalshowflag = true; + }, checkedRole(data){ if(this.participantsData.length > 1){ let parList = data this.participantsData.forEach(item =>{ parList.forEach(items => { if(items.name === item.workPeople){ - this.$message.warning('请勿重复添加参与人') - return + this.$message.warning('请勿重复添加参与人') + return }else{ } }) @@ -534,7 +563,7 @@ export default { //不备案 handleRecord(){ this.recordLoading = true - this.dlFlag = '0', + this.dlFlag = '0' this.wbbzform.commentText = this.commentText; this.wbbzform.participantsData = this.participantsData this.wbbzform.associationData = this.associationData @@ -559,11 +588,17 @@ export default { handleSave() { this.saveLoading = true this.wbbzform.fileName = this.fileInfoList + this.wbbzform.commentText = this.commentText; + this.wbbzform.participantsData = this.participantsData + this.wbbzform.associationData = this.associationData + this.wbbzform.comityOptionsOne = this.comityOptionsOne + this.wbbzform.comityOptionsTwo = this.comityOptionsTwo + this.wbbzform.comityOptionsOneThree = this.comityOptionsOneThree let _formData = new FormData() _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ roleList: this.roleForm, - wbbzform: this.wbbzform, + form: this.wbbzform, })) saveTaskForPub(_formData).then(res => { this.saveLoading = false @@ -646,11 +681,12 @@ export default { }, //添加协会信息 addSociety(){ - var list = { + let list = { contactPerson: this.contactPerson, telephone: this.telephone, mailbox: this.mailbox, } + console.log(this.associationData); this.associationData.push(list) }, //批量删除协会信息 @@ -708,6 +744,7 @@ export default { this.comityOptionsOne.forEach(item => { if (item.children !== null && item.id === this.wbbzform.associationName) { this.comityOptionsTwo = item.children + this.$forceUpdate() } }) }, @@ -717,9 +754,13 @@ export default { this.comityOptionsTwo.forEach(item => { if (item.children !== null && item.id === this.wbbzform.committee) { this.comityOptionsOneThree = item.children + this.$forceUpdate() } }) }, + comityChangeTwo(){ + this.$forceUpdate() + }, }, mounted() { /* 获取标准法规工作组数据 */ diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue index cee4400f8..1a6c39107 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue @@ -584,7 +584,6 @@ export default { this.qbfsForm.commentText = this.commentText var json = Object.assign(this.qbfsForm, this.roleForm) this.$http.post('lawss/activiti/startProcessRollBack', { - id: this.bpnId || '', createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, type: '23', diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue index 5f2df297e..be20c9c24 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue @@ -625,7 +625,6 @@ export default { this.standardSearch.commentText = this.commentText var json = Object.assign(this.standardSearch, this.roleForm) this.$http.post('lawss/activiti/startProcessRollBack', { - id: this.bpnId || '', createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, type: '24', diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index b809e03e2..a7f8c1792 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -472,10 +472,9 @@ export default { if (flag) { this.$refs["roleForm"].validate((valid) => { if (valid) { - // this.isSubmit = true; - var json = Object.assign(qbzxdFrom, this.roleForm); + this.isSubmit = true; + let json = Object.assign(qbzxdFrom, this.roleForm); this.$http.post("lawss/activiti/startProcessRollBack", { - id: this.bpnId || '', createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, type: '25', diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue index 111d9af70..7c1bab24d 100644 --- a/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue @@ -681,7 +681,6 @@ export default { if (valid) { this.isSubmit = true this.$http.post("lawss/activiti/startProcessRollBack", { - id: this.bpnId || '', createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, type: '16', diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue index 2e3b80444..8d7fc8f38 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue @@ -73,7 +73,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="commentText"> + v-model="commentInfo"> @@ -182,7 +182,7 @@ export default { passInfo: 0, detailData: [], loading: false, - commentText: '', // 意见 + commentInfo: '', // 意见 title: '', // 新增编辑抽屉标题 ListModel: false, // 新增编辑抽屉开关 taskIds: this.$route.query.taskIds, @@ -282,6 +282,7 @@ export default { this.passInfo = JSON.parse(JSON.stringify(item)).passInfo } this.dataList = JSON.parse(JSON.stringify(item)).standardInfoList + this.commentInfo = JSON.parse(JSON.stringify(item)).commentInfo }) }, // 批量选择分发责任人 @@ -325,7 +326,7 @@ export default { _formData.append('json', JSON.stringify({ // roleForm: this.roleForm, standardInfoList: this.dataList, - commentText: this.commentText + commentInfo: this.commentInfo })) saveTaskForPub(_formData).then(res => { this.saveLoading = false @@ -358,7 +359,7 @@ export default { let json = { dockUserList: list, passInfo: this.passInfo, - commentText: this.commentText + commentText: this.commentInfo } let flag=false this.dataList.forEach(item => { diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue index a96f17315..43c21da4d 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -275,7 +275,7 @@ export default { if (fileData[i].name.slice(0,fileData[i].name.indexOf('(')) === this.$store.getters.userInfo.userName) { this.dataList = fileData[i].standardInfoList this.standardInfoList = this.dataList - this.textarea = JSON.parse(JSON.stringify(item)).commentText + // this.textarea = JSON.parse(JSON.stringify(item)).commentText } } } @@ -314,7 +314,6 @@ export default { // 退回按钮 handleSubmitNo() { if (this.textarea) { - var json = { passInfo: 1, actionFlag: 1, diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue index 3cd838f65..ae3f71baf 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue @@ -77,7 +77,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="commentText"> + v-model="commentInput"> @@ -189,7 +189,7 @@ export default { modalshowflag: false, // drawer开关 detailData: [], loading: false, - commentText: '', // 意见 + commentInput: '', // 意见 title: '', // 新增编辑抽屉标题 ListModel: false, // 新增编辑抽屉开关 nonSearch: { @@ -273,7 +273,8 @@ export default { this.$nextTick(() => { if (item.responUserList !== undefined) { let listJSON = JSON.parse(JSON.stringify(item.responUserList)) - this.dataList = [listJSON][0] + this.dataList = listJSON + this.commentInput = JSON.parse(JSON.stringify(item)).commentInput } else { if (item.dockUserList !== undefined) { let listJSON = JSON.parse(JSON.stringify(item.dockUserList)) @@ -433,10 +434,8 @@ export default { _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ // roleForm: this.roleForm, - responUserList: { - standardInfoList: this.dataList - }, - commentText: this.commentText + responUserList: this.dataList, + commentInput: this.commentInput })) saveTaskForPub(_formData).then(res => { this.saveLoading = false @@ -474,7 +473,7 @@ export default { let json = { info: { fileDataList }, username: this.$store.getters.userInfo.userName, - commentText: this.commentText, + commentText: this.commentInput, } const params = new FormData(); params.set('json', JSON.stringify(json)) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue index 2196af865..92c075e4a 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue @@ -877,7 +877,6 @@ export default { this.$refs["roleForm"].validate((valid) => { if (valid) { this.$http.post("lawss/activiti/startProcessRollBack", { - id: this.bpnId || '', createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, type: '5', @@ -900,6 +899,14 @@ export default { }, res => { if (res.success) { this.$message.success(res.message); + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } this.$router.push("/processCenter"); } this.isSubmit = false; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index c6c5f1476..6c0589b4a 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -511,7 +511,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { saveTaskFirst } from "api/process"; +import { saveTaskFirst, taskDel } from "api/process"; import file from "@/pages/knowledgeGraph/components/file"; export default { @@ -870,7 +870,6 @@ export default { this.$refs["roleForm"].validate((valid) => { if (valid) { this.$http.post("lawss/activiti/startProcessRollBack", { - id: this.bpnId || '', createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, type: '5', @@ -893,6 +892,14 @@ export default { }, res => { if (res.success) { this.$message.success(res.message); + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } this.$router.push("/processCenter"); } this.isSubmit = false; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue index 05e50fb08..05b9d1b6a 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue @@ -613,7 +613,6 @@ export default { if (valid) { this.isSubmit = true; this.$http.post("lawss/activiti/startProcessRollBack", { - id: this.bpnId || '', createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, type: '6', @@ -635,6 +634,14 @@ export default { }, res => { if (res.success) { this.$message.success(res.message); + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } this.$router.push("/processCenter"); } this.isSubmit = false; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue index 395c8b95f..f7d0fb5b7 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue @@ -346,7 +346,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { saveTaskFirst } from "api/process"; +import { saveTaskFirst, taskDel } from "api/process"; import file from "@/pages/knowledgeGraph/components/file"; export default { @@ -630,7 +630,6 @@ export default { if (valid) { this.isSubmit = true; this.$http.post("lawss/activiti/startProcessRollBack", { - id: this.bpnId || '', createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, type: '6', @@ -652,6 +651,14 @@ export default { }, res => { if (res.success) { this.$message.success(res.message); + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } this.$router.push("/processCenter"); } this.isSubmit = false; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue index 987bb5bd2..a40835243 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue @@ -415,6 +415,7 @@ export default { this.listForm.breakdownList = item.breakdownList; } else { this.listForm = item.form + this.commentText = item.commentText this.dataList = item.form.dataList } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue index 78fe2ca6e..f6fd8c7e5 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue @@ -418,6 +418,7 @@ export default { this.listForm.breakdownList = item.breakdownList; } else { this.listForm = item.form; + this.commentText = item.commentText this.dataList = item.form.dataList; } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue index 05ededd70..47e857dd2 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -362,11 +362,7 @@ export default { } else { this.listForm = item.form; this.dataList = item.form.dataList; - this.dataList.forEach(item => { - this.$set(item, "workPeople", "请选择责任人"); - this.$set(item, "workPeopleId", ""); - }); - console.log(this.dataList); + this.commentText = item.commentText } }); }, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue index b13ecf8a2..8438138d2 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue @@ -717,6 +717,7 @@ export default { this.total = this.dataList.length; } else { this.listForm = item.form; + this.commentText = item.commentText let dataChildren = [] let dataListChildren = [] this.listForm.dataList.forEach(item => { diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue index a3a4344c8..fd3614b34 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue @@ -655,7 +655,6 @@ export default { if (valid) { this.isSubmit = true; this.$http.post("lawss/activiti/startProcessRollBack", { - id: this.bpnId || '', createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, type: '10', @@ -678,6 +677,14 @@ export default { }, res => { if (res.success) { this.$message.success(res.message); + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } this.$router.push("/processCenter"); } this.isSubmit = false; diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue index 44c57ab17..103f23601 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue @@ -388,7 +388,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { saveTaskFirst } from "api/process"; +import { saveTaskFirst, taskDel } from "api/process"; export default { name: "xmqdqrStep1", @@ -665,7 +665,6 @@ export default { if (valid) { this.isSubmit = true; this.$http.post("lawss/activiti/startProcessRollBack", { - id: this.bpnId || '', createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, type: '10', @@ -688,6 +687,14 @@ export default { }, res => { if (res.success) { this.$message.success(res.message); + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } this.$router.push("/processCenter"); } this.isSubmit = false; diff --git a/src/pages/processCenter/pages/phone/wfhxzg/step2.vue b/src/pages/processCenter/pages/phone/wfhxzg/step2.vue index d766de78c..ed67bb269 100644 --- a/src/pages/processCenter/pages/phone/wfhxzg/step2.vue +++ b/src/pages/processCenter/pages/phone/wfhxzg/step2.vue @@ -77,7 +77,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="commentText"> + v-model="commentInfo"> @@ -120,7 +120,7 @@ export default { return { passInfo: 0, loading: false, - commentText: '', // 意见 + commentInfo: '', // 意见 title: '', // 新增编辑抽屉标题 ListModel: false, // 新增编辑抽屉开关 taskIds: this.$route.query.taskIds, @@ -208,7 +208,7 @@ export default { this.passInfo = JSON.parse(JSON.stringify(item)).passInfo } this.dataList = JSON.parse(JSON.stringify(item)).standardInfoList - this.commentText = JSON.parse(JSON.stringify(item)).commentText + this.commentInfo = JSON.parse(JSON.stringify(item)).commentInfo }) }, // 批量选择分发责任人 @@ -225,7 +225,6 @@ export default { }, // 每行选择负责人点击操作 clickOpen(val, id) { - console.log() this.$refs.multipleTable.clearSelection() this.rowDutyPeople = val if (this.rowDutyPeople.dutyPeopleId.length > 0) { @@ -256,7 +255,7 @@ export default { _formData.append('json', JSON.stringify({ // roleForm: this.roleForm, standardInfoList: this.dataList, - commentText: this.commentText + commentInfo: this.commentInfo })) saveTaskForPub(_formData).then(res => { this.saveLoading = false @@ -288,7 +287,8 @@ export default { } let json = { dockUserList: list, - passInfo: this.passInfo + passInfo: this.passInfo, + commentText: this.commentInfo } let flag=false this.dataList.forEach(item => { diff --git a/src/pages/processCenter/pages/phone/wfhxzg/step3.vue b/src/pages/processCenter/pages/phone/wfhxzg/step3.vue index 24fb1f9f3..c3d383d96 100644 --- a/src/pages/processCenter/pages/phone/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/phone/wfhxzg/step3.vue @@ -74,14 +74,14 @@ - + + v-model="textarea"> @@ -127,7 +127,7 @@ export default { return { passInfo: 0, loading: false, - commentText: '', // 意见 + textarea: '', // 意见 title: '', // 新增编辑抽屉标题 ListModel: false, // 新增编辑抽屉开关 nonSearch: { @@ -195,6 +195,7 @@ export default { if (fileData[i].name.slice(0,fileData[i].name.indexOf('(')) === this.$store.getters.userInfo.userName) { this.dataList = fileData[0].standardInfoList this.standardInfoList = this.dataList + this.textarea = JSON.parse(JSON.stringify(item)).textarea } } } else { @@ -246,12 +247,12 @@ export default { }, // 退回按钮 handleSubmitNo() { - if (this.commentText) { + if (this.textarea) { var json = { passInfo: 1, actionFlag: 1, - commentText: this.commentText, + commentText: this.textarea, standardInfoList: this.standardInfoList, } const params = new FormData(); @@ -305,7 +306,7 @@ export default { _formData.append('json', JSON.stringify({ // roleForm: this.roleForm, dockUserList: list, - commentText: this.commentText + textarea: this.textarea })) saveTaskForPub(_formData).then(res => { this.saveLoading = false @@ -346,6 +347,7 @@ export default { let json = { passInfo: this.passInfo, responUserList: list, + commentText: this.textarea, actionFlag: 0 } if(flag)return; diff --git a/src/pages/processCenter/pages/phone/wfhxzg/step5.vue b/src/pages/processCenter/pages/phone/wfhxzg/step5.vue index f35daf2a6..990f20db5 100644 --- a/src/pages/processCenter/pages/phone/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/phone/wfhxzg/step5.vue @@ -261,9 +261,7 @@ export default { this.backLoading = true if (this.commentText) { var json = { - responUserList: { - standardInfoList: this.dataList - }, + responUserList: this.dataList, actionFlag: 1, commentText: this.commentText } diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 22f470a00..085ea947d 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -163,12 +163,12 @@ v-btn-permission="'5aedea192a77b14c364f19bdcee3513a'">移除标准 OCR 拆分 @@ -1745,6 +1745,13 @@ @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"> + + + + + @@ -1839,6 +1846,12 @@ placeholder="关联模块--卡车VPPS中文名称" @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"> + + + + @@ -2314,7 +2327,9 @@ export default { , CBCD: ''//采标程度 , YYBJ: ''//引用标准 , BYYBJ: ''//被引用标准 - , TXLB: ''//体系类别 + , TXLB: '',//体系类别 + DYBXH: '',// 模块结构单元变形号 + DYMC: '',//模块结构单元名称 }, // 树形结构 // tree function diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue index 702f7c6aa..375ea86a9 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -301,6 +301,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -385,7 +438,6 @@ type="primary" size="mini" class="common-button-primary" - @click="QYBZget">查询