diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue index 6f613fbf6..3e8039de6 100644 --- a/src/pages/config/pages/mechanismManage/index.vue +++ b/src/pages/config/pages/mechanismManage/index.vue @@ -68,6 +68,12 @@ 清空 + + + + 批量配置岗位 + + + 导入中... { - if (res.ok) { - this.$message.success('配置岗位成功') - this.modalPost = false - this.getData() - } - }) + if (this.drawerTitle === '配置岗位') { + this.$http.postData('sarUser/user/position', { + positionIds: this.$refs.tree2.getCheckedKeys(), + userId: this.userId + }, {}, res => { + if (res.ok) { + this.$message.success('配置岗位成功') + this.modalPost = false + this.getData() + } + }) + } else { + this.$http.postData('sarUser/user/positionBatch', { + positionIds: this.$refs.tree2.getCheckedKeys(), + userId: this.userId + }, {}, res => { + if (res.ok) { + this.$message.success('配置岗位成功') + this.modalPost = false + this.getData() + } + }) + } + }, searchPostName() { this.page = 1; @@ -407,7 +436,6 @@ export default { loading: 'treeLoading' }, res => { this.treeData = res.data - console.log(this.treeData); this.nodeKeyId = this.treeData[0].id this.$nextTick(function () { this.$refs.tree.setCurrentKey(this.nodeKeyId) @@ -493,6 +521,20 @@ export default { this.pageSize = pageSize this.getTree2() }, + + /** 批量编辑岗位的勾选数据 */ + selectedData(val) { + this.manageData = val + }, + + selectEdit() { + this.userId = [] + this.manageData.forEach(item=>{ + this.userId.push(item.userId) + }) + this.drawerTitle = '批量配置岗位' + this.modalPost = true + }, }, computed: {}, watch: { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue index e51337005..0153e9590 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue @@ -64,11 +64,11 @@ placeholder="请选择初稿完成时间"> - + @@ -78,22 +78,15 @@ placeholder="请输入体系结构" :maxlength="500"/> - + - - - - - - - - - - - - - -
@@ -139,9 +115,26 @@ >
- + + + + + + + - + - + @@ -419,7 +412,13 @@ export default { }, { _this: this, }, res => { - this.standinfoList = res.data.list + this.standinfoList = [] + //展示的数据只能是未开始的 + res.data.list.forEach(item => { + if(item.planStatus === '0'){ + this.standinfoList.push(item) + } + }) this.total = res.data.count }) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue index 2b0953c9e..a6588fd7f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue @@ -63,11 +63,11 @@ placeholder="请选择初稿完成时间"> - + @@ -77,11 +77,11 @@ placeholder="请输入体系结构" :maxlength="500"/> - + @@ -94,13 +94,6 @@ - - - - - - - - - - - - - -
@@ -146,9 +122,26 @@ >
- + + + + + + + - + - + @@ -440,7 +433,13 @@ export default { }, { _this: this, }, res => { - this.standinfoList = res.data.list + this.standinfoList = [] + //展示的数据只能是未开始的 + res.data.list.forEach(item => { + if(item.planStatus === '0'){ + this.standinfoList.push(item) + } + }) this.total = res.data.count }) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index 221b2be10..58bb272a2 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -27,15 +27,6 @@ placeholder="请输入企标名称" :maxlength="500"/> - - - - - - - - - @@ -50,6 +41,12 @@ @click.native="choiceZRRS('1')"> + + + + + @@ -78,13 +75,7 @@ placeholder="请选择计划标准发布时间"> - - - - - - + @@ -92,7 +83,7 @@ @@ -110,9 +101,9 @@ @click.native="choiceTXJG(qbfsForm.tsJson)"> - - + - - + @@ -146,25 +137,29 @@ - - - - + + + - + @@ -360,6 +355,7 @@ export default { nodeList2: [], nodeList: [], standSortOptions: [], + cbcdOptions: [], BZList: [], qcdwOptions: [], qbfsForm: { @@ -367,9 +363,9 @@ export default { unit: "", // 单位 unitName: "", esName: "", // 企标名称 - planStatus: "", // 计划状态 + planStatus: "0", // 计划状态 reviseStatus: "", // 制修订状态 - area: "", //标准范围 + area: "", //适用车型 isRelate: "", //采用何种标准 technologic: '', //指标依据 resPerson: "", // 评审责任人 @@ -380,7 +376,8 @@ export default { releaseTime: "", // 计划标准发布时间 drafter: "", // 起草人 drafterName: "", - newReason: "" //新增原因 + esMatingRelations: "", //配套标准 + newReason: "" //立项原因 // remarks: '', // 备注 }, qbfsFormRules: { @@ -393,9 +390,6 @@ export default { esName: [ { required: true, message: "请输入企标名称", trigger: "blur" } ], - planStatus: [ - { required: true, message: "请选择计划状态", trigger: "blur" } - ], reviseStatus: [ { required: true, message: "请选择制修订状态", trigger: "blur" } ], @@ -418,7 +412,7 @@ export default { {required: true, message: '请选择起草人', trigger: 'change'}, ], newReason: [ - {required: true, message: '请输入新增原因', trigger: 'blur'}, + {required: true, message: '请输入立项原因', trigger: 'blur'}, ], }, @@ -441,10 +435,12 @@ export default { this.$http.get('sys/dictype/getDicTypeListCode', '',{ _this: this }, res => { - this.BZList = res.data.ENERGYTYPES //标准范围 + this.cbcdOptions = res.data.DEGREESTANDARD //采标程度 + this.BZList = res.data.ENERGYTYPES //适用车型 this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 this.standSystemOptions = res.data.TXLBBUSS // 体系结构 this.qcdwOptions = res.data.QCDW // 起草单位 + }) }, methods: { @@ -489,13 +485,14 @@ export default { this.clearQYBZ() }, QYBZenterDrawer () { + console.log(this.QYBZformSelect); if (this.QYBZformSelect.length > 1) { this.$message.warning('请选择一条标准') } else if (this.QYBZformSelect.length < 1){ this.$message.warning('请选择要带入的标准') } else { this.qbfsForm.rqbJson = this.QYBZformSelect[0].id - this.qbfsForm.rqbName = this.QYBZformSelect[0].standName + this.qbfsForm.rqbName = this.QYBZformSelect[0].standCode this.clearQYBZ() this.QYBZmodal = false } @@ -550,6 +547,9 @@ export default { if(this.qbfsForm.unit){ this.$refs.qbfsForm.validateField('unit') } + if(this.qbfsForm.unitName){ + this.$refs.qbfsForm.validateField('unitName') + } }, choiceZRR() { this.nodeList = []; diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue index 4f9347a76..d8ce2a44b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue @@ -20,9 +20,6 @@ - - - @@ -34,9 +31,6 @@ - - - @@ -90,13 +84,7 @@ placeholder="请选择初稿完成时间"> - - - - - - + @@ -104,7 +92,7 @@ @@ -112,17 +100,21 @@ - - - - + + + - + + + - - - - - - - - - + + + + + + + + + + + - - + @@ -192,14 +199,6 @@ v-model="qbfsForm.esStandRelations" > - - - @@ -509,6 +508,7 @@ export default { TXJGList: [], BZList: [], standSortOptions: [], + cbcdOptions: [], //采标程度 QYBZList: [], QYBZformSelect: [], standSystemOptions: [], @@ -556,9 +556,6 @@ export default { esName: [ {required: true, message: '请输入企标名称', trigger: 'blur'}, ], - planStatus: [ - {required: true, message: '请选择计划状态', trigger: 'change'}, - ], reviseStatus: [ {required: true, message: '请选择制修订状态', trigger: 'change'}, ], @@ -593,6 +590,7 @@ export default { reviewer: "", draftTime: "", isSubTime: "", + planStatus: "0", mergeReason: "", company: "", resPersonName: '', @@ -631,7 +629,8 @@ export default { this.$http.get('sys/dictype/getDicTypeListCode', '',{ _this: this }, res => { - this.BZList = res.data.ENERGYTYPES //标准范围 + this.cbcdOptions = res.data.DEGREESTANDARD //采标程度 + this.BZList = res.data.ENERGYTYPES //适用车型 this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 this.standSystemOptions = res.data.TXLBBUSS // 体系结构 this.qcdwOptions = res.data.QCDW // 起草单位 @@ -696,7 +695,7 @@ export default { this.$message.warning('请选择要带入的标准') } else { this.qbfsForm.rqbJson = this.QYBZformSelect[0].id - this.qbfsForm.rqbName = this.QYBZformSelect[0].standName + this.qbfsForm.rqbName = this.QYBZformSelect[0].standCode this.clearQYBZ() this.QYBZmodal = false } @@ -871,7 +870,13 @@ export default { }, { _this: this, }, res => { - this.standinfoList = res.data.list + this.standinfoList = [] + //展示的数据只能是未开始的 + res.data.list.forEach(item => { + if(item.planStatus === '0'){ + this.standinfoList.push(item) + } + }) this.total = res.data.count }) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue index 6d859619d..1ddae5222 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue @@ -63,11 +63,11 @@ placeholder="请选择初稿完成时间"> - + @@ -77,11 +77,11 @@ placeholder="请输入体系结构" :maxlength="500"/> - + @@ -93,13 +93,6 @@ - - - - - - - + +
+ + + +
+
+ +
+ - -
- - - -
-
- -
- - - + - + @@ -427,7 +420,13 @@ export default { }, { _this: this, }, res => { - this.standinfoList = res.data.list + this.standinfoList = [] + //展示的数据只能是未开始的 + res.data.list.forEach(item => { + if(item.planStatus === '0'){ + this.standinfoList.push(item) + } + }) this.total = res.data.count }) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue index 29c7e88bd..0014cd9f8 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue @@ -16,14 +16,11 @@ - - - - + - - - - - - - @@ -53,6 +43,13 @@ placeholder="请输入起草人" :maxlength="500"/> + + + - - - - + @@ -106,9 +96,9 @@ placeholder="请输入体系结构" :maxlength="500"/> - - + - + @@ -139,25 +129,28 @@ :maxlength="500"/> - + + + + - + - + @@ -359,6 +352,7 @@ export default { drawerTitle: '', detailData: [], standSortOptions: [], + cbcdOptions: [], } }, mounted() { @@ -368,7 +362,8 @@ export default { this.$http.get('sys/dictype/getDicTypeListCode', '',{ _this: this }, res => { - this.BZList = res.data.ENERGYTYPES //标准范围 + this.BZList = res.data.ENERGYTYPES //适用车型 + this.cbcdOptions = res.data.DEGREESTANDARD //采标程度 this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 }) }, @@ -457,6 +452,8 @@ export default { handleSubmit(){ this.isSubmit = true this.qbfsForm.bzfgbzFlag = '0' + this.qbfsForm.planStatus = '未开始' + this.qbfsForm.area = this.qbfsForm.area.join(',') this.qbfsForm.commentText = this.commentText let json = JSON.stringify(this.qbfsForm); this.$http.post('lawss/activiti/completeTask', { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue index ee883d1ed..85f3c1774 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue @@ -16,14 +16,11 @@ - - - - + - - - - - - - @@ -53,6 +43,13 @@ placeholder="请输入起草人" :maxlength="500"/> + + + - - - - + @@ -106,9 +96,9 @@ placeholder="请输入体系结构" :maxlength="500"/> - - + - + @@ -139,25 +129,28 @@ :maxlength="500"/> - + + + + - + - + @@ -359,6 +352,7 @@ export default { nodeList:[], drawerTitle: '', detailData: [], + cbcdOptions: [], } }, @@ -371,6 +365,7 @@ export default { }, res => { this.BZList = res.data.ENERGYTYPES //标准范围 this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 + this.cbcdOptions = res.data.DEGREESTANDARD //采标程度 }) }, methods:{ diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue index 7c3edf08b..09dbbfae0 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue @@ -16,14 +16,11 @@ - - - - + - - - - - - - @@ -53,6 +43,13 @@ placeholder="请输入起草人" :maxlength="500"/> + + + - - - - + @@ -106,9 +96,9 @@ placeholder="请输入体系结构" :maxlength="500"/> - - + - + @@ -139,25 +129,28 @@ :maxlength="500"/> - + + + + - + - + @@ -357,6 +350,7 @@ export default { drawerTitle: '', detailData: [], standSortOptions: [], + cbcdOptions: [], } }, mounted() { @@ -366,6 +360,7 @@ export default { this.$http.get('sys/dictype/getDicTypeListCode', '',{ _this: this }, res => { + this.cbcdOptions = res.data.DEGREESTANDARD //采标程度 this.BZList = res.data.ENERGYTYPES //标准范围 this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 }) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue index b87aaa715..93143033c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue @@ -16,14 +16,11 @@ - - - - + - - - - - - - @@ -53,6 +43,13 @@ placeholder="请输入起草人" :maxlength="500"/> + + + - - - - + @@ -106,9 +96,9 @@ placeholder="请输入体系结构" :maxlength="500"/> - - + - + @@ -139,25 +129,28 @@ :maxlength="500"/> - + + + + - + - + @@ -359,6 +352,7 @@ export default { drawerTitle: '', detailData: [], standSortOptions: [], + cbcdOptions: [], } }, mounted() { @@ -368,6 +362,7 @@ export default { this.$http.get('sys/dictype/getDicTypeListCode', '',{ _this: this }, res => { + this.cbcdOptions = res.data.DEGREESTANDARD //采标程度 this.BZList = res.data.ENERGYTYPES //标准范围 this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 }) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue index 0854c961e..a783a5123 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue @@ -16,14 +16,11 @@ - - - - + - - - - - - - @@ -53,6 +43,13 @@ placeholder="请输入起草人" :maxlength="500"/> + + + - - - - + @@ -106,9 +96,9 @@ placeholder="请输入体系结构" :maxlength="500"/> - - + - + @@ -139,25 +129,28 @@ :maxlength="500"/> - + + + + - + - + @@ -359,6 +352,7 @@ export default { drawerTitle: '', detailData: [], standSortOptions: [], + cbcdOptions: [], } }, mounted() { @@ -368,7 +362,8 @@ export default { this.$http.get('sys/dictype/getDicTypeListCode', '',{ _this: this }, res => { - this.BZList = res.data.ENERGYTYPES //标准范围 + this.BZList = res.data.ENERGYTYPES //适用车型 + this.cbcdOptions = res.data.DEGREESTANDARD //采标程度 this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 }) }, @@ -457,6 +452,8 @@ export default { handleSubmit(){ this.isSubmit = true this.qbfsForm.bzfgbzFlag = '0' + this.qbfsForm.planStatus = '未开始' + this.qbfsForm.area = this.qbfsForm.area.join(',') this.qbfsForm.commentText = this.commentText let json = JSON.stringify(this.qbfsForm); this.$http.post('lawss/activiti/completeTask', { diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue index 2cdd5f528..f3cc934b5 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue @@ -314,7 +314,7 @@ export default { }, //清空 clearSearch() { - this.sarSarAccessEOSearch.projectName = '' + this.sarSarAccessEOSearch.carType = '' this.sarSarAccessEOSearch.detailedListName = '' this.searchSarAccess()