From 9e973803ab5620c8918e2dbe9acac39771e81256 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 13 Dec 2020 18:34:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8D=95=E6=8D=AE=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=98=8E=E7=BB=86=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/js/pages/bill/bill_detail.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/erp_web/js/pages/bill/bill_detail.js b/erp_web/js/pages/bill/bill_detail.js
index 606e45ba..a791c13e 100644
--- a/erp_web/js/pages/bill/bill_detail.js
+++ b/erp_web/js/pages/bill/bill_detail.js
@@ -467,7 +467,12 @@
             columns:[[
                 { title: '商品类型',field: 'MType',width:80, hidden:isShowMaterialTypeColumn},
                 { title: depotHeadName,field: 'DepotName',editor:'validatebox',width:90},
-                { title: '名称(型号)(扩展信息)(单位)',field: 'MaterialName',width:230},
+                { title: '条码',field: 'barCode', editor:'validatebox', width:120},
+                { title: '名称', field: 'name', editor: 'validatebox', width: 100},
+                { title: '规格', field: 'standard', editor: 'validatebox', width: 60},
+                { title: '型号', field: 'model', editor: 'validatebox', width: 60},
+                { title: '扩展信息', field: 'materialOther', editor: 'validatebox', width: 70},
+                { title: '库存',field: 'Stock',width:50},
                 { title: anotherDepotHeadName,field: 'AnotherDepotName',hidden:isShowAnotherDepot,width:90},
                 { title: '单位',field: 'Unit',editor:'validatebox',width:60},
                 { title: '数量',field: 'OperNumber',editor:'validatebox',width:60},
@@ -477,12 +482,7 @@
                 { title: '税率',field: 'TaxRate',editor:'validatebox',hidden:isShowTaxColumn,width:75},
                 { title: '税额',field: 'TaxMoney',editor:'validatebox',hidden:isShowTaxColumn,width:75},
                 { title: '价税合计',field: 'TaxLastMoney',editor:'validatebox',hidden:isShowTaxColumn,width:75},
-                { title: '备注',field: 'Remark',editor:'validatebox',width:120},
-                { title: '名称-别',field: 'OtherField1',editor:'validatebox',hidden:otherColumns,width:60},
-                { title: '型号-别',field: 'OtherField2',editor:'validatebox',hidden:otherColumns,width:60},
-                { title: '颜色-别',field: 'OtherField3',editor:'validatebox',hidden:otherColumns,width:60},
-                { title: '备注1',field: 'OtherField4',editor:'validatebox',hidden:true,width:60},
-                { title: '备注2',field: 'OtherField5',editor:'validatebox',hidden:true,width:60}
+                { title: '备注',field: 'Remark',editor:'validatebox',width:100}
             ]],
             onLoadError:function() {
                 $.messager.alert('页面加载提示','页面加载异常，请稍后再试！','error');