Merge branch 'material-ui' of http://192.168.0.75:3000/bonus/bonus-ui into material-ui

src/api/lease/apply.js

@@ -79,6 +79,15 @@ export function applySend(data) {
   })
 }
 
+// 领用申请发布-终止
+export function applyEnd(data) {
+  return request({
+    url: '/material/leaseTask/endPublish',
+    method: 'post',
+    data: data,
+  })
+}
+
 // 领料申请-批量发布
 export function applySendAll(data) {
   return request({

src/views/business/businessHandlingRecord/index.vue

@@ -68,8 +68,8 @@
           <el-tag v-if="scope.row.taskStatus == '0'" type="warning" size="mini" style="margin-right: 5px">
             待审核
           </el-tag>
-          <el-tag v-else-if="scope.row.taskStatus == '1'" size="mini" style="margin-right: 5px">审核中</el-tag>
+          <el-tag v-else-if="scope.row.taskStatus == '6'" size="mini" style="margin-right: 5px">审核中</el-tag>
-          <el-tag v-else-if="scope.row.taskStatus == '2'" type="success" size="mini" style="margin-right: 5px">
+          <el-tag v-else-if="scope.row.taskStatus == '1' || scope.row.taskStatus == '3' || scope.row.taskStatus == '4'" type="success" size="mini" style="margin-right: 5px">
             已完成
           </el-tag>
           <el-tag v-else-if="scope.row.taskStatus == '5'" size="mini" style="margin-right: 5px">待提交</el-tag>
@@ -280,9 +280,9 @@ export default {
       },
       // 考勤状态
       statusOptions: [
-        { label: '待审核', value: '1' },
+        { label: '待审核', value: '0' },
-        { label: '审核中', value: '2' },
+        { label: '审核中', value: '6' },
-        { label: '已完成', value: '3' }
+        { label: '已完成', value: '1' }
       ],
       total: 0, // 总条数
       // 表头
@@ -387,7 +387,7 @@ export default {
       })
     },
     // 导出数据
-    handleExport() {
+    /*handleExport() {
       try {
         let fileName = `数据_${new Date().getTime()}.xLsx`
         let url = ''
@@ -397,6 +397,13 @@ export default {
       } catch (error) {
         console.log('导出数据失败', error)
       }
+    },*/
+    handleExport() {
+      this.download(
+        "/material/leaseTask/exportLeaseRecord",
+        { ...this.queryParams },
+        `领用记录数据_${new Date().getTime()}.xlsx`
+      );
     },
     // 打印
     print() {

src/views/business/leasePublish/component/addToolsApply.vue

@@ -44,14 +44,14 @@
           @click="handleSend"
           >发布</el-button
         >
-        <el-button
+<!--        <el-button
           type="warning"
           plain
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
           >导出数据</el-button
-        >
+        >-->
       </el-col>
       <!-- <el-col :span="1.5">
                 <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-if="isEdit">导出</el-button>

src/views/business/leasePublish/component/homeApply.vue

@@ -33,8 +33,9 @@
           filterable
           style="width: 240px"
         >
-            <el-option label="未完成" value="0"></el-option>
+            <el-option label="未完成" value="1"></el-option>
-            <el-option label="已完成" value="1"></el-option>
+            <el-option label="已终结" value="2"></el-option>
+            <el-option label="已完成" value="3"></el-option>
         </el-select>
       </el-form-item>
 
@@ -89,11 +90,11 @@
             @click="handleView(scope.row)"
             >查看</el-button>
           <el-button size="mini" style="margin-bottom: 10px" type="success"
-            v-if="scope.row.taskStatusName != '已完成'"
+            v-if="scope.row.taskStatusName == '未完成'"
             @click="handleUpdate(scope.row)"
             >发布</el-button>
           <el-button size="mini" type="danger"
-            v-if="scope.row.taskStatusName != '已完成'"
+            v-if="scope.row.taskStatusName == '未完成'"
             @click="handleStop(scope.row)"
             >终止</el-button>
           <el-button size="mini" type="warning"
@@ -261,6 +262,7 @@ import {
   getListLeaseApply,
   applySend,
   applySendAll,
+  applyEnd,
 } from "@/api/lease/apply";
 import {
   getLeasePublishList,
@@ -396,9 +398,9 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       this.download(
-        "/material/lease_apply_info/export",
+        "/material/leaseTask/exportPublish",
         { ...this.queryParams },
-        `领料申请_${new Date().getTime()}.xlsx`
+        `领料申请发布_${new Date().getTime()}.xlsx`
       );
     },
 
@@ -408,7 +410,7 @@ export default {
       this.$modal
         .confirm("是否确认终止所选择的数据项？")
         .then(function () {
-          // return applySend(param);
+          return applyEnd(param);
         })
         .then(() => {
           this.getList();

src/views/business/leasePublish/component/queryToolsApply.vue

@@ -346,9 +346,9 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       this.download(
-        "/material/purchase_check_info/exportDetails",
+        "/material/leaseTask/exportPublishDetails",
-        { taskId: this.taskId },
+        { id: this.id },
-        `新购到货详情_${new Date().getTime()}.xlsx`
+        `领用申请发布详情_${new Date().getTime()}.xlsx`
       );
     },