From 1d2f37bfe138fcbfa316d817a8b8fbccdf0ba2be Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期一, 15 八月 2022 12:07:45 +0800
Subject: [PATCH] 修复图片预览组件src属性为null值控制台报错问题(I5KBAS)

---
 src/views/system/dict/data.vue |   28 ++++++++++++----------------
 1 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
index 2a4c501..12c6492 100644
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/data.vue
@@ -2,7 +2,7 @@
    <div class="app-container">
       <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
          <el-form-item label="瀛楀吀鍚嶇О" prop="dictType">
-            <el-select v-model="queryParams.dictType" size="small">
+            <el-select v-model="queryParams.dictType">
                <el-option
                   v-for="item in typeOptions"
                   :key="item.dictId"
@@ -16,12 +16,11 @@
                v-model="queryParams.dictLabel"
                placeholder="璇疯緭鍏ュ瓧鍏告爣绛�"
                clearable
-               size="small"
                @keyup.enter="handleQuery"
             />
          </el-form-item>
          <el-form-item label="鐘舵��" prop="status">
-            <el-select v-model="queryParams.status" placeholder="鏁版嵁鐘舵��" clearable size="small">
+            <el-select v-model="queryParams.status" placeholder="鏁版嵁鐘舵��" clearable>
                <el-option
                   v-for="dict in sys_normal_disable"
                   :key="dict.value"
@@ -31,8 +30,8 @@
             </el-select>
          </el-form-item>
          <el-form-item>
-            <el-button type="primary" icon="Search" size="mini" @click="handleQuery">鎼滅储</el-button>
-            <el-button icon="Refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+            <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
+            <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
          </el-form-item>
       </el-form>
 
@@ -42,7 +41,6 @@
                type="primary"
                plain
                icon="Plus"
-               size="mini"
                @click="handleAdd"
                v-hasPermi="['system:dict:add']"
             >鏂板</el-button>
@@ -52,7 +50,6 @@
                type="success"
                plain
                icon="Edit"
-               size="mini"
                :disabled="single"
                @click="handleUpdate"
                v-hasPermi="['system:dict:edit']"
@@ -63,7 +60,6 @@
                type="danger"
                plain
                icon="Delete"
-               size="mini"
                :disabled="multiple"
                @click="handleDelete"
                v-hasPermi="['system:dict:remove']"
@@ -74,7 +70,6 @@
                type="warning"
                plain
                icon="Download"
-               size="mini"
                @click="handleExport"
                v-hasPermi="['system:dict:export']"
             >瀵煎嚭</el-button>
@@ -84,7 +79,6 @@
                type="warning"
                plain
                icon="Close"
-               size="mini"
                @click="handleClose"
             >鍏抽棴</el-button>
          </el-col>
@@ -116,14 +110,12 @@
          <el-table-column label="鎿嶄綔" align="center" width="150" class-name="small-padding fixed-width">
             <template #default="scope">
                <el-button
-                  size="mini"
                   type="text"
                   icon="Edit"
                   @click="handleUpdate(scope.row)"
                   v-hasPermi="['system:dict:edit']"
                >淇敼</el-button>
                <el-button
-                  size="mini"
                   type="text"
                   icon="Delete"
                   @click="handleDelete(scope.row)"
@@ -164,7 +156,7 @@
                   <el-option
                      v-for="item in listClassOptions"
                      :key="item.value"
-                     :label="item.label"
+                     :label="item.label + '(' + item.value + ')'"
                      :value="item.value"
                   ></el-option>
                </el-select>
@@ -193,7 +185,8 @@
 </template>
 
 <script setup name="Data">
-import { listType, getType } from "@/api/system/dict/type";
+import useDictStore from '@/store/modules/dict'
+import { optionselect as getDictOptionselect, getType } from "@/api/system/dict/type";
 import { listData, getData, delData, addData, updateData } from "@/api/system/dict/data";
 
 const { proxy } = getCurrentInstance();
@@ -250,8 +243,8 @@
 
 /** 鏌ヨ瀛楀吀绫诲瀷鍒楄〃 */
 function getTypeList() {
-  listType().then(response => {
-    typeOptions.value = response.rows;
+  getDictOptionselect().then(response => {
+    typeOptions.value = response.data;
   });
 }
 /** 鏌ヨ瀛楀吀鏁版嵁鍒楄〃 */
@@ -327,12 +320,14 @@
     if (valid) {
       if (form.value.dictCode != undefined) {
         updateData(form.value).then(response => {
+          useDictStore().removeDict(queryParams.value.dictType);
           proxy.$modal.msgSuccess("淇敼鎴愬姛");
           open.value = false;
           getList();
         });
       } else {
         addData(form.value).then(response => {
+          useDictStore().removeDict(queryParams.value.dictType);
           proxy.$modal.msgSuccess("鏂板鎴愬姛");
           open.value = false;
           getList();
@@ -349,6 +344,7 @@
   }).then(() => {
     getList();
     proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+    useDictStore().removeDict(queryParams.value.dictType);
   }).catch(() => {});
 }
 /** 瀵煎嚭鎸夐挳鎿嶄綔 */

--
Gitblit v1.9.3