From 8425744e3cfd47e2aef124541a1365f77214afec Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Fri, 2 May 2025 22:12:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BD=AC=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E9=80=80=E8=B4=A7=E3=80=81=E8=BD=AC=E9=94=80=E5=94=AE=E9=80=80?=
 =?UTF-8?q?=E8=B4=A7=E3=80=81=E8=BD=AC=E9=9B=B6=E5=94=AE=E9=80=80=E8=B4=A7?=
 =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/bill/PurchaseInList.vue         |  6 ++++++
 jshERP-web/src/views/bill/RetailOutList.vue          |  6 ++++++
 jshERP-web/src/views/bill/SaleOrderList.vue          |  2 +-
 jshERP-web/src/views/bill/SaleOutList.vue            |  6 ++++++
 .../src/views/bill/modules/PurchaseBackModal.vue     | 10 ++++++++--
 .../src/views/bill/modules/RetailBackModal.vue       |  8 ++++++--
 jshERP-web/src/views/bill/modules/SaleBackModal.vue  | 12 +++++++++---
 7 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/jshERP-web/src/views/bill/PurchaseInList.vue b/jshERP-web/src/views/bill/PurchaseInList.vue
index d4fee2c7..2772c743 100644
--- a/jshERP-web/src/views/bill/PurchaseInList.vue
+++ b/jshERP-web/src/views/bill/PurchaseInList.vue
@@ -115,6 +115,7 @@
         <div class="table-operator"  style="margin-top: 5px">
           <a-button v-if="btnEnableList.indexOf(1)>-1" @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
           <a-button v-if="btnEnableList.indexOf(1)>-1" icon="delete" @click="batchDel">删除</a-button>
+          <a-button v-if="quickBtn.purchaseBack && btnEnableList.indexOf(1)>-1" icon="share-alt" @click="transferBill('转采购退货')">转采购退货</a-button>
           <a-tooltip title="可将状态是部分入库的单据强制完成">
             <a-button v-if="inOutManageFlag && btnEnableList.indexOf(1)>-1" icon="issues-close" @click="batchForceClose">强制结单</a-button>
           </a-tooltip>
@@ -210,6 +211,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <purchase-in-modal ref="modalForm" @ok="modalFormOk" @close="modalFormClose"></purchase-in-modal>
+        <purchase-back-modal ref="transferModalForm" @ok="modalFormOk" @close="modalFormClose"></purchase-back-modal>
         <bill-detail ref="modalDetail" @ok="modalFormOk" @close="modalFormClose"></bill-detail>
         <bill-excel-iframe ref="billExcelIframe" @ok="modalFormOk" @close="modalFormClose"></bill-excel-iframe>
       </a-card>
@@ -219,6 +221,7 @@
 <!-- by ji sheng hua-->
 <script>
   import PurchaseInModal from './modules/PurchaseInModal'
+  import PurchaseBackModal from './modules/PurchaseBackModal'
   import BillDetail from './dialog/BillDetail'
   import BillExcelIframe from '@/components/tools/BillExcelIframe'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
@@ -231,6 +234,7 @@
     mixins:[JeecgListMixin,BillListMixin],
     components: {
       PurchaseInModal,
+      PurchaseBackModal,
       BillDetail,
       BillExcelIframe,
       JEllipsis,
@@ -334,6 +338,8 @@
       this.getDepotData()
       this.initUser()
       this.initAccount()
+      this.initQuickBtn()
+      this.getDepotByCurrentUser()
     },
     methods: {
     }
diff --git a/jshERP-web/src/views/bill/RetailOutList.vue b/jshERP-web/src/views/bill/RetailOutList.vue
index cc2540d2..90b02c7a 100644
--- a/jshERP-web/src/views/bill/RetailOutList.vue
+++ b/jshERP-web/src/views/bill/RetailOutList.vue
@@ -100,6 +100,7 @@
         <div class="table-operator"  style="margin-top: 5px">
           <a-button v-if="btnEnableList.indexOf(1)>-1" @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
           <a-button v-if="btnEnableList.indexOf(1)>-1" icon="delete" @click="batchDel">删除</a-button>
