From 1b419ad908dfa19dfedde0ca876e44681e6f14a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Thu, 19 May 2022 20:21:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=A2=9E=E5=8A=A0=E4=BB=A5?=
 =?UTF-8?q?=E9=94=80=E5=AE=9A=E8=B4=AD=E6=A8=A1=E5=9D=97=E5=90=8E=E4=BA=A7?=
 =?UTF-8?q?=E7=94=9F=E7=9A=84=E5=8D=95=E6=8D=AEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/bill/dialog/BillDetail.vue      | 23 ++++++++++++++++++-
 .../src/views/bill/dialog/LinkBillList.vue    |  5 ++--
 .../views/bill/modules/PurchaseOrderModal.vue |  4 ++++
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/jshERP-web/src/views/bill/dialog/BillDetail.vue b/jshERP-web/src/views/bill/dialog/BillDetail.vue
index b6ff835a..bc60deb7 100644
--- a/jshERP-web/src/views/bill/dialog/BillDetail.vue
+++ b/jshERP-web/src/views/bill/dialog/BillDetail.vue
@@ -1292,6 +1292,20 @@
         if(record.status === '3') {
           //部分采购|部分销售的时候显示全部列
           this.columns = this.defColumns
+        } else if(record.purchaseStatus === '3') {
+          //将已出库的标题转为已采购，针对销售订单转采购订单的场景
+          let currentCol = []
+          for(let i=0; i<this.defColumns.length; i++){
+            let info = {}
+            info.title = this.defColumns[i].title
+            info.dataIndex = this.defColumns[i].dataIndex
+            info.width = this.defColumns[i].width
+            if(this.defColumns[i].dataIndex === 'finishNumber') {
+              info.title = '已采购'
+            }
+            currentCol.push(info)
+          }
+          this.columns = currentCol
         } else {
           let currentCol = []
           for(let i=0; i<this.defColumns.length; i++){
@@ -1348,9 +1362,16 @@
         this.$nextTick(() => {
           this.form.setFieldsValue(pick(this.model,'id'))
         });
+        let showType = 'basic'
+        if(record.status === '3') {
+          showType = 'basic'
+        } else if(record.purchaseStatus === '3') {
+          showType = 'purchase'
+        }
         let params = {
           headerId: this.model.id,
-          mpList: getMpListShort(Vue.ls.get('materialPropertyList'))  //扩展属性
+          mpList: getMpListShort(Vue.ls.get('materialPropertyList')),  //扩展属性
+          linkType: showType
         }
         let url = this.readOnly ? this.url.detailList : this.url.detailList;
         this.requestSubTableData(record, type, url, params);
diff --git a/jshERP-web/src/views/bill/dialog/LinkBillList.vue b/jshERP-web/src/views/bill/dialog/LinkBillList.vue
index 5eafc0ed..8535abbd 100644
--- a/jshERP-web/src/views/bill/dialog/LinkBillList.vue
+++ b/jshERP-web/src/views/bill/dialog/LinkBillList.vue
@@ -106,7 +106,7 @@
         selectedDetailRowKeys: [],
         selectBillRows: [],
         selectBillDetailRows: [],
-        showType: 'list',
+        showType: 'basic',
         selectType: 'list',
         linkNumber: '',
         organId: '',
@@ -195,13 +195,14 @@
         this.visible = true;
         this.loadData(1)
       },
-      purchaseShow(type, subType, organType, status) {
+      purchaseShow(type, subType, organType, status, purchaseStatus) {
         this.selectType = 'list'
         this.showType = 'purchase'
         this.queryParam.type = type
         this.queryParam.subType = subType
         this.queryParam.roleType = '全部数据'
         this.queryParam.status = status
+        this.queryParam.purchaseStatus = purchaseStatus
         this.columns[0].title = organType
         this.model = Object.assign({}, {});
         this.visible = true;
diff --git a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
index 5cb8fe26..5e81869e 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
@@ -194,6 +194,8 @@
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
             { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal },
             { title: '多属性', key: 'sku', width: '4%', type: FormTypes.normal },
+            { title: '原数量', key: 'preNumber', width: '4%', type: FormTypes.normal },
+            { title: '已采购', key: 'finishNumber', width: '4%', type: FormTypes.normal },
             { title: '数量', key: 'operNumber', width: '5%', type: FormTypes.inputNumber, statistics: true,
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
@@ -235,6 +237,8 @@
         this.materialTable.columns[1].type = FormTypes.popupJsh
         this.getSystemConfig()
         this.changeColumnHide()
+        this.changeFormTypes(this.materialTable.columns, 'preNumber', 0)
+        this.changeFormTypes(this.materialTable.columns, 'finishNumber', 0)
         if (this.action === 'add') {
           this.addInit(this.prefixNo)
           this.fileList = []