feat: 优化修改排班设置操作

guzijian
1 parent 9b310b89
Showing 3 changed files with 34 additions and 18 deletions
src/router/index.js
src/views/main/components/people/index.vue
src/views/main/manager/index.vue
@@ -7,9 +7,9 @@ import Layout from &#39;@/layout&#39;;
  *
  * hidden: true                     // 当设置 true 的时候该路由不会再侧边栏出现 如401，login等页面，或者如一些编辑页面/edit/1
  * alwaysShow: true                 // 当你一个路由下面的 children 声明的路由大于1个时，自动会变成嵌套的模式--如组件页面
- *                                  // 只有一个时，会将那个子路由当做根路由显示在侧边栏--如引导页面
- *                                  // 若你想不管路由下面的 children 声明的个数都显示你的根路由
- *                                  // 你可以设置 alwaysShow: true，这样它就会忽略之前定义的规则，一直显示根路由
+ *                                     只有一个时，会将那个子路由当做根路由显示在侧边栏--如引导页面
+ *                                     若你想不管路由下面的 children 声明的个数都显示你的根路由
+ *                                     你可以设置 alwaysShow: true，这样它就会忽略之前定义的规则，一直显示根路由
  * redirect: noRedirect             // 当设置 noRedirect 的时候该路由在面包屑导航中不可被点击
  * name:'router-name'               // 设定路由的名字，一定要填写不然使用<keep-alive>时会出现各种问题
  * query: '{"id": 1, "name": "ry"}' // 访问路由的默认传递参数
 <template>
   <div class="people-container">
     <el-transfer @left-check-change="handleLeftChange" @right-check-change="handleRightChange" v-loading="loading"
-      :filterable="true" :titles="['所有人员', '需重新生成人员']" v-model="childrenItemValue" :data="data" />
+      :filterable="true" :titles="[leftTitle, rightTitle]" v-model="childrenItemValue" :data="data" />
   </div>
 </template>
@@ -12,6 +12,16 @@ const loading = ref(false)
 const props = defineProps({
   peopleNowValue: {
     require: false
+  },
+  leftTitle: {
+    require: false,
+    default: "所有人员",
+    type: String
+  },
+  rightTitle: {
+    require: false,
+    default: "需重新生成人员",
+    type: String
   }
 })
@@ -23,7 +23,7 @@
     </el-form>
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="success" plain icon="Edit" :disabled="multiple" @click="handleEdit">编 辑</el-button>
+        <el-button type="success" plain icon="Edit" @click="handleEdit">编 辑</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="primary" plain icon="User" :disabled="single" @click="handleUser">顶 班</el-button>
@@ -41,7 +41,8 @@
       <el-table-column type="selection" width="40" align="center" fixed="left" />
       <el-table-column label="工号" show-overflow-tooltip="true" align="center" width="100" prop="jobCode" fixed="left" />
       <el-table-column label="姓名" show-overflow-tooltip="true" align="center" width="100" prop="name" fixed="left" />
-      <el-table-column label="部门" show-overflow-tooltip="true" align="center" width="100" prop="fleetName" fixed="left" />
+      <el-table-column label="部门" show-overflow-tooltip="true" align="center" width="100" prop="fleetName"
+        fixed="left" />
       <el-table-column label="工种" show-overflow-tooltip="true" align="center" width="100" prop="posts" fixed="left" />
       <el-table-column label="班次" show-overflow-tooltip="true" align="center" width="100" prop="ruleDictName"
         fixed="left" />
@@ -50,8 +51,8 @@
       </el-table-column>
     </el-table>
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
-      @pagination="getList" />
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize" @pagination="getList" />
     <!-- 删除和修改对话框 -->
     <el-dialog :title="title" v-model="open" width="800px" append-to-body>
@@ -66,15 +67,20 @@
         <schedulingAdd v-if="open" :schedulingNowValue="schedulingNowValue" ref="schedulingChildren"
           :schedulingOptions="schedulingOptions" />
       </div>
+
       <!-- 修改|删除 -->
       <el-form :inline="true" label-width="100px">
+        <!-- 选择人员 -->
+        <el-form-item>
+          <people ref="updateChildren" leftTitle="所有人员" rightTitle="已选择人员" />
+        </el-form-item>
         <el-form-item label="开始日期">
           <el-date-picker v-model="startDate" format="YYYY-MM-DD" value-format="YYYY-MM-DD" type="date"
             placeholder="选择开始日期" :disabled-date="disabledDate" />
         </el-form-item>
         <el-form-item label="结束日期">
-          <el-date-picker v-model="endDate" format="YYYY-MM-DD" value-format="YYYY-MM-DD" type="date" placeholder="选择开始日期"
-            :disabled-date="disabledDate" />
+          <el-date-picker v-model="endDate" format="YYYY-MM-DD" value-format="YYYY-MM-DD" type="date"
+            placeholder="选择开始日期" :disabled-date="disabledDate" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -90,8 +96,8 @@
       <el-text class="mx-1" size="small">规则不选择默认顶替当天排班规则，被顶班人员会自动设置为休息。</el-text>
       <schedulingAdd v-if="updateDataFlag" ref="schedulingChildrenSecond" :schedulingNowValue="schedulingNowValue"
         :schedulingOptions="schedulingOptions" />
-      <el-form :inline="true" style="margin-top: 15px;" v-if="updateDataFlag" ref="updateDataRef" :model="updateDataUser"
-        label-width="100px">
+      <el-form :inline="true" style="margin-top: 15px;" v-if="updateDataFlag" ref="updateDataRef"
+        :model="updateDataUser" label-width="100px">
         <el-form-item label="顶班日期" :required="true">
           <el-date-picker v-model="updateDataUser.date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" type="date"
             placeholder="选择顶班日期" @change="handleDateChange" :disabled-date="disabledDate" />
@@ -153,8 +159,8 @@ const againCreateRequestVo = ref({
   month: null,
   jobCode: null
 })
+const updateChildren = ref(null)
 const newAddChildren = ref(null)
-const attendancePeopleList = ref([])
 const peopleList = ref([])
 const otherJobCode = ref(null)
 const schedulingChildren = ref(null);
@@ -167,7 +173,6 @@ const loading = ref(true);
 const showSearch = ref(true);
 const jobCodes = ref([]);
 const single = ref(true);
-const multiple = ref(true);
 const total = ref(0);
 const title = ref("");
 const schedulingOptions = ref(null)
@@ -342,7 +347,6 @@ function handleSelectionChange(selection) {
   if (!single.value) {
     name.value = selection[0].name
   }
-  multiple.value = !selection.length;
 }
@@ -451,9 +455,11 @@ function handleAgainCreateAttendance() {
 function handleUpdate() {
   // 判断当前规则是否为空
-  if (schedulingChildren.value.childrenItemValue) {
+  if (updateChildren.value.childrenItemValue && schedulingChildren.value.childrenItemValue) {
+    console.log(updateChildren.value.childrenItemValue);
+    console.log(schedulingChildren.value.childrenItemValue);
     let updateData = {
-      jobCode: jobCodes.value,
+      jobCode: updateChildren.value.childrenItemValue,
       ruleId: schedulingChildren.value.childrenItemValue.id,
       startDate: startDate.value,
       endDate: endDate.value
@@ -495,7 +501,7 @@ const cancelAgainCreate = () =&gt; {
 /** 删除操作 */
 function handleDelete() {
   let deleteData = {
-    jobCode: jobCodes.value,
+    jobCode: updateChildren.value.childrenItemValue,
     startDate: startDate.value,
     endDate: endDate.value
   }