From 0c1e2edd8828c82d9834f4e5d8250806fc282610 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Mon, 7 Nov 2022 22:55:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=85=A8=E9=83=A8=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E7=9A=84=E6=9F=A5=E7=9C=8B=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=8F=8D=E5=AE=A1=E6=A0=B8=E7=9A=84=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/bill/AllocationOutList.vue      |  2 +-
 jshERP-web/src/views/bill/AssembleList.vue    |  2 +-
 jshERP-web/src/views/bill/DisassembleList.vue |  2 +-
 jshERP-web/src/views/bill/OtherInList.vue     |  2 +-
 jshERP-web/src/views/bill/OtherOutList.vue    |  2 +-
 .../src/views/bill/PurchaseBackList.vue       |  2 +-
 jshERP-web/src/views/bill/PurchaseInList.vue  |  2 +-
 .../src/views/bill/PurchaseOrderList.vue      |  2 +-
 jshERP-web/src/views/bill/RetailBackList.vue  |  2 +-
 jshERP-web/src/views/bill/RetailOutList.vue   |  2 +-
 jshERP-web/src/views/bill/SaleBackList.vue    |  2 +-
 jshERP-web/src/views/bill/SaleOrderList.vue   |  2 +-
 jshERP-web/src/views/bill/SaleOutList.vue     |  2 +-
 .../src/views/bill/dialog/BillDetail.vue      | 29 ++++++++++++++++--
 .../src/views/bill/mixins/BillListMixin.js    |  3 ++
 .../src/views/financial/AdvanceInList.vue     |  2 +-
 jshERP-web/src/views/financial/GiroList.vue   |  2 +-
 jshERP-web/src/views/financial/ItemInList.vue |  2 +-
 .../src/views/financial/ItemOutList.vue       |  2 +-
 .../src/views/financial/MoneyInList.vue       |  2 +-
 .../src/views/financial/MoneyOutList.vue      |  2 +-
 .../financial/dialog/FinancialDetail.vue      | 30 +++++++++++++++++--
 .../financial/mixins/FinancialListMixin.js    |  3 ++
 23 files changed, 79 insertions(+), 24 deletions(-)

diff --git a/jshERP-web/src/views/bill/AllocationOutList.vue b/jshERP-web/src/views/bill/AllocationOutList.vue
index 54ea20d7..ea446554 100644
--- a/jshERP-web/src/views/bill/AllocationOutList.vue
+++ b/jshERP-web/src/views/bill/AllocationOutList.vue
@@ -126,7 +126,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <allocation-out-modal ref="modalForm" @ok="modalFormOk"></allocation-out-modal>
-        <bill-detail ref="modalDetail"></bill-detail>
+        <bill-detail ref="modalDetail" @ok="modalFormOk"></bill-detail>
       </a-card>
     </a-col>
   </a-row>
diff --git a/jshERP-web/src/views/bill/AssembleList.vue b/jshERP-web/src/views/bill/AssembleList.vue
index 6b7d6072..20780b3f 100644
--- a/jshERP-web/src/views/bill/AssembleList.vue
+++ b/jshERP-web/src/views/bill/AssembleList.vue
@@ -126,7 +126,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <assemble-modal ref="modalForm" @ok="modalFormOk"></assemble-modal>
-        <bill-detail ref="modalDetail"></bill-detail>
+        <bill-detail ref="modalDetail" @ok="modalFormOk"></bill-detail>
       </a-card>
     </a-col>
   </a-row>
diff --git a/jshERP-web/src/views/bill/DisassembleList.vue b/jshERP-web/src/views/bill/DisassembleList.vue
index 4439da18..af1228bb 100644
--- a/jshERP-web/src/views/bill/DisassembleList.vue
+++ b/jshERP-web/src/views/bill/DisassembleList.vue
@@ -126,7 +126,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <disassemble-modal ref="modalForm" @ok="modalFormOk"></disassemble-modal>
-        <bill-detail ref="modalDetail"></bill-detail>
+        <bill-detail ref="modalDetail" @ok="modalFormOk"></bill-detail>
       </a-card>
     </a-col>
   </a-row>
