From 7285c160d2bab2545993f9bee2dd6a8520638287 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Wed, 29 Dec 2021 09:36:26 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E6=8B=86=E5=88=86=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E4=B8=8E=E7=BC=96=E8=BE=91=E6=A1=86=E4=B8=80?= =?UTF-8?q?=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standAutoSplit/pages/itemSplitInfo.vue | 215 +++++++++++++++--- 1 file changed, 179 insertions(+), 36 deletions(-) diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue index 7291d830e..e996b9f6f 100644 --- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue +++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue @@ -319,7 +319,7 @@ @close="showItemInfoModal = false" class="demo-drawer" > -
+ +
+ --> +
+ + + + + + + + + + 内容简介 +
+
+ + + + + + +
+ +
{{item.itemContent}}
+
+ + +
+ +
+
+
+ + +
+
+
@@ -1873,35 +1989,6 @@ export default { }) } }, - // 获取关联文件名称 - getFileName (row) { - this.referanceStandList = [] - if (row.referenceStand != null && row.referenceStand !== '') { - this.referanceStandList = row.referenceStand.split(',') - } - if (row.relevanceFile === null) { - this.standItemEO.FileNameList = [] - this.showItemInfoModal = true - return false - } else { - this.$http.get('att/attFile/getMultiFileInfos', { - fileIds: row.relevanceFile - }, { - _this: this - }, res => { - // let fileNameList = [] - // this.standItemEO.relevanceFileName = '' - // res.data.map((item) => { - // fileNameList.push(item.oldFileName) - // }) - // this.standItemEO.relevanceFileName = fileNameList.join('；') - this.standItemEO.FileNameList = res.data - this.showItemInfoModal = true - }, e => { - this.showItemInfoModal = true - }) - } - }, addSpecialRequest (item, index) { let specialObj = { description: '', @@ -2084,7 +2171,7 @@ export default { // this.clause(command[0]) // break case '属性': - this.attribute(command[0]) + this.attribute(command[2], command[0]) break case '编辑': this.editLawsInfo(command[2], command[0]) @@ -2154,9 +2241,65 @@ export default { this.showItemRequestDetails() }, // 点击表格 属性按钮事件 - attribute (row) { - this.getFileName(row) - this.showItemInfoEO = JSON.parse(JSON.stringify(row)) + attribute (index, row) { + this.isSubmit = false + this.standItemEO.id = row.id + this.showItemInfoModal = true + this.saveEditItemIndex = index + this.standItemEO = JSON.parse(JSON.stringify(row)) + if (this.standItemEO.applyArctic && !(this.standItemEO.applyArctic instanceof Array)) { + let a = this.standItemEO.applyArctic.split(',') + this.standItemEO.applyArctic = a // 适用车型 + } + if (this.standItemEO.newcarPutTime != null && this.standItemEO.newcarPutTime !== '') { + this.standItemEO.newcarPutTime = this.standItemEO.newcarPutTime.replace(new RegExp(/-/gm), '/') + this.standItemEO.newcarPutTime = new Date(this.standItemEO.newcarPutTime) + } + if (this.standItemEO.productPutTime != null && this.standItemEO.productPutTime !== '') { + this.standItemEO.productPutTime = this.standItemEO.productPutTime.replace(new RegExp(/-/gm), '/') + this.standItemEO.productPutTime = new Date(this.standItemEO.productPutTime) + } + if (this.standItemEO.paramsList == null || this.standItemEO.paramsList.length < 1) { + let specialObj = { + description: '', + figure: '' + } + this.standItemEO.paramsList.push(specialObj) + } + this.standItemEO.ZRBM = this.standItemEO.responsibleUnit + this.saveItemId = row.id + this.showUpdateItemInfo() + // this.getFileName(row) + // this.showItemInfoEO = JSON.parse(JSON.stringify(row)) + }, + // 获取关联文件名称 + getFileName (row) { + this.referanceStandList = [] + if (row.referenceStand != null && row.referenceStand !== '') { + this.referanceStandList = row.referenceStand.split(',') + } + if (row.relevanceFile === null) { + this.standItemEO.FileNameList = [] + this.showItemInfoModal = true + return false + } else { + this.$http.get('att/attFile/getMultiFileInfos', { + fileIds: row.relevanceFile + }, { + _this: this + }, res => { + // let fileNameList = [] + // this.standItemEO.relevanceFileName = '' + // res.data.map((item) => { + // fileNameList.push(item.oldFileName) + // }) + // this.standItemEO.relevanceFileName = fileNameList.join('；') + this.standItemEO.FileNameList = res.data + this.showItemInfoModal = true + }, e => { + this.showItemInfoModal = true + }) + } }, getDicTypeName(opt, type) { const _type = type ? type.split(',') : [] From 54c50bd0b637cbec6cb1676efc4015f3ea1ac4f6 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Wed, 29 Dec 2021 09:54:38 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg2/step1-12.vue | 29 ++++--------------- .../pages/creatProcess/xmpg2/step10.vue | 5 ++++ .../pages/creatProcess/xmpg2/step11.vue | 5 ++++ .../pages/creatProcess/xmpg2/step12.vue | 5 ++++ .../pages/creatProcess/xmpg2/step7.vue | 29 ++++--------------- .../pages/creatProcess/xmpg2/step8.vue | 5 ++++ .../pages/creatProcess/xmpg2/step9.vue | 5 ++++ 7 files changed, 35 insertions(+), 48 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue index b69e1ff75..0e6f8e884 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue @@ -155,6 +155,8 @@ background :page-sizes="[20, 40, 60]" :total="total" + :page-size="pageSize" + @size-change="handleSizeChange" @current-change="handleCurrentChange" > @@ -297,30 +299,6 @@ export default { }); window.open(routeUrl.href, "_blank"); }, - //查询项目下的标准 - getStandData() { - this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", { - 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 => { - if(item.attrInfoMap === null){ - this.$set(item, "ZCCSSRQ", ''); - this.$set(item, "XCXSSRQ", ''); - }else{ - this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ); - this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ); - } - }) - this.totalNo = res.data.count; - }, e => { - }); - }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { prcNum: this.$route.query.prcNum, @@ -398,6 +376,9 @@ export default { handleCurrentChange(currentPage) { this.currentPage = currentPage; }, + handleSizeChange(size) { + this.pageSize = size; + }, //驳回事件 beforeBack() { if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue index 89d261398..d53a543b5 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue @@ -200,6 +200,8 @@ background :page-sizes="[20, 40, 60]" :total="total" + :page-size="pageSize" + @size-change="handleSizeChange" @current-change="handleCurrentChange" > @@ -551,6 +553,9 @@ export default { handleCurrentChange(currentPage) { this.currentPage = currentPage; }, + handleSizeChange(size) { + this.pageSize = size; + }, }, computed: { listNoDataText() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue index 4df5c1836..984ad8d2b 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue @@ -200,6 +200,8 @@ background :page-sizes="[20, 40, 60]" :total="total" + :page-size="pageSize" + @size-change="handleSizeChange" @current-change="handleCurrentChange" > @@ -526,6 +528,9 @@ export default { handleCurrentChange(currentPage) { this.currentPage = currentPage; }, + handleSizeChange(size) { + this.pageSize = size; + }, }, computed: { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue index 775f91db2..fba54c8cb 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue @@ -200,6 +200,8 @@ background :page-sizes="[20, 40, 60]" :total="total" + :page-size="pageSize" + @size-change="handleSizeChange" @current-change="handleCurrentChange" > @@ -551,6 +553,9 @@ export default { handleCurrentChange(currentPage) { this.currentPage = currentPage; }, + handleSizeChange(size) { + this.pageSize = size; + }, }, computed: { listNoDataText() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue index 70d0b79c0..2e7651a5d 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue @@ -158,6 +158,8 @@ background :page-sizes="[20, 40, 60]" :total="total" + :page-size="pageSize" + @size-change="handleSizeChange" @current-change="handleCurrentChange" > @@ -367,30 +369,6 @@ export default { }); window.open(routeUrl.href, "_blank"); }, - //查询项目下的标准 - getStandData() { - this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", { - 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 => { - if (item.attrInfoMap === null) { - this.$set(item, "ZCCSSRQ", ""); - this.$set(item, "XCXSSRQ", ""); - } else { - this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ); - this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ); - } - }); - this.totalNo = res.data.count; - }, e => { - }); - }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { prcNum: this.$route.query.prcNum, @@ -509,6 +487,9 @@ export default { handleCurrentChange(currentPage) { this.currentPage = currentPage; }, + handleSizeChange(size) { + this.pageSize = size; + }, }, computed: { listNoDataText() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue index e2f7bb78a..8efce2454 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue @@ -198,6 +198,8 @@ background :page-sizes="[20, 40, 60]" :total="total" + :page-size="pageSize" + @size-change="handleSizeChange" @current-change="handleCurrentChange" > @@ -549,6 +551,9 @@ export default { handleCurrentChange(currentPage) { this.currentPage = currentPage; }, + handleSizeChange(size) { + this.pageSize = size; + }, }, computed: { listNoDataText() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue index ccb983998..9fac7b4aa 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue @@ -200,6 +200,8 @@ background :page-sizes="[20, 40, 60]" :total="total" + :page-size="pageSize" + @size-change="handleSizeChange" @current-change="handleCurrentChange" > @@ -551,6 +553,9 @@ export default { handleCurrentChange(currentPage) { this.currentPage = currentPage; }, + handleSizeChange(size) { + this.pageSize = size; + }, }, computed: { listNoDataText() { From ad82276e182ad4ff3fc8f6ea893a8506a958cc5f Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Wed, 29 Dec 2021 10:45:19 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E5=85=A5?= =?UTF-8?q?=E5=BA=93=20-=20=E6=98=AF=E5=90=A6=E7=BA=B3=E5=85=A5=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E6=B8=85=E5=8D=95=20-=20=E6=B7=BB=E5=8A=A0=E5=8F=AF?= =?UTF-8?q?=E9=87=8D=E7=BD=AE=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 4de50bcb7..28587330f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -126,6 +126,7 @@ 是 否 + @@ -3122,6 +3123,9 @@ export default { @import '~@/assets/styles/style'; .bzrkStep1 { + /deep/ .el-button--mini.is-circle { + padding: 2px; + } /deep/ .prc-content-border .form-item-disabled .el-form-item__content .el-input .el-input__inner { width: 70%; } From 3917ef308faba61e718e4045a3f7f460a32410b4 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Wed, 29 Dec 2021 10:47:35 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../details/otherStandardDetails/index.vue | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 233d6e12a..1404296b9 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -90,23 +90,23 @@ - + + {{ file.oldFileName }} + + + Date: Wed, 29 Dec 2021 11:27:19 +0800 Subject: [PATCH 05/11] feat: There is no way the,buss plan add bussSort --- .../enterpriseStandardPlan/index.vue | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue index d93411e8d..ef5a30c9e 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -90,6 +90,12 @@ align="center" width="55"> + + + + + + + { this.QCDWList = res.data.QCDW // 起草单位 this.standSystemOptions = res.data.TXLBBUSS // 体系结构 + this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别 this.BZList = res.data.ENERGYTYPES }, e => { }) From f8f0b695629f5650bdf8a8916d84cd4a56d830c0 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 29 Dec 2021 13:51:26 +0800 Subject: [PATCH 06/11] feat: There is no way the,buss hh process --- .../processCenter/pages/creatProcess/qbrk/common/formList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue index c927509da..8f4833d00 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue @@ -305,7 +305,7 @@ export default { }, summaryFileList: { type: Array, - required: true + required: false }, disabledState: { type: Boolean, From 37e1fb3b9417f442f49746666f54f459ec840104 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Wed, 29 Dec 2021 14:06:24 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E4=B9=8B=E5=89=8D=E4=B8=8D=E5=8F=AF=E9=80=89?= =?UTF-8?q?=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/localTool/standCalendar/index.vue | 25 +++++++++++++++++-- .../pages/creatProcess/bzhHy-ch/step1.vue | 9 ++++++- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/src/pages/localTool/standCalendar/index.vue b/src/pages/localTool/standCalendar/index.vue index 24e890362..a00639dc4 100644 --- a/src/pages/localTool/standCalendar/index.vue +++ b/src/pages/localTool/standCalendar/index.vue @@ -174,10 +174,11 @@ - + @@ -339,7 +340,13 @@ export default { // 议题选中时储存数组 deleteTable: [], loading: false, - dialogTitle: '' + dialogTitle: '', + + datePicker: { + disabledDate(date) { + return date.getTime() < Date.now() - 24 * 60 * 60 * 1000 + } + } } }, mounted() { @@ -819,6 +826,19 @@ export default { @import '~@/assets/styles/style'; .standCalendar { + .content_form { + /deep/.el-input--suffix .el-input__inner { + border: 0; + } + label-input-form { + .picker_style { + margin-bottom: 0; + min-height: 50px; + line-height: 50px; + border-bottom: 1px dashed #e5e5e5; + } + } + } .date-picker { .item { /deep/ .el-input { @@ -874,6 +894,7 @@ export default { margin-top: 50px; } + .card_info { height: 190px; margin-top: 10px; diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue index 31875535c..ce92499e4 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue @@ -82,6 +82,7 @@ @@ -453,7 +454,13 @@ export default { isSubmit: false, saveLoading: false, commentInfo: '', - bpnId: '' + bpnId: '', + // 设置当前日期之前不可选择 + datePicker: { + disabledDate(date) { + return date.getTime() < Date.now() - 24 * 60 * 60 * 1000 + } + } } }, mounted() { From abb197c50905792482923a171629be6b1605e942 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 29 Dec 2021 14:09:25 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E7=AE=A1=E6=8E=A7=E7=AB=8B=E9=A1=B9?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qbzxdjhgk/component/cancel.vue | 90 +++- .../qbzxdjhgk/component/delay.vue | 94 +++- .../qbzxdjhgk/component/establish.vue | 476 +++++++++++++++--- .../qbzxdjhgk/component/merge.vue | 387 +++++++++++++- .../qbzxdjhgk/component/rename.vue | 76 +++ .../pages/creatProcess/qbzxdjhgk/step1-5.vue | 82 ++- .../pages/creatProcess/qbzxdjhgk/step1.vue | 20 +- .../pages/creatProcess/qbzxdjhgk/step2.vue | 68 +++ .../pages/creatProcess/qbzxdjhgk/step3.vue | 67 +++ .../pages/creatProcess/qbzxdjhgk/step4.vue | 67 +++ .../pages/creatProcess/qbzxdjhgk/step5.vue | 67 +++ 11 files changed, 1377 insertions(+), 117 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue index e77ff7e04..91ba66aff 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue @@ -54,13 +54,26 @@ placeholder="请选择初稿完成时间"> - + + disabled + v-model="qbfsForm.rqbName" + placeholder="请输入企业标准" + :maxlength="500"/> + + + + + + @@ -116,6 +129,52 @@ > + + + + + + + + + + + + + + + + + + + + @@ -268,12 +327,13 @@ export default { return{ formRules: { cancelReason: [ - {required: true, message: '请输入延期原因', trigger:'blur'}, + {required: true, message: '请输入取消原因', trigger:'blur'}, ] }, ListModel: false, standinfoList: [], + BZList: [], page: 1, total: 0, pageSize: this.$store.getters.userInfo.configContent, @@ -311,6 +371,12 @@ export default { if(!this.qbfsForm.passFlag){ this.qbfsForm = {} } + //查询下拉框数据 + this.$http.get('sys/dictype/getDicTypeListCode', '',{ + _this: this + }, res => { + this.BZList = res.data.ENERGYTYPES //标准范围 + }) }, methods: { validateForm () { @@ -372,6 +438,16 @@ export default { this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (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(',') + } + 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 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 33119c5c4..63da88cbe 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue @@ -54,6 +54,27 @@ placeholder="请选择初稿完成时间"> + + + + + + + + + - - - @@ -124,6 +137,45 @@ > + + + + + + + + + + + + + + + + + + + + + @@ -282,6 +342,7 @@ export default { props: ['message'], data(){ return{ + BZList: [], formRules: { yqDraftTime: [ { required: true, message: '请选择延期后初稿完成时间', trigger: 'blur' }, @@ -332,6 +393,12 @@ export default { if(!this.qbfsForm.passFlag){ this.qbfsForm = {} } + //查询下拉框数据 + this.$http.get('sys/dictype/getDicTypeListCode', '',{ + _this: this + }, res => { + this.BZList = res.data.ENERGYTYPES //标准范围 + }) }, methods: { validateForm () { @@ -378,6 +445,7 @@ export default { }, //带入标准 OkDrawer(){ + console.log(this.selectList); if(this.selectList.length > 1){ this.$message.warning('您只能带入一条标准') }else if(this.selectList.length < 1){ @@ -393,6 +461,16 @@ export default { this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (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(',') + } + 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 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 6bed46d34..a952cac68 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -1,5 +1,5 @@ @@ -2305,6 +2305,7 @@ export default { standNature: '',//标准性质 textStatus: '',//文本状态 synopsis: '', // 内容摘要 + CLLX: '' // 适用车型 }, // 分页查询过程中用到的对象 diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index f897487fb..665448eeb 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -619,7 +619,7 @@