feat: 新增规则修改确认

guzijian
1 parent d3981895
Showing 3 changed files with 33 additions and 9 deletions
src/api/scheduling/scheduling.js
src/utils/request.js
src/views/scheduling/scheduling/index.vue
@@ -51,3 +51,11 @@ export function delScheduling(id) {
     method: 'delete'
   })
 }
+
+
+export function checkRule(ruleId) {
+  return request({
+    url: `/attendance/check/scheduleRule/${ruleId}`,
+    method: 'get'
+  })
+}
@@ -4,7 +4,7 @@ import { getToken } from &#39;@/utils/auth&#39;
 import errorCode from '@/utils/errorCode'
 import { blobValidate, tansParams } from '@/utils/ruoyi'
 import axios from 'axios'
-import { ElLoading, ElMessage, ElMessageBox, ElNotification } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { saveAs } from 'file-saver'
  
 let downloadLoadingInstance;
@@ -95,8 +95,8 @@ service.interceptors.response.use(res =&gt; {
       ElMessage({ message: msg, type: 'warning' })
       return Promise.reject(new Error(msg))
     } else if (code !== 200) {
-      ElNotification.error({ title: msg })
-      return Promise.reject('error')
+      // ElNotification.error({ title: msg })
+      return Promise.reject(new Error(msg))
     } else {
       return  Promise.resolve(res.data)
     }
@@ -203,7 +203,8 @@
 </template>
  
 <script setup name="Scheduling">
-import { addScheduling, delScheduling, getScheduling, listScheduling, updateScheduling } from "@/api/scheduling/scheduling";
+import { addScheduling, checkRule, delScheduling, getScheduling, listScheduling, updateScheduling } from "@/api/scheduling/scheduling";
+
  
 const { proxy } = getCurrentInstance();
 const { sublevel, today_or_tomorrow, work_hour_type, work_hour_plan } = proxy.useDict('sublevel', 'today_or_tomorrow', 'work_hour_type', 'work_hour_plan');
@@ -399,11 +400,26 @@ function submitForm() {
         if (!validIds([form.value.id])) {
           return;
         }
-        updateScheduling(form.value).then(response => {
-          proxy.$modal.msgSuccess("修改成功");
-          open.value = false;
-          getList();
-        });
+
+        checkRule(form.value.id).then(response => {
+          console.log("checkRule", response);
+          proxy.$modal.msgSuccess(response.data);
+          updateScheduling(form.value).then(response => {
+            proxy.$modal.msgSuccess("检查通过");
+            open.value = false;
+            getList();
+          });
+
+        }).catch((err) => {
+          // 提示确认是否修改
+          proxy.$modal.confirm(err.message + "确认要修改吗？").then(function () {
+            updateScheduling(form.value).then(res => {
+              proxy.$modal.msgSuccess("修改成功");
+              open.value = false;
+              getList();
+            })
+          })
+        })
       } else {
         addScheduling(form.value).then(response => {
           proxy.$modal.msgSuccess("新增成功");