调配

src/components/UserManage/topBar.vue

@@ -58,6 +58,8 @@ import { eLevel } from '@/types/level'
 import { addUser } from './const'
 import { mapActions, mapMutations, mapState } from 'vuex'
 import { nextTick } from 'vue/types/umd'
+import { eAddManagerModalMode } from '@/store/UserManagement/types'
+import {eTypeOfOperatedObject, iUserManagementState} from "@/store/UserManagement/types"
 
 export default Vue.extend({
   components: { addNormalManagerModal, addSuperManagerModal, timerange },
@@ -135,6 +137,23 @@ export default Vue.extend({
       })
     },
     showModal() {
+      const rankVal = (JSON.parse(this.$route.query.rankVal as string)) as {name: string, value: number}[];
+
+      this.$store.commit('UserManagement/save', {
+        modalMode: eAddManagerModalMode.create,
+        typeOfOperatedObject: eTypeOfOperatedObject.manager, // !!!!要改
+        searchLevel: this.level,
+        branchDetailMsg: {
+          fb: rankVal[0].name,
+          fb_id: rankVal[0].value,
+          sb: rankVal[1] && rankVal[1].name || undefined,
+          sb_id: rankVal[1] && rankVal[1].value || undefined,
+          fsb: rankVal[2] && rankVal[2].name || undefined,
+          fsb_id: rankVal[2] && rankVal[2].value || undefined,
+          ssb: rankVal[1] && rankVal[1].name || undefined,
+          ssb_id: rankVal[1] && rankVal[1].value || undefined,
+        }
+      } as iUserManagementState)
       ;(this.$refs.addrModal as any).showModal()
     },
   },

src/components/UserManage/userTable.vue

@@ -71,7 +71,7 @@
 <script lang="ts">
 import Vue, { PropType } from "vue"
 import { firstLevelManager } from '@/mock/index'
-import { staff } from '@/types/staff'
+import { iStaffQueryResItem, staff } from '@/types/staff'
 import { eUserStatusAction } from '@/types/user'
 import { eRole } from "@/types/role"
 import { eLevel } from "@/types/level"
@@ -83,6 +83,7 @@ import { mapActions, mapMutations, mapState } from 'vuex'
 // import Mixin from "@/views/Root/User/Mixin/index"
 import StaffService from '@/service/StaffService'
 import { message } from "ant-design-vue"
+import { eAddManagerModalMode, eTypeOfOperatedObject } from "@/store/UserManagement/types"
 
 
 const staff = new StaffService()
@@ -175,8 +176,33 @@ export default Vue.extend({
       })
       this.platformQuery()
     },
-    deploy(record:staff){
-      (this.$refs.deployModal as any).showModal()
+    deploy(record:iStaffQueryResItem){
+      this.$store.commit('UserManagement/save', {
+        modalMode: eAddManagerModalMode.edit,
+        typeOfOperatedObject: eTypeOfOperatedObject.manager, //!!!!需要调整
+        searchLevel: this.level,
+        branchDetailMsg: {
+          fb: 'zhejiang',
+          fb_id: 1,
+        },
+        personalMsg: {
+          name: record.user_name,
+          uid: record.uuid,
+          phone: record.phone,
+          branchDetailMsg: {
+            fb: record.first_branch,
+            fb_id: 1,
+            sb: record.second_branch,
+            sb_id: 1,
+            fsb: record.first_sub_branch,
+            fsb_id: 1,
+            ssb: record.second_sub_branch,
+            ssb_id: 1,
+            address: record.location,
+          },
+        },
+        modalShow: true,
+      })
     },
     enable(key:string){
       this.type = userModal.enable

src/service/StaffService/index.ts

@@ -84,7 +84,7 @@ export default class StaffService {
     return baseAxios<{data: any}>({
       url: '/staff/deploy',
       method: 'put',
-      params: data
+      data: data
     })
   }
 

src/store/UserManagement/index.ts

@@ -10,7 +10,7 @@ export default <Module<iUserManagementState, {}>>{
   namespaced: true,
   state: {
     refreshMark: NaN,
-    modalShow: true,
+    modalShow: false,
     modalMode: eAddManagerModalMode.create,
     typeOfOperatedObject: eTypeOfOperatedObject.manager,
     searchLevel: eLevel.secondary_branch,

src/store/UserManagement/types.ts

@@ -34,11 +34,11 @@ export interface iPersonalMsg {
 
 export interface iUserManagementState {
   modalShow: boolean
-  modalMode: eAddManagerModalMode
+  modalMode: eAddManagerModalMode /* 模态框的形态 */
   typeOfOperatedObject: eTypeOfOperatedObject | undefined
-  searchLevel: eLevel | undefined
-  branchDetailMsg: Partial<iBranchDetailMsg>
-  personalMsg: iPersonalMsg
-  address: string
-  refreshMark: number
+  searchLevel: eLevel | undefined /* 当前搜索的层级 */
+  branchDetailMsg: Partial<iBranchDetailMsg> /* 分支行搜索页面所选中的信息需要设在此处 */
+  personalMsg: iPersonalMsg /* 调配人员时 该人员的个人信息 */
+  address: string /* 新地址 */
+  refreshMark: number /* 供表格刷新的标记，组件监听refreshMark，若变化，则刷新表格 */
 }

src/types/staff.ts

-import { eRole } from "./role";
+import { eLevel } from "./level";
+import { eNewRoleRelatedToBackEnd, eRole } from "./role";
+import { eUserStatus } from "./user";
 
 enum bank{
   '一级分行',
@@ -34,6 +36,24 @@ interface staff{
   state:string
 }
 
+export interface iStaffQueryResItem{
+  bank_name: string
+  created_at: number
+  first_branch: string
+  first_sub_branch: string
+  level: eLevel
+  location: string
+  operator_name: string
+  operator_uuid: string
+  phone: string
+  role: eNewRoleRelatedToBackEnd
+  second_branch: string
+  second_sub_branch: string
+  status: eUserStatus
+  user_name: string
+  uuid: string
+}
+
 export{
   bank,
   role,

src/views/Root/OutletManagement/index.vue

@@ -402,19 +402,25 @@ export default Vue.extend({
     }
   },
   methods: {
-    async handleInput(e: Event){
-      const ret = await handle建设银行excelFileChange(e)
+    async handleInput(e: Event) {
+      const ret = await handle建设银行excelFileChange(e);
       StaffService.getInstance().import({
-        staffs: ret as any
-      })
+        staffs: ret as any,
+      });
     },
     getLalo() {
-      window.navigator.geolocation.getCurrentPosition((position) => {
-        this.formData.la = position.coords.latitude.toString();
-        this.formData.lo = position.coords.longitude.toString();
-        const form = this.$refs.form as FormModel;
-        form.validateField(["la", "lo"], (err) => {});
-      });
+      if ("geolocation" in window.navigator) {
+        window.navigator.geolocation.getCurrentPosition((position) => {
+          this.formData.la = position.coords.latitude.toString();
+          this.formData.lo = position.coords.longitude.toString();
+          const form = this.$refs.form as FormModel;
+          form.validateField(["la", "lo"], (err) => {});
+        }, (error)=>{
+          message.error('获取失败')
+        });
+      }else{
+        message.error("浏览器不支持获取GPS")
+      }
     },
     async clickViewNote(record: any) {
       console.log(record);