From bb673ddc262413e5308b68f81315cc142627d61a Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Sat, 27 Apr 2024 10:47:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=B3=E8=81=94=E8=AF=B7=E8=B4=AD=E5=8D=95?=
 =?UTF-8?q?=E7=9A=84=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/bill/PurchaseOrderList.vue      | 19 ++++++++++++++++++-
 .../src/views/bill/mixins/BillListMixin.js    | 18 +++++++++++++++++-
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/jshERP-web/src/views/bill/PurchaseOrderList.vue b/jshERP-web/src/views/bill/PurchaseOrderList.vue
index c7abb2a7..6a9da8e6 100644
--- a/jshERP-web/src/views/bill/PurchaseOrderList.vue
+++ b/jshERP-web/src/views/bill/PurchaseOrderList.vue
@@ -58,6 +58,16 @@
                     </a-select>
                   </a-form-item>
                 </a-col>
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="关联请购单" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-input placeholder="请输入关联请购单" v-model="queryParam.linkApply"></a-input>
+                  </a-form-item>
+                </a-col>
+                <a-col :md="6" :sm="24" v-if="purchaseBySaleFlag">
+                  <a-form-item label="关联订单" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-input placeholder="请输入关联订单" v-model="queryParam.linkNumber"></a-input>
+                  </a-form-item>
+                </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="单据状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
                     <a-select placeholder="选择单据状态" v-model="queryParam.status">
@@ -90,7 +100,12 @@
                 <a-row style="width: 500px">
                   <template v-for="(item,index) in defColumns">
                     <template>
-                      <a-col :span="8">
+                      <a-col :span="8" v-if="purchaseBySaleFlag">
+                        <a-checkbox :value="item.dataIndex">
+                          <j-ellipsis :value="item.title" :length="10"></j-ellipsis>
+                        </a-checkbox>
+                      </a-col>
+                      <a-col :span="8" v-if="!purchaseBySaleFlag && item.dataIndex!=='linkNumber'">
                         <a-checkbox :value="item.dataIndex">
                           <j-ellipsis :value="item.title" :length="10"></j-ellipsis>
                         </a-checkbox>
@@ -186,6 +201,8 @@
           subType: "采购订单",
           organId: "",
           depotId: "",
+          linkApply: "",
+          linkNumber: "",
           creator: "",
           status: "",
           remark: ""
diff --git a/jshERP-web/src/views/bill/mixins/BillListMixin.js b/jshERP-web/src/views/bill/mixins/BillListMixin.js
index d9606501..4d5d4e7d 100644
--- a/jshERP-web/src/views/bill/mixins/BillListMixin.js
+++ b/jshERP-web/src/views/bill/mixins/BillListMixin.js
@@ -13,6 +13,8 @@ export const BillListMixin = {
       checkFlag: true,
       /* 单据Excel是否开启 */
       isShowExcel: false,
+      //以销定购的场景开关
+      purchaseBySaleFlag: false,
       waitTotal: 0,
       dateFormat: 'YYYY-MM-DD',
       billExcelUrl: '',
@@ -135,6 +137,7 @@ export const BillListMixin = {
           let multiBillType = res.data.multiBillType
           let multiLevelApprovalFlag = res.data.multiLevelApprovalFlag
           this.checkFlag = getCheckFlag(multiBillType, multiLevelApprovalFlag, this.prefixNo)
+          this.purchaseBySaleFlag = res.data.purchaseBySaleFlag==='1'?true:false
           this.inOutManageFlag = res.data.inOutManageFlag==='1'?true:false
         }
       })
@@ -211,7 +214,20 @@ export const BillListMixin = {
         this.settingDataIndex = this.defDataIndex
       }
       this.columns = this.defColumns.filter(item => {
-        return this.settingDataIndex.includes(item.dataIndex)
+        if(this.purchaseBySaleFlag) {
+          //以销定购-开启
+          return this.settingDataIndex.includes(item.dataIndex)
+        } else {
+          //以销定购-关闭
+          if(this.prefixNo === 'CGDD') {
+            //采购订单只显示除了关联订单之外的列
+            if(item.dataIndex!=='linkNumber') {
+              return this.settingDataIndex.includes(item.dataIndex)
+            }
+          } else {
+            return this.settingDataIndex.includes(item.dataIndex)
+          }
+        }
       })
     },
     //列设置更改事件