diff --git a/src/components/treeSelect/treeSelect.vue b/src/components/treeSelect/treeSelect.vue index 2998f54b5..15f13c20d 100644 --- a/src/components/treeSelect/treeSelect.vue +++ b/src/components/treeSelect/treeSelect.vue @@ -22,6 +22,7 @@ 0) { if (this.multiple) { this.defaultCheckedKeys = this.checkedKeys; diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 44ea1b563..a87ee6f2d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -114,15 +114,10 @@ - - - + - - - + - { this.form = JSON.parse(JSON.stringify(item)) + this.defaultCheckedKeys = [this.form.standSystem]; this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN' this.form.prcNum = this.prcNum this.form.prcName = this.prcName diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index 4107bd216..b60c5d0f9 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -119,15 +119,11 @@ - - - + { this.form = JSON.parse(JSON.stringify(item)) + this.defaultCheckedKeys = [this.form.standSystem]; this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN' this.form.prcNum = this.prcNum this.form.prcName = this.prcName this.form['id'] = item.id + this.$forceUpdate() }) }, closeDrawer() { @@ -886,7 +896,6 @@ export default { }, mounted () { this.processTable() - this.getData() this.$http.get('sys/dictype/getDicTypeListCode', '', { _this: this }, res => { @@ -894,6 +903,7 @@ export default { this.standNatureOptions = res.data.SARPROPERTY // 标准性质 this.standStateOptions = res.data.WBZTCLASS // 文本状态 this.standSystemOptions = res.data.BZTXCLASS // 标准体系 + console.log(this.standSystemOptions) this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型 this.categoryOptions = res.data.NYLXCLASS // 能源类型 this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 @@ -902,8 +912,10 @@ export default { this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.txlbOptions = res.data.TXLBCLASS // 体系类别 + this.getData() }) - } + this.$forceUpdate() + }, } diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index e970a22cc..4be4dffe5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -114,15 +114,10 @@ - - - + { this.form = JSON.parse(JSON.stringify(item)) + this.defaultCheckedKeys = [this.form.standSystem]; this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN' this.form.prcNum = this.prcNum this.form.prcName = this.prcName this.form['id'] = item.id + this.$forceUpdate() }) }, closeDrawer() { @@ -861,6 +875,9 @@ export default { }) }, }, + created(){ + this.getData() + }, mounted () { this.processTable() this.getData() @@ -879,7 +896,15 @@ export default { this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.txlbOptions = res.data.TXLBCLASS // 体系类别 + this.treeStatus = true }) + }, + watch:{ + form(val){ + if(this.form){ + + } + } } } diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue index a48901ce0..16a110542 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue @@ -119,15 +119,10 @@ - - - + { this.form = JSON.parse(JSON.stringify(item)) + this.defaultCheckedKeys = [this.form.standSystem]; this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN' this.form.prcNum = this.prcNum this.form.prcName = this.prcName diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 266ed3eb0..42a67b79e 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -1132,7 +1132,7 @@ export default { }, productModelAdd: { id : "", - sorDivide : null, + sorDivide : "INLAND_STAND", menuName : "", parentId : null, parentIds : null, @@ -1654,8 +1654,7 @@ export default { }, methods: { popoverHide (checkedIds, checkedData) { - console.log(checkedIds); - console.log(checkedData); + console.log(checkedData) this.sarStandardsInfoEO.standSystem = checkedData.id console.log(this.sarStandardsInfoEO.standSystem); }, @@ -1894,6 +1893,7 @@ export default { const [displayLocation] = values const formFieldList = this.formFieldList this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item)) + console.log(this.sarStandardsInfoEO) this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem]; this.sarStandardsInfoEO.standSort = item.standSort if (this.sarStandardsInfoEO.putTime != null && this.sarStandardsInfoEO.putTime !== '') { diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index cb3ee2016..988292524 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -13,6 +13,32 @@ @node-click="treeClick" default-expand-all :expand-on-click-node="false"> + + {{ node.label}} + + + 新增 + + + 编辑 + + + 删除 + + +
@@ -88,23 +114,23 @@ size="mini" @click="exportStandard()" title="不勾选时默认导出所有筛选项;勾选时仅导出勾选项" - v-btn-permission="'J2X4KHNN4N'">导出 + >导出 批量删除 + >批量删除 移除标准 + >移除标准 模板下载 + >模板下载 配置标准 + >配置标准
@@ -200,7 +226,7 @@ > 取消收藏 - 编辑 + 编辑 分享 删除 @@ -303,86 +329,132 @@ :rules="sarStandardsInfoRules" class="label-input-form" > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{ opt.label }} - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + +