Merge remote-tracking branch 'origin/master'

src/api/boxManagement/buyContainer/index.js

@@ -257,4 +257,11 @@ export function synchronousPutBoxData(data) {
     method: 'post',
     data: data
   })
+}
+export function revokeCheckPleaseVerifyCost(data) {
+  return request({
+    url: '/api/blade-los/expenseapplication/revokeCheckPleaseVerifyCost',
+    method: 'post',
+    data: data
+  })
 }

src/views/boxManagement/boxCost/detailsPage.vue

@@ -169,8 +169,10 @@
                   :disabled="selectionfeedList.length == 0 || form.buxStaus == '已确认'"
                   @click="allClick('D费用批量删除')">批量删除</el-button>
                 <el-button type="primary" plain size="small"
-                  :disabled="(selectionfeedList.length == 0 && selectionfeecList.length == 0) || form.buxStaus == '已确认'"
+                  :disabled="selectionfeedList.length == 0 || form.buxStaus == '已确认'"
                   @click="allClick('D费用申请')">请核费用</el-button>
+                <el-button type="danger" plain size="small" :disabled="selectionfeedList.length == 0 || form.buxStaus == '已确认'"
+                  @click="allClick('D撤销请核')">撤销请核</el-button>
                 <el-button type="primary" plain size="small" :disabled="selectionfeedList.length != 1"
                   @click="allClick('D申请修改')">申请修改</el-button>
                 <el-button type="success" plain size="small" :disabled="selectionfeedList.length != 1"
@@ -270,8 +272,10 @@
                 <el-button type="danger" plain size="small"
                   :disabled="selectionfeecList.length == 0 || form.buxStaus == '已确认'"
                   @click="allClick('C费用批量删除')">批量删除</el-button>
-                <!-- <el-button type="primary" plain size="small" :disabled="editDisabled || selectionfeecList.length == 0"
-                  @click="allClick('C费用申请')">请核费用</el-button> -->
+                <el-button type="primary" plain size="small" :disabled="selectionfeecList.length == 0 || form.buxStaus == '已确认'"
+                  @click="allClick('C费用申请')">请核费用</el-button>
+                <el-button type="danger" plain size="small" :disabled="selectionfeecList.length == 0 || form.buxStaus == '已确认'"
+                  @click="allClick('C撤销请核')">撤销请核</el-button>
                 <!-- <el-button type="primary" plain size="small" @click="$refs.printC.openDialog()">打印账单</el-button> -->
                 <el-button type="primary" plain size="small" :disabled="selectionfeecList.length != 1"
                   @click="allClick('C申请修改')">申请修改</el-button>
@@ -507,7 +511,8 @@ import {
   copyAgent,
   confirm,
   revoke,
-  pleaseVerifyCost
+  pleaseVerifyCost,
+  revokeCheckPleaseVerifyCost
 } from "@/api/boxManagement/buyContainer/index.js";
 import dicSelect from "@/components/dicSelect/main";
 import checkSchedule from "@/components/checkH/checkSchedule.vue";
@@ -1317,6 +1322,12 @@ export default {
             overHidden: true,
           },
           {
+            label: "付费申请金额",
+            prop: "appliedAmount",
+            width: "100",
+            overHidden: true,
+          },
+          {
             label: "申请发票金额",
             prop: "appliedInvoiceAmount",
             width: "120",
@@ -1597,6 +1608,12 @@ export default {
             overHidden: true,
           },
           {
+            label: "付费申请金额",
+            prop: "appliedAmount",
+            width: "100",
+            overHidden: true,
+          },
+          {
             label: "申请发票金额",
             prop: "appliedInvoiceAmount",
             width: "120",
@@ -2493,8 +2510,8 @@ export default {
         })
       }
       if (name == 'D费用申请') {
-        let selecList = [...this.selectionfeedList, ...this.selectionfeecList]
-        for (let row of selecList) {
+        // let selecList = [...this.selectionfeedList, ...this.selectionfeecList]
+        for (let row of this.selectionfeedList) {
           if (!row.id) {
             return this.$message.error("请保存费用明细");
           }
@@ -2514,7 +2531,7 @@ export default {
           obj = {
             srcId: this.form.id,
             srcType: this.form.type,
-            feeCenterList: selecList,
+            feeCenterList: this.selectionfeedList,
             url: '/boxManagement/boxCost/index',
             pageStatus: '',
             pageLabel: '箱管费用',
@@ -2533,6 +2550,46 @@ export default {
           })
         });
       }
+      if (name == 'D撤销请核') {
+        for (let row of this.selectionfeedList) {
+          if (!row.id) {
+            return this.$message.error("请保存费用明细");
+          }
+          if (row.auditStatus == 0) {
+            return this.$message.error("未申请费用，不允许撤销");
+          }
+          if (row.auditStatus > 2) {
+            return this.$message.error("费用已经审核通过,请使用申请修改和删除功能!");
+          }
+        }
+        this.$confirm("确定撤销请核?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          let obj = {}
+          obj = {
+            srcId: this.form.id,
+            srcType: this.form.type,
+            feeCenterList: this.selectionfeedList,
+            url: '/boxManagement/boxCost/index',
+            pageStatus: '',
+            pageLabel: '箱管费用',
+          }
+          const loading = this.$loading({
+            lock: true,
+            text: '加载中',
+            spinner: 'el-icon-loading',
+            background: 'rgba(255,255,255,0.7)'
+          });
+          revokeCheckPleaseVerifyCost(obj).then(res => {
+            this.$message.success("操作成功");
+            this.getDetail(this.form.id)
+          }).finally(() => {
+            loading.close();
+          })
+        });
+      }
       if (name == 'D申请修改') {
         for (let row of this.selectionfeedList) {
           if (!row.id) {
@@ -2622,6 +2679,46 @@ export default {
           })
         });
       }
+      if (name == 'C撤销请核') {
+        for (let row of this.selectionfeecList) {
+          if (!row.id) {
+            return this.$message.error("请保存费用明细");
+          }
+          if (row.auditStatus == 0) {
+            return this.$message.error("未申请费用，不允许撤销");
+          }
+          if (row.auditStatus > 2) {
+            return this.$message.error("费用已经审核通过,请使用申请修改和删除功能!");
+          }
+        }
+        this.$confirm("确定撤销请核?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          let obj = {}
+          obj = {
+            srcId: this.form.id,
+            srcType: this.form.type,
+            feeCenterList: this.selectionfeecList,
+            url: '/boxManagement/boxCost/index',
+            pageStatus: '',
+            pageLabel: '箱管费用',
+          }
+          const loading = this.$loading({
+            lock: true,
+            text: '加载中',
+            spinner: 'el-icon-loading',
+            background: 'rgba(255,255,255,0.7)'
+          });
+          revokeCheckPleaseVerifyCost(obj).then(res => {
+            this.$message.success("操作成功");
+            this.getDetail(this.form.id)
+          }).finally(() => {
+            loading.close();
+          })
+        });
+      }
       if (name == 'C申请修改') {
         for (let row of this.selectionfeecList) {
           if (!row.id) {