From ad95ec1952d1d94f4e25b13a30cf142ddf372cb2 Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Sat, 3 May 2025 15:46:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=94=80=E5=94=AE=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E8=BD=AC=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E7=9A=84?=
 =?UTF-8?q?=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/SaleOrderList.vue    |  4 ++++
 .../src/views/bill/mixins/BillListMixin.js     | 18 +++++++++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/jshERP-web/src/views/bill/SaleOrderList.vue b/jshERP-web/src/views/bill/SaleOrderList.vue
index 3275ce1b..2b3d30a6 100644
--- a/jshERP-web/src/views/bill/SaleOrderList.vue
+++ b/jshERP-web/src/views/bill/SaleOrderList.vue
@@ -86,6 +86,7 @@
           <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.saleOut && btnEnableList.indexOf(1)>-1" icon="share-alt" @click="transferBill('转销售出库')">转销售出库</a-button>
+          <a-button v-if="quickBtn.purchaseOrder && purchaseBySaleFlag && 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>
@@ -180,6 +181,7 @@
         <!-- 表单区域 -->
         <sale-order-modal ref="modalForm" @ok="modalFormOk" @close="modalFormClose"></sale-order-modal>
         <sale-out-modal ref="transferModalForm" @ok="modalFormOk" @close="modalFormClose"></sale-out-modal>
+        <purchase-order-modal ref="transferPurchaseModalForm" @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>
@@ -189,6 +191,7 @@
 <script>
   import SaleOrderModal from './modules/SaleOrderModal'
   import SaleOutModal from './modules/SaleOutModal'
+  import PurchaseOrderModal from './modules/PurchaseOrderModal'
   import BillDetail from './dialog/BillDetail'
   import BillExcelIframe from '@/components/tools/BillExcelIframe'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
@@ -203,6 +206,7 @@
     components: {
       SaleOrderModal,
       SaleOutModal,
+      PurchaseOrderModal,
       BillDetail,
       BillExcelIframe,
       JEllipsis,
diff --git a/jshERP-web/src/views/bill/mixins/BillListMixin.js b/jshERP-web/src/views/bill/mixins/BillListMixin.js
index 4c243ee9..4a76b265 100644
--- a/jshERP-web/src/views/bill/mixins/BillListMixin.js
+++ b/jshERP-web/src/views/bill/mixins/BillListMixin.js
@@ -750,11 +750,19 @@ export const BillListMixin = {
                 accountId: info.accountId,
                 salesMan: info.salesMan
               }
-              this.$refs.transferModalForm.action = "add"
-              this.$refs.transferModalForm.transferParam = transferParam
-              this.$refs.transferModalForm.defaultDepotId = this.defaultDepotId
-              this.$refs.transferModalForm.add()
-              this.$refs.transferModalForm.title = type
+              if(type === '转采购订单-以销定购') {
+                this.$refs.transferPurchaseModalForm.action = "add"
+                this.$refs.transferPurchaseModalForm.transferParam = transferParam
+                this.$refs.transferPurchaseModalForm.defaultDepotId = this.defaultDepotId
+                this.$refs.transferPurchaseModalForm.add()
+                this.$refs.transferPurchaseModalForm.title = type
+              } else {
+                this.$refs.transferModalForm.action = "add"
+                this.$refs.transferModalForm.transferParam = transferParam
+                this.$refs.transferModalForm.defaultDepotId = this.defaultDepotId
+                this.$refs.transferModalForm.add()
+                this.$refs.transferModalForm.title = type
+              }
             }
           })
         } else {