Browse Source

Merge branch 'feature/返利单批量审核' into develop

chen 2 years ago
parent
commit
71b8ebf46b
2 changed files with 67 additions and 12 deletions
  1. 16 0
      src/api/finance/rebate_list.js
  2. 51 12
      src/views/finance/rebate_list.vue

+ 16 - 0
src/api/finance/rebate_list.js

@@ -63,6 +63,22 @@ export function getRebateOrderBatchDel(params) {
     params,
     params,
   });
   });
 }
 }
+// 批量申请
+export function getRebateOrderApplyBatch(params) {
+  return request({
+    url: "/rebate/order/apply/batch",
+    method: "post",
+    params,
+  });
+}
+// 批量审核
+export function getRebateOrderExamineBatch(params) {
+  return request({
+    url: "/rebate/order/examine/batch",
+    method: "post",
+    params,
+  });
+}
 // 复核前-编辑
 // 复核前-编辑
 export function getRebateOrderAclUpdate(data) {
 export function getRebateOrderAclUpdate(data) {
   return request({
   return request({

+ 51 - 12
src/views/finance/rebate_list.vue

@@ -70,9 +70,16 @@
       <!-- 按钮 -->
       <!-- 按钮 -->
       <div class="btn-group clearfix">
       <div class="btn-group clearfix">
         <div class="fl">
         <div class="fl">
-          <el-popconfirm v-if="$checkBtnRole('del', $route.meta.roles)" class="delClass" @onConfirm="deleFn" title="这是一段内容确定删除吗?">
+          <el-popconfirm style="margin-right:15px" v-if="$checkBtnRole('del', $route.meta.roles)" class="delClass" @onConfirm="deleFn" title="确定删除吗?">
             <el-button :disabled="deleList.length < 1" slot="reference" type="danger" icon="el-icon-minus" size="mini">批量删除</el-button>
             <el-button :disabled="deleList.length < 1" slot="reference" type="danger" icon="el-icon-minus" size="mini">批量删除</el-button>
           </el-popconfirm>
           </el-popconfirm>
+          <el-popconfirm style="margin-right:15px" v-if="$checkBtnRole('apply', $route.meta.roles) && searchForm.examineStatus ==='SAVE'" class="delClass" @onConfirm="batchApplication" title="确定执行批量申请吗?">
+            <el-button :disabled="deleList.length < 1" slot="reference" type="warning" icon="el-icon-finished" size="mini">批量申请</el-button>
+          </el-popconfirm>
+          <el-popconfirm style="margin-right:15px" v-if="$checkBtnRole('examine', $route.meta.roles) && searchForm.examineStatus ==='WAIT'" class="delClass" @onConfirm="batchAudit" title="确定执行批量申请吗?">
+            <el-button :disabled="deleList.length < 1" slot="reference" type="warning" icon="el-icon-finished" size="mini">批量审核</el-button>
+          </el-popconfirm>
+          <!-- <el-button @click="batchApplication" :disabled='deleList.length < 1' size="mini" type="warning" icon="el-icon-finished" v-if="$checkBtnRole('examine', $route.meta.roles) && searchForm.examineStatus ==='SAVE'">批量申请</el-button> -->
         </div>
         </div>
         <div class="fr">
         <div class="fr">
           <ExportButton :exUrl="'/rebate/order/export'" :exParams="exParams" />
           <ExportButton :exUrl="'/rebate/order/export'" :exParams="exParams" />
@@ -242,10 +249,7 @@
     <RebateListConfirm @updateList="updateList" :detailId="detailId" :isShow="isShow" v-else-if="showPage == 6" />
     <RebateListConfirm @updateList="updateList" :detailId="detailId" :isShow="isShow" v-else-if="showPage == 6" />
     <!-- 编辑 -->
     <!-- 编辑 -->
     <RebateListEdit @updateList="updateList" :detailId="detailId" v-else-if="showPage == 7" />
     <RebateListEdit @updateList="updateList" :detailId="detailId" v-else-if="showPage == 7" />
-    <!-- <EditDateTimeDialog
-      :isShow.sync="isShowEditDateDialog"
-      :dateForm.sync="dateForm"
-    /> -->
+    <ExamineDialog :isShow.sync="isShowExamineDialog" :examineForm.sync="examineForm" />
   </div>
   </div>
 </template>
 </template>
 
 
@@ -254,6 +258,8 @@ import {
   getRebateOrderList,
   getRebateOrderList,
   getRebateOrderApply,
   getRebateOrderApply,
   getRebateOrderBatchDel,
   getRebateOrderBatchDel,
+  getRebateOrderApplyBatch,
+  getRebateOrderExamineBatch,
 } from "@/api/finance/rebate_list";
 } from "@/api/finance/rebate_list";
 import RebateListApply from "./components/rebate_list-apply.vue";
 import RebateListApply from "./components/rebate_list-apply.vue";
 import RebateListExamine from "./components/rebate_list-examine.vue";
 import RebateListExamine from "./components/rebate_list-examine.vue";
@@ -261,6 +267,7 @@ import RebateListReview from "./components/rebate_list-review.vue";
 import RebateListDetail from "./components/rebate_list-detail";
 import RebateListDetail from "./components/rebate_list-detail";
 import RebateListConfirm from "./components/rebate_list-confirm";
 import RebateListConfirm from "./components/rebate_list-confirm";
 import RebateListEdit from "./components/rebate_list-edit.vue";
 import RebateListEdit from "./components/rebate_list-edit.vue";
+import ExamineDialog from "@/components/Common/examine-dialog";
 
 
 export default {
 export default {
   name: "rebate_list",
   name: "rebate_list",
@@ -271,6 +278,7 @@ export default {
     RebateListReview,
     RebateListReview,
     RebateListConfirm,
     RebateListConfirm,
     RebateListEdit,
     RebateListEdit,
+    ExamineDialog,
   },
   },
   data() {
   data() {
     return {
     return {
@@ -295,6 +303,11 @@ export default {
       isCustomer: null,
       isCustomer: null,
       secondId: null,
       secondId: null,
       isShow: null,
       isShow: null,
+      isShowExamineDialog: false,
+      examineForm: {
+        status: "",
+        remark: "",
+      },
     };
     };
   },
   },
   computed: {
   computed: {
@@ -320,11 +333,35 @@ export default {
     }
     }
   },
   },
   methods: {
   methods: {
+    //批量审核
+    batchAudit() {
+      this.isShowExamineDialog = true;
+    },
+    //提交批量审核
+    async submitExamineForm() {
+      let res = this.deleList.toString();
+
+      await getRebateOrderExamineBatch({
+        ids: res,
+        examineStatus: this.examineForm.status,
+        examineRemark: this.examineForm.remark,
+      });
+      this.deleList = [];
+      this.isShowExamineDialog = false;
+      this.getDataList();
+      this.$message.success("批量审批成功");
+    },
+    //批量申请
+    async batchApplication() {
+      let res = this.deleList.toString();
+      await getRebateOrderApplyBatch({ ids: res });
+      this.getDataList();
+      this.$message.success("批量申请成功");
+      this.deleList = [];
+    },
     // 批量删除
     // 批量删除
     selectionChangeFn(value) {
     selectionChangeFn(value) {
-      // console.log(value);
       const res = value.map((v) => v.rebateOrderId);
       const res = value.map((v) => v.rebateOrderId);
-      // console.log(res);
       this.deleList = res;
       this.deleList = res;
     },
     },
     //删除
     //删除
@@ -339,11 +376,13 @@ export default {
 
 
     selectableFn(row, index) {
     selectableFn(row, index) {
       // console.log(row, index, 444);
       // console.log(row, index, 444);
-      if (row.examineStatus !== "SAVE") {
-        return false;
-      } else {
-        return true;
-      }
+      // if (row.examineStatus !== "SAVE") {
+      //   return false;
+      // } else {
+      //   return true;
+      // }
+
+      return true;
     },
     },
     //切换radio获取数据
     //切换radio获取数据
     changeRadioFn(v) {
     changeRadioFn(v) {