diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue index a0eef35a7..ffbe8a46c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue @@ -278,7 +278,7 @@ export default { }, formRules: { nextStatus: [ - { required: true, message: "请选择下一步状态", trigger: "change" } + { required: true, message: "", trigger: "change" } ] }, associationOptions: [{ diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue index 7b9baad49..95540b7e1 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue @@ -42,11 +42,23 @@ - - - + + + + + + + + @@ -380,9 +392,9 @@ export default { } }, mounted(){ - if(this.qbfsForm.passFlag){ - this.qbfsForm = {} - } + // if(this.qbfsForm.passFlag){ + // this.qbfsForm = {} + // } //查询下拉框数据 this.$http.get('sys/dictype/getDicTypeListCode', '',{ _this: this diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue index 40f863469..4bfe6e648 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue @@ -46,6 +46,19 @@ + + + + + + @@ -401,9 +414,9 @@ export default { } }, mounted(){ - if(this.qbfsForm.passFlag){ - this.qbfsForm = {} - } + // if(this.qbfsForm.passFlag){ + // this.qbfsForm = {} + // } //查询下拉框数据 this.$http.get('sys/dictype/getDicTypeListCode', '',{ _this: this diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index c5067e8ed..33ebc9065 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -139,7 +139,7 @@ @@ -160,7 +160,7 @@ :enterpriseStandard="true" :placeholderText="'包括已有、应有的关联标准，如企业标准、行业标准、国家标准'" :config="{attrName: '引用标准'}" - :labelWidth="'180px'" + :labelWidth="'150px'" v-model="qbfsForm.esMatingRelations" > @@ -550,9 +550,9 @@ export default { }, mounted(){ this.getWorkData() - if(this.qbfsForm.passFlag){ - this.qbfsForm = {} - } + // if(this.qbfsForm.passFlag){ + // this.qbfsForm = {} + // } //查询下拉框数据 this.$http.get('sys/dictype/getDicTypeListCode', '',{ _this: this diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue index f41b18984..186d5cb50 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue @@ -70,6 +70,19 @@ + + + + + + @@ -101,7 +114,7 @@ :enterpriseStandard="true" :placeholderText="'包括已有、应有的关联标准，如企业标准、行业标准、国家标准'" :config="{attrName: '引用标准'}" - :labelWidth="'180px'" + :labelWidth="'150px'" v-model="qbfsForm.esMatingRelations" > @@ -712,9 +725,9 @@ export default { } }, mounted() { - if(this.qbfsForm.passFlag){ - this.qbfsForm = {} - } + // if(this.qbfsForm.passFlag){ + // this.qbfsForm = {} + // } //查询下拉框数据 this.$http.get('sys/dictype/getDicTypeListCode', '',{ _this: this @@ -801,6 +814,13 @@ export default { }, TXJGenterDrawer () { let list = this.$refs.TXJGTree.getCheckedNodes() + if(list.length > 0){ + let parenList = list.filter ( item => item.parentId === null || item.parentId === ''); + if (parenList.length > 0) { + this.$message.error('请选择二级及以下目录') + return + } + } let id = '' let name = '' list.map(item => { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue index 66cb24c1f..8ad9539c2 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue @@ -46,6 +46,19 @@ + + + + + + @@ -389,9 +402,9 @@ export default { } }, mounted(){ - if(this.qbfsForm.passFlag){ - this.qbfsForm = {} - } + // if(this.qbfsForm.passFlag){ + // this.qbfsForm = {} + // } this.$http.get('sys/dictype/getDicTypeListCode', '',{ _this: this }, res => { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index 372939517..aaebf35d6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -529,6 +529,7 @@ export default { this.$refs["roleForm"].validate((valid) => { if (valid) { this.isSubmit = true; + qbzxdFrom.commentText = this.commentText; var json = Object.assign(qbzxdFrom, this.roleForm); this.$http.post("lawss/activiti/completeTask", { taskIds: this.$route.query.taskIds, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue index 39a340c15..5a4484d35 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue @@ -124,7 +124,8 @@

责任工程师

- +
@@ -228,6 +229,7 @@ title="选择工作组组长" :visible.sync="workModel" size="900px" + @close="closeWorkDrawer" custom-class="demo-drawer" >
@@ -260,14 +262,14 @@
+ 数据加载中... @@ -299,7 +301,7 @@
- 取消 + 取消 带入
@@ -350,7 +352,7 @@ :before-upload="beforeUpload" :action="importExcelUrl" :file-list="defaultFileList" - accept=".xlsx" + accept=".xls" name="file" ref="importFileAboutStand">
@@ -379,6 +381,7 @@ export default { name: "qbzxdlxStep1", data() { return { + tableLoading: false, importModalshowflag: false, //导入弹窗 showUploadlist: true, // 导入过程中新增数据时，如果数据错误，不出现导入列表 importExcelUrl: 'api/att/attFile/upload', // 导入EXCEL文档 @@ -589,6 +592,13 @@ export default { workChange(data) { this.workChangeList = data }, + //工作组取消按钮 + closeWorkDrawer(){ + this.workModel = false + this.workSearch.workGroupName = '' + this.getWorkData() + this.$refs.workGroup.clearSelection() + }, OkWork(){ if(this.workChangeList.length > 1 ){ this.$message.warning('您只能选择一条数据进行带入') @@ -601,6 +611,7 @@ export default { this.$refs.qblx_pageData.validateField('wgLeaderName') } this.workModel = false + this.workSearch.workGroupName = '' this.$refs.workGroup.clearSelection() } }, @@ -614,10 +625,12 @@ export default { }, res => { this.workData = res.data.records; this.total = res.data.total; + this.tableLoading = false }, e => { }); }, choiceLeader(){ + this.getWorkData() this.workModel = true }, choiceZRBM(type, title, id) { @@ -1014,7 +1027,7 @@ export default { height: 100%; /deep/ .el-upload-list__item-name { - margin-left: 48px; + //margin-left: 48px; } /deep/ .el-upload-list { @@ -1106,6 +1119,10 @@ export default { border: 0; } } + .table-height{ + height: calc(~'100% - 65px'); + overflow: auto; + } } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue index 6300cfc6c..a5acf3841 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue @@ -25,6 +25,7 @@

{{ item.name }} @@ -194,7 +195,7 @@ :enterpriseStandard="true" :placeholderText="'包括已有、应有的关联标准，如企业标准、行业标准、国家标准'" :config="{attrName: '引用标准'}" - :labelWidth="'180px'" + :labelWidth="'150px'" v-model="qbfsForm.esMatingRelations" > @@ -675,8 +676,20 @@ export default { //必填人员校验规则 roleFormRules: { dockUserName: [ - { required: true, message: "请选择工作组组长", trigger: "change" } - ] + { required: true, message: "请选择标准立项单位整车/系统总工", trigger: "change" } + ], + countersignerName:[ + {required: true, message:'请选择会签人员', trigger: "change" } + ], + examineName:[ + {required: true, message:'请选择标准体系工作组组长', trigger: "change" } + ], + approverName:[ + {required: true, message:'请选择总院技术委员会覆盖领域企业标准：专委会主任/总院技术委员会未覆盖领域企业标准：总院院长或总院主管副院长', trigger: "change" } + ], + engineerName:[ + {required: true, message:'请选择相关单位、工程研究总院标准法规部', trigger: "change" } + ], }, roleForm: { prcCreateUserName: this.$store.getters.userInfo.userName, diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index c10c9e14c..989404319 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -247,7 +247,6 @@ export default { //草稿办理待开发 const { prcType, id } = row const mes = JSON.parse(row.mes) - console.log(mes) this.$store.commit('setDetailMap', this.$route.path) switch (prcType) { // 标准入库、 @@ -899,6 +898,17 @@ export default { } }) break + //企标制修订立项计划 + case '26': + this.$router.push({ + name: 'qbzxdlxStep1', + query: { + type: '26', + processName: '企标制修订立项计划', + bpnId: id + } + }) + break } }, ...mapMutations(['setProcess', 'setHandleInfo']), diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index 9ca8433b2..7c1f2fcc1 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -542,7 +542,6 @@ export default { XCXSSRQLAWS: '', //是否纳入认证清单 isRelateAccess: '', - standType: 'INLAND', askType: '', // 监管类型 dataSource: 'INLAND_STAND', // 数据来源 page: 1, diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 847554f66..1882f8b5f 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -71,8 +71,8 @@ - - + + @@ -187,11 +187,11 @@ - - + + - - + + + :disabled="formdisableflag" placeholder="选择起草部门"> + 手动查找 + @@ -585,7 +592,7 @@ class="add-form-item" > - + @@ -1076,11 +1083,6 @@ > - - - - - - { + let a, b + a = item.substring(item.indexOf('(') +1) + b = a.substring(0, a.lastIndexOf(')')) + idList.push(b) + }) + idList = idList.join(',') + this.nodeList2.push(idList) + } this.userType = type this.drawerTitle = title this.modalShowRoleFlag = true @@ -3565,7 +3574,9 @@ export default { }, choiceQCDW(type, title, id) { this.nodeListZRBM = [] - this.nodeListZRBM.push(id) + if(this.sarBussionessStandEO.QCDWID && this.sarBussionessStandEO.QCDWID.length > 0){ + this.nodeListZRBM = this.sarBussionessStandEO.QCDWID.split(',') + } this.drawerTitle = title this.modalshowflagZRBM = true }, @@ -3586,7 +3597,16 @@ export default { this.sarBussionessSearch.QCDW = nameList } this.$set(this.sarBussionessStandEO, 'QCDWId', idList) - this.$set(this.sarBussionessStandEO, 'QCDW', nameList) + let tNameList = (this.sarBussionessStandEO.QCDW === null || this.sarBussionessStandEO.QCDW === '') ? nameList : this.sarBussionessStandEO.QCDW+','+nameList + const arr=new Set() + let permission = tNameList.split(","); + permission.forEach((item, index) => { + arr.add(item) + }) + + let nameNew=Array.from(arr).join(',') + this.$set(this.sarBussionessStandEO, 'QCDW', nameNew) + if (this.sarBussionessStandEO.QCRBUSS) { this.$refs.sarBussionessStandForm.validateField('QCDW') }