From 2c7eedbcb43485eac6931a59205563d950dfc1fd Mon Sep 17 00:00:00 2001
From: liuchuang <123456>
Date: Thu, 16 Jul 2020 09:42:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E9=94=AE=E6=9C=8D=E5=8A=A1=E5=92=8C?=
 =?UTF-8?q?=E8=A7=A3=E7=A0=81=E9=94=A6=E6=B0=B4=E6=A8=A1=E5=9D=97=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/custom/module-add-or-update.vue   | 29 +++++++++-------
 src/views/modules/custom/module.vue           | 34 +++++++++++++++----
 .../modules/news/banner-add-or-update.vue     |  3 --
 .../modules/news/notice-add-or-update.vue     | 16 ++++++---
 src/views/modules/news/notice.vue             | 16 +++++----
 5 files changed, 66 insertions(+), 32 deletions(-)

diff --git a/src/views/modules/custom/module-add-or-update.vue b/src/views/modules/custom/module-add-or-update.vue
index 6fe85b0..1eba424 100644
--- a/src/views/modules/custom/module-add-or-update.vue
+++ b/src/views/modules/custom/module-add-or-update.vue
@@ -1,8 +1,8 @@
 <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="$i18n.locale === 'en-US' ? '120px' : '80px'">
-        <el-form-item label="模块名称" prop="moduleCode">
-          <el-select v-model="dataForm.moduleCode" placeholder="请选择模块" filterable collapse-tags @change="changeHandle($event)" :disabled="disabledModuleName">
+        <el-form-item label="模块分类" prop="moduleCategory">
+          <el-select v-model="dataForm.moduleCategory" placeholder="请选择模块分类" filterable collapse-tags >
             <el-option
               v-for="item in optionModuleName"
               :key="item.dictValue"
@@ -11,6 +11,12 @@
             </el-option>
           </el-select>
       </el-form-item>
+        <el-form-item label="模块名称" prop="name">
+            <el-input v-model="dataForm.name" placeholder="模块名称" maxlength="50" show-word-limit></el-input>
+        </el-form-item>
+        <el-form-item label="模块编码" prop="moduleCode">
+            <el-input v-model="dataForm.moduleCode" placeholder="模块编码" maxlength="50" show-word-limit></el-input>
+        </el-form-item>
       <el-row>
         <el-form-item label="模块图片"
                       v-loading="loading" prop="imgUrl">
