From 4cb6fb0e63228dde8b486e6b017e042dcd06b67e Mon Sep 17 00:00:00 2001
From: yujt <work@yujt.net.cn>
Date: Mon, 22 Jun 2020 14:42:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E9=97=BB=E7=B1=BB?=
 =?UTF-8?q?=E5=88=AB=E7=BB=B4=E6=8A=A4=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../news/newscategory-add-or-update.vue       | 35 ++++++++++++----
 src/views/modules/news/newscategory.vue       | 41 ++++++++++++++++---
 .../psychologisttitle-add-or-update.vue       |  6 +--
 3 files changed, 64 insertions(+), 18 deletions(-)

diff --git a/src/views/modules/news/newscategory-add-or-update.vue b/src/views/modules/news/newscategory-add-or-update.vue
index d76c557..ddd1e32 100644
--- a/src/views/modules/news/newscategory-add-or-update.vue
+++ b/src/views/modules/news/newscategory-add-or-update.vue
@@ -8,19 +8,23 @@
              ref="dataForm"
              @keyup.enter.native="dataFormSubmitHandle()"
              :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
-      <el-form-item label="类别名称"
-                    prop="categoryName">
+      <el-form-item label="所属版块" prop="sectionCode">
+          <el-select v-model="dataForm.sectionCode" clearable placeholder="所属版块">
+            <el-option v-for="item in sectionCodeList" :key="item.dictValue" :label="item.dictName" :value="item.dictValue"></el-option>
+          </el-select>
+        </el-form-item>
+      <el-form-item label="类别名称" prop="categoryName">
         <el-input v-model="dataForm.categoryName"
                   placeholder="类别名称"></el-input>
       </el-form-item>
       <el-form-item label="类别编码"  prop="categoryCode">
         <el-input v-model="dataForm.categoryCode" v-bind:readonly = "codeReadOnly" placeholder="类别编码"></el-input>
       </el-form-item>
-      <el-form-item label="独立功能" prop="independentFlag">
+      <!-- <el-form-item label="独立功能" prop="independentFlag">
         <el-select v-model="dataForm.independentFlag" v-bind:disabled = "codeReadOnly" placeholder="是否关联独立功能">
           <el-option v-for="item in yesOrNoContains" :key="item.id" :label="item.name" :value="item.id"></el-option>
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="描述"
                     prop="description">
         <el-input v-model="dataForm.description"
@@ -53,10 +57,12 @@ export default {
         categoryName: '',
         categoryCode: '',
         description: '',
+        sectionCode: '',
         independentFlag: '',
         sort: 0
       },
-      yesOrNoContains: [{ id: '0', name: '否' }, { id: '1', name: '是' }],
+      sectionCodeList: [],
+      // yesOrNoContains: [{ id: '0', name: '否' }, { id: '1', name: '是' }],
       codeReadOnly: false
     }
   },
@@ -72,7 +78,7 @@ export default {
         sort: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        independentFlag: [
+        sectionCode: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ]
       }
@@ -87,8 +93,19 @@ export default {
           this.getInfo()
         }
       })
+      this.getsectionCodeList()
     },
     // 获取信息
+    getsectionCodeList () {
+      this.$http.get(`/sys/dict/listSimple/function_section_article`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.sectionCodeList = res.data
+        })
+        .catch(() => {})
+    },
     getInfo () {
       this.$http.get(`/news/newscategory/${this.dataForm.id}`).then(({ data: res }) => {
         if (res.code !== 0) {
@@ -98,9 +115,9 @@ export default {
           ...this.dataForm,
           ...res.data
         }
-        if (res.data.independentFlag === '1') {
-          this.codeReadOnly = true
-        }
+        // if (res.data.independentFlag === '1') {
+        //   this.codeReadOnly = true
+        // }
       }).catch(() => { })
     },
     // 表单提交
diff --git a/src/views/modules/news/newscategory.vue b/src/views/modules/news/newscategory.vue
index 9f6820b..86cb6e6 100644
--- a/src/views/modules/news/newscategory.vue
+++ b/src/views/modules/news/newscategory.vue
@@ -2,11 +2,13 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__newscategory}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <!-- <el-form-item>
-          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
-        </el-form-item> -->
+        <el-form-item label="所属版块">
+          <el-select v-model="dataForm.sectionCode" clearable placeholder="所属版块">
+            <el-option v-for="item in sectionCodeList" :key="item.dictValue" :label="item.dictName" :value="item.dictValue"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()"> 刷新 </el-button>
+          <el-button @click="getDataList()"> 查询 </el-button>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
@@ -20,6 +22,7 @@
             {{scope.$index+1}}
         </template>
       </el-table-column>
+        <el-table-column prop="sectionCode" label="所属版块" :formatter="showSectionCode" header-align="center" align="center"></el-table-column>
         <el-table-column prop="categoryName" label="类别名称" header-align="center" align="center"></el-table-column>
         <el-table-column prop="description" label="描述" header-align="center" align="center"></el-table-column>
         <el-table-column prop="sort" label="排序" header-align="center" align="center"></el-table-column>
@@ -59,12 +62,38 @@ export default {
         deleteIsBatch: true
       },
       dataForm: {
-        id: ''
-      }
+        id: '',
+        sectionCode: ''
+      },
+      sectionCodeList: []
     }
   },
   components: {
     AddOrUpdate
+  },
+  created () {
+    this.getsectionCodeList()
+  },
+  methods: {
+    getsectionCodeList () {
+      this.$http.get(`/sys/dict/listSimple/function_section_article`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.sectionCodeList = res.data
+        })
+        .catch(() => {})
+    },
+    showSectionCode: function (row, column) {
+      if (row.sectionCode) {
+        let dict = this.sectionCodeList.filter(item => item.dictValue === row.sectionCode)[0]
+        if (dict) {
+          return dict.dictName
+        }
+      }
+      return ''
+    }
   }
 }
 </script>
diff --git a/src/views/modules/psychology/psychologisttitle-add-or-update.vue b/src/views/modules/psychology/psychologisttitle-add-or-update.vue
index 7f77e73..56f34d0 100644
--- a/src/views/modules/psychology/psychologisttitle-add-or-update.vue
+++ b/src/views/modules/psychology/psychologisttitle-add-or-update.vue
@@ -47,9 +47,9 @@ export default {
         code: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-          sort: [
-              { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-          ],
+        sort: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
         delFlag: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],