From 34211dbde01a51181635ea47a411a7585e98c47c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Wed, 13 Dec 2023 22:55:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=94=80=E5=94=AE=E9=80=80?=
 =?UTF-8?q?=E8=B4=A7=E5=92=8C=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7=E7=9A=84?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E5=8D=95=E6=8D=AE=E6=9F=A5=E8=AF=A2=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/bill/dialog/LinkBillList.vue       | 2 ++
 jshERP-web/src/views/bill/modules/PurchaseBackModal.vue | 2 +-
 jshERP-web/src/views/bill/modules/SaleBackModal.vue     | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/jshERP-web/src/views/bill/dialog/LinkBillList.vue b/jshERP-web/src/views/bill/dialog/LinkBillList.vue
index 1317576d..7a5d19f6 100644
--- a/jshERP-web/src/views/bill/dialog/LinkBillList.vue
+++ b/jshERP-web/src/views/bill/dialog/LinkBillList.vue
@@ -74,6 +74,8 @@
             <a-tag v-if="record.status === '2' && queryParam.subType === '销售订单'" color="cyan">完成销售</a-tag>
             <a-tag v-if="record.status === '3' && queryParam.subType === '采购订单'" color="blue">部分采购</a-tag>
             <a-tag v-if="record.status === '3' && queryParam.subType === '销售订单'" color="blue">部分销售</a-tag>
+            <a-tag v-if="record.status === '2' && (queryParam.subType === '采购'||queryParam.subType === '销售')" color="green">已审核</a-tag>
+            <a-tag v-if="record.status === '3' && (queryParam.subType === '采购'||queryParam.subType === '销售')" color="green">已审核</a-tag>
           </template>
           <template v-if="queryParam.purchaseStatus">
             <a-tag v-if="record.purchaseStatus === '0'" color="red">未采购</a-tag>
diff --git a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
index 352d24d6..b4ad0fe1 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
@@ -374,7 +374,7 @@
         }
       },
       onSearchLinkNumber() {
-        this.$refs.linkBillList.show('入库', '采购', '供应商', "1")
+        this.$refs.linkBillList.show('入库', '采购', '供应商', "1,2,3")
         this.$refs.linkBillList.title = "选择采购入库"
       },
       linkBillListOk(selectBillDetailRows, linkNumber, organId, discountMoney, deposit, remark) {
diff --git a/jshERP-web/src/views/bill/modules/SaleBackModal.vue b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
index 51ef22ca..3bcc5688 100644
--- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
@@ -385,7 +385,7 @@
         }
       },
       onSearchLinkNumber() {
-        this.$refs.linkBillList.show('出库', '销售', '客户', "1")
+        this.$refs.linkBillList.show('出库', '销售', '客户', "1,2,3")
         this.$refs.linkBillList.title = "选择销售出库"
       },
       linkBillListOk(selectBillDetailRows, linkNumber, organId, discountMoney, deposit, remark) {