席位管理

src/api/modules/account.ts

@@ -2,7 +2,14 @@ import { handle } from '../index'
 
 const suffix = 'api'
 
-export const getUserInfoByUsername = () => handle({
+// 获取个人信息
+export const getUserInfo = () => handle({
   url: `/${suffix}/account/search`,
   method: 'get',
 })
+//  根据部门ID获取用户列表
+export const getAccountListByDeptId = (params: any) => handle({
+  url: `/${suffix}/account/list`,
+  method: 'get',
+  params
+})

src/api/modules/seat.ts

@@ -27,3 +27,10 @@ export const getSeatDutyUnitById = (id: string) => handle({
   url: `/${suffix}/seat/duty/unit/${id}`,
   method: 'get',
 })
+
+//  席位管理 > 座位编辑
+export const editSeatDutyUnitEdit = (params: any) => handle({
+  url: `/${suffix}/seat/duty/unit/edit`,
+  method: 'put',
+  params
+})

src/components/cus/cus-form-link/select.vue

@@ -58,6 +58,7 @@ export default defineComponent({
     const router = useRouter();
     const route = useRoute();
     const that = (getCurrentInstance() as ComponentInternalInstance).appContext.config.globalProperties
+    const attrs = (getCurrentInstance() as ComponentInternalInstance).attrs
     const state = reactive({
       paramVal: props.param,
       loading: true,
@@ -81,7 +82,7 @@ export default defineComponent({
       return map
     })
     const handleChange = (val: any) => {
-      emit('getObject', optionsMapCpt.value.get(val))
+      emit('getObject', attrs.multiple === undefined ? optionsMapCpt.value.get(val) : val.map(v => optionsMapCpt.value.get(v)))
     }
     onMounted(() => {
       if (props.static !== false || props.options?.length > 0) {

src/store/modules/app.ts

@@ -1,4 +1,4 @@
-import {getUserInfoByUsername} from "@/api/modules/account";
+import {getUserInfo} from "@/api/modules/account";
 import {getSignTime} from "@/api/modules/sign";
 import {ElMessage} from "element-plus";
 import {getSeatDutyPersonSearch} from "@/api/modules/seat";
@@ -43,7 +43,7 @@ const actions = {
 	LOAD_USER_INFO({ commit }: any, refresh: boolean = false) {
 		return new Promise((resolve, reject) => {
 			if (refresh || !state.userInfo?.id) {
-				getUserInfoByUsername().then((res) => {
+				getUserInfo().then((res) => {
 					if (res.code === 200) {
 						commit('SET_USER_INFO', res.data)
 						resolve(res.data)

src/store/modules/dictionary.ts

@@ -33,6 +33,7 @@ const mutations = {
     data.forEach(v => {
       v.dictLabel = v.organizationName
       v.dictValue = v.id
+      map.set(v.dictValue, v)
       list.push(v)
     })
     state.deptList = list

src/views/system/seat-manage/index.vue

@@ -42,18 +42,18 @@
         </div>
         <div class="seat-position" v-loading="loadingSeat">
           <template v-for="item in seatList">
-            <div class="seat-item __hover" :class="{no: !(item.abbreviation || item.name), active: currentSeatId === item.id}" @click="onSeatClick(item)">
+            <div class="seat-item __hover" :class="{no: !(item.abbreviation || item.name), active: currentSeatId === item.id}" @click="onSeatClick(item.id)">
               <div class="index">{{item.serialNumber}}</div>
               <div class="name">{{item.abbreviation || item.name || '无单位'}}</div>
             </div>
           </template>
         </div>
       </div>
-      <div class="dept" v-if="seatInfo.info?.id">
+      <div class="dept" v-if="seatInfo.info?.id" v-loading="loadingForm">
         <template v-if="isEdit">
           <div class="dept-edit-buttons">
-            <div class="reset __hover">清空</div>
-            <div class="save __hover">保存</div>
+            <div class="reset __hover" @click="onReset">清空</div>
+            <div class="save __hover" @click="onSave">保存</div>
             <div class="cancel __hover" @click="onEditCancel">取消</div>
           </div>
           <div class="dept-edit-form">
@@ -62,17 +62,18 @@
                   :span="24"
                   :disabled="true"
                   label="席位编号:"
-                  v-model:param="seatInfo.editDutyInfo.deptForm.index"/>
+                  v-model:param="seatInfo.editDutyInfo.deptForm.serialNumber"/>
               <CusFormColumn
                   :span="24"
-                  required
                   label="单位名称:"
-                  link="dept"
-                  v-model:param="seatInfo.editDutyInfo.deptForm.p2"/>
+                  link="select"
+                  v-model:param="seatInfo.editDutyInfo.deptForm.deptId"
+                  :options="$store.state.dictionary.deptList"
+                  @change="onChangeDept"/>
               <CusFormColumn
                   :span="24"
                   label="单位简称:"
-                  v-model:param="seatInfo.editDutyInfo.deptForm.p2"/>
+                  v-model:param="seatInfo.editDutyInfo.deptForm.abbreviation"/>
               <CusFormColumn
                   :span="24"
                   label="简介:"
@@ -80,12 +81,12 @@
                   :rows="4"
                   show-word-limit
                   :maxlength="100"
-                  v-model:param="seatInfo.editDutyInfo.deptForm.p3"/>
+                  v-model:param="seatInfo.editDutyInfo.deptForm.introduction"/>
             </CusForm>
           </div>
           <div class="dept-duty-total">
             值班人员列表({{seatInfo.editDutyInfo.tableData.length}})
-            <div class="people-add __hover" @click="addPeople">
+            <div class="people-add __hover" @click="addPeople" v-if="seatInfo.editDutyInfo.deptForm.deptId">
               <img src="./add.png"/>新增
             </div>
           </div>
@@ -95,6 +96,13 @@
                 :tableHead="seatInfo.editDutyInfo.tableHead"
                 noPage
             >
+              <template #do-column-value="{ scope }">
+                <div class="__cus-table_do">
+                  <div class="__cus-table_do-red __hover" @click="delPeople(scope)">
+                    <SvgIcon name="del" size="16"/>删除
+                  </div>
+                </div>
+              </template>
             </CusTable>
           </div>
         </template>
@@ -115,7 +123,7 @@
             </div>
           </div>
           <div class="dept-duty-total">
-            值班人员列表({{seatInfo.dutyInfo.total}})
+            值班人员列表({{seatInfo.dutyInfo.tableData.length}})
           </div>
           <div class="dept-duty-table">
             <CusTable
@@ -129,7 +137,7 @@
         </template>
       </div>
     </div>
-    <PeopleCom v-model:show="showPeople" :transfer="transfer"/>
+    <PeopleCom v-model:show="showPeople" :transfer="transfer" @getPeople="getPeople"/>
   </div>
 </template>
 
@@ -149,8 +157,13 @@ import {
 import {useStore} from 'vuex'
 import {useRouter, useRoute} from 'vue-router'
 import PeopleCom from './people.vue'
-import {getSeatDutyPersonEdit, getSeatDutyUnitById, getSeatDutyUnitList} from "@/api/modules/seat";
-import {ElMessage} from "element-plus";
+import {
+  editSeatDutyUnitEdit,
+  getSeatDutyPersonEdit,
+  getSeatDutyUnitById,
+  getSeatDutyUnitList
+} from "@/api/modules/seat";
+import {ElMessage, ElMessageBox} from "element-plus";
 
 export default defineComponent({
   name: '',
@@ -174,17 +187,17 @@ export default defineComponent({
           tableData: [],
           loading: false,
           tableHead: [
-            {value: "p1", label: "姓名", show: true},
-            {value: "p1", label: "联系电话", show: true},
-            {value: "p1", label: "更新时间", show: true},
+            {value: "name", label: "姓名", show: true},
+            {value: "linkPhone", label: "联系电话", show: true},
+            {value: "time", label: "更新时间", show: true},
           ],
         },
         editDutyInfo: {
-          tableData: [],
+          tableData: <any>[],
           tableHead: [
-            {value: "p1", label: "姓名", show: true},
-            {value: "p1", label: "联系电话", show: true},
-            {value: "p1", label: "更新时间", show: true},
+            {value: "name", label: "姓名", show: true},
+            {value: "linkPhone", label: "联系电话", show: true},
+            {value: "time", label: "更新时间", show: true},
             {value: "do", label: "操作", show: true},
           ],
           deptForm: {}
@@ -192,10 +205,13 @@ export default defineComponent({
       },
       isEdit: false,
       showPeople: false,
-      transfer: {}
+      transfer: {},
+      loadingForm: false
     })
+    const ref_form = ref()
     //  获取字典
     const initDictionary = () => {
+      store.dispatch('dictionary/LOAD_DEPT')
       store.dispatch('dictionary/LOAD_DICT_LIST', 'duty_hall_leader')
       store.dispatch('dictionary/LOAD_DICT_LIST', 'total_class')
       store.dispatch('dictionary/LOAD_DICT_LIST', 'shift_leader')
@@ -246,17 +262,17 @@ export default defineComponent({
         state.loadingSeat = false
       })
     }
-    const onSeatClick = (item) => {
-      state.currentSeatId = item.id
+    const onSeatClick = (seatId) => {
+      state.currentSeatId = seatId
       //  重置数据
       state.seatInfo.info = {}
       state.seatInfo.dutyInfo.tableData = []
-      state.seatInfo.editDutyInfo.tableData = []
-      state.seatInfo.editDutyInfo.deptForm = {}
+      state.isEdit = false
       state.loadingSeat = true
       that.$api.getSeatDutyUnitById(state.currentSeatId).then(res => {
         if (res.code === 200) {
-          state.seatInfo.info = res.data
+          state.seatInfo.info = JSON.parse(JSON.stringify(res.data))
+          state.seatInfo.dutyInfo.tableData = JSON.parse(JSON.stringify(res.data.dutyUnitPersonList || []))
         } else {
           ElMessage.error(res.message)
         }
@@ -275,10 +291,66 @@ export default defineComponent({
       state.seatInfo.editDutyInfo.tableData = []
       state.isEdit = false
     }
+    const onReset = () => {
+      state.seatInfo.editDutyInfo.tableData = []
+      state.seatInfo.editDutyInfo.deptForm.abbreviation = ''
+      state.seatInfo.editDutyInfo.deptForm.introduction = ''
+      state.seatInfo.editDutyInfo.deptForm.deptId = ''
+    }
+    const onSave = () => {
+      ref_form.value.submit().then(() => {
+        ElMessageBox.confirm("是否提交?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then(() => {
+          state.loadingForm = true
+          that.$api.editSeatDutyUnitEdit(Object.assign(state.seatInfo.editDutyInfo.deptForm, {
+            dutyUnitPersonList: state.seatInfo.editDutyInfo.tableData.map(v => {
+              v.unitId = state.seatInfo.editDutyInfo.deptForm.id
+              return v
+            }),
+            name: store.state.dictionary.deptMap.get(state.seatInfo.editDutyInfo.deptForm.deptId).organizationName
+          })).then(res => {
+            if (res.code === 200) {
+              onSeatClick(state.currentSeatId)
+              initSeat()
+              ElMessage.success(res.message)
+            } else {
+              ElMessage.error(res.message)
+            }
+            state.loadingForm = false
+          }).catch(() => {
+            state.loadingForm = false
+          })
+        }).catch(() => {})
+      }).catch((e) => {
+        ElMessage({
+          message: e[0].message,
+          grouping: true,
+          type: 'warning',
+        })
+      })
+    }
+    const onChangeDept = (val) => {
+      state.seatInfo.editDutyInfo.deptForm.name = store.state.dictionary.deptMap.get(val)
+      state.seatInfo.editDutyInfo.deptForm.abbreviation = ''
+      state.seatInfo.editDutyInfo.deptForm.introduction = ''
+      state.seatInfo.editDutyInfo.tableData = []
+    }
     const addPeople = () => {
-      state.transfer = JSON.parse(JSON.stringify(state.seatInfo.info))
+      state.transfer = {
+        deptId: state.seatInfo.editDutyInfo.deptForm.deptId,
+        selectUserId: state.seatInfo.editDutyInfo.tableData.map(v => v.accountId)
+      }
       state.showPeople = true
     }
+    const getPeople = (val: any) => {
+      state.seatInfo.editDutyInfo.tableData.push(...val)
+    }
+    const delPeople = (scope) => {
+      state.seatInfo.editDutyInfo.tableData.splice(scope.$index, 1)
+    }
     watch(() => store.state.app.dutyInfo, () => {
       initDuty()
     })
@@ -289,11 +361,17 @@ export default defineComponent({
     })
     return {
       ...toRefs(state),
+      ref_form,
       onEdit,
       onEditCancel,
       addPeople,
       setDuty,
-      onSeatClick
+      onSeatClick,
+      onChangeDept,
+      getPeople,
+      delPeople,
+      onReset,
+      onSave
     }
   },
 })

src/views/system/seat-manage/people.vue

@@ -5,7 +5,7 @@
       @close="$emit('update:show', false)"
       @submit="onSubmit"
       width="400px"
-      height="226px"
+      maxHeight="80%"
       footAlign="right"
   >
     <div class="__normal-form">
@@ -14,23 +14,23 @@
             :span="24"
             required
             label="单位:"
-            link="dept"
-            :disabled="true"
-            v-model:param="cusDetail.p1"/>
+            link="select"
+            v-model:param="cusDetail.deptId"
+            :options="$store.state.dictionary.deptList"
+            :disabled="true"/>
         <CusFormColumn
             :span="24"
             required
-            label="新增值班人员:"
-            v-model:param="cusDetail.p2"
+            label="值班人员:"
+            v-model:param="cusDetail.peopleId"
             link="select"
             static
-            labelKey="label"
-            valueKey="value"
-            :options="[
-                {label: '类型一', value: '1'},
-                {label: '类型二', value: '2'},
-                {label: '类型三', value: '3'},
-            ]"/>
+            labelKey="displayName"
+            valueKey="id"
+            multiple
+            :options="peopleList"
+            :isLoading="loadingPeople"
+            @getObject="getPeopleObj"/>
       </CusForm>
     </div>
   </CusDialog>
@@ -51,6 +51,8 @@ import {
 } from 'vue'
 import {useStore} from 'vuex'
 import {useRouter, useRoute} from 'vue-router'
+import {getAccountListByDeptId} from "@/api/modules/account";
+import {ElMessage, ElMessageBox} from "element-plus";
 
 export default defineComponent({
   name: '',
@@ -65,23 +67,67 @@ export default defineComponent({
     const route = useRoute();
     const that = (getCurrentInstance() as ComponentInternalInstance).appContext.config.globalProperties
     const state = reactive({
-      cusDetail: {}
+      cusDetail: <any>{},
+      peopleList: {},
+      selectPeopleList: [],
+      selectUserId: [],
+      loadingPeople: false
     })
+    const ref_form = ref()
     watch(() => props.show, (n) => {
       if (n) {
-        state.cusDetail = {}
+        state.cusDetail = {
+          deptId: props.transfer.deptId,
+          peopleId: []
+        }
+        state.selectUserId = props.transfer.selectUserId
+        getPeople()
         nextTick(() => {
           ref_form.value.reset()
         })
       }
     })
-    const ref_form = ref()
+    const getPeople = () => {
+      state.loadingPeople = true
+      state.peopleList = []
+      that.$api.getAccountListByDeptId({externalId: store.state.dictionary.deptMap.get(state.cusDetail.deptId).externalId}).then(res => {
+        if (res.code === 200) {
+          state.peopleList = res.data.filter(v => !state.selectUserId.includes(v.id))
+        } else {
+          ElMessage.error(res.message)
+        }
+        state.loadingPeople = false
+      }).catch(() => {
+        state.loadingPeople = false
+      })
+    }
     const onSubmit = () => {
+      ref_form.value.submit().then(() => {
+        emit('getPeople', state.selectPeopleList)
+        emit('update:show', false)
+      }).catch((e) => {
+        ElMessage({
+          message: e[0].message,
+          grouping: true,
+          type: 'warning',
+        })
+      })
+    }
+    const getPeopleObj = (arr) => {
+      state.selectPeopleList = arr.map(v => {
+        const obj = {
+          linkPhone: v.phoneNumber,
+          name: v.displayName,
+          accountId: v.id
+        }
+        return obj
+      })
     }
     return {
       ...toRefs(state),
       onSubmit,
-      ref_form
+      ref_form,
+      getPeopleObj
     }
   },
 })