Merge branch 'dev' of gitlab.33.cn:CassiniatSaturn/fns_backend into dev

src/components/UserManage/topBar.vue

@@ -55,6 +55,7 @@ import addNormalManagerModal from './addNormalManagerModal.vue'
 import addSuperManagerModal from './addSuperManagerModal.vue'
 import timerange from '@/components/TimePicker/index.vue'
 import { eLevel } from '@/types/level'
+import { eNewRoleRelatedToBackEnd } from "@/types/role"
 import { addUser } from './const'
 import { mapActions, mapMutations, mapState } from 'vuex'
 import { nextTick } from 'vue/types/umd'
@@ -87,14 +88,22 @@ export default Vue.extend({
     searchPageReqParams: {
       deep: true,
       handler(newV) {
-        if (this.type === addUser.superManager) {
+        console.log(2)
+        // if (this.type === addUser.superManager) {
           this.platformSave({
             start: newV.startTime,
             end: newV.endTime,
             userName: newV.queryName,
             phone: newV.queryTel,
           })
-        }
+        // } else {
+        //   this.platformSave({
+        //     start: newV.startTime,
+        //     end: newV.endTime,
+        //     userName: newV.queryName,
+        //     phone: newV.queryTel,
+        //   })
+        // }
       },
     },
   },
@@ -112,6 +121,7 @@ export default Vue.extend({
     }),
     ...mapActions('platformUserManagement', {
       platformQuery: 'query',
+      platform: 'queryUser',
     }),
     getNewTime(startTime: number, endTime: number) {
       this.searchPageReqParams.startTime = startTime
@@ -119,10 +129,16 @@ export default Vue.extend({
     },
     query() {
       if (this.type === addUser.superManager) {
-      this.platformSave({
-        page: 1,
-      })
-      this.platformQuery()}
+        this.platformSave({
+          page: 1,
+        })
+        this.platformQuery()
+      } else {
+        this.platformSave({
+          page: 1,
+        })
+        this.platform()
+      }
     },
     reset() {
       this.searchPageReqParams.queryName = ''
@@ -140,10 +156,10 @@ export default Vue.extend({
     },
     showModal() {
       const rankVal = (JSON.parse(this.$route.query.rankVal as string)) as {name: string, value: number}[];
-
+      const role = this.$route.query.role === eNewRoleRelatedToBackEnd.ACM ? eTypeOfOperatedObject.clientManager : eTypeOfOperatedObject.manager
       this.$store.commit('UserManagement/save', {
         modalMode: eAddManagerModalMode.create, // create表示新增
-        typeOfOperatedObject: eTypeOfOperatedObject.manager, // !!!!要改 表示管理员还是客服经理
+        typeOfOperatedObject: role, // !!!!要改 表示管理员还是客服经理
         searchLevel: this.level, // 当前搜索的层级 如果展示一级分行页面 则是 eLevel.firstLevel_branch
         branchDetailMsg: { // 分支行下拉栏的值
           fb: rankVal[0].name,

src/components/UserManage/userTable.vue

@@ -167,6 +167,7 @@ export default Vue.extend({
           uuid,
           role
         }
+        console.log(this.params)
       } else {
         this.params = {
           location: this.$route.query.address

src/const/columns/userColumns.ts

@@ -4,27 +4,27 @@ const columns:Array<column> =
   {
     title: '注册时间',
     align:'center',
-    dataIndex: 'time',
+    dataIndex: 'created_at',
   },
   {
     title:'uid',
     align:'center',
-    dataIndex:'key'
+    dataIndex:'uuid'
   },
   {
     title:'姓名',
     align:'center',
-    dataIndex: 'name'
+    dataIndex: 'user_name'
   },
   {
     title: '手机号',
     align:'center',
-    dataIndex: 'account',
+    dataIndex: 'phone',
   },
   {
     title: '所属网点',
     align:'center',
-    dataIndex: 'bank',
+    dataIndex: 'location',
   },
   {
     title: '备注',

src/service/StaffService/index.ts

@@ -123,7 +123,8 @@ export default class StaffService {
     second_branch?: number,
     second_sub_branch?: number,
     start?: number,
-    user_name?: string
+    user_name?: string,
+    role?: string
   }) {
     return baseAxios({
       url: '/staff/query',
@@ -159,7 +160,7 @@ export default class StaffService {
     role: string
   }) {
     return baseAxios({
-      url: '/staff/next_level',
+      url: '/staff/view',
       method: 'get',
       params: data
     })

src/store/platformUserManagement/index.ts

@@ -64,7 +64,8 @@ export default <Module<iPlatformModuleState, {}>>{
         second_sub_branch: state.secondSubBranch,
         start: state.start,
         user_name: state.userName,
-        level: state.level
+        level: state.level,
+        role: state.role + ''
       }).then(res => {
         if (res.code === 200) {
           commit('save', {

src/views/Root/User/client.vue

@@ -62,7 +62,7 @@
 </template>
 <script lang="ts">
 import Vue from "vue"
-import { FormModel } from 'ant-design-vue'
+import { FormModel, message } from 'ant-design-vue'
 import { userList } from '@/mock/index'
 import { user } from '@/types/user'
 import { columns } from '@/const/columns/userColumns'
@@ -105,7 +105,8 @@ export default Vue.extend({
         current: 1,
         defaultPageSize: 10,
         total: 0
-      }
+      },
+      uuid: ''
     }
   },
   created() {
@@ -157,18 +158,25 @@ export default Vue.extend({
       this.queryParam.user_name = ''
       this.queryParam.phone = ''
     },
-    check(text:user){
+    check(text:any){
       this.visible = true
       this.note = text
     },
-    edit(text:user){
+    edit(text:any){
       this.note = text
+      this.uuid = text.uuid
       this.show = true
     },
     onSubmit(){
       (this.$refs.ruleForm as FormModel).validate(valid => {
         if (valid) {
-          // staff.
+          staff.remarkStaff({uuid: this.uuid, remark: this.form.notes}).then(res => {
+            if (res.code == 200) {
+              message.success('编辑成功')
+              this.reset()
+              this.getList()
+            }
+          })
           this.show = false
         } else {
           console.log('error submit!!');

src/views/Root/User/index.vue

@@ -18,12 +18,17 @@
         :role="role"
       />
       <!-- 搜索框 -->
-      <a-input
+      <!-- <a-input
         :disabled="value.length == 0 ? false : true"
         placeholder="通过输入详细地址搜索"
         v-model="search"
         style="width: 20%; margin-right: 15px"
-      />
+      /> -->
+      <a-select style="width: 120px" v-model="search">
+        <a-select-option v-for="item in option" :key="item.value" :value="item.value">
+          {{ item.label }}
+        </a-select-option>
+      </a-select>
       <!-- 操作 -->
       <a-button type="primary" style="margin-right: 10px" @click="query"
         >查询</a-button
@@ -46,6 +51,7 @@ import { eLevel } from '@/types/level';
 import { fooList } from "@/views/Root/OutletManagement/components/HeaderSelect/const";
 import { PAGE_SIZE } from "@/const/config/page"
 import HeaderSelect from "@/views/Root/OutletManagement/components/HeaderSelect/index.vue";
+import { eNewRoleRelatedToBackEnd } from "@/types/role"
 import { mapActions, mapMutations, mapState } from 'vuex'
 Vue.use(Cascader)
 Vue.prototype.$message = message
@@ -68,9 +74,19 @@ export default Vue.extend({
   },
   data(){
     return{
-      search:'',
+      search: eNewRoleRelatedToBackEnd.Management,
       value:[],
-      fooList
+      fooList,
+      option: [
+        {
+          label: eNewRoleRelatedToBackEnd.Management,
+          value: eNewRoleRelatedToBackEnd.Management
+        },
+        {
+          label: eNewRoleRelatedToBackEnd.ACM,
+          value: eNewRoleRelatedToBackEnd.ACM
+        }
+      ]
     }
   },
   mounted(){
@@ -138,22 +154,22 @@ export default Vue.extend({
         const count = arr.length
         switch (count) {
           case 1:
-            this.$router.push({path: '/backend/user/firstLevel', query: { rankVal: JSON.stringify(arr) }})
+            this.$router.push({path: '/backend/user/firstLevel', query: { rankVal: JSON.stringify(arr), role: this.search }})
             break
           case 2:
-            this.$router.push({path: '/backend/user/secondary', query: { rankVal: JSON.stringify(arr) }})
+            this.$router.push({path: '/backend/user/secondary', query: { rankVal: JSON.stringify(arr), role: this.search }})
             break
           case 3:
-            this.$router.push({path: '/backend/user/firstSub', query: { rankVal: JSON.stringify(arr) }})
+            this.$router.push({path: '/backend/user/firstSub', query: { rankVal: JSON.stringify(arr), role: this.search }})
             break
           case 4:
-            this.$router.push({path: '/backend/user/secondarySub', query: { rankVal: JSON.stringify(arr) }})
+            this.$router.push({path: '/backend/user/secondarySub', query: { rankVal: JSON.stringify(arr), role: this.search }})
         }
       }
     },
     reset(){
       (this.$refs.headerSelect as any).init();
-      this.search = ''
+      this.search = eNewRoleRelatedToBackEnd.Management
     },
   }
 })