diff --git a/jshERP-web/src/views/bill/OtherInList.vue b/jshERP-web/src/views/bill/OtherInList.vue
index 465e4e8f..37f6095e 100644
--- a/jshERP-web/src/views/bill/OtherInList.vue
+++ b/jshERP-web/src/views/bill/OtherInList.vue
@@ -140,7 +140,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <other-in-modal ref="modalForm" @ok="modalFormOk"></other-in-modal>
-        <bill-detail ref="modalDetail"></bill-detail>
+        <bill-detail ref="modalDetail" @ok="modalFormOk"></bill-detail>
       </a-card>
     </a-col>
   </a-row>
diff --git a/jshERP-web/src/views/bill/OtherOutList.vue b/jshERP-web/src/views/bill/OtherOutList.vue
index 3059bcb4..0badcc54 100644
--- a/jshERP-web/src/views/bill/OtherOutList.vue
+++ b/jshERP-web/src/views/bill/OtherOutList.vue
@@ -140,7 +140,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <other-out-modal ref="modalForm" @ok="modalFormOk"></other-out-modal>
-        <bill-detail ref="modalDetail"></bill-detail>
+        <bill-detail ref="modalDetail" @ok="modalFormOk"></bill-detail>
       </a-card>
     </a-col>
   </a-row>
diff --git a/jshERP-web/src/views/bill/PurchaseBackList.vue b/jshERP-web/src/views/bill/PurchaseBackList.vue
index 6d529836..7f64610f 100644
--- a/jshERP-web/src/views/bill/PurchaseBackList.vue
+++ b/jshERP-web/src/views/bill/PurchaseBackList.vue
@@ -149,7 +149,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <purchase-back-modal ref="modalForm" @ok="modalFormOk"></purchase-back-modal>
-        <bill-detail ref="modalDetail"></bill-detail>
+        <bill-detail ref="modalDetail" @ok="modalFormOk"></bill-detail>
       </a-card>
     </a-col>
   </a-row>
diff --git a/jshERP-web/src/views/bill/PurchaseInList.vue b/jshERP-web/src/views/bill/PurchaseInList.vue
index 861a5944..35625419 100644
--- a/jshERP-web/src/views/bill/PurchaseInList.vue
+++ b/jshERP-web/src/views/bill/PurchaseInList.vue
@@ -151,7 +151,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <purchase-in-modal ref="modalForm" @ok="modalFormOk"></purchase-in-modal>
-        <bill-detail ref="modalDetail"></bill-detail>
+        <bill-detail ref="modalDetail" @ok="modalFormOk"></bill-detail>
       </a-card>
     </a-col>
   </a-row>
diff --git a/jshERP-web/src/views/bill/PurchaseOrderList.vue b/jshERP-web/src/views/bill/PurchaseOrderList.vue
index 13fcf6dc..70f18530 100644
--- a/jshERP-web/src/views/bill/PurchaseOrderList.vue
+++ b/jshERP-web/src/views/bill/PurchaseOrderList.vue
@@ -131,7 +131,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <purchase-order-modal ref="modalForm" @ok="modalFormOk"></purchase-order-modal>
-        <bill-detail ref="modalDetail"></bill-detail>
+        <bill-detail ref="modalDetail" @ok="modalFormOk"></bill-detail>
       </a-card>
     </a-col>
   </a-row>
diff --git a/jshERP-web/src/views/bill/RetailBackList.vue b/jshERP-web/src/views/bill/RetailBackList.vue
index 18fafefe..5c019948 100644
--- a/jshERP-web/src/views/bill/RetailBackList.vue
+++ b/jshERP-web/src/views/bill/RetailBackList.vue
@@ -149,7 +149,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <retail-back-modal ref="modalForm" @ok="modalFormOk"></retail-back-modal>
-        <bill-detail ref="modalDetail"></bill-detail>
+        <bill-detail ref="modalDetail" @ok="modalFormOk"></bill-detail>
       </a-card>
     </a-col>
   </a-row>
diff --git a/jshERP-web/src/views/bill/RetailOutList.vue b/jshERP-web/src/views/bill/RetailOutList.vue
index e4c3b4d2..a701ae85 100644
--- a/jshERP-web/src/views/bill/RetailOutList.vue
+++ b/jshERP-web/src/views/bill/RetailOutList.vue
@@ -144,7 +144,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <retail-out-modal ref="modalForm" @ok="modalFormOk"></retail-out-modal>
-        <bill-detail ref="modalDetail"></bill-detail>
+        <bill-detail ref="modalDetail" @ok="modalFormOk"></bill-detail>
       </a-card>
     </a-col>
   </a-row>
