✨ add dict status

tookbra · Jun 2, 2019 · ba98a2c · ba98a2c
1 parent a8c7252
commit ba98a2c
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 14 deletions.
diff --git a/src/mock/services/system/dict.js b/src/mock/services/system/dict.js
@@ -13,35 +13,40 @@ const pageDict = () => {
         name: "权限",
         code: "permission",
         dictKey: "query",
-        dictValue: "查询"
+        dictValue: "查询",
+        status: 1
       },
       {
         id: 2,
         name: "权限",
         code: "permission",
         dictKey: "get",
-        dictValue: "详情"
+        dictValue: "详情",
+        status: 1
       },
       {
         id: 3,
         name: "权限",
         code: "permission",
         dictKey: "add",
-        dictValue: "新增"
+        dictValue: "新增",
+        status: 1
       },
       {
         id: 4,
         name: "权限",
         code: "permission",
         dictKey: "update",
-        dictValue: "修改"
+        dictValue: "修改",
+        status: 1
       },
       {
         id: 5,
         name: "权限",
         code: "permission",
         dictKey: "delete",
-        dictValue: "删除"
+        dictValue: "删除",
+        status: 1
       }
     ]
   });
@@ -69,7 +74,8 @@ export const getDict = req => {
     name: "权限",
     code: "permission",
     dictKey: "query",
-    dictValue: "查询"
+    dictValue: "查询",
+    status: 1
   });
 };
 // eslint-disable-next-line no-unused-vars
@@ -80,35 +86,40 @@ export const getDictByCode = req => {
       name: "权限",
       code: "permission",
       dictKey: "query",
-      dictValue: "查询"
+      dictValue: "查询",
+      status: 1
     },
     {
       id: 2,
       name: "权限",
       code: "permission",
       dictKey: "get",
-      dictValue: "详情"
+      dictValue: "详情",
+      status: 1
     },
     {
       id: 3,
       name: "权限",
       code: "permission",
       dictKey: "add",
-      dictValue: "新增"
+      dictValue: "新增",
+      status: 1
     },
     {
       id: 4,
       name: "权限",
       code: "permission",
       dictKey: "update",
-      dictValue: "修改"
+      dictValue: "修改",
+      status: 1
     },
     {
       id: 5,
       name: "权限",
       code: "permission",
       dictKey: "delete",
-      dictValue: "删除"
+      dictValue: "删除",
+      status: 1
     }
   ]);
 };

diff --git a/src/views/system/dict.vue b/src/views/system/dict.vue
@@ -13,6 +13,15 @@
               <a-input v-model="queryParam.key" placeholder="字典键名" />
             </a-form-item>
           </a-col>
+          <a-col :md="5" :sm="24">
+            <a-form-item label="状态">
+              <a-select placeholder="请选择" default-value="">
+                <a-select-option value="">全部</a-select-option>
+                <a-select-option value="1">禁用</a-select-option>
+                <a-select-option value="2">启用</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
           <a-col :md="5" :sm="24">
             <span class="table-page-search-submitButtons">
               <a-button
@@ -52,6 +61,9 @@
       }"
       :showSizeChanger="true"
     >
+      <span slot="status" slot-scope="text">
+        {{ text | statusFilter }}
+      </span>
       <span slot="action" class="table-nav" slot-scope="text, record">
         <template>
           <a @click="() => showDetail(record)">
@@ -153,6 +165,24 @@
             ]"
           />
         </a-form-item>
+        <a-form-item
+          label="状态"
+          :label-col="{ span: 5 }"
+          :wrapper-col="{ span: 14 }"
+        >
+          <a-select
+            placeholder="请选择状态"
+            v-decorator="[
+              'status',
+              {
+                rules: [{ required: true, message: '请选择状态' }]
+              }
+            ]"
+          >
+            <a-select-option :value="1">正常</a-select-option>
+            <a-select-option :value="2">禁用</a-select-option>
+          </a-select>
+        </a-form-item>
       </a-form>
     </a-modal>
   </basicContainer>
@@ -187,6 +217,7 @@ export default {
       title: "",
       edit: false,
       dictForm: this.$form.createForm(this),
+      dict: {},
       // 表头
       columns: [
         {
@@ -206,6 +237,11 @@ export default {
           title: "字典键值",
           dataIndex: "dictValue"
         },
+        {
+          title: "状态",
+          dataIndex: "status",
+          scopedSlots: { customRender: "status" }
+        },
         {
           title: "操作",
           dataIndex: "action",
@@ -335,8 +371,10 @@ export default {
       this.dictForm.validateFields(err => {
         if (!err) {
           this.$loading.show();
+          let dict = this.dictForm.getFieldsValue();
+          dict.id = this.dict.id;
           if (this.edit) {
-            modifyDict(this.dictForm.getFieldsValue())
+            modifyDict(dict)
               .then(res => {
                 if (res.success) {
                   this.visible = false;
@@ -347,7 +385,7 @@ export default {
                 vm.$loading.hide();
               });
           } else {
-            addDict(this.dictForm.getFieldsValue())
+            addDict(dict)
               .then(res => {
                 if (res.success) {
                   this.visible = false;
@@ -385,7 +423,7 @@ export default {
         });
     },
     setFormValues({ ...dict }) {
-      let fields = ["id", "code", "name", "dictKey", "dictValue"];
+      let fields = ["id", "code", "name", "dictKey", "dictValue", "status"];
       Object.keys(dict).forEach(key => {
         if (fields.indexOf(key) !== -1) {
           this.dictForm.getFieldDecorator(key);
@@ -394,6 +432,7 @@ export default {
           this.dictForm.setFieldsValue(obj);
         }
       });
+      this.dict = dict;
     }
   }
 };