From 2815485915714260877c274f47f0bb0154ab61bc Mon Sep 17 00:00:00 2001
From: fangyy <596179054@qq.com>
Date: Thu, 6 Jan 2022 09:10:52 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=8A=B6=E6=80=81(=E5=90=AF=E7=94=A8=E3=80=81?=
 =?UTF-8?q?=E7=A6=81=E7=94=A8)=E7=9A=84=E6=8E=A7=E5=88=B6=EF=BC=9B2.?=
 =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=8F=AA=E8=AF=BB=E5=8F=AF=E5=86=99=E7=9A=84?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6=EF=BC=8C=E5=AD=97=E5=85=B8=E9=99=A4=E4=BA=86?=
 =?UTF-8?q?=20code=20=E5=80=BC=E4=B8=8D=E8=83=BD=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=A4=96=EF=BC=8C=E5=85=B6=E4=BD=99=E9=83=BD=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9B3.=E5=90=8E=E7=AB=AF=E6=A0=87?=
 =?UTF-8?q?=E8=AE=B0=E5=88=A0=E9=99=A4=E6=96=B9=E6=B3=95=E8=BF=87=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=89=8D=E7=AB=AF=E5=8E=BB=E9=99=A4=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/dict.js                        |  6 +--
 src/components/Dict/dictMixin.js              |  7 ++-
 .../Dict/display/dictDisplayMixin.js          |  2 +-
 src/views/system/dict/SysDictModalForm.vue    | 23 ++++----
 src/views/system/dict/SysDictPage.vue         | 54 +++++++++++--------
 5 files changed, 53 insertions(+), 39 deletions(-)

diff --git a/src/api/system/dict.js b/src/api/system/dict.js
index 30b0e11..bc20d3e 100644
--- a/src/api/system/dict.js
+++ b/src/api/system/dict.js
@@ -39,10 +39,10 @@ export function getObj(id) {
   })
 }
 
-export function delObj(id) {
+export function statusObj(id, status) {
   return request({
-    url: '/system/dict/' + id,
-    method: 'delete'
+    url: '/system/dict/' + id + '/' + status,
+    method: 'patch'
   })
 }
 
diff --git a/src/components/Dict/dictMixin.js b/src/components/Dict/dictMixin.js
index 5856711..05d6c46 100644
--- a/src/components/Dict/dictMixin.js
+++ b/src/components/Dict/dictMixin.js
@@ -13,7 +13,10 @@ export default {
     },
     itemIsDisabled: { // 给字典项添加是否禁用的属性
       type: Function,
-      default: null
+      default: (dictItem, dictStatus) => {
+        // 根据字典启用禁用设置是否可编辑
+        return dictStatus !== 1
+      }
     }
 
   },
@@ -40,7 +43,7 @@ export default {
             continue
           }
           // 字典项是否 disable
-          item.disabled = this.itemIsDisabled && this.itemIsDisabled(item)
+          item.disabled = this.itemIsDisabled && this.itemIsDisabled(item, this.dictData.status)
           // 选择名称，国际化处理
           item.name = this.i18nName(item)
 
diff --git a/src/components/Dict/display/dictDisplayMixin.js b/src/components/Dict/display/dictDisplayMixin.js
index c736073..67511ec 100644
--- a/src/components/Dict/display/dictDisplayMixin.js
+++ b/src/components/Dict/display/dictDisplayMixin.js
@@ -24,7 +24,7 @@ export default {
       return  this.dictItems.find(dictItem => dictItem.value === this.value) || {};
     },
     showText() {
-      return (this.dictItem && this.dictItem.name) || this.value;
+      return (this.dictItem && this.dictItem.name) || this.value + '';
     }
   },
 }
diff --git a/src/views/system/dict/SysDictModalForm.vue b/src/views/system/dict/SysDictModalForm.vue
index 41f7ac8..1337f84 100644
--- a/src/views/system/dict/SysDictModalForm.vue
+++ b/src/views/system/dict/SysDictModalForm.vue
@@ -25,14 +25,6 @@
         <a-input v-decorator="['title', decoratorOptions.title]" placeholder="字典名称" />
       </a-form-item>
 
-      <a-form-item label="字典类型">
-        <dict-radio-group
-          v-decorator="['editable',decoratorOptions.editable]"
-          placeholder="字典类型"
-          dict-code="dict_property"
-        />
-      </a-form-item>
-
       <a-form-item label="数据类型">
         <dict-radio-group
           v-decorator="['valueType',decoratorOptions.valueType]"
@@ -41,6 +33,13 @@
         />
       </a-form-item>
 