diff --git a/jshERP-web/src/views/bill/SaleBackList.vue b/jshERP-web/src/views/bill/SaleBackList.vue
index 637194a3..5b16abc4 100644
--- a/jshERP-web/src/views/bill/SaleBackList.vue
+++ b/jshERP-web/src/views/bill/SaleBackList.vue
@@ -150,7 +150,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <sale-back-modal ref="modalForm" @ok="modalFormOk"></sale-back-modal>
-        <bill-detail ref="modalDetail"></bill-detail>
+        <bill-detail ref="modalDetail" @ok="modalFormOk"></bill-detail>
       </a-card>
     </a-col>
   </a-row>
diff --git a/jshERP-web/src/views/bill/SaleOrderList.vue b/jshERP-web/src/views/bill/SaleOrderList.vue
index 679b40c9..d3697e87 100644
--- a/jshERP-web/src/views/bill/SaleOrderList.vue
+++ b/jshERP-web/src/views/bill/SaleOrderList.vue
@@ -137,7 +137,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <sale-order-modal ref="modalForm" @ok="modalFormOk"></sale-order-modal>
-        <bill-detail ref="modalDetail"></bill-detail>
+        <bill-detail ref="modalDetail" @ok="modalFormOk"></bill-detail>
       </a-card>
     </a-col>
   </a-row>
diff --git a/jshERP-web/src/views/bill/SaleOutList.vue b/jshERP-web/src/views/bill/SaleOutList.vue
index 5922f093..e6e18e26 100644
--- a/jshERP-web/src/views/bill/SaleOutList.vue
+++ b/jshERP-web/src/views/bill/SaleOutList.vue
@@ -152,7 +152,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <sale-out-modal ref="modalForm" @ok="modalFormOk"></sale-out-modal>
-        <bill-detail ref="modalDetail"></bill-detail>
+        <bill-detail ref="modalDetail" @ok="modalFormOk"></bill-detail>
       </a-card>
     </a-col>
   </a-row>
diff --git a/jshERP-web/src/views/bill/dialog/BillDetail.vue b/jshERP-web/src/views/bill/dialog/BillDetail.vue
index 1d53fa96..94b2389b 100644
--- a/jshERP-web/src/views/bill/dialog/BillDetail.vue
+++ b/jshERP-web/src/views/bill/dialog/BillDetail.vue
@@ -28,6 +28,8 @@
       <a-button v-if="billType === '盘点复盘'" v-print="'#stockCheckReplayPrint'">普通打印</a-button>
       <!--导出Excel-->
       <a-button v-if="billType === '采购订单'||billType === '销售订单'" @click="exportExcel()">导出</a-button>
+      <!--反审核-->
+      <a-button v-if="isCanBackCheck && model.status==='1'" @click="handleBackCheck()">反审核</a-button>
       <a-button key="back" @click="handleCancel">取消</a-button>
     </template>
     <a-form :form="form">
@@ -976,7 +978,7 @@
 
 <script>
   import pick from 'lodash.pick'
-  import { getAction } from '@/api/manage'
+  import { getAction, postAction } from '@/api/manage'
   import { findBillDetailByNumber, findFinancialDetailByNumber, getPlatformConfigByKey, getCurrentSystemConfig} from '@/api/api'
   import { getMpListShort, openDownloadDialog, sheet2blob } from "@/utils/util"
   import BillPrintIframe from './BillPrintIframe'
@@ -996,6 +998,7 @@
         width: '1600px',
         visible: false,
         model: {},
+        isCanBackCheck: true,
         billType: '',
         billPrintFlag: false,
         fileList: [],
@@ -1019,7 +1022,8 @@
         loading: false,
         dataSource: [],
         url: {
-          detailList: '/depotItem/getDetailList'
+          detailList: '/depotItem/getDetailList',
+          batchSetStatusUrl: "/depotHead/batchSetStatus"
         },
         //表头
         columns:[],
@@ -1463,6 +1467,27 @@
           this.loading = false
         })
       },
