From 46db957f87b36a0cbda7cf0efc917159a279dcdb Mon Sep 17 00:00:00 2001 From: jishenghua <752718920@qq.com> Date: Sun, 21 Apr 2024 23:28:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=AF=B7=E8=B4=AD=E5=8D=95?= =?UTF-8?q?=E7=9A=84=E6=98=8E=E7=BB=86=E5=AF=BC=E5=85=A5excel=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsh/erp/controller/DepotItemController.java | 5 +++++ jshERP-web/public/doc/apply_item_template.xls | Bin 0 -> 18432 bytes jshERP-web/src/views/bill/PurchaseApplyList.vue | 2 +- .../views/bill/modules/PurchaseApplyModal.vue | 12 ++++++------ 4 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 jshERP-web/public/doc/apply_item_template.xls diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java index 0dda5f4b..73c74337 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java @@ -921,6 +921,11 @@ public class DepotItemController { List> detailList = new ArrayList<>(); for (int i = 2; i < src.getRows(); i++) { String depotName = "", barCode = "", num = "", unitPrice = "", taxRate = "", remark = ""; + if("QGD".equals(prefixNo)) { + barCode = ExcelUtils.getContent(src, i, 0); + num = ExcelUtils.getContent(src, i, 2); + remark = ExcelUtils.getContent(src, i, 3); + } if("CGDD".equals(prefixNo) || "XSDD".equals(prefixNo)) { barCode = ExcelUtils.getContent(src, i, 0); num = ExcelUtils.getContent(src, i, 2); diff --git a/jshERP-web/public/doc/apply_item_template.xls b/jshERP-web/public/doc/apply_item_template.xls new file mode 100644 index 0000000000000000000000000000000000000000..3ff9179542434c269d894efacb578a9b9045e0e5 GIT binary patch literal 18432 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 Oh^O-ap#Oz;X5im=cVgoJ literal 0 HcmV?d00001 diff --git a/jshERP-web/src/views/bill/PurchaseApplyList.vue b/jshERP-web/src/views/bill/PurchaseApplyList.vue index 374ff672..4530dbf5 100644 --- a/jshERP-web/src/views/bill/PurchaseApplyList.vue +++ b/jshERP-web/src/views/bill/PurchaseApplyList.vue @@ -98,7 +98,7 @@ 列设置 - diff --git a/jshERP-web/src/views/bill/modules/PurchaseApplyModal.vue b/jshERP-web/src/views/bill/modules/PurchaseApplyModal.vue index 47cac5d5..abe416a5 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseApplyModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseApplyModal.vue @@ -160,14 +160,14 @@ { title: '名称', key: 'name', width: '10%', type: FormTypes.normal }, { title: '规格', key: 'standard', width: '9%', type: FormTypes.normal }, { title: '型号', key: 'model', width: '9%', type: FormTypes.normal }, - { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal }, - { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal }, - { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal }, - { title: '多属性', key: 'sku', width: '4%', type: FormTypes.normal }, - { title: '数量', key: 'operNumber', width: '5%', type: FormTypes.inputNumber, statistics: true, + { title: '颜色', key: 'color', width: '6%', type: FormTypes.normal }, + { title: '扩展信息', key: 'materialOther', width: '6%', type: FormTypes.normal }, + { title: '单位', key: 'unit', width: '6%', type: FormTypes.normal }, + { title: '多属性', key: 'sku', width: '10%', type: FormTypes.normal }, + { title: '数量', key: 'operNumber', width: '6%', type: FormTypes.inputNumber, statistics: true, validateRules: [{ required: true, message: '${title}不能为空' }] }, - { title: '备注', key: 'remark', width: '6%', type: FormTypes.input}, + { title: '备注', key: 'remark', width: '8%', type: FormTypes.input}, ] }, confirmLoading: false,