feat: 新增提示，编辑规则的时候不会关闭dialog

guzijian
1 parent b2475692
Showing 3 changed files with 23 additions and 16 deletions
src/views/main/components/people/index.vue
src/views/main/manager/index.vue
src/views/report/sign/index.vue
@@ -25,7 +25,9 @@ const props = defineProps({
   }
 })
-
+const resetPeople = () => {
+  childrenItemValue.value = []
+}
 const data = ref([])
 const childrenItemValue = ref([])
@@ -62,7 +64,8 @@ onMounted(() =&gt; {
 })
 defineExpose({
-  childrenItemValue
+  childrenItemValue,
+  resetPeople
 });
 </script>
@@ -55,21 +55,24 @@
       v-model:limit="queryParams.pageSize" @pagination="getList" />
     <!-- 删除和修改对话框 -->
-    <el-dialog :title="title" v-model="open" width="800px" append-to-body>
+    <el-dialog :title="title" draggable v-model="open" width="800px" append-to-body>
       <template #header>
         <el-radio-group v-model="radio" size="large">
-          <el-radio-button label="修改" />
-          <el-radio-button label="删除" />
+          <el-radio-button label="修 改" />
+          <el-radio-button label="删 除" />
         </el-radio-group>
       </template>
-      <el-text v-show="radio == '删除'" class="mx-1" size="small">删除操作请使用在离职员工身上，删除了的记录是没办法进行修改的</el-text>
-      <div v-show="radio == '修改'" style="margin-bottom: 30px;">
+      <el-text v-show="radio == '删 除'" class="mx-1" size="small">删除操作请使用在离职员工身上，删除了的记录是没办法进行修改的</el-text>
+      <div v-show="radio == '修 改'" style="margin-bottom: 30px;">
         <schedulingAdd v-if="open" :schedulingNowValue="schedulingNowValue" ref="schedulingChildren"
           :schedulingOptions="schedulingOptions" />
       </div>
       <!-- 修改|删除 -->
       <el-form :inline="true" label-width="100px">
+        <el-form-item>
+          <el-alert title="右侧穿梭框内的人员都会参与这次操作" type="warning" show-icon :closable="false" />
+        </el-form-item>
         <!-- 选择人员 -->
         <el-form-item>
           <people ref="updateChildren" leftTitle="所有人员" rightTitle="已选择人员" />
@@ -166,7 +169,7 @@ const otherJobCode = ref(null)
 const schedulingChildren = ref(null);
 const schedulingChildrenSecond = ref(null);
 const name = ref(null);
-const radio = ref("修改")
+const radio = ref("修 改")
 const driverList = ref([]);
 const open = ref(false);
 const loading = ref(true);
@@ -362,7 +365,7 @@ function handleEdit() {
 /** 提交按钮 */
 function submitForm() {
-  if (radio.value == "修改") {
+  if (radio.value == "修 改") {
     handleUpdate()
   } else {
     handleDelete()
@@ -456,8 +459,6 @@ function handleAgainCreateAttendance() {
 function handleUpdate() {
   // 判断当前规则是否为空
   if (updateChildren.value.childrenItemValue && schedulingChildren.value.childrenItemValue) {
-    console.log(updateChildren.value.childrenItemValue);
-    console.log(schedulingChildren.value.childrenItemValue);
     let updateData = {
       jobCode: updateChildren.value.childrenItemValue,
       ruleId: schedulingChildren.value.childrenItemValue.id,
@@ -472,11 +473,13 @@ function handleUpdate() {
       .then(res => {
         proxy.$modal.msgSuccess("对应的排班明细已经修改成功");
         getList();
-        open.value = false
+        updateChildren.value.resetPeople();
       })
       .catch(() => {
         open.value = false
       })
+  } else {
+    proxy.$modal.msgError("请选择规则和需要修改的人员");
   }
 }
@@ -513,7 +516,7 @@ function handleDelete() {
     .then((res) => {
       proxy.$modal.msgSuccess("对应的排班明细已经删除成功");
       getList();
-      open.value = false
+      updateChildren.value.resetPeople();
     })
 }
@@ -94,11 +94,12 @@
         <el-table-column label="线路" align="center" prop="lineName" />
         <el-table-column label="路牌" align="center" prop="lpName" />
         <el-table-column label="车辆自编号" align="center" prop="nbbm" width="130" />
+        <el-table-column label="打卡场地" align="center" prop="siteName" width="182" />
         <el-table-column label="计划操作" align="center" prop="planAction" />
         <el-table-column label="实际操作" align="center" prop="actualAction">
           <template #default="scope">
             <el-tag class="ml-2" type="success" v-if="scope.row.actualAction != null">{{ scope.row.actualAction
-            }}</el-tag>
+              }}</el-tag>
             <el-tag class="ml-2" type="danger" v-else>{{ scope.row.planAction == "签到" ? "未签到" : "未签退" }}</el-tag>
           </template>
         </el-table-column>
@@ -108,7 +109,7 @@
         <el-table-column label="有无异常" align="center" prop="exString">
           <template #default="scope">
             <el-tag class="ml-2" type="success" v-if="scope.row.exString == '无异常'">{{ scope.row.exString
-            }}</el-tag>
+              }}</el-tag>
             <el-tag class="ml-2" type="danger" v-else>{{ scope.row.exString }}</el-tag>
           </template>
         </el-table-column>
@@ -326,7 +327,7 @@ const onExportDateType = (val) =&gt; {
 }
 </script>
-<style >
+<style>
 .el-table .warning-row {
   --el-table-tr-bg-color: var(--el-color-danger-light-9);
 }