Merge branch 'dev_newRegister' of http://121.42.41.42:7070/r/esua-epdc-admin into dev_newRegister

src/views/modules/sys/role-add-or-update.vue

@@ -13,10 +13,10 @@
         <el-input v-model="dataForm.name"
                   :placeholder="$t('role.name')"></el-input>
       </el-form-item>
-      <el-form-item label="角色编码">
+      <el-form-item label="角色类型">
-        <el-select v-model="dataForm.code"
+        <el-select v-model="dataForm.typeKey"
-                   placeholder="角色编码">
+                   placeholder="角色类型">
-          <el-option v-for="item in roleCodeList"
+          <el-option v-for="item in roleTypeList"
                      :key="item.dictValue"
                      :label="item.dictName"
                      :value="item.dictValue">
@@ -71,14 +71,14 @@ export default {
       visible: false,
       menuList: [],
       deptList: [],
-      roleCodeList: [],
+      roleTypeList: [],
       dataForm: {
         id: '',
         name: '',
         menuIdList: [],
         deptIdList: [],
         remark: '',
-        code: ''
+        typeKey: ''
       }
     }
   },
@@ -92,7 +92,7 @@ export default {
     }
   },
   created () {
-    this.getRoleCodeList()
+    this.getRoleTypeList()
   },
   methods: {
     init () {
@@ -170,12 +170,12 @@ export default {
         }).catch(() => { })
       })
     }, 1000, { 'leading': true, 'trailing': false }),
-    getRoleCodeList () {
+    getRoleTypeList () {
-      this.$http.get(`/sys/dict/listSimple/sysRoleCode`).then(({ data: res }) => {
+      this.$http.get(`/sys/dict/listSimple/sysRoleType`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
-        this.roleCodeList = res.data
+        this.roleTypeList = res.data
       }).catch(() => { })
     }
   }

src/views/modules/sys/role.vue

@@ -38,10 +38,11 @@
                          :label="$t('role.name')"
                          header-align="center"
                          align="center"></el-table-column>
-        <el-table-column prop="code"
+        <el-table-column prop="typeKey"
-                         label="角色编码"
+                         label="角色类型"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         :formatter="showRoleTypeFormatter"></el-table-column>
         <el-table-column prop="remark"
                          :label="$t('role.remark')"
                          header-align="center"
@@ -100,11 +101,34 @@ export default {
       },
       dataForm: {
         name: ''
+      },
+      sysRoleTypeList: []
     }
-    }
+  },
+  created () {
+    this.getSysRoleTypeList()
   },
   components: {
     AddOrUpdate
+  },
+  methods: {
+    getSysRoleTypeList () {
+      this.$http.get(`/sys/dict/listSimple/sysRoleType`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.sysRoleTypeList = res.data
+      }).catch(() => { })
+    },
+    showRoleTypeFormatter: function (row, column) {
+      if (row.typeKey) {
+        let dict = this.sysRoleTypeList.filter(item => item.dictValue === row.typeKey)[0]
+        if (dict) {
+          return dict.dictName
+        }
+      }
+      return ''
+    }
   }
 }
 </script>

src/views/modules/user/partymembers.vue

@@ -106,6 +106,16 @@
           <el-button type="info"
                      @click="exportHandle()">{{ $t('export') }}</el-button>
         </el-form-item>
+        <el-form-item>
+          <el-upload class="upload-demo"
+                     :action="uploadUrl"
+                     :on-preview="handlePreview"
+                     multiple
+                     :limit="1"
+                     :on-exceed="handleExceed">
+            <el-button type="primary">点击上传</el-button>
+          </el-upload>
+        </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading"
                 :data="dataList"
@@ -198,6 +208,7 @@
 <script>
 import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './partymembers-add-or-update'
+import Cookies from 'js-cookie'
 export default {
   mixins: [mixinViewModule],
   data () {
@@ -227,7 +238,8 @@ export default {
       gridOptions: [],
       registOptions: [],
       postOptions: [],
-      timeRange: []
+      timeRange: [],
+      upLoadUrl: ''
     }
   },
   components: {
@@ -237,6 +249,7 @@ export default {
     this.getStreetList()
     this.getRegistOptions()
     this.getPostOptions()
+    this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/app-user/partymembers/importExcel?token=${Cookies.get('token')}`
   },
   methods: {
     selectedTime () {
@@ -336,6 +349,12 @@ export default {
       }).catch(() => {
         this.dataListLoading = false
       })
+    },
+    handleExceed (files, fileList) {
+      this.$message.warning(`当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`)
+    },
+    beforeRemove (file, fileList) {
+      return this.$confirm(`确定移除 ${file.name}？`)
     }
   }
 }