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 @@ + + + + + diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 6d73b5859..79f6eacee 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -1724,6 +1724,7 @@ import CustomOrg from '@/components/CustomFormComponents/OrgTree' import {dateFormat} from '@/common/date' import RelatedTermsSelect from './components/RelatedTermsSelect' import { getBusStandFileByAttId } from 'api/process' +import {dicTypeData} from "api/unqualProcess"; export default { @@ -1746,6 +1747,7 @@ export default { }, data() { return { + CycxOptions: [], activeNames: ['基础信息','过程稿件','实施日期'], activeState: true, itemExistList: [], @@ -2757,8 +2759,8 @@ export default { this.resolveListForm = editItem this.resolveListForm.termsConditions = this.resolveListForm.termsConditions?this.resolveListForm.termsConditions.replace(/<.*?>/ig, ' '):'' // this.resolveListForm.readContent = this.readContent?this.readContent.replace(/<.*?>/ig, ' '):'' - this.resolveListForm.xccssrq = this.resolveListForm.xccssrq.split(',') - this.resolveListForm.zccssrq = this.resolveListForm.zccssrq.split(',') + this.resolveListForm.xccssrq = this.resolveListForm.xccssrq?this.resolveListForm.xccssrq.split(','):'' + this.resolveListForm.zccssrq = this.resolveListForm.zccssrq?this.resolveListForm.zccssrq.split(','):'' }else { this.$message.warning('请选择一条数据') } @@ -3085,6 +3087,19 @@ export default { }, {}, res => { this.selectedItemList = [] if (res.ok) { + console.log('3092',res.data.list) + res.data.list.forEach(item => { + let k = (item.applyArctic || "").split(',') + for (let i in this.applyArcticOptions.options) { + for (let m = 0; m < k.length; m++) { + if (this.applyArcticOptions.options[i].value === k[m]) { + k[m] = this.applyArcticOptions.options[i].label + } + item.applyArctic = k.join(',') + } + } + item.applyArctic = item.applyArctic.replaceAll('\"', '').replaceAll('\[', '').replaceAll('\]', '') + }) this.standItemList = res.data.list; this.total7 = res.data.count // 分页需要 } @@ -3583,6 +3598,12 @@ export default { return item.id } }, + created() { + dicTypeData().then(res => { + // 能源类型数据字典 + this.CycxOptions = res.data.CLLX + }) + }, async mounted() { this.sarStandardsInfoEO.id = this.$route.params.id // await this.selectStandMessage() @@ -3722,41 +3743,18 @@ export default { }, { _this: this }, res => { - // displayLocation.map(item => { - // if (item.value === '2URVBGR2Y4UG77KZ5YPL') { - // item.child.forEach(items =>{ - // let accessCountry = JSON.parse(sessionStorage.getItem("accessCountry")); - // if (accessCountry.country === undefined) { - // accessCountry.country = '文本' - // } - // if(items.attrField === 'SSRQ') { - // items.attrName = '实施日期' + '(' + accessCountry.country + ')' + ':' - // if (accessCountry.ssrq !== undefined) { - // item.value = accessCountry.ssrq - // } - // } else if (items.attrField === 'ZCCSSRQ') { - // items.attrName = '在产车实施日期' + '(' + accessCountry.country + ')' + ':' - // if (accessCountry.zccssrqgj !== undefined) { - // item.value = accessCountry.zccssrqgj - // } - // } else if(items.attrField === 'XCXSSRQ') { - // items.attrName = '新车型实施日期' + '(' + accessCountry.country + ')' + ':' - // if (accessCountry.xcxssrqgj !== undefined) { - // item.value = accessCountry.xcxssrqgj - // } - // - // } - // }) - // for (let key in res.data) { - // item.one.push({ - // attrName: key, - // value: res.data[key].join(','), - // isShowImp: '0', - // id: key - // }) - // } - // } - // }) + displayLocation.map(item => { + if (item.value === '2URVBGR2Y4UG77KZ5YPL') { + for (let key in res.data) { + item.one.push({ + attrName: key, + value: res.data[key].join(','), + isShowImp: '0', + id: key + }) + } + } + }) this.dynamicFormField = displayLocation }) sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation)) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue index 97fad8e2b..730458af1 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue @@ -164,10 +164,10 @@ -

技术管理中心主任

+

技术委员会相关专委会主任/研究总院职能部门领导,技术管理中心主任

- +
@@ -175,10 +175,10 @@ -

工程研究总院院长

+

工程研究总院院长或标准法规主管副院长

- +
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index 2ae9cd88d..cdb198016 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -35,6 +35,7 @@ @@ -164,11 +165,11 @@ -

技术管理中心主任

+

技术委员会相关专委会主任/研究总院职能部门领导,技术管理中心主任

- +
@@ -176,10 +177,10 @@ -

工程研究总院院长

+

工程研究总院院长或标准法规主管副院长

- +
@@ -263,6 +264,11 @@ export default { name: "bzdyStep1", data() { return { + pickerOptions: { + disabledDate(time) { + return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的 + } + }, drawerTitle2: '', type2: '', bpnId: '', @@ -397,14 +403,14 @@ export default { this.nodeList2 = this.roleForm.dockUserList.split(',') } } else { - this.drawerTitle2 = '选择技术管理中心主任' + this.drawerTitle2 = '选择技术委员会相关专委会主任/研究总院职能部门领导,技术管理中心主任' if ( this.roleForm.directorUser.length > 0) { this.nodeList2 = this.roleForm.directorUser.split(',') } } this.modalshowflag2 = true }, - choiceZRR (type, title, id) { + choiceZRR (type, title, id) { this.nodeList = [] this.nodeList.push(id) this.type = type diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue index cf40474f6..a4a438917 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue @@ -47,7 +47,7 @@ {{ item.name }} @@ -63,7 +63,7 @@ {{ item.name }} @@ -127,19 +127,19 @@ - - -
- - -
-
-
+ + + + + + + + + + + + +
{ this.saveLoading = false @@ -425,7 +428,7 @@ this.json.dyhz = this.form.dyhz this.isSubmit = true var json = this.json - json.commentText = this.commentText + // json.commentText = this.commentText json.fileId = this.form.fileId json.fileName = this.form.fileName this.$http.post('lawss/activiti/completeTask', { diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue index 1e1404123..9dde7dcb7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue @@ -47,7 +47,7 @@ {{ item.name }} @@ -63,7 +63,7 @@ {{ item.name }} @@ -322,6 +322,10 @@ updateFile (fileId) { window.location.href = '/api/att/attFile/downloadFile?fileId=' + fileId }, + updateFile2 (item) { + let id = item.id + window.location.href = '/api/att/attFile/downloadFile?fileId=' + id + }, handleTabs(name) { this.active = name }, diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue index 98493163f..381d36b17 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue @@ -3,7 +3,7 @@ - +
基础信息
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..bcb421fc3 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -119,7 +119,7 @@ width="260px" > - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + { 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..84b22800b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -119,7 +119,7 @@ width="260px" > - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + { 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/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue index 8dfd0b84c..7128517c9 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue @@ -111,7 +111,7 @@ width="260px" >
- - - - - -
-
基础信息
-
人员信息
-
-
- -
- - - -
- - - - - 国内标准入库 - 海外标准入库 - - - - - - - - - - - - - - - - - - - + diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index 470c43081..9367084a2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -365,6 +365,14 @@ - -
+ +
+ {{value.name}} +
+
+ - - +
+
@@ -548,6 +556,17 @@ > + + + + +
@@ -721,7 +740,7 @@ sortable="custom" align="center"> - {{form.wssmr}} + {{form.wssmr}} @@ -649,7 +649,7 @@ sortable="custom" align="center"> { if (res) { const processForm = JSON.parse(res.mesg) - this.commentText = processForm.commentText + // this.commentText = processForm.commentText if (processForm.form === undefined) { this.getFormFieldList(processForm) } else { diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue index 587f50ab8..c8f404d14 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue @@ -430,10 +430,12 @@ > - - - - + + + + + + @@ -633,7 +635,7 @@ sortable="custom" align="center"> + @click.native="choiceZRRS('1')">
@@ -161,13 +161,13 @@ -

技术管理中心主任

+

技术委员会相关专委会主任/研究总院职能部门领导,技术管理中心主任

@@ -176,13 +176,13 @@ -

工程研究总院院长

+

工程研究总院院长或标准法规主管副院长

@@ -287,7 +287,7 @@
0) { - this.nodeList2 = this.roleForm.dockUserList.split(',') + if (type === '1') { + this.drawerTitle2 = '选择责任部门对接人' + if ( this.roleForm.dockUserList.length > 0) { + this.nodeList2 = this.roleForm.dockUserList.split(',') + } + } else { + this.drawerTitle2 = '选择技术委员会相关专委会主任/研究总院职能部门领导,技术管理中心主任' + if (this.roleForm.directorUser.length > 0) { + this.nodeList2 = this.roleForm.directorUser.split(',') + } } this.modalshowflag2 = true }, diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index ebc145333..49a58d99f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -138,7 +138,7 @@ + @click.native="choiceZRRS('1')"> @@ -162,13 +162,13 @@ -

技术管理中心主任

+

技术委员会相关专委会主任/研究总院职能部门领导,技术管理中心主任

@@ -177,13 +177,13 @@ -

工程研究总院院长

+

工程研究总院院长或标准法规主管副院长

@@ -289,7 +289,7 @@ 0) { - this.nodeList2 = this.roleForm.dockUserList.split(',') + if (type === '1') { + this.drawerTitle2 = '选择责任部门对接人' + if ( this.roleForm.dockUserList.length > 0) { + this.nodeList2 = this.roleForm.dockUserList.split(',') + } + } else { + this.drawerTitle2 = '选择技术委员会相关专委会主任/研究总院职能部门领导,技术管理中心主任' + if (this.roleForm.directorUser.length > 0) { + this.nodeList2 = this.roleForm.directorUser.split(',') + } } this.modalshowflag2 = true }, diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue index 90b9e7da4..a5a771887 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue @@ -464,7 +464,7 @@ export default { if (this.commentText) { this.isSubmit = true var json = this.json - json.directorFlag = '0' + json.directorFlag = '1' json.commentText = this.commentText this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue index 6a39b188b..fdd493c52 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue @@ -3,7 +3,7 @@ - +
基础信息
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 0836ca2e6..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/> + + + +