From 8cd8b20b7855e55d4b7b31fb5f5d2dcb9d8965f2 Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Tue, 8 Apr 2025 22:57:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=A2=9E=E5=8A=A0=E5=BC=BA=E5=88=B6=E7=BB=93?=
 =?UTF-8?q?=E5=8D=95-=E4=BB=A5=E9=94=80=E5=AE=9A=E8=B4=AD=E7=9A=84?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/mixins/JeecgListMixin.js       | 31 ---------
 jshERP-web/src/views/bill/SaleOrderList.vue   |  4 ++
 .../src/views/bill/mixins/BillListMixin.js    | 64 ++++++++++++++++++-
 3 files changed, 67 insertions(+), 32 deletions(-)

diff --git a/jshERP-web/src/mixins/JeecgListMixin.js b/jshERP-web/src/mixins/JeecgListMixin.js
index b4066525..ff5ed860 100644
--- a/jshERP-web/src/mixins/JeecgListMixin.js
+++ b/jshERP-web/src/mixins/JeecgListMixin.js
@@ -231,37 +231,6 @@ export const JeecgListMixin = {
         });
       }
     },
-    batchForceClose: function () {
-      if(!this.url.forceCloseBatch){
-        this.$message.error("请设置url.forceCloseBatch属性!")
-        return
-      }
-      if (this.selectedRowKeys.length <= 0) {
-        this.$message.warning('请选择一条记录！')
-      } else {
-        let ids = "";
-        for (let a = 0; a < this.selectedRowKeys.length; a++) {
-          ids += this.selectedRowKeys[a] + ","
-        }
-        let that = this
-        this.$confirm({
-          title: "确认强制结单",
-          content: "是否强制结单选中数据?",
-          onOk: function () {
-            that.loading = true
-            postAction(that.url.forceCloseBatch, {ids: ids}).then((res) => {
-              if(res.code === 200){
-                that.loadData()
-              } else {
-                that.$message.warning(res.data.message)
-              }
-            }).finally(() => {
-              that.loading = false
-            });
-          }
-        });
-      }
-    },
     handleDelete: function (id) {
       if(!this.url.delete){
         this.$message.error("请设置url.delete属性!")
diff --git a/jshERP-web/src/views/bill/SaleOrderList.vue b/jshERP-web/src/views/bill/SaleOrderList.vue
index 68b8fa49..8f512719 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="btnEnableList.indexOf(1)>-1" icon="issues-close" @click="batchForceClose">强制结单</a-button>
+          <a-button v-if="purchaseBySaleFlag && btnEnableList.indexOf(1)>-1" icon="issues-close" @click="batchForceClosePurchase">强制结单-以销定购</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>
@@ -201,6 +202,8 @@
           remark: ""
         },
         prefixNo: 'XSDD',
+        //以销定购开关
+        purchaseBySaleFlag: false,
         labelCol: {
           span: 5
         },
@@ -258,6 +261,7 @@
           delete: "/depotHead/delete",
           deleteBatch: "/depotHead/deleteBatch",
           forceCloseBatch: "/depotHead/forceCloseBatch",
+          forceClosePurchaseBatch: "/depotHead/forceClosePurchaseBatch",
           batchSetStatusUrl: "/depotHead/batchSetStatus"
         }
       }
diff --git a/jshERP-web/src/views/bill/mixins/BillListMixin.js b/jshERP-web/src/views/bill/mixins/BillListMixin.js
index f7940af8..6fec16b6 100644
--- a/jshERP-web/src/views/bill/mixins/BillListMixin.js
+++ b/jshERP-web/src/views/bill/mixins/BillListMixin.js
@@ -1,5 +1,5 @@
 import Vue from 'vue'
-import {getAction } from '@/api/manage'
+import { getAction, postAction } from '@/api/manage'
 import { FormTypes } from '@/utils/JEditableTableUtil'
 import {findBillDetailByNumber, findBySelectSup, findBySelectCus, findBySelectRetail, getUserList, getAccount, waitBillCount,
   getCurrentSystemConfig, getPlatformConfigByKey} from '@/api/api'
@@ -107,6 +107,68 @@ export const BillListMixin = {
       }
       this.handleDetail(record, type, prefixNo);
     },
+    batchForceClose: function () {
+      if(!this.url.forceCloseBatch){
+        this.$message.error("请设置url.forceCloseBatch属性!")
+        return
+      }
+      if (this.selectedRowKeys.length <= 0) {
+        this.$message.warning('请选择一条记录！')
+      } else {
+        let ids = "";
+        for (let a = 0; a < this.selectedRowKeys.length; a++) {
+          ids += this.selectedRowKeys[a] + ","
+        }
+        let that = this
+        this.$confirm({
+          title: "确认强制结单",
+          content: "是否强制结单选中数据?",
+          onOk: function () {
+            that.loading = true
+            postAction(that.url.forceCloseBatch, {ids: ids}).then((res) => {
+              if(res.code === 200){
+                that.loadData()
+              } else {
+                that.$message.warning(res.data.message)
+              }
+            }).finally(() => {
+              that.loading = false
+            });
+          }
+        });
+      }
+    },
+    batchForceClosePurchase: function () {
+      if(!this.url.forceClosePurchaseBatch){
+        this.$message.error("请设置url.forceClosePurchaseBatch属性!")
+        return
+      }
+      if (this.selectedRowKeys.length <= 0) {
+        this.$message.warning('请选择一条记录！')
+      } else {
+        let ids = "";
+        for (let a = 0; a < this.selectedRowKeys.length; a++) {
+          ids += this.selectedRowKeys[a] + ","
+        }
+        let that = this
+        this.$confirm({
+          title: "确认强制结单(以销定购)",
+          content: "是否强制结单选中数据?",
+          onOk: function () {
+            that.loading = true
+            postAction(that.url.forceClosePurchaseBatch, {ids: ids}).then((res) => {
+              if(res.code === 200){
+                that.loadData()
+              } else {
+                that.$message.warning(res.data.message)
+              }
+            }).finally(() => {
+              that.loading = false
+            });
+          }
+        });
+      }
+    },
     handleApprove(record) {
       this.$refs.modalForm.action = "approve";
       this.$refs.modalForm.edit(record);