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 00000000..3ff91795 Binary files /dev/null and b/jshERP-web/public/doc/apply_item_template.xls differ 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,