From 177e7d88008ec0f70460a6d6d56e2318b966125d Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Sun, 21 Apr 2024 14:53:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=B7=E8=B4=AD=E5=8D=95?=
 =?UTF-8?q?=E7=9A=84=E5=8E=86=E5=8F=B2=E5=8D=95=E6=8D=AE=E7=9A=84=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/bill/dialog/HistoryBillList.vue | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/jshERP-web/src/views/bill/dialog/HistoryBillList.vue b/jshERP-web/src/views/bill/dialog/HistoryBillList.vue
index 0133037b..8ed9841c 100644
--- a/jshERP-web/src/views/bill/dialog/HistoryBillList.vue
+++ b/jshERP-web/src/views/bill/dialog/HistoryBillList.vue
@@ -147,6 +147,7 @@
           },
           { title: '单据日期', dataIndex: 'operTimeStr',width:145},
           { title: '操作员', dataIndex: 'userName',width:70},
+          { title: '数量', dataIndex: 'materialCount',width:50},
           { title: '金额合计', dataIndex: 'totalPrice',width:70},
           { title: '含税合计', dataIndex: 'totalTaxLastMoney',width:70,
             customRender:function (text,record,index) {
@@ -173,13 +174,33 @@
       show(type, subType, organType, organId) {
         this.queryParam.type = type
         this.queryParam.subType = subType
-        this.columns[1].title = organType
         this.organLabel = organType
         this.model = Object.assign({}, {})
         this.visible = true
+        this.initColumns(subType, organType)
         this.loadSupplier(organType, organId)
         this.loadData(1)
       },
+      initColumns(subType, organType) {
+        for(let i=0; i<this.columns.length; i++) {
+          if (this.columns[i].dataIndex === 'organName') {
+            this.columns[i].title = organType
+          }
+        }
+        if(subType === '请购单') {
+          for(let i=0; i<this.columns.length; i++){
+            if(this.columns[i].dataIndex === 'organName') {
+              this.columns.splice(i, 1)
+            }
+            if(this.columns[i].dataIndex === 'totalPrice') {
+              this.columns.splice(i, 1)
+            }
+            if(this.columns[i].dataIndex === 'totalTaxLastMoney') {
+              this.columns.splice(i, 1)
+            }
+          }
+        }
+      },
       loadSupplier(organType, organId) {
         if(organType === '供应商') {
           findBySelectSup({}).then((res)=>{