From 3d423edf30084e2f87ae18f1ef421e3fc6aa42f1 Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Sat, 27 Apr 2024 13:05:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=AF=B7=E8=B4=AD=E5=8D=95?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=92=8C=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E7=9A=84=E5=BD=95=E5=85=A5=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/bill/PurchaseApplyList.vue          | 7 +------
 jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue | 3 ++-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/jshERP-web/src/views/bill/PurchaseApplyList.vue b/jshERP-web/src/views/bill/PurchaseApplyList.vue
index 581479dc..1b262c2b 100644
--- a/jshERP-web/src/views/bill/PurchaseApplyList.vue
+++ b/jshERP-web/src/views/bill/PurchaseApplyList.vue
@@ -197,12 +197,7 @@
             align:"center", width: 180,
             scopedSlots: { customRender: 'action' },
           },
-          { title: '单据编号', dataIndex: 'number',width:180,
-            customRender:function (text,record,index) {
-              text = record.linkNumber?text+"[转]":text
-              return text
-            }
-          },
+          { title: '单据编号', dataIndex: 'number',width:180},
           { title: '商品信息', dataIndex: 'materialsList',width:320, ellipsis:true},
           { title: '单据日期', dataIndex: 'operTimeStr',width:185},
           { title: '操作员', dataIndex: 'userName',width:120, ellipsis:true},
diff --git a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
index 389f4ed5..1c2b10c2 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
@@ -257,7 +257,7 @@
             { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
             { 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: 'sku', width: '9%', 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,
@@ -415,6 +415,7 @@
               discountLastMoney += info.allPrice
             }
             info.linkId = info.id
+            this.changeColumnShow(info)
           }
           if(linkNumber.indexOf('QGD')===-1) {
             this.$nextTick(() => {