+          <a-button v-if="quickBtn.retailBack && btnEnableList.indexOf(1)>-1" icon="share-alt" @click="transferBill('转零售退货')">转零售退货</a-button>
           <a-button v-if="checkFlag && btnEnableList.indexOf(2)>-1" icon="check" @click="batchSetStatus(1)">审核</a-button>
           <a-button v-if="checkFlag && btnEnableList.indexOf(7)>-1" icon="stop" @click="batchSetStatus(0)">反审核</a-button>
           <a-button v-if="isShowExcel && btnEnableList.indexOf(3)>-1" icon="download" @click="handleExport">导出</a-button>
@@ -179,6 +180,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <retail-out-modal ref="modalForm" @ok="modalFormOk" @close="modalFormClose"></retail-out-modal>
+        <retail-back-modal ref="transferModalForm" @ok="modalFormOk" @close="modalFormClose"></retail-back-modal>
         <bill-detail ref="modalDetail" @ok="modalFormOk" @close="modalFormClose"></bill-detail>
         <bill-excel-iframe ref="billExcelIframe" @ok="modalFormOk" @close="modalFormClose"></bill-excel-iframe>
       </a-card>
@@ -188,6 +190,7 @@
 <!-- create ji sheng hua-->
 <script>
   import RetailOutModal from './modules/RetailOutModal'
+  import RetailBackModal from './modules/RetailBackModal'
   import BillDetail from './dialog/BillDetail'
   import BillExcelIframe from '@/components/tools/BillExcelIframe'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
@@ -200,6 +203,7 @@
     mixins:[JeecgListMixin,BillListMixin],
     components: {
       RetailOutModal,
+      RetailBackModal,
       BillDetail,
       BillExcelIframe,
       JEllipsis,
@@ -284,6 +288,8 @@
       this.getDepotData()
       this.initUser()
       this.initAccount()
+      this.initQuickBtn()
+      this.getDepotByCurrentUser()
     },
     methods: {
     }
diff --git a/jshERP-web/src/views/bill/SaleOrderList.vue b/jshERP-web/src/views/bill/SaleOrderList.vue
index ef2592d6..3275ce1b 100644
--- a/jshERP-web/src/views/bill/SaleOrderList.vue
+++ b/jshERP-web/src/views/bill/SaleOrderList.vue
@@ -85,7 +85,7 @@
         <div class="table-operator"  style="margin-top: 5px">
           <a-button v-if="btnEnableList.indexOf(1)>-1" @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
           <a-button v-if="btnEnableList.indexOf(1)>-1" icon="delete" @click="batchDel">删除</a-button>
-          <a-button v-if="quickBtn.purchaseIn && btnEnableList.indexOf(1)>-1" icon="share-alt" @click="transferBill('转销售出库')">转销售出库</a-button>
+          <a-button v-if="quickBtn.saleOut && btnEnableList.indexOf(1)>-1" icon="share-alt" @click="transferBill('转销售出库')">转销售出库</a-button>
           <a-tooltip title="可将状态是部分销售的单据强制完成">
             <a-button v-if="btnEnableList.indexOf(1)>-1" icon="issues-close" @click="batchForceClose">强制结单</a-button>
           </a-tooltip>
diff --git a/jshERP-web/src/views/bill/SaleOutList.vue b/jshERP-web/src/views/bill/SaleOutList.vue
index c1c78441..8edd53a8 100644
--- a/jshERP-web/src/views/bill/SaleOutList.vue
+++ b/jshERP-web/src/views/bill/SaleOutList.vue
@@ -116,6 +116,7 @@
         <div class="table-operator"  style="margin-top: 5px">
           <a-button v-if="btnEnableList.indexOf(1)>-1" @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
           <a-button v-if="btnEnableList.indexOf(1)>-1" icon="delete" @click="batchDel">删除</a-button>
+          <a-button v-if="quickBtn.saleBack && btnEnableList.indexOf(1)>-1" icon="share-alt" @click="transferBill('转销售退货')">转销售退货</a-button>
           <a-tooltip title="可将状态是部分出库的单据强制完成">
             <a-button v-if="inOutManageFlag && btnEnableList.indexOf(1)>-1" icon="issues-close" @click="batchForceClose">强制结单</a-button>
           </a-tooltip>
@@ -211,6 +212,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <sale-out-modal ref="modalForm" @ok="modalFormOk" @close="modalFormClose"></sale-out-modal>
+        <sale-back-modal ref="transferModalForm" @ok="modalFormOk" @close="modalFormClose"></sale-back-modal>
         <bill-detail ref="modalDetail" @ok="modalFormOk" @close="modalFormClose"></bill-detail>
         <bill-excel-iframe ref="billExcelIframe" @ok="modalFormOk" @close="modalFormClose"></bill-excel-iframe>
       </a-card>
