From eda3252c953675a4e2524091702b882680828493 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 6 Jun 2022 09:16:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E8=AE=BA=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppContentManage/components/Add.vue       |   2 +-
 .../AppContentManage/components/List.vue      | 322 +++++++++---------
 2 files changed, 163 insertions(+), 161 deletions(-)

diff --git a/packages/publicity/AppContentManage/components/Add.vue b/packages/publicity/AppContentManage/components/Add.vue
index d17aa220..a78f3cc6 100644
--- a/packages/publicity/AppContentManage/components/Add.vue
+++ b/packages/publicity/AppContentManage/components/Add.vue
@@ -27,7 +27,7 @@
             </el-form-item>
             <el-form-item label="是否可评论" style="width: 100%;" prop="isComment" :rules="[{required: true, message: '请选择是否可评论'}]">
               <el-radio-group v-model="form.isComment">
-                <el-radio v-for="op in dict.getDict('yseOrNo')" :key="op.dictValue" :label="op.dictValue">{{ op.dictName }}</el-radio>
+                <el-radio v-for="op in dict.getDict('yesOrNo')" :key="op.dictValue" :label="op.dictValue">{{ op.dictName }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-form>
diff --git a/packages/publicity/AppContentManage/components/List.vue b/packages/publicity/AppContentManage/components/List.vue
index 4d368bb3..456b3bd0 100644
--- a/packages/publicity/AppContentManage/components/List.vue
+++ b/packages/publicity/AppContentManage/components/List.vue
@@ -10,13 +10,13 @@
         </template>
       </ai-search-bar>
       <ai-table
-        :tableData="tableData"
-        :col-configs="colConfigs"
-        :total="total"
-        style="margin-top: 6px;"
-        :current.sync="search.current"
-        :size.sync="search.size"
-        @getList="getList">
+          :tableData="tableData"
+          :col-configs="colConfigs"
+          :total="total" :dict="dict"
+          style="margin-top: 6px;"
+          :current.sync="search.current"
+          :size.sync="search.size"
+          @getList="getList">
         <el-table-column slot="options" width="160px" fixed="right" label="操作" align="center">
           <template slot-scope="{ row }">
             <div class="table-options">
@@ -28,33 +28,33 @@
         </el-table-column>
       </ai-table>
       <ai-dialog
-        :visible.sync="isShowAdd"
-        width="880px"
-        height="580px"
-        title="文章分类"
-        @close="onClose"
-        @onConfirm="onConfirm(false)">
+          :visible.sync="isShowAdd"
+          width="880px"
+          height="580px"
+          title="文章分类"
+          @close="onClose"
+          @onConfirm="onConfirm(false)">
         <el-form ref="form" class="ai-form" :model="form" label-width="110px" label-position="right">
           <el-form-item label="分类名称" style="width: 500px;" prop="categoryName" :rules="[{ required: true, message: '请输入分类名称', trigger: 'blur' }]">
             <div class="catewrapper">
-              <el-input  size="small" style="width: 300px;" placeholder="请输入分类名称" v-model="form.categoryName">
+              <el-input size="small" style="width: 300px;" placeholder="请输入分类名称" v-model="form.categoryName">
               </el-input>
               <el-button style="margin-left: 20px;" size="small" type="primary" icon="iconfont iconAdd" v-if="!id" @click="onConfirm(true)">添加</el-button>
             </div>
           </el-form-item>
         </el-form>
         <ai-table
-          v-if="!id"
-          class="detail-table__table"
-          :border="true"
-          tableSize="small"
-          :total="cateTotal"
-          :tableData="cateList"
-          :col-configs="cateColConfigs"
-          :current.sync="cateSearch.current"
-          :size.sync="cateSearch.size"
-          :stripe="false"
-          @getList="getCateList">
+            v-if="!id"
+            class="detail-table__table"
+            :border="true"
+            tableSize="small"
+            :total="cateTotal"
+            :tableData="cateList"
+            :col-configs="cateColConfigs"
+            :current.sync="cateSearch.current"
+            :size.sync="cateSearch.size"
+            :stripe="false"
+            @getList="getCateList">
           <el-table-column slot="options" width="220px" fixed="right" label="操作" align="center">
             <template slot-scope="{ row }">
               <div class="table-options">
@@ -70,158 +70,160 @@
 </template>
 
 <script>
-  export default {
-    name: 'List',
+export default {
+  name: 'List',
 
-    props: {
-      instance: Function,
-      dict: Object
-    },
+  props: {
+    instance: Function,
+    dict: Object
+  },
 
-    data() {
-      return {
-        search: {
-          current: 1,
-          size: 10,
-          title: ''
-        },
+  data() {
+    return {
+      search: {
+        current: 1,
+        size: 10,
+        title: ''
+      },
+      moduleId: '',
+      cateSearch: {
+        current: 1,
+        size: 10
+      },
+      total: 10,
+      cateList: [],
+      colConfigs: [
+        {prop: 'moduleName', label: '模块名称', align: 'left', width: '200px'},
+        {prop: 'menuName', label: '关联菜单', align: 'center'},
+        {prop: 'categoryStr', label: '文章分类', align: 'center'},
+        {prop: 'needExamine', label: '是否审核', align: 'center', dict: 'yesOrNo'},
+        {prop: 'isComment', label: '是否可以评论', align: 'center', dict: 'yesOrNo'}
+      ],
+      cateColConfigs: [
+        {prop: 'showIndex', label: '排序', align: 'center', width: 80},
+        {prop: 'categoryName', label: '分类名称', align: 'center'}
+      ],
+      form: {
+        categoryName: '',
         moduleId: '',
-        cateSearch: {
-          current: 1,
-          size: 10
-        },
-        total: 10,
-        cateList: [],
-        colConfigs: [
-          { prop: 'moduleName',  label: '模块名称', align: 'left', width: '200px' },
-          { prop: 'menuName', label: '关联菜单', align: 'center' },
-          { prop: 'categoryStr', label: '文章分类', align: 'center' },
-          { prop: 'needExamine', label: '是否审核', align: 'center', formart: v => v === '0' ? '否' : '是' }
-        ],
-        cateColConfigs: [
-          {prop: 'categoryName', label: '分类名称', align: 'center'}
-        ],
-        form: {
-          categoryName: '',
-          moduleId: '',
-          showIndex: 1
-        },
-        cateTotal: 0,
-        isShowAdd: false,
-        id: '',
-        tableData: []
+        showIndex: 1
+      },
+      cateTotal: 0,
+      isShowAdd: false,
+      id: '',
+      tableData: []
+    }
+  },
+
+  mounted() {
+    this.getList()
+  },
+
+  methods: {
+    getList() {
+      this.instance.post(`/app/appcontentmoduleinfo/list`, null, {
+        params: {
+          ...this.search
+        }
+      }).then(res => {
+        if (res.code == 0) {
+          this.tableData = res.data.records
+          this.total = res.data.total
+        }
+      })
+    },
+
+    getCateList() {
+      this.instance.post(`/app/appcontentmodulecategory/list`, null, {
+        params: {
+          ...this.cateSearch,
+          moduleId: this.moduleId
+        }
+      }).then(res => {
+        if (res.code == 0) {
+          this.cateList = res.data.records
+          this.cateTotal = res.data.total
+        }
+      })
+    },
+
+    removeCate(id) {
+      this.$confirm('确定删除该数据？').then(() => {
+        this.instance.post(`/app/appcontentmodulecategory/delete?ids=${id}`).then(res => {
+          if (res.code == 0) {
+            this.$message.success('删除成功！')
+            this.getList()
+            this.getCateList()
+          }
+        })
+      })
+    },
+
+    remove(id) {
+      this.$confirm('确定删除该数据？').then(() => {
+        this.instance.post(`/app/appcontentmoduleinfo/delete?ids=${id}`).then(res => {
+          if (res.code == 0) {
+            this.$message.success('删除成功！')
+            this.getList()
+          }
+        })
+      })
+    },
+
+    onConfirm(flag) {
+      if (!flag && !this.id) {
+        this.isShowAdd = false
+
+        return false
       }
-    },
 
-    mounted() {
-      this.getList()
-    },
-
-    methods: {
-      getList() {
-        this.instance.post(`/app/appcontentmoduleinfo/list`, null, {
-          params: {
-            ...this.search
-          }
-        }).then(res => {
-          if (res.code == 0) {
-            this.tableData = res.data.records
-            this.total = res.data.total
-          }
-        })
-      },
-
-      getCateList () {
-        this.instance.post(`/app/appcontentmodulecategory/list`, null, {
-          params: {
-            ...this.cateSearch,
-            moduleId: this.moduleId
-          }
-        }).then(res => {
-          if (res.code == 0) {
-            this.cateList = res.data.records
-            this.cateTotal = res.data.total
-          }
-        })
-      },
-
-      removeCate(id) {
-        this.$confirm('确定删除该数据？').then(() => {
-          this.instance.post(`/app/appcontentmodulecategory/delete?ids=${id}`).then(res => {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.instance.post(`/app/appcontentmodulecategory/addOrUpdate`, {
+            ...this.form,
+            id: this.id || ''
+          }).then(res => {
             if (res.code == 0) {
-              this.$message.success('删除成功！')
+              this.$message.success('提交成功')
               this.getList()
               this.getCateList()
-            }
-          })
-        })
-      },
+              this.form.categoryName = ''
 
-      remove(id) {
-        this.$confirm('确定删除该数据？').then(() => {
-          this.instance.post(`/app/appcontentmoduleinfo/delete?ids=${id}`).then(res => {
-            if (res.code == 0) {
-              this.$message.success('删除成功！')
-              this.getList()
-            }
-          })
-        })
-      },
+              if (this.id) {
+                this.id = ''
 
-      onConfirm (flag) {
-        if (!flag && !this.id) {
-          this.isShowAdd = false
-
-          return false
-        }
-
-        this.$refs.form.validate((valid) => {
-          if (valid) {
-            this.instance.post(`/app/appcontentmodulecategory/addOrUpdate`, {
-              ...this.form,
-              id: this.id || ''
-            }).then(res => {
-              if (res.code == 0) {
-                this.$message.success('提交成功')
-                this.getList()
-                this.getCateList()
-                this.form.categoryName = ''
-
-                if (this.id) {
-                  this.id = ''
-
-                  return false
-                }
+                return false
               }
-            })
-          }
-        })
-      },
+            }
+          })
+        }
+      })
+    },
 
-      onClose () {
-        this.id = ''
-        this.moduleId = ''
-        this.form.categoryName = ''
-        this.form.moduleId = ''
-      },
+    onClose() {
+      this.id = ''
+      this.moduleId = ''
+      this.form.categoryName = ''
+      this.form.moduleId = ''
+    },
 
-      toAdd(id) {
-        this.$emit('change', {
-          type: 'Add',
-          params: {
-            id: id || ''
-          }
-        })
-      }
+    toAdd(id) {
+      this.$emit('change', {
+        type: 'Add',
+        params: {
+          id: id || ''
+        }
+      })
     }
   }
+}
 </script>
 
 <style lang="scss" scoped>
-  .notice {
-    .catewrapper {
-      display: flex;
-      align-items: center;
-    }
+.notice {
+  .catewrapper {
+    display: flex;
+    align-items: center;
   }
+}
 </style>