From d394a42644c94e805f68c895602ef138e151617c Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Sat, 3 May 2025 15:18:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=B7=E8=B4=AD=E5=8D=95?=
 =?UTF-8?q?=E8=BD=AC=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E7=9A=84=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/bill/PurchaseApplyList.vue        |  6 ++++++
 .../src/views/bill/modules/PurchaseOrderModal.vue      | 10 ++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/jshERP-web/src/views/bill/PurchaseApplyList.vue b/jshERP-web/src/views/bill/PurchaseApplyList.vue
index d56c5335..e8254bb6 100644
--- a/jshERP-web/src/views/bill/PurchaseApplyList.vue
+++ b/jshERP-web/src/views/bill/PurchaseApplyList.vue
@@ -75,6 +75,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.purchaseOrder && 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>
@@ -160,6 +161,7 @@
         <!-- table区域-end -->
         <!-- 表单区域 -->
         <purchase-apply-modal ref="modalForm" @ok="modalFormOk" @close="modalFormClose"></purchase-apply-modal>
+        <purchase-order-modal ref="transferModalForm" @ok="modalFormOk" @close="modalFormClose"></purchase-order-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>
@@ -169,6 +171,7 @@
 <!-- by  ji  sheng  hua-->
 <script>
   import PurchaseApplyModal from './modules/PurchaseApplyModal'
+  import PurchaseOrderModal from './modules/PurchaseOrderModal'
   import BillDetail from './dialog/BillDetail'
   import BillExcelIframe from '@/components/tools/BillExcelIframe'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
@@ -181,6 +184,7 @@
     mixins:[JeecgListMixin,BillListMixin],
     components: {
       PurchaseApplyModal,
+      PurchaseOrderModal,
       BillDetail,
       BillExcelIframe,
       JEllipsis,
@@ -238,6 +242,8 @@
     created() {
       this.initSystemConfig()
       this.initUser()
+      this.initQuickBtn()
+      this.getDepotByCurrentUser()
     },
     computed: {
     },
diff --git a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
index be428a37..8b307fe2 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
@@ -320,6 +320,8 @@
           this.fileList = []
           this.$nextTick(() => {
             handleIntroJs(this.prefixNo, 1)
+            let tp = this.transferParam
+            this.linkBillListOk(tp.list, tp.number, tp.organId)
           })
         } else {
           if(this.model.linkNumber) {
@@ -414,6 +416,7 @@
         this.changeFormTypes(this.materialTable.columns, 'preNumber', 1)
         this.changeFormTypes(this.materialTable.columns, 'finishNumber', 1)
         if(selectBillDetailRows && selectBillDetailRows.length>0) {
+          let listEx = []
           let discountLastMoney = 0
           for(let j=0; j<selectBillDetailRows.length; j++) {
             let info = selectBillDetailRows[j];
@@ -427,8 +430,12 @@
               discountLastMoney += info.allPrice
             }
             info.linkId = info.id
-            this.changeColumnShow(info)
+            if(info.operNumber>0) {
+              listEx.push(info)
+              this.changeColumnShow(info)
+            }
           }
+          this.materialTable.dataSource = listEx
           //根据单号查询单据类型
           findBillDetailByNumber({'number':linkNumber}).then((res) => {
             if (res.code === 200) {
@@ -456,7 +463,6 @@
               'changeAmount': discountLastMoney.toFixed(2)
             })
           })
-          this.materialTable.dataSource = selectBillDetailRows
         }
       }
     }