diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index cdc948f50..4ef277c07 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -395,7 +395,7 @@

{{ sarStandardsInfoEO.standStatusShow || '-' }} + >文本状态{{ sarStandardsInfoEO.textStatusBuss || '-' }}

{{ sarStandardsInfoEO.issueTime || '-' }}

{{ sarStandardsInfoEO.putTime || '-' }}

@@ -1295,6 +1295,7 @@ export default { }, data () { return { + textOptions: [], commentAverageScoreTag: '1', qualityFirstHistoryPeopleId: '',//质量评价最新评价的人的id dynamicFirstHistoryPeopleId: '',//动态评价最新评价的人的id @@ -2155,6 +2156,11 @@ export default { _this: this }, res => { this.sarStandardsInfoEO = res.data || {} + this.textOptions.forEach(item => { + if(this.sarStandardsInfoEO.textStatusBuss === item.value){ + this.sarStandardsInfoEO.textStatusBuss = item.label + } + }) if (this.sarStandardsInfoEO.issueTime) { this.sarStandardsInfoEO.issueTime = this.sarStandardsInfoEO.issueTime.split(' ')[0] } @@ -2870,6 +2876,18 @@ export default { async mounted () { //查询动态评价总平均分和质量评价总平均分 let standId = this.$route.params.id + // 从数据库中查询各下拉框数据 + this.$http.get('sys/dictype/getDicTypeListCode', '', { + _this: this + }, res => { + this.applyArcticOptions = res.data.ENERGYTYPES // 根据需求文档，产品类别对应标准属性中的“适用车型” + this.emergyKindOptions = res.data.ENERGYTYPES + this.requestOptions = res.data.REQUESTTYPE + this.textOptions = res.data.TEXTSTATUSBUSS //企标文本状态 + this.mjOptions = res.data.MJ + this.STANDSOURCEREVISION = res.data.STANDSOURCEREVISION + }, e => { + }) this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getScore', {lawId:standId}, { _this: this }, res => { @@ -2912,17 +2930,6 @@ export default { this.sarStandardsInfoEO.id = this.$route.params.id this.getOrgTreeSource() this.standItemEO.standId = this.$route.params.id - // 从数据库中查询各下拉框数据 - this.$http.get('sys/dictype/getDicTypeListCode', '', { - _this: this - }, res => { - this.applyArcticOptions = res.data.ENERGYTYPES // 根据需求文档，产品类别对应标准属性中的“适用车型” - this.emergyKindOptions = res.data.ENERGYTYPES - this.requestOptions = res.data.REQUESTTYPE - this.mjOptions = res.data.MJ - this.STANDSOURCEREVISION = res.data.STANDSOURCEREVISION - }, e => { - }) Promise.all([this.queryDisplayLocation(), this.selectStandMessage(), this.getAddFormFieldList()]).then(async(values) => { const [displayLocation, {attrInfoMap: dynamicFormField}, formFieldList] = values // const relatedPlansRes = await this.queryRelatedPlans() diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 40ed0b811..213874f4e 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -71,7 +71,7 @@ v-for="(file, fileIndex) in child1Func(child.value)"> - {{ file.oldFileName }} { - console.log(location); + console.log(location.child) location.isShowImp = '0' if (dynamicFormField) { let value = dynamicFormField[field.attrField] @@ -3705,7 +3706,6 @@ export default { displayLocation.forEach(location => { // 动态属性字段-FBGBJBD 单独添加至基础信息 const list = displayLocation.filter(item => item.label === '过程稿件'); - console.log('3535', list) if (location.label === '基础信息' && list && list.length > 0) { //发布稿必读 if (!list[0].child) { @@ -3772,6 +3772,7 @@ export default { } } }) + console.log(child) const fieldsIsTextAreaOrFile = child.filter(field => { return field.attrType === 'TEXTAREA' || field.attrType === 'FILE' }) @@ -3783,7 +3784,6 @@ export default { location.half = half location.showAll = false }) - console.log(displayLocation) this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list', { id: this.$route.params.id }, { diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue index a026d304a..2ecc81de1 100644 --- a/src/pages/localTool/standardWarning.vue +++ b/src/pages/localTool/standardWarning.vue @@ -162,9 +162,9 @@ {{ scope.row.itemsName }} - + @@ -473,8 +473,8 @@ export default { //标准名称 standName: this.dynamic.standName, //发布日期 - startPutTime: this.dynamic.putTime[0], - endPutTime: this.dynamic.putTime[1], + startIssueTime: this.dynamic.putTime[0], + endIssueTime: this.dynamic.putTime[1], //实施日期 startSSRQ: this.dynamic.SSRQ[0], endSSRQ: this.dynamic.SSRQ[1], diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 4540d8489..ba3e6623d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -836,6 +836,11 @@ + { if (res.success) { - console.log("this.formTongGuo.approvalOpinion",this.formTongGuo.approvalOpinion); if(this.formTongGuo.approvalOpinion == '1'){ - console.log("shibai"); this.$message.warning("驳回成功") this.isSubmit = false this.formTongGuo.commentText = '' // 流程提交之后，应该流转至待办任务页面 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) }else{ - console.log("hello"); this.processCreateStand(json) } } @@ -1294,6 +1292,7 @@ * @auth: chenxiaoxi */ processCreateStand(json) { + console.log(json) const _formData = new FormData() _formData.append('infoJson', json) processCreateStand(_formData).then(res => { diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index bb2a4bb25..896790f91 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -1576,6 +1576,7 @@ export default { caName: '', // 草案 fbgbjbdName: '', // 发布稿 bfbdtbzh: '', // 发布稿 + bfdtbzh: '', xgdName: '', // 修改单 bpgName: '', // 报批稿 ssgName: '', // 送审稿 @@ -1949,6 +1950,7 @@ export default { this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',') }else if(this.replaceLawType === 'bfbdtbzh'){ this.form.bfbdtbzh = this.form.bfbdtbzh ? this.form.bfbdtbzh + ',' +textArr.join(',') : textArr.join(',') + this.form.bfdtbzh = this.form.bfdtbzh ? this.form.bfdtbzh + ',' + textArr.join(',') : textArr.join(',') } else { this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',') } diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index be51968b5..d1804f4a8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -266,7 +266,7 @@ @checkedRole="checkedRole" > @@ -336,6 +336,8 @@ name: "bzzqyjStep3", data() { return { + modaltitle2: '', + addType: '', onlyKey: '', commentText3: '', itermsConditionsFlag: false, @@ -349,6 +351,10 @@ oldText: '', newText: '', reason: '', + id: '', + department: this.$store.getters.userInfo.upDeptName, + responUserName: this.$store.getters.userInfo.userName, + responUser: this.$store.getters.userInfo.userId }, drawerModal: false, todoId: '', @@ -426,7 +432,11 @@ } } }, + saveUserInfo2 () { + if (this.addType === 'add') { + this.data.push(this.editForm) + } for( let a = 0; a < this.data.length; a++) { if (this.data[a].id === this.itemId) { this.data[a].chapterNumber = this.editForm.chapterNumber @@ -438,10 +448,27 @@ } this.modalshowflag2 = false }, - cancleUserInfo2 () { - this.modalshowflag2 = false + addModal() { + var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36); + this.itemId = id + this.editForm = { + chapterNumber: '', + chapterName: '', + oldText: '', + newText: '', + reason: '', + id: id, + department: this.$store.getters.userInfo.upDeptName, + responUserName: this.$store.getters.userInfo.userName, + responUser: this.$store.getters.userInfo.userId + } + this.addType = 'add' + this.modaltitle2 = '新增' + this.modalshowflag2 = true }, itemEdit (row) { + this.addType = 'edit' + this.modaltitle2 = '编辑' this.itemId = row.id this.modalshowflag2 = true this.editForm = { @@ -452,6 +479,10 @@ reason: row.reason, } }, + + cancleUserInfo2 () { + this.modalshowflag2 = false + }, downloadFile (attId) { window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId }, @@ -529,31 +560,6 @@ this.$message.warning('请选择要删除的数据') } }, - addModal() { - var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36); - var json = { - chapterNumber: '', - chapterName: '', - commentText: '', - oldText: '', - newText: '', - reason: '', - id: id, - department: this.$store.getters.userInfo.upDeptName, - responUserName: this.$store.getters.userInfo.userName, - responUser: this.$store.getters.userInfo.userId - } - this.data.push(json) - this.itemId = id - this.editForm = { - chapterNumber: '', - chapterName: '', - oldText: '', - newText: '', - reason: '', - } - this.modalshowflag2 = true - }, handleTabs(name) { this.active = name }, diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue index 7153ae16c..b48731a98 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue @@ -285,7 +285,7 @@ :nodeList="nodeList" > @@ -346,6 +346,8 @@ export default { name: "bzzqyjStep4", data() { return { + modaltitle2: '', + addType: '', commentText4: '', acceptShow: false, idList: [], @@ -450,31 +452,6 @@ export default { this.$message.warning('请选择要删除的数据') } }, - addModal() { - var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36); - var json = { - chapterNumber: '', - chapterName: '', - commentText: '', - oldText: '', - newText: '', - reason: '', - id: id, - department: this.$store.getters.userInfo.institutionName, - responUserName: this.$store.getters.userInfo.userName, - responUser: this.$store.getters.userInfo.userId - } - this.data.push(json) - this.itemId = id - this.editForm = { - chapterNumber: '', - chapterName: '', - oldText: '', - newText: '', - reason: '', - } - this.modalshowflag2 = true - }, getItemList (standId, fileType) { // 查询分解单条款数据 this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', { standId: standId, @@ -497,6 +474,9 @@ export default { } }, saveUserInfo2 () { + if (this.addType === 'add') { + this.data.push(this.editForm) + } for( let a = 0; a < this.data.length; a++) { if (this.data[a].id === this.itemId) { this.data[a].chapterNumber = this.editForm.chapterNumber @@ -508,10 +488,27 @@ export default { } this.modalshowflag2 = false }, - cancleUserInfo2 () { - this.modalshowflag2 = false + addModal() { + var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36); + this.itemId = id + this.editForm = { + chapterNumber: '', + chapterName: '', + oldText: '', + newText: '', + reason: '', + id: id, + department: this.$store.getters.userInfo.upDeptName, + responUserName: this.$store.getters.userInfo.userName, + responUser: this.$store.getters.userInfo.userId + } + this.addType = 'add' + this.modaltitle2 = '新增' + this.modalshowflag2 = true }, itemEdit (row) { + this.addType = 'edit' + this.modaltitle2 = '编辑' this.itemId = row.id this.modalshowflag2 = true this.editForm = { @@ -522,6 +519,9 @@ export default { reason: row.reason, } }, + cancleUserInfo2 () { + this.modalshowflag2 = false + }, checkedRole2(data) { this.form.spId = data[0].id this.form.spName = data[0].name diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index a3b328df4..3e20e1aca 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -179,7 +179,7 @@ class="common-button-primary" size="mini" type="primary" - @click="itemEdit(scope.row)">处理 + @click="itemEdit(scope.row, scope.$index)">处理 @@ -447,14 +447,13 @@ }, saveUserInfo2 () { for( let a = 0; a < this.data.length; a++) { - if (this.data[a].id === this.itemId) { + if (a === this.itemId) { this.data[a].chapterNumber = this.editForm.chapterNumber this.data[a].chapterName = this.editForm.chapterName this.data[a].oldText = this.editForm.oldText this.data[a].newText = this.editForm.newText this.data[a].reason = this.editForm.reason this.data[a].cause = this.editForm.cause - this.$set(this.data, a,this.editForm) } } this.modalshowflag2 = false @@ -462,8 +461,8 @@ cancleUserInfo2 () { this.modalshowflag2 = false }, - itemEdit (row) { - this.itemId = row.id + itemEdit (row, index) { + this.itemId = index this.modalshowflag2 = true this.editForm = { chapterNumber: row.chapterNumber, @@ -599,7 +598,8 @@ this.form.textType = data.form ? data.form.textType : data.textType this.form.cid = data.form ? data.form.cid : data.cid this.form.endTime = data.form ? data.form.endTime : data.endTime - data.info.forEach(item => { + let newArr = data.info ? data.info : data.form.data + newArr.forEach(item => { if (!item.source) { item.source = '1' } @@ -610,7 +610,7 @@ }); this.json = data; this.getItemList(data.standId,this.form.textValue) - this.data = data.info + this.data = newArr if (data.introduce) { } else { this.$http.get("slrs/sar-public-idea-all/getPublicIdea", { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue index 227a6eb41..db4ee6551 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -340,8 +340,8 @@ user7Name: '' }, formRules: { - responUserList: [ - {required: true, message: "请选择责任人", trigger: "change"} + user7: [ + {required: true, message: "请选择审批领导", trigger: "change"} ] }, json: {} @@ -474,23 +474,29 @@ this.active = name; }, handleSubmit() { - this.isSubmit = true; - var json = this.json; - json.hqFlag = '0'; - json.commentText = this.commentText6; - json.user7 = this.form.user7; - json.user7Name = this.form.user7Name; - 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.$refs['bzzqyjForm'].validate((valid) => { + if (valid) { + this.isSubmit = true; + var json = this.json; + json.hqFlag = '0'; + json.commentText = this.commentText6; + json.user7 = this.form.user7; + json.user7Name = this.form.user7Name; + 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('请选择审批领导') } - this.isSubmit = false; - }); + }) }, handleSubmitNo() { if (this.commentText6) { @@ -520,6 +526,7 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg); + console.log(data); this.commentText6 = data.commentText6 || '' this.form.fjList = data.fjList || data.form.fjList this.form.cid = data.cid || data.form.cid; @@ -528,9 +535,10 @@ this.form.modelList = data.modelList || data.form.modelList this.form.user7 = data.form ? data.form.user7 : (data.user7 ? data.user7 : '') this.form.user7Name = data.form ? data.form.user7Name : (data.user7Name ? data.user7Name : '') - this.oldData = JSON.parse(JSON.stringify(data.info)) - var arr = [] - data.info.forEach(item => { + let newArr = data.info ? data.info : data.form.data + this.oldData = JSON.parse(JSON.stringify(newArr)) + let arr = [] + newArr.forEach(item => { if (item.state != '3') { arr.push(item) } diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue index ec06fe45c..544bed354 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue @@ -493,9 +493,10 @@ export default { this.form.endTime = data.endTime || data.form.endTime; this.form.textType = data.textType || data.form.textType this.form.modelList = data.modelList || data.form.modelList - this.oldData = JSON.parse(JSON.stringify(data.info)) - var arr = [] - data.info.forEach(item => { + let newArr = data.info ? data.info : data.form.data + this.oldData = JSON.parse(JSON.stringify(newArr)) + let arr = [] + newArr.forEach(item => { if (item.state != '3') { arr.push(item) } diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue index 623533ab4..90dbad5a6 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue @@ -249,7 +249,6 @@ show-submit :submitLoading="isSubmit" :saveLoading="saveLoading" - @save="handleSave" @submit="handleSubmit" show-back @back="handleSubmitNo" @@ -497,9 +496,10 @@ export default { this.form.endTime = data.endTime || data.form.endTime; this.form.textType = data.textType || data.form.textType this.form.modelList = data.modelList || data.form.modelList - this.oldData = JSON.parse(JSON.stringify(data.info)) - var arr = [] - data.info.forEach(item => { + let newArr = data.info ? data.info : data.form.data + this.oldData = JSON.parse(JSON.stringify(newArr)) + let arr = [] + newArr.forEach(item => { if (item.state != '3') { arr.push(item) } diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue index 8fc381cb8..61c52caf5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue @@ -496,9 +496,10 @@ export default { this.form.endTime = data.endTime || data.form.endTime; this.form.textType = data.textType || data.form.textType this.form.modelList = data.modelList || data.form.modelList - this.oldData = JSON.parse(JSON.stringify(data.info)) - var arr = [] - data.info.forEach(item => { + let newArr = data.info ? data.info : data.form.data + this.oldData = JSON.parse(JSON.stringify(newArr)) + let arr = [] + newArr.forEach(item => { if (item.state != '3') { arr.push(item) } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue index 0153e9590..6a113aacd 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue @@ -40,8 +40,8 @@ clearable > - - + + @@ -200,8 +200,8 @@ placeholder="根据企标名称查找" > - - + + @@ -257,7 +257,7 @@ + label="制修订类型"> diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue index a6588fd7f..c0f6b8804 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue @@ -40,8 +40,8 @@ clearable > - - + + @@ -216,8 +216,8 @@ placeholder="根据企标名称查找" > - - + + @@ -273,7 +273,7 @@ + label="制修订类型"> diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index cfa58cfd8..cba002292 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -27,9 +27,9 @@ placeholder="请输入企标名称" :maxlength="500"/> - - + @@ -281,9 +281,9 @@ v-if="TXJGmodal" ref="TXJGTree" :data="standSystemOptions" + @check-change="handleClick" show-checkbox node-key="id" - default-expand-all check-strictly :default-checked-keys="TXJGList" :props="defaultProps"> @@ -373,7 +373,7 @@ export default { unitName: "", esName: "", // 企标名称 planStatus: "0", // 计划状态 - reviseStatus: "", // 制修订状态 + reviseStatus: "", // 制修订类型 area: "", //适用车型 isRelate: "", //采用何种标准 technologic: '', //指标依据 @@ -400,7 +400,7 @@ export default { { required: true, message: "请输入企标名称", trigger: "blur" } ], reviseStatus: [ - { required: true, message: "请选择制修订状态", trigger: "blur" } + { required: true, message: "请选择制修订类型", trigger: "blur" } ], resPersonName: [ { required: true, message: "请输入评审责任人", trigger: "blur" } @@ -453,6 +453,12 @@ export default { }) }, methods: { + //体系结构单选 + handleClick(data,checked, node){ + if(checked){ + this.$refs.TXJGTree.setCheckedNodes([data]); + } + }, TXJGcloseDrawer () { this.TXJGmodal = false }, @@ -591,18 +597,26 @@ export default { this.modalshowflag2 = true; }, checkedRole2(data) { + console.log(data); let idList = "", nameList = "" + let unitList = "", unitNameList = "" data.forEach(item => { if (nameList.length) { nameList += ","; idList += ","; + unitList += ","; + unitNameList += ","; } idList += item.id; nameList += item.name; + unitList += item.institutionId + unitNameList += item.institutionName }); if(this.roleType === '1'){ this.$set(this.qbfsForm, 'drafter', idList) this.$set(this.qbfsForm, 'drafterName', nameList) + this.$set(this.qbfsForm, 'unit', unitList) + this.$set(this.qbfsForm, 'unitName', unitNameList) }else if(this.roleType === '2'){ this.$set(this.qbfsForm, 'resPerson', idList) this.$set(this.qbfsForm, 'resPersonName', nameList) @@ -611,6 +625,9 @@ export default { if(this.qbfsForm.drafterName){ this.$refs.qbfsForm.validateField('drafterName'); } + if(this.qbfsForm.unitName){ + this.$refs.qbfsForm.validateField('unitName'); + } if(this.qbfsForm.resPersonName){ this.$refs.qbfsForm.validateField('resPersonName'); } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue index 122b25651..be6b2d3d6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue @@ -20,8 +20,8 @@ - - + + @@ -31,8 +31,8 @@ - - + + @@ -64,8 +64,8 @@ clearable > - - + + @@ -222,8 +222,8 @@ placeholder="根据企标名称查找" > - - + + @@ -279,7 +279,7 @@ + label="制修订类型"> @@ -444,10 +444,10 @@ @@ -558,7 +558,7 @@ export default { {required: true, message: '请输入企标名称', trigger: 'blur'}, ], reviseStatus: [ - {required: true, message: '请选择制修订状态', trigger: 'change'}, + {required: true, message: '请选择制修订类型', trigger: 'change'}, ], resPersonName: [ {required: true, message: '请输入评审责任人', trigger: 'blur'}, @@ -649,6 +649,12 @@ export default { } }, methods: { + //体系结构单选 + handleClick(data,checked, node){ + if(checked){ + this.$refs.TXJGTree.setCheckedNodes([data]); + } + }, TXJGcloseDrawer () { this.TXJGmodal = false }, @@ -783,19 +789,26 @@ export default { this.modalshowflag2 = true; }, checkedRole2(data) { - let idList = ""; - let nameList = ""; + let idList = "", nameList = "" + let unitList = "", unitNameList = "" data.forEach(item => { if (nameList.length) { nameList += ","; idList += ","; + unitList += ","; + unitNameList += ","; } idList += item.id; nameList += item.name; + unitList += item.institutionId + unitNameList += item.institutionName + }); if(this.type === '1'){ this.$set(this.qbfsForm, 'drafter', idList) this.$set(this.qbfsForm, 'drafterName', nameList) + this.$set(this.qbfsForm, 'unit', unitList) + this.$set(this.qbfsForm, 'unitName', unitNameList) }else if(this.type === '2'){ this.$set(this.qbfsForm, 'resPerson', idList) this.$set(this.qbfsForm, 'resPersonName', nameList) @@ -803,6 +816,9 @@ export default { if(this.qbfsForm.drafterName){ this.$refs.qbfsForm.validateField('drafterName'); } + if(this.qbfsForm.unitName){ + this.$refs.qbfsForm.validateField('unitName'); + } if(this.qbfsForm.resPersonName){ this.$refs.qbfsForm.validateField('resPersonName'); } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue index 1ddae5222..aa622b986 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue @@ -40,8 +40,8 @@ clearable > - - + + @@ -207,8 +207,8 @@ placeholder="根据企标名称查找" > - - + + @@ -264,7 +264,7 @@ + label="制修订类型"> diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue index 7c1ca6056..7135d0c3f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue @@ -29,8 +29,8 @@ placeholder="请输入企标名称" :maxlength="500"/> - - + + diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue index 9e2ef5889..df88ceb56 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue @@ -29,8 +29,8 @@ placeholder="请输入企标名称" :maxlength="500"/> - - + + diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue index b388590b8..3f749b734 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue @@ -29,8 +29,8 @@ placeholder="请输入企标名称" :maxlength="500"/> - - + + diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue index ebd00421f..aab680de4 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue @@ -29,8 +29,8 @@ placeholder="请输入企标名称" :maxlength="500"/> - - + + diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue index c021631fd..b9c64d605 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue @@ -29,8 +29,8 @@ placeholder="请输入企标名称" :maxlength="500"/> - - + + diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue index 81f4d6857..9961d3c26 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -288,10 +288,15 @@ + readonly> + + + + + + + @@ -886,15 +891,22 @@ this.modalshowflag2 = true }, checkedRole2 (data) { - var idList = '' - var nameList = '' + console.log(data); + let idList = '' + let nameList = '' + let bmIdList = '' + let bmNameList = '' data.forEach( item => { if (nameList.length > 0) { nameList += ',' idList += ',' + bmIdList += ',' + bmNameList += ',' } idList += item.id nameList += item.name + bmIdList += item.institutionId + bmNameList += item.institutionName }) if (this.type === 'resPerson') { this.addForm.resPerson = idList @@ -902,6 +914,8 @@ } else if (this.type === 'drafter') { this.addForm.drafter = idList this.addForm.drafterName = nameList + this.addForm.unitName = bmNameList + this.addForm.unit = bmIdList } }, addDrawerSubmit () { diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index d42f83c03..381663abc 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -141,6 +141,13 @@ > + + + + +
@@ -260,6 +270,7 @@ export default { newText: '', reason: '', chapterName: '', + cause: '', }, opinionContentRules: { partCode: [ @@ -382,6 +393,7 @@ export default { this.opinionContent.reason = row.reason this.opinionContent.oldText = row.oldText this.opinionContent.newText = row.newText + this.opinionContent.cause = row.cause } else { this.id = '' this.opiniontitle = '新增意见' @@ -389,6 +401,7 @@ export default { this.opinionContent.reason = '' this.opinionContent.oldText = '' this.opinionContent.newText = '' + this.opinionContent.cause = '' } this.isDialog = true }, @@ -433,6 +446,7 @@ export default { reason: this.opinionContent.reason, partCode: this.opinionContent.partCode, chapterName: this.opinionContent.chapterName, + cause: this.opinionContent.cause, userId: this.$store.getters.userInfo.userId || '', userName: this.$store.getters.userInfo.userName || '', deptName: this.$store.getters.userInfo.orgName || '',