From ce896e105dac2e4d7a9f2824d4280673465b9f13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A5=9E=E8=AF=9D?= <752718920@qq.com> Date: Fri, 6 May 2022 20:04:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81=E5=88=97?= =?UTF-8?q?=E7=9A=84=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/jeecgbiz/JSelectList.vue | 2 +- .../jeecgbiz/modal/JSelectMaterialModal.vue | 24 +++++------ .../src/views/material/MaterialList.vue | 40 +++++++++---------- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/jshERP-web/src/components/jeecgbiz/JSelectList.vue b/jshERP-web/src/components/jeecgbiz/JSelectList.vue index 086e1e84..b825baa9 100644 --- a/jshERP-web/src/components/jeecgbiz/JSelectList.vue +++ b/jshERP-web/src/components/jeecgbiz/JSelectList.vue @@ -22,7 +22,7 @@ props: { modalWidth: { type: Number, - default: 1300, + default: 1450, required: false }, value: { diff --git a/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue b/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue index 045a8f6f..f898098b 100644 --- a/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue +++ b/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue @@ -101,20 +101,20 @@ }, categoryTree:[], columns: [ - {dataIndex: 'mBarCode', title: '条码', width: 100, align: 'left', ellipsis:true}, - {dataIndex: 'name', title: '名称', width: 120, ellipsis:true}, - {dataIndex: 'categoryName', title: '类别', width: 80, ellipsis:true}, - {dataIndex: 'standard', title: '规格', width: 80, ellipsis:true}, - {dataIndex: 'model', title: '型号', width: 80, ellipsis:true}, - {dataIndex: 'color', title: '颜色', width: 80, ellipsis:true}, - {dataIndex: 'unit', title: '单位', width: 70, ellipsis:true}, - {dataIndex: 'sku', title: '多属性', width: 80, ellipsis:true}, - {dataIndex: 'stock', title: '库存', width: 60}, - {dataIndex: 'expand', title: '扩展信息', width: 80, ellipsis:true}, - {dataIndex: 'enableSerialNumber', title: '序列号', width: 60, align: "center", + {dataIndex: 'mBarCode', title: '条码', align: 'left'}, + {dataIndex: 'name', title: '名称'}, + {dataIndex: 'categoryName', title: '类别'}, + {dataIndex: 'standard', title: '规格'}, + {dataIndex: 'model', title: '型号'}, + {dataIndex: 'color', title: '颜色'}, + {dataIndex: 'unit', title: '单位'}, + {dataIndex: 'sku', title: '多属性'}, + {dataIndex: 'stock', title: '库存'}, + {dataIndex: 'expand', title: '扩展信息'}, + {dataIndex: 'enableSerialNumber', title: '序列号', align: "center", scopedSlots: { customRender: 'customRenderEnableSerialNumber' } }, - {dataIndex: 'enableBatchNumber', title: '批号', width: 50, align: "center", + {dataIndex: 'enableBatchNumber', title: '批号', align: "center", scopedSlots: { customRender: 'customRenderEnableBatchNumber' } } ], diff --git a/jshERP-web/src/views/material/MaterialList.vue b/jshERP-web/src/views/material/MaterialList.vue index c44a75cb..a1018c87 100644 --- a/jshERP-web/src/views/material/MaterialList.vue +++ b/jshERP-web/src/views/material/MaterialList.vue @@ -222,14 +222,14 @@ 'purchaseDecimal','commodityDecimal','wholesaleDecimal','lowDecimal','enabled','enableSerialNumber','enableBatchNumber','action'], // 默认的列 defColumns: [ - {title: '条码', dataIndex: 'mBarCode', width: '8%'}, - {title: '名称', dataIndex: 'name', width: '10%', ellipsis:true}, - {title: '规格', dataIndex: 'standard', width: '6%', ellipsis:true}, - {title: '型号', dataIndex: 'model', width: '6%', ellipsis:true}, - {title: '颜色', dataIndex: 'color', width: '4%', ellipsis:true}, - {title: '类别', dataIndex: 'categoryName', width: '6%', ellipsis:true}, - {title: '扩展信息', dataIndex: 'materialOther', width: '6%', ellipsis:true}, - {title: '单位', dataIndex: 'unit', width: '6%', ellipsis:true, + {title: '条码', dataIndex: 'mBarCode'}, + {title: '名称', dataIndex: 'name'}, + {title: '规格', dataIndex: 'standard'}, + {title: '型号', dataIndex: 'model'}, + {title: '颜色', dataIndex: 'color'}, + {title: '类别', dataIndex: 'categoryName'}, + {title: '扩展信息', dataIndex: 'materialOther'}, + {title: '单位', dataIndex: 'unit', customRender:function (t,r,index) { if (r) { let name = t?t:r.unitName @@ -241,28 +241,28 @@ } } }, - {title: '基础重量', dataIndex: 'weight', width: '5%'}, - {title: '保质期', dataIndex: 'expiryNum', width: '4%'}, - {title: '库存', dataIndex: 'stock', width: '5%'}, - {title: '采购价', dataIndex: 'purchaseDecimal', width: '5%'}, - {title: '零售价', dataIndex: 'commodityDecimal', width: '5%'}, - {title: '销售价', dataIndex: 'wholesaleDecimal', width: '5%'}, - {title: '最低售价', dataIndex: 'lowDecimal', width: '5%'}, - {title: '备注', dataIndex: 'remark', width: '5%', ellipsis:true}, - {title: '状态', dataIndex: 'enabled', width: '4%', align: "center", + {title: '基础重量', dataIndex: 'weight'}, + {title: '保质期', dataIndex: 'expiryNum'}, + {title: '库存', dataIndex: 'stock'}, + {title: '采购价', dataIndex: 'purchaseDecimal'}, + {title: '零售价', dataIndex: 'commodityDecimal'}, + {title: '销售价', dataIndex: 'wholesaleDecimal'}, + {title: '最低售价', dataIndex: 'lowDecimal'}, + {title: '备注', dataIndex: 'remark'}, + {title: '状态', dataIndex: 'enabled', align: "center", width: 100, scopedSlots: { customRender: 'customRenderEnabled' } }, - {title: '序列号', dataIndex: 'enableSerialNumber', width: '4%', align: "center", + {title: '序列号', dataIndex: 'enableSerialNumber', align: "center", width: 100, scopedSlots: { customRender: 'customRenderEnableSerialNumber' } }, - {title: '批号', dataIndex: 'enableBatchNumber', width: '3%', align: "center", + {title: '批号', dataIndex: 'enableBatchNumber', align: "center", width: 100, scopedSlots: { customRender: 'customRenderEnableBatchNumber' } }, { title: '操作', dataIndex: 'action', align:"center", - width: '6%', + width: 150, scopedSlots: { customRender: 'action' }, } ],