From e17787ccbd998c9758956aedcf1e491ce27b2206 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Mon, 27 Jul 2020 14:46:34 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90PC=E7=AB=AF=E4=BC=98=E5=8C=96=E3=80=91?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E4=BC=98=E5=8C=96=EF=BC=88=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B9=E6=95=B0=E6=8D=AE=E9=94=99=E4=B9=B1?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=EF=BC=89-=E7=8E=8B?=
 =?UTF-8?q?=E5=85=AC=E5=B3=B0-2020-07-27?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/sys/dept-add-or-update.vue |  1 -
 src/views/modules/sys/dict-add-or-update.vue |  2 +-
 src/views/modules/sys/dict.vue               | 21 +++++++++++++++-----
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/views/modules/sys/dept-add-or-update.vue b/src/views/modules/sys/dept-add-or-update.vue
index 79fb3497..c15f9666 100644
--- a/src/views/modules/sys/dept-add-or-update.vue
+++ b/src/views/modules/sys/dept-add-or-update.vue
@@ -6,7 +6,6 @@
     <el-form :model="dataForm"
              :rules="dataRule"
              ref="dataForm"
-             @keyup.enter.native="dataFormSubmitHandle()"
              label-width="120px">
       <el-form-item prop="name"
                     :label="$t('dept.name')">
diff --git a/src/views/modules/sys/dict-add-or-update.vue b/src/views/modules/sys/dict-add-or-update.vue
index 3292949a..2bf24ac8 100644
--- a/src/views/modules/sys/dict-add-or-update.vue
+++ b/src/views/modules/sys/dict-add-or-update.vue
@@ -1,6 +1,6 @@
 <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 :model="dataForm" :rules="dataRule" ref="dataForm" label-width="120px">
       <el-form-item prop="dictName" :label="$t('dict.dictName')">
         <el-input v-model="dataForm.dictName" :placeholder="$t('dict.dictName')"></el-input>
       </el-form-item>
diff --git a/src/views/modules/sys/dict.vue b/src/views/modules/sys/dict.vue
index 33c52dd6..fb086c35 100644
--- a/src/views/modules/sys/dict.vue
+++ b/src/views/modules/sys/dict.vue
@@ -17,17 +17,17 @@
                     @keyup.native="btKeyUpDictType"
                     clearable></el-input>
         </el-form-item>
-        <el-form-item v-if="dataForm.pid !== '0'">
+        <el-form-item v-if="dataForm.pid !== '0'" label='字典值'>
           <el-input v-model="dataForm.dictValue"
                     :placeholder="$t('dict.dictValue')"
                     clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataListSearch()" type='primary'>{{ $t('query') }}</el-button>
+          <el-button @click="getDataListSearch()" type='success'>{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('sys:dict:save')"
-                     type="success"
+                     type="primary"
                      @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <!-- <el-form-item>
@@ -143,16 +143,18 @@ export default {
   components: {
     AddOrUpdate
   },
-  activated () {
+  created: function () {
     // 通过路由参数pid, 控制列表请求操作
     this.dataForm.pid = this.$route.params.pid || '0'
     if (this.dataForm.pid !== '0') {
       this.mixinViewModuleOptions.getDataListURL = '/sys/dict/list'
       this.mixinViewModuleOptions.getDataListIsPage = false
-      this.dataForm.dictType = this.$route.params.type || ''
     }
     this.getDataList()
   },
+  activated(){
+    this.getDataList()
+  },
   methods: {
     // 子级
     childHandle (row) {
@@ -195,9 +197,18 @@ export default {
     addOrUpdateHandle (row = {}) {
       this.addOrUpdateVisible = true
       this.$nextTick(() => {
+        var dictTypeSubStr = ''
+        if (this.dataForm.pid !== '0') {
+          var titleName = `${this.$route.meta.title}`
+          var startIndex = titleName.indexOf('- ') === -1 ? 0 : titleName.indexOf('- ')
+          dictTypeSubStr = titleName.substr(startIndex,titleName.length).replace('- ','')
+        }
         this.$refs.addOrUpdate.dataForm.id = row.id
         this.$refs.addOrUpdate.dataForm.pid = this.dataForm.pid
         this.$refs.addOrUpdate.dataForm.dictType = row.dictType || this.dataForm.dictType || ''
+        if (this.$refs.addOrUpdate.dataForm.dictType === null || this.$refs.addOrUpdate.dataForm.dictType === '') {
+          this.$refs.addOrUpdate.dataForm.dictType = dictTypeSubStr
+        }
         this.$refs.addOrUpdate.init()
       })
     }