feat: 排班规则和班次管理删除解锁。

guzijian
1 parent f74c9820
Showing 5 changed files with 82 additions and 39 deletions
src/utils/request.js
src/views/main/manager/index.vue
src/views/num/num/index.vue
src/views/report/sign/index.vue
src/views/scheduling/scheduling/index.vue
-import axios from 'axios'
-import { ElNotification , ElMessageBox, ElMessage, ElLoading } from 'element-plus'
+import cache from '@/plugins/cache'
+import useUserStore from '@/store/modules/user'
 import { getToken } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
-import { tansParams, blobValidate } from '@/utils/ruoyi'
-import cache from '@/plugins/cache'
+import { blobValidate, tansParams } from '@/utils/ruoyi'
+import axios from 'axios'
+import { ElLoading, ElMessage, ElMessageBox, ElNotification } from 'element-plus'
 import { saveAs } from 'file-saver'
-import useUserStore from '@/store/modules/user'
  
 let downloadLoadingInstance;
 // 是否显示重新登录
@@ -117,7 +117,8 @@ service.interceptors.response.use(res =&gt; {
 )
  
 // 通用下载方法
-export function download(url, params, filename, config) {
+export function download(url, params, filename, config = { timeout: 1000 * 30 }) {
+
   downloadLoadingInstance = ElLoading.service({ text: "正在下载数据，请稍候", background: "rgba(0, 0, 0, 0.7)", })
   return service.post(url, params, {
     transformRequest: [(params) => { return tansParams(params) }],
@@ -447,8 +447,6 @@ watch(againCreateFlag, (val1, val2) =&gt; {
  
 function handleAgainCreateAttendance() {
   againCreateFlag.value = true;
-
-
 }
  
 function handleUpdate() {
@@ -183,7 +183,7 @@ function resetQuery() {
 function handleSelectionChange(selection) {
   ids.value = selection.map(item => item.id);
   single.value = selection.length != 1;
-  multiple.value = !selection.length;
+  multiple.value = selection.length != 1;
 }
  
 /** 新增按钮操作 */
@@ -230,18 +230,16 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
  
-  proxy.$modal.msgSuccess("班型删除功能暂时禁用");
-  let result = false;
-  if (result) {
-    const _ids = row.id || ids.value;
-    proxy.$modal.confirm('是否确认删除班次管理编号为"' + _ids + '"的数据项？').then(function () {
-      return delNum(_ids);
-    }).then(() => {
-      getList();
-      proxy.$modal.msgSuccess("删除成功");
-    }).catch(() => { });
-  }
-
+  // proxy.$modal.msgSuccess("班型删除功能暂时禁用");
+  // console.log(row);
+  const _ids = row.id || ids.value;
+  const deletePrompt = row.ruleDictName ? "是否确认删除班次名称为" + row.ruleDictName + "的数据项？" : "是否确认删除该班次?";
+  proxy.$modal.confirm(deletePrompt).then(function () {
+    return delNum(_ids);
+  }).then(() => {
+    getList();
+    proxy.$modal.msgSuccess("删除成功");
+  }).catch(() => { });
 }
  
 /** 导出按钮操作 */
@@ -30,6 +30,7 @@
         <el-form-item>
           <el-button type="primary" @click="onExportDateType('date')">按天导出</el-button>
           <el-button type="primary" @click="onExportDateType('month')">按月导出</el-button>
+          <el-button type="primary" @click="onExportDateBySplit">按照时间段导出</el-button>
         </el-form-item>
  
         <el-form-item>
@@ -114,16 +115,33 @@
         <el-table-column label="原因" align="center" fixed="right" prop="remark" width="300" />
       </el-table>
     </el-dialog>
+
+
     <el-dialog title="请选择导出日期" v-model="openDateFlag" width="1080px" append-to-body>
       <el-form>
         <el-form-item label="日期">
           <el-date-picker v-model="exportDate" :format="exportFormat == 'month' ? 'YYYY-MM' : 'YYYY-MM-DD'"
             :value-format="exportFormat == 'month' ? 'YYYY-MM' : 'YYYY-MM-DD'" :type="exportFormat"
-            placeholder="选择重新生成月份" />
+            placeholder="选择导出日期" />
         </el-form-item>
       </el-form>
       <el-button type="primary" @click="onExport()">导出</el-button>
     </el-dialog>
+
+    <el-dialog title="选择导出时间段" v-model="openDateSplitFlag" width="1080px" append-to-body>
+      <el-form :model="exportDatePrams">
+        <el-form-item label="日期">
+          <el-date-picker v-model="exportDatePrams.startDate" format="YYYY-MM-DD" value-format="YYYY-MM-DD" type="date"
+            placeholder="选择开始日期" />
+        </el-form-item>
+        <el-form-item label="日期">
+          <el-date-picker v-model="exportDatePrams.endDate" format="YYYY-MM-DD" value-format="YYYY-MM-DD" type="date"
+            placeholder="选择结束日期" />
+        </el-form-item>
+      </el-form>
+      <el-button type="primary"
+        @click="exportByTimePeriod(exportDatePrams.startDate, exportDatePrams.endDate)">导出</el-button>
+    </el-dialog>
   </div>
 </template>
  
@@ -149,7 +167,12 @@ const tableData = ref([]) // 表格数据
 const currentPage = ref(1) // 当前页
 const exportDate = ref()
 const exportFormat = ref("date")
+const exportDatePrams = ref({
+  startDate: "",
+  endDate: ""
+})
 const openDateFlag = ref(false)
+const openDateSplitFlag = ref(false)
  
 const rules = ref({
   date: [
@@ -260,16 +283,40 @@ const onExport = () =&gt; {
   let namePre = exportFormat.value === 'date' ? exportDate.value : exportDate.value + '-01';
   console.log(namePre);
   proxy.download('report/export', {
-    ids: ids.value,
     date: namePre,
     exportFlag: exportFormat.value === 'date' ? 1 : 2
   }, `${exportDate.value}签到报表.xlsx`)
-    .then(res => {
-      proxy.$message({
-        message: '导出成功',
-        type: 'success'
-      })
+
+}
+
+/**
+ * 按照时间段导出
+ * @param {string} startDate
+ * @param {string} endDate
+ */
+const exportByTimePeriod = (startDate, endDate) => {
+  // 校验日期
+  if (!startDate || !endDate) {
+    proxy.$message({
+      message: '请选择日期',
+      type: 'warning'
     })
+    return
+  }
+  proxy.download('report/export', {
+    startDate,
+    endDate,
+    exportFlag: 3
+  }, `${startDate}到${endDate}的签到报表.xlsx`, {
+    timeout: 300000
+  })
+
+}
+
+const onExportDateBySplit = () => {
+  openDateSplitFlag.value = true
+  exportDatePrams.value.startDate = ''
+  exportDatePrams.value.endDate = ''
 }
  
 const onExportDateType = (val) => {
@@ -390,17 +390,16 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
  
-  proxy.$modal.msgSuccess("规则删除暂时停用防止误操作");
-  let result = false;
-  if (result) {
-    const _ids = row.id || ids.value;
-    proxy.$modal.confirm('是否确认删除排班规则编号为"' + _ids + '"的数据项？').then(function () {
-      return delScheduling(_ids);
-    }).then(() => {
-      getList();
-      proxy.$modal.msgSuccess("删除成功");
-    }).catch(() => { });
-  }
+  // proxy.$modal.msgSuccess("规则删除暂时停用防止误操作");
+  console.log(row);
+  const deletePrompt = row.ruleName ? "是否确认删除规则名称为" + row.ruleName + "的数据项？" : "是否确认该规则？";
+  const _ids = row.id || ids.value;
+  proxy.$modal.confirm(deletePrompt).then(function () {
+    return delScheduling(_ids);
+  }).then(() => {
+    getList();
+    proxy.$modal.msgSuccess("删除成功");
+  }).catch(() => { });
  
 }