From 8726fe9374580ec3820adee718e49cda9e1e48b1 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, 11 Jan 2024 08:20:13 +0000 Subject: [PATCH 1/2] update README.md. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 季圣华 <752718920@qq.com> --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index bfd4abc2..a02a2484 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,6 @@ * 很多人说华夏ERP（英文名：jshERP）是目前人气领先的国产ERP系统 * 虽然目前只有进销存+财务+生产的功能，但后面将会推出ERP的全部功能，有兴趣请帮点一下 **Star** 哦 * **官网地址：http://www.huaxiaerp.com 商务或技术交流，请联系QQ：752718920 微信：shenhua861584** -* 欢迎加入华夏ERP交流QQ群(入群帮安装)，群3：805736336(满)、群4：146571538 # 网络版介绍 * 推荐使用网络版（158元1年）淘宝链接：https://item.taobao.com/item.htm?id=674169489573 From ce6059e826e5cb8664b0a98f6dd07b22ec12cd70 Mon Sep 17 00:00:00 2001 From: jishenghua <752718920@qq.com> Date: Wed, 10 Jan 2024 12:41:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E7=95=8C=E9=9D=A2=E5=BA=8F=E5=88=97=E5=8F=B7?= =?UTF-8?q?=E8=BF=87=E9=95=BF=E5=AF=BC=E8=87=B4=E5=8F=98=E5=BD=A2=E7=9A=84?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/bill/dialog/BillDetail.vue | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/jshERP-web/src/views/bill/dialog/BillDetail.vue b/jshERP-web/src/views/bill/dialog/BillDetail.vue index d776e47c..777b50ae 100644 --- a/jshERP-web/src/views/bill/dialog/BillDetail.vue +++ b/jshERP-web/src/views/bill/dialog/BillDetail.vue @@ -1190,7 +1190,7 @@ { title: '扩展信息', dataIndex: 'materialOther'}, { title: '库存', dataIndex: 'stock'}, { title: '单位', dataIndex: 'unit'}, - { title: '序列号', dataIndex: 'snList'}, + { title: '序列号', dataIndex: 'snList', width:300}, { title: '批号', dataIndex: 'batchNumber'}, { title: '有效期', dataIndex: 'expirationDate'}, { title: '多属性', dataIndex: 'sku'}, @@ -1210,7 +1210,7 @@ { title: '扩展信息', dataIndex: 'materialOther'}, { title: '库存', dataIndex: 'stock'}, { title: '单位', dataIndex: 'unit'}, - { title: '序列号', dataIndex: 'snList'}, + { title: '序列号', dataIndex: 'snList', width:300}, { title: '批号', dataIndex: 'batchNumber'}, { title: '有效期', dataIndex: 'expirationDate'}, { title: '多属性', dataIndex: 'sku'}, @@ -1249,7 +1249,7 @@ { title: '扩展信息', dataIndex: 'materialOther'}, { title: '库存', dataIndex: 'stock'}, { title: '单位', dataIndex: 'unit'}, - { title: '序列号', dataIndex: 'snList'}, + { title: '序列号', dataIndex: 'snList', width:300}, { title: '批号', dataIndex: 'batchNumber'}, { title: '有效期', dataIndex: 'expirationDate'}, { title: '多属性', dataIndex: 'sku'}, @@ -1273,7 +1273,7 @@ { title: '扩展信息', dataIndex: 'materialOther'}, { title: '库存', dataIndex: 'stock'}, { title: '单位', dataIndex: 'unit'}, - { title: '序列号', dataIndex: 'snList'}, + { title: '序列号', dataIndex: 'snList', width:300}, { title: '批号', dataIndex: 'batchNumber'}, { title: '有效期', dataIndex: 'expirationDate'}, { title: '多属性', dataIndex: 'sku'}, @@ -1316,7 +1316,7 @@ { title: '扩展信息', dataIndex: 'materialOther'}, { title: '库存', dataIndex: 'stock'}, { title: '单位', dataIndex: 'unit'}, - { title: '序列号', dataIndex: 'snList'}, + { title: '序列号', dataIndex: 'snList', width:300}, { title: '批号', dataIndex: 'batchNumber'}, { title: '有效期', dataIndex: 'expirationDate'}, { title: '多属性', dataIndex: 'sku'}, @@ -1340,7 +1340,7 @@ { title: '扩展信息', dataIndex: 'materialOther'}, { title: '库存', dataIndex: 'stock'}, { title: '单位', dataIndex: 'unit'}, - { title: '序列号', dataIndex: 'snList'}, + { title: '序列号', dataIndex: 'snList', width:300}, { title: '批号', dataIndex: 'batchNumber'}, { title: '有效期', dataIndex: 'expirationDate'}, { title: '多属性', dataIndex: 'sku'}, @@ -1364,7 +1364,7 @@ { title: '扩展信息', dataIndex: 'materialOther'}, { title: '库存', dataIndex: 'stock'}, { title: '单位', dataIndex: 'unit'}, - { title: '序列号', dataIndex: 'snList'}, + { title: '序列号', dataIndex: 'snList', width:300}, { title: '批号', dataIndex: 'batchNumber'}, { title: '有效期', dataIndex: 'expirationDate'}, { title: '多属性', dataIndex: 'sku'}, @@ -1384,7 +1384,7 @@ { title: '扩展信息', dataIndex: 'materialOther'}, { title: '库存', dataIndex: 'stock'}, { title: '单位', dataIndex: 'unit'}, - { title: '序列号', dataIndex: 'snList'}, + { title: '序列号', dataIndex: 'snList', width:300}, { title: '批号', dataIndex: 'batchNumber'}, { title: '有效期', dataIndex: 'expirationDate'}, { title: '多属性', dataIndex: 'sku'}, @@ -1533,6 +1533,9 @@ let info = {} info.title = this.defColumns[i].title info.dataIndex = this.defColumns[i].dataIndex + if(this.defColumns[i].width) { + info.width = this.defColumns[i].width + } if(this.defColumns[i].dataIndex === 'finishNumber') { info.title = '已采购' } @@ -1551,6 +1554,9 @@ let info = {} info.title = this.defColumns[i].title info.dataIndex = this.defColumns[i].dataIndex + if(this.defColumns[i].width) { + info.width = this.defColumns[i].width + } if(this.defColumns[i].dataIndex === 'barCode') { info.scopedSlots = { customRender: 'customBarCode' } } @@ -1561,6 +1567,9 @@ let info = {} info.title = this.defColumns[i].title info.dataIndex = this.defColumns[i].dataIndex + if(this.defColumns[i].width) { + info.width = this.defColumns[i].width + } currentCol.push(info) } }