+      <a-form-item label="状态">
+        <a-radio-group v-decorator="['status', decoratorOptions.status]" :disabled="!$has('system:dict:updateStatus')">
+          <a-radio :value="1"> 启用 </a-radio>
+          <a-radio :value="0"> 禁用 </a-radio>
+        </a-radio-group>
+      </a-form-item>
+
       <a-form-item label="备注">
         <a-textarea
           v-decorator="['remarks']"
@@ -83,13 +82,13 @@ export default {
         title: {
           rules: [{ required: true, message: '请输入字典名称!' }]
         },
-        editable: {
-          rules: [{ required: true, message: '请选择字典类型!' }],
-          initialValue: 1
-        },
         valueType: {
           rules: [{ required: true, message: '请选择数据类型!' }],
           initialValue: 1
+        },
+        status: {
+          rules: [{ required: true, message: '请选择状态!' }],
+          initialValue: 1
         }
       }
     }
diff --git a/src/views/system/dict/SysDictPage.vue b/src/views/system/dict/SysDictPage.vue
index 89ced23..1e190f2 100644
--- a/src/views/system/dict/SysDictPage.vue
+++ b/src/views/system/dict/SysDictPage.vue
@@ -8,6 +8,7 @@
       :columns="columns"
       :request="tableRequest"
       :scroll="{ x: 800 }"
+      :response-data-process="responseDataProcess"
     >
       <!-- 查询表单 -->
       <template #search-form="searchFormState">
@@ -44,17 +45,24 @@
       </template>
 
       <!--数据表格区域-->
-      <template #type-slot="text">
-        <dict-tag dict-code="dict_property" :value="text" />
+      <template #status-slot="text, record">
+        <a-switch
+          v-model="record.showStatus"
+          :disabled="!$has('system:dict:updateStatus')"
+          @change="
+            (checked) => {
+              handleUpdateStatus(record, checked)
+            }
+          "
+        >
+          <a-icon slot="checkedChildren" type="check" />
+          <a-icon slot="unCheckedChildren" type="close" />
+        </a-switch>
       </template>
       <template #action-slot="text, record">
         <a v-has="'system:dict:edit'" @click="handleEdit(record)">编辑</a>
         <a-divider type="vertical" />
         <a @click="handleShowItem(record)">字典项</a>
-        <a-divider type="vertical" />
-        <a-popconfirm v-has="'system:dict:del'" title="确认要删除吗？" @confirm="() => handleDel(record)">
-          <a href="javascript:" class="ballcat-text-danger">删除</a>
-        </a-popconfirm>
       </template>
     </ProTable>
 
@@ -67,7 +75,7 @@
 </template>
 
 <script>
-import { getPage, delObj } from '@/api/system/dict'
+import { getPage, statusObj } from '@/api/system/dict'
 import DictItemModal from './SysDictItemModal'
 import SysDictModalForm from '@/views/system/dict/SysDictModalForm'
 import ProTable from '@/components/Table/ProTable'
@@ -94,12 +102,6 @@ export default {
           width: 180,
           ellipsis: true
         },
-        {
-          title: '属性',
-          dataIndex: 'editable',
-          width: 60,
-          scopedSlots: { customRender: 'type-slot' }
-        },
         {
           title: '备注',
           dataIndex: 'remarks',
@@ -112,6 +114,13 @@ export default {
           width: 150,
           sorter: true
         },
+        {
+          title: '启用状态',
+          dataIndex: 'showStatus',
+          width: 80,
+          scopedSlots: { customRender: 'status-slot' },
+          align: 'center'
+        },
         {
           key: 'operate',
           title: '操作',
@@ -121,8 +130,7 @@ export default {
         }
       ],
 
-      itemModalInited: false,
-      dictCodes: ['dict_property']
+      itemModalInited: false
     }
   },
   methods: {
@@ -138,17 +146,21 @@ export default {
     handleEdit(record) {
       this.$refs.formModal.update(record, { title: '编辑字典' })
     },
-    // 删除
-    handleDel (record) {
-      doRequest(delObj(record[this.rowKey]), {
-        onSuccess: () => {
-          this.reloadPageTable(false)
-        }
+    // 更新状态
+    handleUpdateStatus(record, checked) {
+      doRequest(statusObj(record[this.rowKey], checked ? 1 : 0), {
+        onSuccess: () => {}
       })
     },
     // 字典项表格弹窗
     handleShowItem(record) {
       this.$refs.dictItemModal.show(record)
+    },
+    responseDataProcess(data) {
+      data.records.forEach((item) => {
+        item.showStatus = item.status === 1
+      })
+      return data.records
     }
   }
 }
-- 
Gitee