add feats

src/store/modules/sysuser.js

@@ -9,7 +9,25 @@ export default {
     detail: {
       status: 1,
       isSales: 1,
-    }
+    },
+    identityDict: [
+      {
+        label: '迎宾保安',
+        value: 'first-usher',
+      },
+      {
+        label: '迎宾前台',
+        value: 'main-usher',
+      },
+      {
+        label: '置业顾问',
+        value: 'consultant',
+      },
+      {
+        label: '其他',
+        value: '',
+      },
+    ],
   },
   mutations: {
     updateList (state, payload) {

src/views/content/list.vue

@@ -118,7 +118,7 @@ export default {
       window.console.log(err)
     },
     handleImgSuccess (res) {
-      const url = res.message
+      const url = res.data
       this.addContent({
         detail: JSON.stringify({
           contentType: 'image',
@@ -130,7 +130,7 @@ export default {
       })
     },
     handleVideoSuccess (res) {
-      const url = res.message
+      const url = res.data
       this.addContent({
         detail: JSON.stringify({
           contentType: 'video',

src/views/index.js

@@ -18,6 +18,15 @@ const pages = [
       title: '系统配置',
     },
     children: [
+      {
+        path: 'sysuser',
+        name: 'sysuserlist',
+        component: () => import('./sysuser/list.vue'),
+        meta: {
+          menuShow: true,
+          title: '系统人员',
+        },
+      },
       {
         path: 'device',
         name: 'devicelist',
@@ -63,15 +72,6 @@ const pages = [
           title: '人员类型',
         },
       },
-      {
-        path: 'sysuser',
-        name: 'sysuserlist',
-        component: () => import('./sysuser/list.vue'),
-        meta: {
-          menuShow: true,
-          title: '销售列表',
-        },
-      },
       {
         path: 'sysuser/edit',
         name: 'sysuseredit',

src/views/sysuser/edit.vue

@@ -1,28 +1,34 @@
 <template>
-  <el-form :rules="rules" :model="detail" ref="ruleForm" label-width="160px">
-    <el-form-item label="用户名" prop="nickname" required>
-      <el-input v-model="detail.nickname"></el-input>
-    </el-form-item>
-    <el-form-item label="手机号" prop="phone" required>
-      <el-input v-model="detail.phone"></el-input>
-    </el-form-item>
-    <el-form-item label="微信ID" prop="wxId">
-      <el-input v-model="detail.wxId"></el-input>
-    </el-form-item>
-    <el-form-item label="openid" prop="openid">
-      <el-input v-model="detail.openid" readonly=""></el-input>
-    </el-form-item>
-    <el-form-item label="状态" prop="status" required>
-      <el-select v-model="detail.status" placeholder="请选择">
-        <el-option label="禁用" :value="0"></el-option>
-        <el-option label="启用" :value="1"></el-option>
-      </el-select>
-    </el-form-item>
-    <el-form-item>
-      <el-button type="primary" @click="onSubmit">保存</el-button>
-      <el-button @click="onCancel">取消</el-button>
-    </el-form-item>
-  </el-form>
+  <div>
+    <el-form class="user-form" :rules="rules" :model="detail" ref="ruleForm" label-width="160px">
+      <el-form-item label="用户名" prop="username" required>
+        <el-input v-model="detail.username"></el-input>
+      </el-form-item>
+      <el-form-item label="手机号" prop="phone" required>
+        <el-input v-model="detail.phone"></el-input>
+      </el-form-item>
+      <el-form-item label="身份" prop="userIdentity">
+        <el-select class="width-100" v-model="detail.userIdentity" placeholder="请选择">
+          <el-option
+            v-for="item in identityDict"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="状态" prop="status" required>
+        <el-select class="width-100" v-model="detail.status" placeholder="请选择">
+          <el-option label="禁用" :value="0"></el-option>
+          <el-option label="启用" :value="1"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="onSubmit">保存</el-button>
+        <el-button @click="onCancel">取消</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
 </template>
 
 <script>
@@ -91,7 +97,8 @@ export default {
   },
   computed: {
     ...mapUserState({
-      detail: x => x.detail
+      detail: x => x.detail,
+      identityDict: x => x.identityDict,
     }),
   },
   created () {
@@ -101,5 +108,12 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+  .user-form {
+    width: 60%;
+    max-width: 600px;
+  }
 
+  .width-100 {
+    width: 100%;
+  }
 </style>

src/views/sysuser/list.vue

@@ -7,8 +7,19 @@
     <el-form-item>
       <el-input v-model="filterData.phone" placeholder="手机号" clearable></el-input>
     </el-form-item>
+    <el-form-item>
+        <el-select v-model="filterData.identity" placeholder="请选择">
+          <el-option label="全部"></el-option>
+          <el-option
+            v-for="item in identityDict"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+    </el-form-item>
     <el-form-item slot="tail">
-      <el-button type="success" icon="el-icon-plus" @click='addSales'>销售</el-button>
+      <el-button type="success" icon="el-icon-plus" @click='addUser'>人员</el-button>
     </el-form-item>
   </xm-search>
 
@@ -17,7 +28,7 @@
       :data="list.records || []"
       style="width: 100%">
       <el-table-column
-        prop="nickname"
+        prop="username"
         label="用户名">
       </el-table-column>
       <el-table-column
@@ -25,8 +36,10 @@
         label="手机号">
       </el-table-column>
       <el-table-column
-        prop="wxId"
-        label="微信ID">
+        label="用户身份">
+        <template slot-scope="scope">
+          {{getIdentityName(scope.row.userIdentity)}}
+        </template>
       </el-table-column>
       <el-table-column
         label="状态">
@@ -75,6 +88,7 @@ export default {
       filterData: {
         name: '',
         phone: '',
+        identity: undefined,
       },
       pageNavi: {
         page: 1,
@@ -86,6 +100,7 @@ export default {
   computed: {
     ...mapUserState({
       list: x => x.list,
+      identityDict: x => x.identityDict,
     })
   },
   methods: {
@@ -95,16 +110,14 @@ export default {
     handleEdit (row) {
       this.$router.push({ name: 'sysuseredit', query: {id: row.userId} })
     },
-    addSales () {
+    addUser () {
       this.$router.push({ name: 'sysuseredit' })
     },
     getList () {
       this.getSysUserList({
         pageNum: this.pageNavi.page || 1,
         pageSize: this.pageNavi.size,
-        name: this.filterData.name,
-        phone: this.filterData.phone,
-        isSales: 1,
+        ...this.filterData,
       }).then((data) => {
         const { current: page, size, total } = data
         this.pageNavi = { page, size, total }
@@ -122,6 +135,10 @@ export default {
       }
 
       return dayjs(dt).format('YYYY-MM-DD HH:mm')
+    },
+    getIdentityName (val) {
+      const identity = (this.identityDict || []).filter(x => x.value == val)[0] || {}
+      return identity.label || '-'
     }
   },
   created () {