diff --git a/src/components/mechanismTree/index.vue b/src/components/mechanismTree/index.vue index a134dbbdd..2c83ad0be 100644 --- a/src/components/mechanismTree/index.vue +++ b/src/components/mechanismTree/index.vue @@ -26,8 +26,9 @@ icon-class="icon-tree" :check-strictly="true" :current-node-key="nodeKeyId" - node-key="id" + node-key="name" :filter-node-method="filterNode" + :default-checked-keys="nodeList" highlight-current :auto-expand-parent="true" show-checkbox diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue index f826a4d4f..8721d1575 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue @@ -2,7 +2,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue index fd96c045c..7d26ebcf5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -617,15 +617,12 @@ // 清空 clearSearchStand () { this.standCommonlySearch.page = 1 - this.standCommonlySearch.start = '' - this.standCommonlySearch.end = '' - this.standCommonlySearch.categorg = '' - this.standCommonlySearch.cname = '' + this.standCommonlySearch.numOrName = '' this.sarStandCompareHis() }, // 搜索 sarStandCompareHisInfo() { - this.splitInfoPage = 1 + this.standCommonlySearch.page = 1 this.sarStandCompareHis() }, // 查询表格 diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index 27d9b6888..8c9279251 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -632,15 +632,12 @@ export default { // 清空 clearSearchStand() { this.standCommonlySearch.page = 1 - this.standCommonlySearch.start = '' - this.standCommonlySearch.end = '' - this.standCommonlySearch.categorg = '' - this.standCommonlySearch.cname = '' + this.standCommonlySearch.numOrName = '' this.sarStandCompareHis() }, // 搜索 sarStandCompareHisInfo() { - this.splitInfoPage = 1 + this.standCommonlySearch.page = 1 this.sarStandCompareHis() }, // 查询表格 diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index 84c33eb92..b8c140352 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -686,6 +686,7 @@ this.plForm.complianceState = '' this.plForm.newData = '' this.plForm.onlineData = '' + this.plForm.applyArctic = '' this.modalshowflag = true } else { this.$message.warning('请选择要编辑的数据') diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue index df47e84dc..82dc0dcc3 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue @@ -723,7 +723,7 @@ export default { // 分页每页显示数改变后方法 pageSizeChange(pageSize) { this.$store.getters.userInfo.configContent = pageSize - this.standCommonlySearch.size = pageSize + this.standCommonlySearch.pageSize = pageSize this.sarStandCompareHis() }, /** 选择带入数据的方法操作 diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index a7f8eb4a7..e101cda51 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -719,7 +719,7 @@ export default { // 分页每页显示数改变后方法 pageSizeChange(pageSize) { this.$store.getters.userInfo.configContent = pageSize - this.standCommonlySearch.size = pageSize + this.standCommonlySearch.pageSize = pageSize this.sarStandCompareHis() }, /** 选择带入数据的方法操作 diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index 9def032ea..aa41eeffa 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -574,6 +574,7 @@ 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 @@ -702,9 +703,9 @@ } else { this.form.fjListId = data.fjListId || data.form.fjListId } - this.form.textType = data.textType - this.form.modelList = data.modelList - this.form.modelNameList = data.modelNameList + this.form.textType = data.textType || data.form.textType + this.form.modelList = data.modelList || data.form.modelList + this.form.modelNameList = data.modelNameList || data.form.modelNameList this.form.cid = data.cid || data.form.cid this.form.endTime = data.endTime || data.form.endTime this.todoId = res.id diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue index 24ba96755..285a5407a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue @@ -499,10 +499,11 @@ this.form.cid = data.cid || data.form.cid this.form.endTime = data.endTime || data.form.endTime this.form.cname = data.cname || data.form.cname - this.form.textType = data.textType - this.form.modelList = data.modelList - this.form.modelNameList = data.modelNameList + this.form.textType = data.textType || data.form.textType + this.form.modelList = data.modelList || data.form.modelList + this.form.modelNameList = data.modelNameList || data.form.modelNameList this.form.bzfgId = data.bzfgId || '' + this.form.bzfgName = data.bzfgName || '' this.json = data this.data = data.info || data.data }).catch(e => { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue index 9bbcc251c..93d76a563 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue @@ -483,9 +483,9 @@ this.form.cid = data.cid || data.form.cid this.form.endTime = data.endTime || data.form.endTime this.form.cname = data.cname || data.form.cname - this.form.textType = data.textType - this.form.modelList = data.modelList - this.form.modelNameList = data.modelNameList + this.form.textType = data.textType || data.form.textType + this.form.modelList = data.modelList || data.form.modelList + this.form.modelNameList = data.modelNameList || data.form.modelNameList this.form.bzfgId = data.bzfgId || '' this.json = data this.data = data.info || data.data diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue index f6513b873..a7f964180 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue @@ -496,6 +496,7 @@ export default { 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 @@ -692,9 +693,9 @@ export default { this.form.cid = data.cid || data.form.cid this.form.endTime = data.endTime || data.form.endTime this.form.cname = data.cname || data.form.cname - this.form.textType = data.textType - this.form.modelList = data.modelList - this.form.modelNameList = data.modelNameList + this.form.textType = data.textType || data.form.textType + this.form.modelList = data.modelList || data.form.modelList + this.form.modelNameList = data.modelNameList || data.form.modelNameList this.form.spId = data.spId || '' this.form.spName = data.spName || '' this.json = data diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index dc18ccf8b..d3223b404 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -607,9 +607,9 @@ this.form.cid = data.cid || data.form.cid; this.form.endTime = data.endTime || data.form.endTime; this.form.cname = data.cname || data.form.cname; - this.form.textType = data.textType - this.form.modelList = data.modelList - this.form.modelNameList = data.modelNameList + this.form.textType = data.textType || data.form.textType + this.form.modelList = data.modelList || data.form.modelList + this.form.modelNameList = data.modelNameList || data.form.modelNameList // this.oldData = JSON.parse(JSON.stringify(data.summaryList)) // console.log(data); // data.summaryList.forEach(item => { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue index b89f1b7f6..a626da29e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -540,9 +540,9 @@ export default { } }) this.json = data - this.form.textType = data.textType - this.form.modelList = data.modelList - this.form.modelNameList = data.modelNameList + this.form.textType = data.textType || data.form.textType + this.form.modelList = data.modelList || data.form.modelList + this.form.modelNameList = data.modelNameList || data.form.modelNameList this.data = arr }).catch(e => { }); diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue index 4d0bb709f..7cac24107 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue @@ -536,9 +536,9 @@ export default { arr.push(item) } }) - this.form.textType = data.textType - this.form.modelList = data.modelList - this.form.modelNameList = data.modelNameList + this.form.textType = data.textType || data.form.textType + this.form.modelList = data.modelList || data.form.modelList + this.form.modelNameList = data.modelNameList || data.form.modelNameList this.json = data this.data = arr }).catch(e => { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue index d8ebf13aa..7e49ab043 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue @@ -537,9 +537,9 @@ export default { } }) this.json = data - this.form.textType = data.textType - this.form.modelList = data.modelList - this.form.modelNameList = data.modelNameList + this.form.textType = data.textType || data.form.textType + this.form.modelList = data.modelList || data.form.modelList + this.form.modelNameList = data.modelNameList || data.form.modelNameList this.data = arr }).catch(e => { }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue index 188fd08a2..7c17f52f5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue @@ -537,9 +537,9 @@ export default { } }) this.json = data - this.form.textType = data.textType - this.form.modelList = data.modelList - this.form.modelNameList = data.modelNameList + this.form.textType = data.textType || data.form.textType + this.form.modelList = data.modelList || data.form.modelList + this.form.modelNameList = data.modelNameList || data.form.modelNameList this.data = arr }).catch(e => { }); diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue index 13a80e735..6d988ab50 100644 --- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue @@ -37,12 +37,19 @@ placeholder="请输入标准编号" clearable> + 手动查找
@@ -81,23 +88,18 @@ clearable> - -
- - - - -
+ + +
@@ -257,6 +259,134 @@ 流程列表加载中
+ + +
+
+
+
+ + + + + + + + + + + + + 查询 + + + + 清空 + + + +
+ + + + + + + + + + + + + + + + + +
+ +
+
+
+ 取消 + 添加 +
+ 1){ + this.$message.warning('您只能选择一条标准进行添加') + }else{ + this.wbbzform.standName = this.standList[0].standName || this.standList[0].standEnName + this.wbbzform.standType = this.standList[0].standSort + this.wbbzform.standNumber = this.standList[0].standSort + '\xa0\xa0 '+ this.standList[0].standNumber + this.standModel = false + } + + }, + //添加标准取消事件 + cancelStand() { + this.standModel = false; + }, + typeChange(type) { + this.standardSearch.standType = type; + }, + clearStandSearch() { + this.standardSearch = { + standType: "", + standNumber: "" + }; + this.getStandData(); + }, + getStandDataBtn(){ + this.pageNo =1; + this.getStandData(); + }, + //查询项目下的标准 + getStandData() { + this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1", { + standType: this.standardSearch.standType, + standNumber: this.standardSearch.standNumber, + page: this.pageNo, + pageSize: this.pageSizeNo + }, { + _this: this + }, res => { + this.standardData = res.data.list; + this.standardData.forEach(item => { + this.$set(item, "ZCCSSRQ", item.zccssrq); + this.$set(item, "XCXSSRQ", item.xcxssrq); + }) + this.totalNo = res.data.count; + }, e => { + }); + }, + // 点击查看 + handlePreview(item) { + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.id, + pageType: "INLAND_STAND" + } + }); + window.open(routeUrl.href, "_blank"); + }, + //添加标准select的改变 + selectThree(data) { + this.standList = data; + }, + pageChangeNo(page) { + this.pageNo = page; + this.getStandData(); + }, + pageSizeChangeNo(pageSize) { + this.pageSizeNo = this.$store.getters.userInfo.configContent; + this.getStandData(); + + }, handleSave() { }, //不备案 @@ -520,6 +772,9 @@ export default { background: #E6A23C; } } - + .table-height{ + height: calc(~'100% - 65px'); + overflow: auto; + } } diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue index eb2c12a78..edfd581ec 100644 --- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue @@ -33,37 +33,37 @@
- + + v-for="item in comityOptionsOne" + :key="item.id" + :label="item.name" + :value="item.id"> - + + v-for="item in comityOptionsTwo" + :key="item.id" + :label="item.name" + :value="item.id"> - + + v-for="item in comityOptionsOneThree" + :key="item.id" + :label="item.name" + :value="item.id">
- +
@@ -122,7 +122,7 @@ @@ -350,6 +366,9 @@ components: {}, data() { return { + modalshowflagZRBM: false, + nodeListZRBM: [], + QCDWmodal: false, QCDWValue: [], QCDWList: [], @@ -425,6 +444,24 @@ props: {}, watch: {}, methods: { + drawerCheckZRBM (data) { + let list = '' + for (let a = 0; a < data.length; a++) { + if (list.length > 0) { + list += ',' + list += data[a].name + } else { + list = data[a].name + } + } + this.addForm.unit = list + this.modalshowflagZRBM = false + }, + choiceZRBM(id) { + this.nodeListZRBM = [] + this.nodeListZRBM = id.split(',') + this.modalshowflagZRBM = true + }, QCDWOK () { let arr1 = [] if (this.addForm.unit) { diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index 55900ad98..def0339eb 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -35,7 +35,12 @@ @click="handleQueryPdf(file)" :key="item"> {{ file.name }} - 下载 +
@@ -51,7 +56,12 @@ @click="handleQueryPdf(file)" :key="item"> {{ file.name }} - 下载 + @@ -73,6 +83,7 @@ 添加 导出 + 导出上报意见