diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index 8a29886b1..0bd81f495 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -485,6 +485,7 @@ let data = JSON.parse(res.mesg) this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsName = data.itemsName || data.form.itemsName + this.commentText = data.commentText if (data.form) { this.form.itemsName1 = data.form.itemsName1 || '' this.form.itemsNum1 = data.form.itemsNum1 || '' diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index 3e7de87d4..64051a107 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -857,6 +857,7 @@ this.acceptShow = false this.submitShow = true } + this.commentText = data.commentText this.todoId = res.id this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsName = data.itemsName || data.form.itemsName diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue index 3fbce2468..1f0ab47e7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue @@ -484,6 +484,7 @@ let data = JSON.parse(res.mesg) this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsName = data.itemsName || data.form.itemsName + this.commentText = data.commentText if (data.form) { this.form.itemsName1 = data.form.itemsName1 || '' this.form.itemsNum1 = data.form.itemsNum1 || '' diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue index 212b770b6..6fb68cad4 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue @@ -472,6 +472,7 @@ let data = JSON.parse(res.mesg) this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsName = data.itemsName || data.form.itemsName + this.commentText = data.commentText if (data.form) { this.form.itemsName1 = data.form.itemsName1 || '' this.form.itemsNum1 = data.form.itemsNum1 || '' diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue index c93f1e9da..cf5303764 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue @@ -470,6 +470,7 @@ let data = JSON.parse(res.mesg) this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsName = data.itemsName || data.form.itemsName + this.commentText = data.commentText if (data.form) { this.form.itemsName1 = data.form.itemsName1 || '' this.form.itemsNum1 = data.form.itemsNum1 || '' @@ -479,7 +480,6 @@ } this.sarType = data.standInData || data.sarType this.json = data - console.log(data.itemList); this.itemList = data.itemList this.loading = false }).catch(e => { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index 49a58d99f..850227d12 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -236,7 +236,6 @@ type="primary" size="mini" class="common-button-primary" - @click="sarStandCompareHisInfo">查询 { + console.log(data); + console.log(res.data); + }) } else if (this.selectedList.length > 1) { this.$message.warning("只能选择一条数据进行带入"); } else { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index fc1f6205e..dbccea007 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -493,7 +493,7 @@ - +

总院各中心兼职标准化员/各事业部标准化员

@@ -503,7 +503,7 @@ - +

会签征求意见人员

@@ -513,7 +513,7 @@ - +

意见汇总及标准修改人员

@@ -523,7 +523,7 @@ - +

总院标准法规部产品标准工程师/各事业部标准法规部人员

@@ -533,7 +533,7 @@ - +

总院项目总工/各事业部整车所产品经理

@@ -543,7 +543,7 @@ - +

总院标准法规部高级经理/各事业部标准业务/认证业务经理

@@ -553,7 +553,7 @@ - +

总院标准法规部高级经理/各事业部标准业务/认证业务经理

@@ -563,7 +563,7 @@ - +

总院技术管理中心主任/各事业部主管标准业务高级经理

@@ -573,7 +573,7 @@ - +

总院平台总监/各事业部研发副总裁

@@ -583,7 +583,7 @@ - +

总院标准法规部产品标准工程师/各事业部标准化员

@@ -593,7 +593,7 @@ - +

抄送人员

diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index 97879e923..2c8735abf 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -25,7 +25,7 @@ - + - + - 根据企标编号、企标名称查询 + 根据企标名称、起草责任单位查询 @@ -493,7 +493,7 @@ - +

总院各中心兼职标准化员/各事业部标准化员

@@ -503,7 +503,7 @@ - +

会签征求意见人员

@@ -513,7 +513,7 @@ - +

技术委员会评审/评审意见修改人员

@@ -523,7 +523,7 @@ - +

标准法规部标准化工程师

@@ -533,7 +533,7 @@ - +

起草单位高级经理

@@ -543,7 +543,7 @@ - +

标准法规部高级经理

@@ -553,7 +553,7 @@ - +

起草单位中心主任

@@ -563,7 +563,7 @@ - +

总院院长或总院主管副院长

@@ -573,7 +573,7 @@ - +

标准法规部标准化工程师发布人员

@@ -791,39 +791,36 @@
- - + + + + + + + + + + + + + + + + - - - - + - - - - - + width="120"> + + + + - - - - - - - + prop="reviseStatus" + width="150" + align="center" + label="制修订状态"> + + + + + + + + + + + + + + + + + + + + + + + +
- 新增 { + if(this.form.planId === undefined || this.form.planId === null || this.form.planId === ''){ + callback(new Error('请先选择企标计划带入企标名称！')) + }else if(value === undefined || value === null || value === ''){ + callback(new Error('请输入企标名称！')) + }else { + callback() + } + }; + + const validateStandSort = (rule, value, callback) => { + if(this.form.planId === undefined || this.form.planId === null || this.form.planId === ''){ + callback(new Error('请先选择企标计划带入企标类别！')) + }else if(value === undefined || value === null || value === ''){ + callback(new Error('请选择企标类别！')) + }else { + callback() + } + callback() + }; + const validateModelName = (rule, value, callback) => { if(this.FBGBUSSFileList.length === 0){ callback(new Error('请上传发布稿文件！')) @@ -1059,11 +1116,10 @@ page: 1, pageSize: this.$store.getters.userInfo.configContent, total: 0, - standType: 'INLAND', - standSort: '', - standName: '', - standEnName: '', - standNumber: '' + unit: '', + esName: '', + planStatus: '0,3', + reviseStatus: '', }, tableData: { // 标准表格数据 @@ -1166,7 +1222,10 @@ fileType: '', countryArr:'', commentCycleDate:'', + planDisabled:true, form: { + planId:'', + reviseStatus:'', modelData:[], modelDataNameVerify:[], modelDataZrUserVerify:[], @@ -1291,7 +1350,7 @@ { required: true, message: '选择维护模块名称', validator: validateModelName,trigger: 'blur' }, ], standSort: [ - { required: true, message: '请选择企标类别', trigger: 'change' } + { required: true, validator:validateStandSort,trigger: 'change' } ], standNumber: [ { required: true, message: '请输入企标编号', trigger: 'blur' }, @@ -1302,9 +1361,9 @@ { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, ], standName: [ - { required: true, message: '请输入企标中文名称', trigger: 'blur' }, + { required: true, validator:validateStandName, trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.valiateName, trigger: 'change'} + {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, @@ -1407,6 +1466,15 @@ }, }, methods: { + getMap1(item){ + const map = new Map(); + map.set('0','未开始') + map.set('1','制定中') + map.set('2','修订中') + map.set('3','已取消') + map.set('4','已完成') + return map.get(item) + }, modelProp(row,index){ console.log(row) console.log(index) @@ -1697,42 +1765,19 @@ // 带入 case 2: if (this.standardCheckedList.length === 1) { - this.$http.get('lawss/sarLawsInfo/getStandInfoUpdateById', {id: this.standardCheckedList[0].id}, { - _this: this - }, res => { - if(res && res.data){ - const bringData = res.data - - const json = Object.assign(bringData, bringData.attrInfoMap); - this.form = JSON.parse(JSON.stringify(json)) - this.form.TGRLAWS = JSON.parse(JSON.stringify(json)).TGRLAWS && JSON.parse(JSON.stringify(json)).TGRLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).TGRLAWS.split(',') : [] - this.form.TGDWLAWS = JSON.parse(JSON.stringify(json)).TGDWLAWS && JSON.parse(JSON.stringify(json)).TGDWLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).TGDWLAWS.split(',') : [] - this.form.NYLXLAWS = JSON.parse(JSON.stringify(json)).NYLXLAWS && JSON.parse(JSON.stringify(json)).NYLXLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).NYLXLAWS.split(',') : [] - this.form.YYRZLAWS = JSON.parse(JSON.stringify(json)).YYRZLAWS && JSON.parse(JSON.stringify(json)).YYRZLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).YYRZLAWS.split(',') : [] - this.form.ZRBMLAWS = JSON.parse(JSON.stringify(json)).ZRBMLAWS && JSON.parse(JSON.stringify(json)).ZRBMLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).ZRBMLAWS.split(',') : [] - this.form.ZRGCSLAWS = JSON.parse(JSON.stringify(json)).ZRGCSLAWS && JSON.parse(JSON.stringify(json)).ZRGCSLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).ZRGCSLAWS.split(',') : [] - this.form.prcNum = this.prcNum - this.form.prcName = this.prcName - this.form['id'] = bringData.id - this.standardDrawer = false - this.verifySarStandard = true - this.busVsFunc() - this.modelFunc() - this.$forceUpdate() - } - // 遍历对象初始化文件信息 - for(const p in this.form) { - if (typeof (this.form[p ]) != "function") { - this.initializeFileList(p,this.form[p]); - } - } - console.log("res",res); - }) + this.form.standName = this.standardCheckedList[0].esName + this.form.standSort = this.standardCheckedList[0].bussSort + this.form.planId = this.standardCheckedList[0].id + this.form.reviseStatus = this.standardCheckedList[0].reviseStatus + this.standardDrawer = false + this.verifySarStandard = true + this.planDisabled = false + this.$forceUpdate() } else if (this.standardCheckedList.length > 1) { - this.$message.warning('最多可以带入一条政策信息') + this.$message.warning('最多可以带入一条计划信息') } else { - this.$message.warning('请选择要带入的政策信息') + this.$message.warning('请选择要带入的计划信息') } break // 取消 @@ -1751,6 +1796,7 @@ case 'fbgbjbd': this.getFileList(value,this.FBGBJBDFileList); break; + case 'ssg': this.getFileList(value,this.ssgFileList); break; @@ -1818,11 +1864,11 @@ this.standardCheckedList = data }, handleResetSearch() { - this.standardSearchForm.standType = 'BUSINESS' - this.standardSearchForm.standNumber = '' - this.standardSearchForm.standSort = '' - this.standardSearchForm.standName = '' - this.standardSearchForm.standEnName = '' + this.standardSearchForm.page = 1 + this.standardSearchForm.unit = '' + this.standardSearchForm.esName = '' + this.standardSearchForm.planStatus = '' + this.standardSearchForm.reviseStatus = '0,3' setTimeout(() => { this.handleSearchStandard() }, 100) @@ -1836,7 +1882,9 @@ }, getDomesticStandardTable () { this.loadSarStandard = true - this.$http.get('lawss/sarLawsInfo/page', this.standardSearchForm, {}, res => { + this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans', this.standardSearchForm, { + _this: this + }, res => { this.loadSarStandard = false if (res.ok) { this.tableData.standardData = res.data.list @@ -1847,19 +1895,15 @@ }) }, handleSearchStandard () { - if (this.form.standType === '') { - this.$message.warning('请选择标准来源') - } else { - this.standardDrawer = true - this.$nextTick(() => { - // 动态设置表格高度 + this.standardDrawer = true + this.$nextTick(() => { + // 动态设置表格高度 + this.tableHeight.standardTableHeight = $('.standard-table-wrap').height() + window.onresize = () => { this.tableHeight.standardTableHeight = $('.standard-table-wrap').height() - window.onresize = () => { - this.tableHeight.standardTableHeight = $('.standard-table-wrap').height() - } - }) - this.getDomesticStandardTable() - } + } + }) + this.getDomesticStandardTable() }, saveUserInfo () { this.filterText = '' @@ -2577,6 +2621,27 @@ }, res => { if (res.success) { this.$message.success(res.message) + const planForm = {} + planForm.id = this.form.planId + planForm.planStatus = this.form.reviseStatus !== undefined ? ( this.form.reviseStatus === '1' ? '1' : '2') :'' + this.$http.post("esRevisePlan/es-revise-plan/modPlan", planForm, { + _this: this + }, res => { + this.submitLoading = false + if (res.ok) { + if (res.data === '操作成功') { + this.addDrawer = false + this.$message.success(tips + '成功') + this.getData() + } else { + this.addDrawer = false + this.$message.warning(res.data) + this.getData() + } + } else { + this.$message.warning(tips + '失败') + } + }) this.isSubmit = false // 流程提交之后，应该流转至待办任务页面 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue index 91ba66aff..e51337005 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue @@ -22,6 +22,16 @@ clearable > + + + + + + - + @@ -199,9 +209,8 @@ - - - + + @@ -248,7 +257,8 @@ label="计划状态" align="center"> { this.BZList = res.data.ENERGYTYPES //标准范围 + this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 }) }, methods: { @@ -432,22 +447,28 @@ export default { this.qbfsForm.esName = this.selectList[0].esName this.qbfsForm.draftTime = this.selectList[0].draftTime this.qbfsForm.drafterName = this.selectList[0].drafterName - this.qbfsForm.planStatus = this.selectList[0].planStatus === '0'? '完成' : (this.selectList[0].planStatus === '1'? '修订' : '制定') + this.qbfsForm.planStatus = this.selectList[0].planStatus === '0'? '未开始' : (this.selectList[0].planStatus === '1'? '制定中' : (this.selectList[0] === '2'? '修订中' : + (this.selectList[0] === '3'? '已取消' : '已完成'))) this.qbfsForm.releaseTime = this.selectList[0].releaseTime this.qbfsForm.resPersonName = this.selectList[0].resPersonName - this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus === '1'? '制定中' : '未制定') + this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '1'? '制定' : '修订' this.qbfsForm.unitName = this.selectList[0].unitName this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName if(this.selectList[0].area){ this.qbfsForm.area = this.selectList[0].area.split(',') } + if(this.selectList[0].bussSort){ + this.qbfsForm.bussSort = this.selectList[0].bussSort.split(',') + } this.qbfsForm.rqbName = this.selectList[0].rqbName this.qbfsForm.tsJsonName = this.selectList[0].tsJsonName this.qbfsForm.isRelate = this.selectList[0].isRelate this.qbfsForm.useLevel = this.selectList[0].useLevel this.qbfsForm.esStandRelations = this.selectList[0].esStandRelations this.qbfsForm.technologic = this.selectList[0].technologic - this.qbfsForm.esMatingRelations = this.selectList[0].esMatingRelations + if(this.selectList[0].esMatingRelations && this.selectList[0].esMatingRelations !== 'null'){ + this.qbfsForm.esMatingRelations = this.selectList[0].esMatingRelations + } this.ListModel = false } }, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue index 63da88cbe..2b0953c9e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue @@ -22,6 +22,16 @@ clearable > + + + + + + - - - + + @@ -54,11 +63,11 @@ placeholder="请选择初稿完成时间"> - + @@ -216,9 +225,8 @@ - - - + + @@ -265,7 +273,8 @@ label="计划状态" align="center"> { this.BZList = res.data.ENERGYTYPES //标准范围 + this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 }) }, methods: { @@ -455,22 +469,28 @@ export default { this.qbfsForm.esName = this.selectList[0].esName this.qbfsForm.draftTime = this.selectList[0].draftTime this.qbfsForm.drafterName = this.selectList[0].drafterName - this.qbfsForm.planStatus = this.selectList[0].planStatus === '0'? '完成' : (this.selectList[0].planStatus === '1'? '修订' : '制定') + this.qbfsForm.planStatus = this.selectList[0].planStatus === '0'? '未开始' : (this.selectList[0].planStatus === '1'? '制定中' : (this.selectList[0] === '2'? '修订中' : + (this.selectList[0] === '3'? '已取消' : '已完成'))) this.qbfsForm.releaseTime = this.selectList[0].releaseTime this.qbfsForm.resPersonName = this.selectList[0].resPersonName - this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus === '1'? '制定中' : '未制定') + this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '1'? '制定' : '修订' this.qbfsForm.unitName = this.selectList[0].unitName this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName if(this.selectList[0].area){ this.qbfsForm.area = this.selectList[0].area.split(',') } + if(this.selectList[0].bussSort){ + this.qbfsForm.bussSort = this.selectList[0].bussSort.split(',') + } this.qbfsForm.rqbName = this.selectList[0].rqbName this.qbfsForm.tsJsonName = this.selectList[0].tsJsonName this.qbfsForm.isRelate = this.selectList[0].isRelate this.qbfsForm.useLevel = this.selectList[0].useLevel this.qbfsForm.esStandRelations = this.selectList[0].esStandRelations this.qbfsForm.technologic = this.selectList[0].technologic - this.qbfsForm.esMatingRelations = this.selectList[0].esMatingRelations + if(this.selectList[0].esMatingRelations && this.selectList[0].esMatingRelations !== 'null'){ + this.qbfsForm.esMatingRelations = this.selectList[0].esMatingRelations + } this.ListModel = false } }, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index a952cac68..23c33f0ad 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -11,6 +11,16 @@ clearable > + + + + + + - + @@ -82,7 +92,7 @@ @@ -349,6 +359,7 @@ export default { modalshowflag: false, nodeList2: [], nodeList: [], + standSortOptions: [], BZList: [], qcdwOptions: [], qbfsForm: { @@ -372,46 +383,13 @@ export default { newReason: "" //新增原因 // remarks: '', // 备注 }, - useOptions: [ - { - value: "ISO", - label: "ISO" - }, { - value: "ESE", - label: "ESE" - }, { - value: "EC/EEC", - label: "EC/EEC" - }, { - value: "IEC", - label: "IEC" - }, { - value: "GB", - label: "GB" - }, { - value: "GB/T", - label: "GB/T" - }, { - value: "QC/T", - label: "QC/T" - }, { - value: "JT/T", - label: "JT/T" - }, { - value: "HJ", - label: "HJ" - }, { - value: "TB", - label: "团标" - },{ - value: "QT", - label: "其他" - }, - ], qbfsFormRules: { unit: [ { required: true, message: "请选择起草单位", trigger: "change" } ], + bussSort: [ + { required: true, message: "请选择企标类别", trigger: "blur" } + ], esName: [ { required: true, message: "请输入企标名称", trigger: "blur" } ], @@ -464,6 +442,7 @@ export default { _this: this }, res => { this.BZList = res.data.ENERGYTYPES //标准范围 + this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 this.standSystemOptions = res.data.TXLBBUSS // 体系结构 this.qcdwOptions = res.data.QCDW // 起草单位 }) @@ -646,8 +625,6 @@ export default { @import '~@/assets/styles/mixins'; @import '~@/assets/styles/style'; #establish { - height: 100%; - background: #fff; .classDisplay { /deep/.el-form-item__content { width: calc(~'100% - 180px'); diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue index c57d0d1d7..fb1329fd4 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue @@ -53,6 +53,16 @@ clearable > + + + + + + - - - + + @@ -87,7 +96,7 @@ @click.native="choiceZRBM('unit', '选择起草责任单位', qbfsForm.unit)"> - + @@ -95,7 +104,7 @@ @@ -127,11 +136,13 @@ - - - - - + + + + + + + @@ -213,9 +224,8 @@ - - - + + @@ -262,7 +272,8 @@ label="计划状态" align="center"> { this.BZList = res.data.ENERGYTYPES //标准范围 + this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 this.standSystemOptions = res.data.TXLBBUSS // 体系结构 this.qcdwOptions = res.data.QCDW // 起草单位 }) @@ -825,8 +842,9 @@ export default { if(this.showType === 'one'){ this.qbfsForm.esId1 = this.selectList[0].id || '--' this.qbfsForm.esName1 = this.selectList[0].esName || '--' - this.qbfsForm.planStatus1 = this.selectList[0].planStatus === '0'? '完成' : (this.selectList[0].planStatus === '1'? '修订' : '制定') - this.qbfsForm.reviseStatus1 = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus === '1'? '制定中' : '未制定') + this.qbfsForm.planStatus1 = this.selectList[0].planStatus === '0'? '未开始' : (this.selectList[0].planStatus === '1'? '制定中' : (this.selectList[0] === '2'? '修订中' : + (this.selectList[0] === '3'? '已取消' : '已完成'))) + this.qbfsForm.reviseStatus1 = this.selectList[0].reviseStatus === '1'? '制定' : '修订' this.standShow = true }else{ if(this.qbfsForm.esName1 === this.selectList[0].esName ){ @@ -834,8 +852,9 @@ export default { }else{ this.qbfsForm.esId2 = this.selectList[0].id || '--' this.qbfsForm.esName2 = this.selectList[0].esName || '--' - this.qbfsForm.planStatus2 = this.selectList[0].planStatus === '0'? '完成' : (this.selectList[0].planStatus === '1'? '修订' : '制定') - this.qbfsForm.reviseStatus2 = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus === '1'? '制定中' : '未制定') + this.qbfsForm.planStatus2 = this.selectList[0].planStatus === '0'? '未开始' : (this.selectList[0].planStatus === '1'? '制定中' : (this.selectList[0] === '2'? '修订中' : + (this.selectList[0] === '3'? '已取消' : '已完成'))) + this.qbfsForm.reviseStatus2 = this.selectList[0].reviseStatus === '1'? '制定' : '修订' this.standShow2 = true } } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue index 8fe1d1227..6d859619d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue @@ -22,6 +22,16 @@ clearable > + + + + + + - - - + + @@ -54,11 +63,11 @@ placeholder="请选择初稿完成时间"> - + @@ -207,9 +216,8 @@ - - - + + @@ -256,7 +264,8 @@ label="计划状态" align="center"> { this.BZList = res.data.ENERGYTYPES //标准范围 + this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 }) }, methods: { @@ -441,22 +455,28 @@ export default { this.qbfsForm.esName = this.selectList[0].esName this.qbfsForm.draftTime = this.selectList[0].draftTime this.qbfsForm.drafterName = this.selectList[0].drafterName - this.qbfsForm.planStatus = this.selectList[0].planStatus === '0'? '完成' : (this.selectList[0].planStatus === '1'? '修订' : '制定') + this.qbfsForm.planStatus = this.selectList[0].planStatus === '0'? '未开始' : (this.selectList[0].planStatus === '1'? '制定中' : (this.selectList[0] === '2'? '修订中' : + (this.selectList[0] === '3'? '已取消' : '已完成'))) this.qbfsForm.releaseTime = this.selectList[0].releaseTime this.qbfsForm.resPersonName = this.selectList[0].resPersonName - this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus === '1'? '制定中' : '未制定') + this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '1'? '制定' : '修订' this.qbfsForm.unitName = this.selectList[0].unitName this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName if(this.selectList[0].area){ this.qbfsForm.area = this.selectList[0].area.split(',') } + if(this.selectList[0].bussSort){ + this.qbfsForm.bussSort = this.selectList[0].bussSort.split(',') + } this.qbfsForm.rqbName = this.selectList[0].rqbName this.qbfsForm.tsJsonName = this.selectList[0].tsJsonName this.qbfsForm.isRelate = this.selectList[0].isRelate this.qbfsForm.useLevel = this.selectList[0].useLevel this.qbfsForm.esStandRelations = this.selectList[0].esStandRelations this.qbfsForm.technologic = this.selectList[0].technologic - this.qbfsForm.esMatingRelations = this.selectList[0].esMatingRelations + if(this.selectList[0].esMatingRelations && this.selectList[0].esMatingRelations !== 'null'){ + this.qbfsForm.esMatingRelations = this.selectList[0].esMatingRelations + } this.ListModel = false } }, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue index dbde6d77d..29c7e88bd 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue @@ -15,6 +15,16 @@ + + + + + + - + @@ -348,7 +358,7 @@ export default { nodeList:[], drawerTitle: '', detailData: [], - + standSortOptions: [], } }, mounted() { @@ -359,6 +369,7 @@ export default { _this: this }, res => { this.BZList = res.data.ENERGYTYPES //标准范围 + this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 }) }, methods:{ diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index c0f297174..8f696fab7 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -455,7 +455,6 @@ export default { if (valid) { this.isSubmit = true; let json = Object.assign(qbzxdFrom, this.roleForm); - console.log(json); this.$http.post("lawss/activiti/startProcessRollBack", { createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue index 61f5b6413..ee883d1ed 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue @@ -15,6 +15,16 @@ + + + + + + - + @@ -335,6 +345,7 @@ export default { data(){ return { BZList: [], + standSortOptions: [], active: '1', type: '', commentText: '', @@ -359,6 +370,7 @@ export default { _this: this }, res => { this.BZList = res.data.ENERGYTYPES //标准范围 + this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 }) }, methods:{ diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue index b9b2737fc..7c3edf08b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue @@ -15,6 +15,16 @@ + + + + + + - + @@ -346,7 +356,7 @@ export default { nodeList:[], drawerTitle: '', detailData: [], - + standSortOptions: [], } }, mounted() { @@ -357,6 +367,7 @@ export default { _this: this }, res => { this.BZList = res.data.ENERGYTYPES //标准范围 + this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 }) }, methods:{ diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue index 1129be8e7..b87aaa715 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue @@ -15,6 +15,16 @@ + + + + + + - + @@ -348,7 +358,7 @@ export default { nodeList:[], drawerTitle: '', detailData: [], - + standSortOptions: [], } }, mounted() { @@ -359,6 +369,7 @@ export default { _this: this }, res => { this.BZList = res.data.ENERGYTYPES //标准范围 + this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 }) }, methods:{ diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue index 936a1db64..0854c961e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue @@ -15,6 +15,16 @@ + + + + + + - + @@ -348,7 +358,7 @@ export default { nodeList:[], drawerTitle: '', detailData: [], - + standSortOptions: [], } }, mounted() { @@ -359,6 +369,7 @@ export default { _this: this }, res => { this.BZList = res.data.ENERGYTYPES //标准范围 + this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 }) }, methods:{ diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue index 2d1c5894b..15a654958 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -5,6 +5,7 @@ + @@ -14,6 +15,7 @@ + @@ -118,7 +120,7 @@ align="center" label="制修订状态">