diff --git a/src/components/CustomFormComponents/DatePicker.vue b/src/components/CustomFormComponents/DatePicker.vue index c5ea683dc..132f60b76 100644 --- a/src/components/CustomFormComponents/DatePicker.vue +++ b/src/components/CustomFormComponents/DatePicker.vue @@ -14,7 +14,7 @@ :value-format="valueFormat" format="yyyy-MM-dd" :value="value" - type="date" + type="dates" :editable="true" :disabled="disabled" :placeholder="placeholder" @@ -74,5 +74,7 @@ export default { diff --git a/src/components/treeSelect/treeSelectNew.vue b/src/components/treeSelect/treeSelectNew.vue index 35f323421..7f5bb827a 100644 --- a/src/components/treeSelect/treeSelectNew.vue +++ b/src/components/treeSelect/treeSelectNew.vue @@ -175,7 +175,7 @@ if (node.level >= 1) { setTimeout(() => { - this.getChildByList(node.data.level,node.data.vppsCode, resolve); + this.getChildByList(node.data.level,node.data.id, resolve); }, 500); return resolve([]); // 加上这个，防止在该节点没有子节点时一直转圈的问题发生。 } @@ -192,8 +192,8 @@ } }) }, - getChildByList( level,vppsCode,resolve) { // 获取子节点请求 - let params = {level : level,vppsCode :vppsCode,type : this.type}; + getChildByList( level,id,resolve) { // 获取子节点请求 + let params = {level : level,id :id,type : this.type}; this.$http.get(this.urlChild, params, { _this: this }, res => { diff --git a/src/pages/details/complianceDetails/index.vue b/src/pages/details/complianceDetails/index.vue index 2cffa194f..01c8770b0 100644 --- a/src/pages/details/complianceDetails/index.vue +++ b/src/pages/details/complianceDetails/index.vue @@ -1,10 +1,9 @@
- + - + {{ rh_pageData.comityFileNum || '-' }} - + {{ rh_pageData.comityFileName || '-' }} - + {{ rh_pageData.comityName || '-' }} - + {{ rh_pageData.comityState || '-' }} - + {{ rh_pageData.comityKind || '-' }} - + {{ rh_pageData.comityMake.makeQualification || '-' }} - + {{ rh_pageData.comityMake.makeRole || '' }} - + {{ rh_pageData.comityMake.makeCost || '-' }} - + {{ rh_pageData.comityMake.makeDuties || '-' }} - + {{ rh_pageData.comityMake.makeTime || '-' }} - + - + - + 基础信息
- + - + {{ rh_pageData.comityFileNum || '-' }} - + {{ rh_pageData.comityFileName || '-' }} - + {{ rh_pageData.comityName || '-' }} - + {{ rh_pageData.comityState || '-' }} - + {{ rh_pageData.comityKind || '-' }} - + {{ rh_pageData.comityMake.makeQualification || '-' }} - + {{ rh_pageData.comityMake.makeRole || '' }} - + {{ rh_pageData.comityMake.makeDuties || '-' }} - + {{ rh_pageData.comityMake.makeCost || '-' }} - + {{ rh_pageData.comityMake.makeTime || '-' }} - + - + - + - + - + - + - + - + - + 基础信息
- + - + {{ rh_pageData.comityFileNum || '-' }} - + {{ rh_pageData.comityFileName || '-' }} - + {{ rh_pageData.comityName || '-' }} - + {{ rh_pageData.comityState || '-' }} - + {{ rh_pageData.comityKind || '-' }} - + {{ rh_pageData.comityMake.makeQualification || '-' }} - + {{ rh_pageData.comityMake.makeRole || '' }} - + {{ rh_pageData.comityMake.makeCost || '-' }} - + {{ rh_pageData.comityMake.makeDuties || '-' }} - + {{ rh_pageData.comityMake.makeTime || '-' }} - + - + - + 基础信息
- + - + {{ rh_pageData.comityFileNum || '-' }} - + {{ rh_pageData.comityFileName || '-' }} - + {{ rh_pageData.comityName || '-' }} - + {{ rh_pageData.comityState || '-' }} - + {{ rh_pageData.comityKind || '-' }} - + {{ rh_pageData.comityMake.makeQualification || '-' }} - + {{ rh_pageData.comityMake.makeRole || '' }} - + {{ rh_pageData.comityMake.makeCost || '-' }} - + {{ rh_pageData.comityMake.makeDuties || '-' }} - + {{ rh_pageData.comityMake.makeTime || '-' }} - + - + - +
基础信息
- + - + {{ rh_pageData.comityFileNum || '-' }} - + {{ rh_pageData.comityFileName || '-' }} - + {{ rh_pageData.comityName || '-' }} - + {{ rh_pageData.comityState || '-' }} - + {{ rh_pageData.comityKind || '-' }} - + {{ rh_pageData.comityMake.makeQualification || '-' }} - + {{ rh_pageData.comityMake.makeRole || '' }} - + {{ rh_pageData.comityMake.makeCost || '-' }} - + {{ rh_pageData.comityMake.makeDuties || '-' }} - + {{ rh_pageData.comityMake.makeTime || '-' }} - + - + - +
基础信息
- + - + {{ hh_pageData.associaName || '-' }} - + {{ hh_pageData.associaNameOne || '-' }} - + {{ hh_pageData.associaNameTwo || '-' }} - + {{ hh_pageData.partPeople || '-' }} - + {{ hh_pageData.meetingStartTime || '-' }} - + {{ hh_pageData.meetingName || '-' }} - +
添加 批量删除 @@ -84,7 +84,7 @@ - + - + - +

参会人

@@ -143,7 +143,7 @@ - +

法规工程师

diff --git a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue index 3e5e65c59..a7e06d66d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue @@ -14,44 +14,44 @@
- + - + {{ hh_pageData.associaName || '-' }} - + {{ hh_pageData.associaNameOne || '-' }} - + {{ hh_pageData.associaNameTwo || '-' }} - + {{ hh_pageData.partPeople || '-' }} - + {{ hh_pageData.meetingStartTime || '-' }} - + {{ hh_pageData.meetingName || '-' }} - + - + - + 基础信息
- + - + - + - + @@ -45,7 +45,7 @@ - + @@ -58,7 +58,7 @@ - + @@ -73,7 +73,7 @@ - + - + - + - + @@ -111,7 +111,7 @@ - + - + 计划内 计划外 diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue index 37b316657..ae2d7683e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue @@ -14,51 +14,51 @@
- + - + {{ ch_pageData.meetingName || '-' }} - + {{ ch_pageData.primaryUnit || '-' }} - + {{ ch_pageData.associaName || '-' }} - + {{ ch_pageData.meetingStartTime || '-' }} - + {{ ch_pageData.meetingPlace || '-' }} - + {{ ch_pageData.feeStand || '-' }} - + {{ ch_pageData.feeKind || '-' }} - + - + {{ ch_pageData.sort || '-'}} - + - + 基础信息
- + - + {{ ch_pageData.meetingName || '-' }} - + {{ ch_pageData.primaryUnit || '-' }} - + {{ ch_pageData.associaName || '-' }} - + {{ ch_pageData.meetingStartTime || '-' }} - + {{ ch_pageData.meetingPlace || '-' }} - + {{ ch_pageData.feeStand || '-' }} - + {{ ch_pageData.feeKind || '-' }} - + - + {{ ch_pageData.sort || '-' }} - + - + - + - + - + - + - + 基础信息
- + - + {{ ch_pageData.meetingName || '-' }} - + {{ ch_pageData.primaryUnit || '-' }} - + {{ ch_pageData.associaName || '-' }} - + {{ ch_pageData.meetingStartTime || '-' }} - + {{ ch_pageData.meetingPlace || '-' }} - + {{ ch_pageData.feeStand || '-' }} - + {{ ch_pageData.feeKind || '-' }} - + - + {{ ch_pageData.sort || '-' }} - + - + 基础信息
- + - + {{ ch_pageData.meetingName || '-' }} - + {{ ch_pageData.primaryUnit || '-' }} - + {{ ch_pageData.associaName || '-' }} - + {{ ch_pageData.meetingStartTime || '-' }} - + {{ ch_pageData.meetingPlace || '-' }} - + {{ ch_pageData.feeStand || '-' }} - + {{ ch_pageData.feeKind || '-' }} - + - + {{ ch_pageData.sort || '-' }} - + - +
基础信息
- + - + {{ ch_pageData.meetingName || '-' }} - + {{ ch_pageData.primaryUnit || '-' }} - + {{ ch_pageData.associaName || '-' }} - + {{ ch_pageData.meetingStartTime || '-' }} - + {{ ch_pageData.meetingPlace || '-' }} - + {{ ch_pageData.feeStand || '-' }} - + {{ ch_pageData.feeKind || '-' }} - + - + {{ ch_pageData.sort || '-' }} - + - + -
+
@@ -178,7 +178,7 @@ @@ -188,7 +188,7 @@ @@ -554,6 +554,7 @@ :drawerTitle="drawerTitle" :show-checkBox="showCheckBox" :url="url" + :type="'car'" :urlChild="urlChild" :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1" :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs" @popoverHideCancel="popoverHideBusVsCancel"> @@ -570,6 +571,7 @@ :drawerTitle="drawerTitle" :show-checkBox="showCheckBox" :url="url" + :type="'truck'" :urlChild="urlChild" :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2" :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs" @popoverHideCancel="popoverHideCarVsCancel"> @@ -1281,6 +1283,7 @@ zbjbdFileList: [], kwjFileList: [], glwjFileList: [], + nodeList5: [], filterText:'', textStatusMap: {}, // 文本状态id与name对应 standardDrawer: false, @@ -1404,9 +1407,9 @@ standSystemName: '',// 标准体系名称 gxhbq: '', // 标签 // 实施日期 - ssrq: '', // 实施日期(标准文本) - xcxssrq: '', // 新车型实施日期(标准文本) - zccssrq: '', // 在产车实施日期(标准文本) + ssrq: [], // 实施日期(标准文本) + xcxssrq: [], // 新车型实施日期(标准文本) + zccssrq: [], // 在产车实施日期(标准文本) ssrqgj: '', // 实施日期(国际) xcxssrqgj: '', // 新车型实施日期(国际) zccssrqgj: '', // 在产车实施日期(国际) @@ -1464,6 +1467,8 @@ zrUserName: '', jlUserId: '', jlUserName: '', + wssmr: '', + wssmrId: '', applyUpdUserId: this.$store.getters.userInfo.userId, applyUpdUserName: this.$store.getters.userInfo.userName, prcCreateUser: this.$store.getters.userInfo.userId, @@ -2799,6 +2804,11 @@ position: relative; overflow: hidden; } + .prc-content-border { + /deep/ .el-input__inner { + padding-left: 30px; + } + } /deep/ .el-dialog__body { padding: 0 20px 10px; color: #606266; diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 4ab48c3bf..585523f05 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -791,6 +791,7 @@ :modalShowFlag="modalShowFlag2" :drawerTitle="drawerTitle" :url="url" + :type="'car'" :urlChild="urlChild" :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1" :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs" @popoverHideCancel="popoverHideBusVsCancel" > @@ -805,6 +806,7 @@ :modalShowFlag="modalShowFlag3" :drawerTitle="drawerTitle" :url="url" + :type="'truck'" :urlChild="urlChild" :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2" :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs" @popoverHideCancel="popoverHideCarVsCancel"> diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue index fdc53a326..d4d2818c9 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue @@ -25,6 +25,22 @@ > + + + + + + 选择已拆分标准 @@ -522,7 +538,7 @@ export default { // 查询相关参数 searching: false, commentText:'', - fileType: 'FBGBJBD', + fileType: '', standardSearch: { standType: "", standName: "" @@ -531,6 +547,7 @@ export default { productLine: '', uname: '', }, + decomposeOptions: [], //分解单来源数据 standardTypeOptions: [ { value: "INLAND", @@ -717,7 +734,12 @@ export default { this.standardSearch.standType = type; }, choiceShow() { - this.ListModel = true; + if(!this.fileType){ + this.$message.warning('请先选择分解单来源') + }else{ + this.getStandData(); + this.ListModel = true; + } }, drawerCheck(data) { var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()); @@ -913,7 +935,7 @@ export default { this.listForm.id = this.selectedList[0].id; this.$http.get("SarStandItems/sar-stand-items/findAllItems", { ids: this.listForm.id, - type: "FBGBJBD" + type: this.fileType }, { _this: this }, res => { @@ -1002,6 +1024,9 @@ export default { this.page = 1; this.getStandData(); }, + fileTypeChange(type){ + this.fileType = type + }, //获取标准数据 getStandData() { this.$http.post("SarStandItems/sar-stand-items/findStand", { @@ -1050,10 +1075,19 @@ export default { this.standStateOptions = res.data.WBZTCLASS; // 文本状态 this.setMap(this.standStateOptions); }); + //查找分解单来源数据 + this.$http.get('lawss/sarStandAttrDetails/getListData',{},{ + _this: this + }, res => { + res.data.forEach(item => { + if(item.sarType === 'STAND' || item.sarType === 'INLAND_STAND' || item.sarType === 'FOREIGN_STAND'){ + this.decomposeOptions.push(item) + } + }) + }) this.getData(); this.getTree(); this.getProductData(); - this.getStandData(); } }; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index 63b699a47..260f2e913 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -25,6 +25,22 @@ > + + + + + + 选择已拆分标准 @@ -261,6 +277,7 @@ custom-class="demo-drawer" >
+ 数据获取中
@@ -500,6 +517,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; import { saveTaskFirst } from "api/process"; +import file from "@/pages/knowledgeGraph/components/file"; export default { name: "xmpgStep1", @@ -516,6 +534,7 @@ export default { satisfyFlag: true, active: "1", standModel: false, + tableLoading: false, sarAccessListDatas: [], productData: [], //添加抽屉的数据 standList: [], //新添加的标准 @@ -524,7 +543,7 @@ export default { drawerTitle: "", //drawer标题 // 查询相关参数 searching: false, - fileType: "FBGBJBD", + fileType: "", projectSearch: { productLine: '', uname: '', @@ -533,6 +552,7 @@ export default { standType: "", standName: "" }, + decomposeOptions: [], //分解单数据 standardTypeOptions: [ { value: "INLAND", @@ -710,7 +730,13 @@ export default { this.standardSearch.standType = type; }, choiceShow() { - this.ListModel = true; + if(!this.fileType){ + this.$message.warning('请先选择分解单来源') + }else{ + this.getStandData(); + this.ListModel = true; + } + }, drawerCheck(data) { var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()); @@ -906,7 +932,7 @@ export default { this.listForm.id = this.selectedList[0].id; this.$http.get("SarStandItems/sar-stand-items/findAllItems", { ids: this.listForm.id, - type: "FBGBJBD" + type: this.fileType }, { _this: this }, res => { @@ -999,8 +1025,12 @@ export default { this.page = 1; this.getStandData(); }, + fileTypeChange(type){ + this.fileType = type + }, //获取标准数据 getStandData() { + this.tableLoading = true this.$http.post("SarStandItems/sar-stand-items/findStand", { page: this.page, size: this.pageSize, @@ -1011,6 +1041,7 @@ export default { }, res => { this.sarAccessListDatas = res.records; this.total = res.total; + this.tableLoading = false }, e => { }); @@ -1047,9 +1078,18 @@ export default { this.standStateOptions = res.data.WBZTCLASS; // 文本状态 this.setMap(this.standStateOptions); }); + //查找分解单来源数据 + this.$http.get('lawss/sarStandAttrDetails/getListData',{},{ + _this: this + }, res => { + res.data.forEach(item => { + if(item.sarType === 'STAND' || item.sarType === 'INLAND_STAND' || item.sarType === 'FOREIGN_STAND'){ + this.decomposeOptions.push(item) + } + }) + }) this.getTree(); this.getProductData(); - this.getStandData(); } }; diff --git a/src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue b/src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue index afc3541ea..9761463ac 100644 --- a/src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue +++ b/src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue @@ -1,16 +1,16 @@