@@ -64,6 +70,7 @@ export default {
       dataForm: {
         id: '',
         moduleCode: '',
+        moduleCategory: '',
         name: '',
         imgUrl: '',
         sort: '',
@@ -87,13 +94,18 @@ export default {
       optionModuleName: [],
       // 图片
       loading: false,
-      uploadUrl: '',
-      disabledModuleName: false
+      uploadUrl: ''
     }
   },
   computed: {
     dataRule () {
       return {
+        name: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        moduleCategory: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
         moduleCode: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
@@ -117,23 +129,14 @@ export default {
   methods: {
     init () {
       this.visible = true
-      this.disabledModuleName = false
       this.dataForm.imgUrl = ''
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
         if (this.dataForm.id) {
-          this.disabledModuleName = true
           this.getInfo()
         }
       })
     },
-    changeHandle (value) {
-      let obj = {}
-      obj = this.optionModuleName.find((item) => {
-        return item.dictValue === value
-      })
-      this.dataForm.name = obj.dictName
-    },
     // 获取信息
     getInfo () {
       this.$http.get(`/custom/module/${this.dataForm.id}`).then(({ data: res }) => {
diff --git a/src/views/modules/custom/module.vue b/src/views/modules/custom/module.vue
index 25607b4..83f1505 100644
--- a/src/views/modules/custom/module.vue
+++ b/src/views/modules/custom/module.vue
@@ -19,9 +19,10 @@
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="moduleCode" label="模块编码" header-align="center" align="center"></el-table-column>
+        <el-table-column type="selection" header-align="center" align="center" width="40"></el-table-column>
         <el-table-column prop="name" label="模块名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="moduleCode" label="模块编码" header-align="center" align="center" width="170"></el-table-column>
+        <el-table-column prop="moduleCategory" label="模块分类" header-align="center" align="center" :formatter="moduleTypeFormat"></el-table-column>
         <el-table-column align="center" label="模块图片" :show-overflow-tooltip="true" prop="imgUrl">
           <template slot-scope="scope">
             <el-popover placement="right"
@@ -38,10 +39,10 @@
             </el-popover>
           </template>
         </el-table-column>
-        <el-table-column prop="sort" label="排序" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="enableFlag" label="启用标识" :formatter="showFlagFormatter" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="enableFlag" label="启用标识" :formatter="showFlagFormatter" header-align="center" align="center" width="80"></el-table-column>
+        <el-table-column prop="sort" label="排序" header-align="center" align="center" width="60"></el-table-column>
         <el-table-column prop="remark" label="备注" header-align="center" align="center"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="130">
           <template slot-scope="scope">
             <el-button v-if="$hasPermission('custom:module:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
             <el-button v-if="$hasPermission('custom:module:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
@@ -79,15 +80,36 @@ export default {
       },
       dataForm: {
         id: ''
-      }
+      },
+      optionModuleName: []
     }
   },
+  created () {
+    this.getListSimpleByDictType()
+    this.getNoticeCategory()
+  },
   methods: {
     showFlagFormatter: function (row, column) {
       if (row.enableFlag === '0') {
         return '否'
       }
       return '是'
+    },
+    // 获取模块名称[参数：moduleType]
+    getListSimpleByDictType () {
+      this.$http.get(`/custom/module/listSimple/moduleType`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.optionModuleName = res.data
+      }).catch(() => {})
+    },
+    moduleTypeFormat (row, column) {
+      for (var property in this.optionModuleName) {
+        if (row.moduleCategory === this.optionModuleName[property].dictValue) {
+          return this.optionModuleName[property].dictName
+        }
+      }
     }
   },
   components: {
diff --git a/src/views/modules/news/banner-add-or-update.vue b/src/views/modules/news/banner-add-or-update.vue
index 7857288..898b5f2 100644
--- a/src/views/modules/news/banner-add-or-update.vue
+++ b/src/views/modules/news/banner-add-or-update.vue
@@ -147,9 +147,6 @@ export default {
   computed: {
     dataRule () {
       return {
-        url: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
         title: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
diff --git a/src/views/modules/news/notice-add-or-update.vue b/src/views/modules/news/notice-add-or-update.vue
index 08cb7c5..aaeb585 100644
--- a/src/views/modules/news/notice-add-or-update.vue
+++ b/src/views/modules/news/notice-add-or-update.vue
@@ -38,9 +38,9 @@
         <el-select v-model="dataForm.noticeCategory" placeholder="请选择模块">
           <el-option
             v-for="item in optionNoticeCategoryCode"
-            :key="item.dictValue"
-            :label="item.dictName"
-            :value="item.dictValue">
+            :key="item.moduleCode"
+            :label="item.name"
+            :value="item.moduleCode">
           </el-option>
         </el-select>
     </el-form-item>
@@ -51,6 +51,13 @@
                   show-word-limit
                   placeholder="通知标题"></el-input>
       </el-form-item>
+      <el-form-item label="联系电话"
+                    prop="mobile">
+        <el-input v-model="dataForm.mobile"
+                  maxlength="20"
+                  show-word-limit
+                  placeholder="联系电话"></el-input>
+      </el-form-item>
       <el-form-item prop="noticeContent"
                     label="通知内容">
         <el-row style="height: 550px;">
@@ -96,6 +103,7 @@ export default {
         gridId: null,
         grid: null,
         noticeTitle: '',
+        mobile: '',
         noticeContent: '',
         allDeptIdsShow: []
       },
@@ -332,7 +340,7 @@ export default {
       this.loading = false
     },
     getListSimpleByDictType () {
-      this.$http.get(`/news/notice/listSimple/notice_category`).then(({ data: res }) => {
+      this.$http.get(`/custom/module/noticeCategory`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
diff --git a/src/views/modules/news/notice.vue b/src/views/modules/news/notice.vue
index 521ce4f..8f3f468 100644
--- a/src/views/modules/news/notice.vue
+++ b/src/views/modules/news/notice.vue
@@ -14,9 +14,9 @@
           <el-select v-model="dataForm.noticeCategory" placeholder="请选择模块" clearable>
             <el-option
               v-for="item in optionNoticeCategoryCode"
-              :key="item.dictValue"
-              :label="item.dictName"
-              :value="item.dictValue">
+              :key="item.moduleCode"
+              :label="item.name"
+              :value="item.moduleCode">
             </el-option>
           </el-select>
       </el-form-item>
@@ -52,6 +52,10 @@
                          header-align="center"
                          align="center"
                          :formatter="noticeCategoryFormat"></el-table-column>
+        <el-table-column prop="mobile"
+                         label="联系电话"
+                         header-align="center"
+                         align="center"></el-table-column>
         <el-table-column prop="readingAmount"
                          label="阅读量"
                          header-align="center"
@@ -172,7 +176,7 @@ export default {
       }
     },
     getListSimpleByDictType () {
-      this.$http.get(`/news/notice/listSimple/notice_category`).then(({ data: res }) => {
+      this.$http.get(`/custom/module/noticeCategory`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
@@ -181,8 +185,8 @@ export default {
     },
     noticeCategoryFormat (row, column) {
       for (var property in this.optionNoticeCategoryCode) {
-        if (row.noticeCategory === this.optionNoticeCategoryCode[property].dictValue) {
-          return this.optionNoticeCategoryCode[property].dictName
+        if (row.noticeCategory === this.optionNoticeCategoryCode[property].moduleCode) {
+          return this.optionNoticeCategoryCode[property].name
         }
       }
     }