From 7a9103ad9b09068d2d9bb73fb16d22c87a530b7e Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 22 Dec 2021 14:44:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=AD=97=E5=85=B8=E9=A1=B9?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=94=AF=E6=8C=81=20=E7=88=B6=E7=BA=A7Id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-oper-web/src/i18n/zh-CN.js              |  1 +
 epmet-oper-web/src/i18n/zh-TW.js              |  1 +
 .../modules/sys/dict-data-add-or-update.vue   | 34 +++++++++++++++++++
 .../src/views/modules/sys/dict-data.vue       | 16 ++++++---
 .../src/views/modules/sys/dict-type.vue       |  3 +-
 5 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/epmet-oper-web/src/i18n/zh-CN.js b/epmet-oper-web/src/i18n/zh-CN.js
index 5810501..5d9b1d5 100644
--- a/epmet-oper-web/src/i18n/zh-CN.js
+++ b/epmet-oper-web/src/i18n/zh-CN.js
@@ -290,6 +290,7 @@ t.dict.dictName = '字典名称'
 t.dict.dictType = '字典类型'
 t.dict.dictLabel = '字典标签'
 t.dict.dictValue = '字典值'
+t.dict.dictPValue = '父级字典值'
 t.dict.sort = '排序'
 t.dict.remark = '备注'
 t.dict.createDate = '创建时间'
diff --git a/epmet-oper-web/src/i18n/zh-TW.js b/epmet-oper-web/src/i18n/zh-TW.js
index 6c706df..068726a 100644
--- a/epmet-oper-web/src/i18n/zh-TW.js
+++ b/epmet-oper-web/src/i18n/zh-TW.js
@@ -288,6 +288,7 @@ t.dict.dictName = '字典名稱'
 t.dict.dictType = '字典類型'
 t.dict.dictLabel = '字典標籤'
 t.dict.dictValue = '字典值'
+t.dict.dictPValue = '父級字典值'
 t.dict.sort = '排序'
 t.dict.remark = '備註'
 t.dict.createDate = '創建時間'
diff --git a/epmet-oper-web/src/views/modules/sys/dict-data-add-or-update.vue b/epmet-oper-web/src/views/modules/sys/dict-data-add-or-update.vue
index 96a3f34..a0177f2 100644
--- a/epmet-oper-web/src/views/modules/sys/dict-data-add-or-update.vue
+++ b/epmet-oper-web/src/views/modules/sys/dict-data-add-or-update.vue
@@ -1,6 +1,17 @@
 <template>
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+      <el-form-item :label="$t('dict.dictPValue')">
+        <el-select v-model="dataForm.dictPValue"
+                   placeholder="请选择"
+                   class="overtime-input">
+          <el-option v-for="item in pDictList"
+                     :key="item.value"
+                     :label="item.label"
+                     :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item prop="dictValue" :label="$t('dict.dictValue')">
         <el-input v-model="dataForm.dictValue" :placeholder="$t('dict.dictValue')"></el-input>
       </el-form-item>
@@ -27,11 +38,14 @@ export default {
   data () {
     return {
       visible: false,
+      pDictList: [],
       dataForm: {
         id: '',
         dictTypeId: '',
         dictLabel: '',
         dictValue: '',
+        dictPValue: '',
+        dictType: '',
         sort: 0,
         remark: ''
       }
@@ -57,9 +71,11 @@ export default {
       this.visible = true
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
+        this.dataForm.dictPValue = ''
         if (this.dataForm.id) {
           this.getInfo()
         }
+        this.initPDictList()
       })
     },
     // 获取信息
@@ -74,12 +90,30 @@ export default {
         }
       }).catch(() => {})
     },
+    //获取客户数据
+    async initPDictList () {
+      let params = {
+        dictType: this.dataForm.dictType
+      }
+      this.$http
+          .post('/sys/dict/data/dictlist', params)
+          .then(({ data: res }) => {
+            if (res.code === 0) {
+              this.pDictList = res.data
+              console.log(this.pDictList)
+            }
+          })
+    },
     // 表单提交
     dataFormSubmitHandle: debounce(function () {
       this.$refs['dataForm'].validate((valid) => {
         if (!valid) {
           return false
         }
+        console.log('===',this.dataForm.dictPValue=== '');
+        if (this.dataForm.dictPValue === ''){
+          this.dataForm.dictPValue = null;
+        }
         this.$http[!this.dataForm.id ? 'post' : 'put']('/sys/dict/data', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
diff --git a/epmet-oper-web/src/views/modules/sys/dict-data.vue b/epmet-oper-web/src/views/modules/sys/dict-data.vue
index f602421..de5f2d8 100644
--- a/epmet-oper-web/src/views/modules/sys/dict-data.vue
+++ b/epmet-oper-web/src/views/modules/sys/dict-data.vue
@@ -22,9 +22,9 @@
           <el-button type="primary"
                      @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
-        <el-form-item>
-          <el-buttontype="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-buttontype=>
-        </el-form-item>
+<!--        <el-form-item>
+          <el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>-->
       </el-form>
       <el-table v-loading="dataListLoading"
                 :data="dataList"
@@ -44,6 +44,10 @@
                          :label="$t('dict.dictLabel')"
                          header-align="center"
                          align="center"></el-table-column>
+        <el-table-column prop="dictPValue"
+                         :label="$t('dict.dictPValue')"
+                         header-align="center"
+                         align="center"></el-table-column>
         <el-table-column prop="sort"
                          :label="$t('dict.sort')"
                          sortable="custom"
@@ -107,7 +111,8 @@ export default {
       dataForm: {
         dictTypeId: '0',
         dictLabel: '',
-        dictValue: ''
+        dictValue: '',
+        dictType: ''
       }
     }
   },
@@ -116,7 +121,9 @@ export default {
   },
   created () {
     this.dataForm.dictTypeId = this.$route.params.dictTypeId || '0'
+    this.dataForm.dictType = this.$route.params.dictType || '0'
     this.getDataList()
+    console.log(this.dataForm)
   },
   methods: {
     // 新增 / 修改
@@ -125,6 +132,7 @@ export default {
       this.$nextTick(() => {
         this.$refs.addOrUpdate.dataForm.id = id
         this.$refs.addOrUpdate.dataForm.dictTypeId = this.dataForm.dictTypeId
+        this.$refs.addOrUpdate.dataForm.dictType = this.dataForm.dictType
         this.$refs.addOrUpdate.init()
       })
     }
diff --git a/epmet-oper-web/src/views/modules/sys/dict-type.vue b/epmet-oper-web/src/views/modules/sys/dict-type.vue
index 5f5c945..a8e3553 100644
--- a/epmet-oper-web/src/views/modules/sys/dict-type.vue
+++ b/epmet-oper-web/src/views/modules/sys/dict-type.vue
@@ -129,7 +129,8 @@ export default {
         title: `${this.$route.meta.title} - ${row.dictType}`,
         path: 'sys/dict-data',
         params: {
-          dictTypeId: row.id
+          dictTypeId: row.id,
+          dictType:row.dictType
         }
       }
       // 动态路由