+      handleBackCheck() {
+        let that = this
+        this.$confirm({
+          title: "确认操作",
+          content: "是否对该单据进行反审核?",
+          onOk: function () {
+            that.loading = true
+            postAction(that.url.batchSetStatusUrl, {status: '0', ids: that.model.id}).then((res) => {
+              if(res.code === 200){
+                that.$emit('ok')
+                that.loading = false
+                that.close()
+              } else {
+                that.$message.warning(res.data.message)
+                that.loading = false
+              }
+            }).finally(() => {
+            })
+          }
+        })
+      },
       handleCancel() {
         this.close()
       },
diff --git a/jshERP-web/src/views/bill/mixins/BillListMixin.js b/jshERP-web/src/views/bill/mixins/BillListMixin.js
index 9e3d28c9..b8be9062 100644
--- a/jshERP-web/src/views/bill/mixins/BillListMixin.js
+++ b/jshERP-web/src/views/bill/mixins/BillListMixin.js
@@ -72,6 +72,9 @@ export const BillListMixin = {
       }
     },
     myHandleDetail(record, type) {
+      if(this.btnEnableList.indexOf(7)===-1) {
+        this.$refs.modalDetail.isCanBackCheck = false
+      }
       this.handleDetail(record, type);
     },
     handleApprove(record) {
diff --git a/jshERP-web/src/views/financial/AdvanceInList.vue b/jshERP-web/src/views/financial/AdvanceInList.vue
index 63e18279..0d0660a8 100644
--- a/jshERP-web/src/views/financial/AdvanceInList.vue
+++ b/jshERP-web/src/views/financial/AdvanceInList.vue
@@ -129,7 +129,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <advance-in-modal ref="modalForm" @ok="modalFormOk"></advance-in-modal>
-        <financial-detail ref="modalDetail"></financial-detail>
+        <financial-detail ref="modalDetail" @ok="modalFormOk"></financial-detail>
       </a-card>
     </a-col>
   </a-row>
diff --git a/jshERP-web/src/views/financial/GiroList.vue b/jshERP-web/src/views/financial/GiroList.vue
index dc40cbd6..e7a62a01 100644
--- a/jshERP-web/src/views/financial/GiroList.vue
+++ b/jshERP-web/src/views/financial/GiroList.vue
@@ -129,7 +129,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <giro-modal ref="modalForm" @ok="modalFormOk"></giro-modal>
-        <financial-detail ref="modalDetail"></financial-detail>
+        <financial-detail ref="modalDetail" @ok="modalFormOk"></financial-detail>
       </a-card>
     </a-col>
   </a-row>
diff --git a/jshERP-web/src/views/financial/ItemInList.vue b/jshERP-web/src/views/financial/ItemInList.vue
index 812bdd07..aa093e7e 100644
--- a/jshERP-web/src/views/financial/ItemInList.vue
+++ b/jshERP-web/src/views/financial/ItemInList.vue
@@ -138,7 +138,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <item-in-modal ref="modalForm" @ok="modalFormOk"></item-in-modal>
-        <financial-detail ref="modalDetail"></financial-detail>
+        <financial-detail ref="modalDetail" @ok="modalFormOk"></financial-detail>
       </a-card>
     </a-col>
   </a-row>
diff --git a/jshERP-web/src/views/financial/ItemOutList.vue b/jshERP-web/src/views/financial/ItemOutList.vue
index 14589df7..e022d348 100644
--- a/jshERP-web/src/views/financial/ItemOutList.vue
+++ b/jshERP-web/src/views/financial/ItemOutList.vue
@@ -138,7 +138,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <item-out-modal ref="modalForm" @ok="modalFormOk"></item-out-modal>
-        <financial-detail ref="modalDetail"></financial-detail>
+        <financial-detail ref="modalDetail" @ok="modalFormOk"></financial-detail>
       </a-card>
     </a-col>
   </a-row>
diff --git a/jshERP-web/src/views/financial/MoneyInList.vue b/jshERP-web/src/views/financial/MoneyInList.vue
index 2d5bdcca..40f60f78 100644
--- a/jshERP-web/src/views/financial/MoneyInList.vue
+++ b/jshERP-web/src/views/financial/MoneyInList.vue
@@ -139,7 +139,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <money-in-modal ref="modalForm" @ok="modalFormOk"></money-in-modal>
-        <financial-detail ref="modalDetail"></financial-detail>
+        <financial-detail ref="modalDetail" @ok="modalFormOk"></financial-detail>
       </a-card>
     </a-col>
   </a-row>
diff --git a/jshERP-web/src/views/financial/MoneyOutList.vue b/jshERP-web/src/views/financial/MoneyOutList.vue
index f12ecdb8..4d3c6119 100644
--- a/jshERP-web/src/views/financial/MoneyOutList.vue
+++ b/jshERP-web/src/views/financial/MoneyOutList.vue
@@ -139,7 +139,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <money-out-modal ref="modalForm" @ok="modalFormOk"></money-out-modal>
-        <financial-detail ref="modalDetail"></financial-detail>
+        <financial-detail ref="modalDetail" @ok="modalFormOk"></financial-detail>
       </a-card>
     </a-col>
   </a-row>
diff --git a/jshERP-web/src/views/financial/dialog/FinancialDetail.vue b/jshERP-web/src/views/financial/dialog/FinancialDetail.vue
index 3963f55c..3ecdcf5d 100644
--- a/jshERP-web/src/views/financial/dialog/FinancialDetail.vue
+++ b/jshERP-web/src/views/financial/dialog/FinancialDetail.vue
@@ -17,6 +17,8 @@
       <a-button v-if="financialType === '支出'" v-print="'#itemOutPrint'" ghost type="primary">打印</a-button>
       <a-button v-if="financialType === '收款'" v-print="'#moneyInPrint'" ghost type="primary">打印</a-button>
       <a-button v-if="financialType === '付款'" v-print="'#moneyOutPrint'" ghost type="primary">打印</a-button>
+      <!--反审核-->
+      <a-button v-if="isCanBackCheck && model.status==='1'" @click="handleBackCheck()">反审核</a-button>
       <a-button key="back" @click="handleCancel">取消</a-button>
     </template>
     <a-form :form="form">
@@ -396,8 +398,7 @@
 </template>
 <script>
   import pick from 'lodash.pick'
-  import { getAction } from '@/api/manage'
-  import { findBillDetailByNumber} from '@/api/api'
+  import { getAction, postAction } from '@/api/manage'
   import JUpload from '@/components/jeecg/JUpload'
   export default {
     name: 'FinancialDetail',
@@ -410,6 +411,7 @@
         width: '1600px',
         visible: false,
         model: {},
+        isCanBackCheck: true,
         financialType: '',
         fileList: [],
         labelCol: {
@@ -424,7 +426,8 @@
         loading: false,
         dataSource: [],
         url: {
-          detailList: '/accountItem/getDetailList'
+          detailList: '/accountItem/getDetailList',
+          batchSetStatusUrl: '/accountHead/batchSetStatus'
         },
         advanceInColumns: [
           { title: '账户名称',dataIndex: 'accountName',width: '30%'},
@@ -497,6 +500,27 @@
           this.loading = false
         })
       },
+      handleBackCheck() {
+        let that = this
+        this.$confirm({
+          title: "确认操作",
+          content: "是否对该单据进行反审核?",
+          onOk: function () {
+            that.loading = true
+            postAction(that.url.batchSetStatusUrl, {status: '0', ids: that.model.id}).then((res) => {
+              if(res.code === 200){
+                that.$emit('ok')
+                that.loading = false
+                that.close()
+              } else {
+                that.$message.warning(res.data.message)
+                that.loading = false
+              }
+            }).finally(() => {
+            })
+          }
+        })
+      },
       handleCancel() {
         this.close()
       },
diff --git a/jshERP-web/src/views/financial/mixins/FinancialListMixin.js b/jshERP-web/src/views/financial/mixins/FinancialListMixin.js
index e41634e3..27e9efde 100644
--- a/jshERP-web/src/views/financial/mixins/FinancialListMixin.js
+++ b/jshERP-web/src/views/financial/mixins/FinancialListMixin.js
@@ -56,6 +56,9 @@ export const FinancialListMixin = {
       }
     },
     myHandleDetail(record, type) {
+      if(this.btnEnableList.indexOf(7)===-1) {
+        this.$refs.modalDetail.isCanBackCheck = false
+      }
       this.handleDetail(record, type);
     },
     handleApprove(record) {