@@ -219,6 +221,7 @@
 </template>
 <script>
   import SaleOutModal from './modules/SaleOutModal'
+  import SaleBackModal from './modules/SaleBackModal'
   import BillDetail from './dialog/BillDetail'
   import BillExcelIframe from '@/components/tools/BillExcelIframe'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
@@ -231,6 +234,7 @@
     mixins:[JeecgListMixin,BillListMixin],
     components: {
       SaleOutModal,
+      SaleBackModal,
       BillDetail,
       BillExcelIframe,
       JEllipsis,
@@ -335,6 +339,8 @@
       this.getDepotData()
       this.initUser()
       this.initAccount()
+      this.initQuickBtn()
+      this.getDepotByCurrentUser()
     },
     methods: {
     }
diff --git a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
index beee8bce..a92a3d0e 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
@@ -316,6 +316,10 @@
         if (this.action === 'add') {
           this.addInit(this.prefixNo)
           this.fileList = []
+          this.$nextTick(() => {
+            let tp = this.transferParam
+            this.linkBillListOk(tp.list, tp.number, tp.organId, tp.discountMoney, tp.deposit, tp.remark, this.defaultDepotId, tp.accountId)
+          })
         } else {
           if(this.model.linkNumber) {
             this.rowCanEdit = false
@@ -412,8 +416,10 @@
             }
             info.linkId = info.id
             allTaxLastMoney += info.taxLastMoney
-            listEx.push(info)
-            this.changeColumnShow(info)
+            if(info.operNumber>0) {
+              listEx.push(info)
+              this.changeColumnShow(info)
+            }
           }
           this.materialTable.dataSource = listEx
           ///给优惠后金额重新赋值
diff --git a/jshERP-web/src/views/bill/modules/RetailBackModal.vue b/jshERP-web/src/views/bill/modules/RetailBackModal.vue
index ca7c1510..c338b664 100644
--- a/jshERP-web/src/views/bill/modules/RetailBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/RetailBackModal.vue
@@ -300,6 +300,8 @@
           this.fileList = []
           this.$nextTick(() => {
             this.form.setFieldsValue({'getAmount':0, 'backAmount':0})
+            let tp = this.transferParam
+            this.linkBillListOk(tp.list, tp.number, tp.organId, tp.discountMoney, tp.deposit, tp.remark)
           })
         } else {
           if(this.model.linkNumber) {
@@ -408,8 +410,10 @@
             let info = selectBillDetailRows[j];
             info.linkId = info.id
             allTaxLastMoney += info.allPrice
-            listEx.push(info)
-            this.changeColumnShow(info)
+            if(info.operNumber>0) {
+              listEx.push(info)
+              this.changeColumnShow(info)
+            }
           }
           this.materialTable.dataSource = listEx
           ///给优惠后金额重新赋值
diff --git a/jshERP-web/src/views/bill/modules/SaleBackModal.vue b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
index ce59e49e..7f6d1109 100644
--- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
@@ -189,7 +189,7 @@
   import { FormTypes } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { BillModalMixin } from '../mixins/BillModalMixin'
-  import { getMpListShort,changeListFmtMinus } from "@/utils/util"
+  import { getMpListShort, changeListFmtMinus, handleIntroJs } from '@/utils/util'
   import { getAction } from '@/api/manage'
   import JSelectMultiple from '@/components/jeecg/JSelectMultiple'
   import JUpload from '@/components/jeecg/JUpload'
@@ -321,6 +321,10 @@
           this.addInit(this.prefixNo)
           this.personList.value = ''
           this.fileList = []
+          this.$nextTick(() => {
+            let tp = this.transferParam
+            this.linkBillListOk(tp.list, tp.number, tp.organId, tp.discountMoney, tp.deposit, tp.remark, this.defaultDepotId, tp.accountId, tp.salesMan)
+          })
         } else {
           if(this.model.linkNumber) {
             this.rowCanEdit = false
@@ -422,8 +426,10 @@
             }
             info.linkId = info.id
             allTaxLastMoney += info.taxLastMoney
-            listEx.push(info)
-            this.changeColumnShow(info)
+            if(info.operNumber>0) {
+              listEx.push(info)
+              this.changeColumnShow(info)
+            }
           }
           this.materialTable.dataSource = listEx
           ///给优惠后金额重新赋值