From 5ffc4c3e342b4aec34899289dc155dab8952e101 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, 8 Sep 2022 21:51:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8D=95=E6=8D=AE=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E5=BA=8F=E5=88=97=E5=8F=B7=E3=80=81=E6=89=B9=E5=8F=B7?= =?UTF-8?q?=E3=80=81=E6=9C=89=E6=95=88=E6=9C=9F=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/views/bill/modules/AllocationOutModal.vue | 4 ++-- jshERP-web/src/views/bill/modules/OtherInModal.vue | 4 ++-- jshERP-web/src/views/bill/modules/OtherOutModal.vue | 4 ++-- .../src/views/bill/modules/PurchaseBackModal.vue | 4 ++-- .../src/views/bill/modules/PurchaseInModal.vue | 4 ++-- .../src/views/bill/modules/RetailBackModal.vue | 10 +++++----- jshERP-web/src/views/bill/modules/RetailOutModal.vue | 12 ++++++------ jshERP-web/src/views/bill/modules/SaleBackModal.vue | 4 ++-- jshERP-web/src/views/bill/modules/SaleOutModal.vue | 4 ++-- 9 files changed, 25 insertions(+), 25 deletions(-) diff --git a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue index 3eb81d01..02ea202d 100644 --- a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue +++ b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue @@ -153,8 +153,8 @@ { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal }, { title: '序列号', key: 'snList', width: '12%', type: FormTypes.popupJsh, kind: 'sn', multi: true }, { title: '批号', key: 'batchNumber', width: '7%', type: FormTypes.popupJsh, kind: 'batch', multi: false }, - { title: '有效期', key: 'expirationDate',width: '6%', type: FormTypes.normal }, - { title: '多属性', key: 'sku', width: '4%', type: FormTypes.normal }, + { title: '有效期', key: 'expirationDate',width: '7%', type: FormTypes.normal }, + { title: '多属性', key: 'sku', width: '9%', type: FormTypes.normal }, { title: '数量', key: 'operNumber', width: '5%', type: FormTypes.inputNumber, statistics: true, validateRules: [{ required: true, message: '${title}不能为空' }] }, diff --git a/jshERP-web/src/views/bill/modules/OtherInModal.vue b/jshERP-web/src/views/bill/modules/OtherInModal.vue index e03be559..80b578c2 100644 --- a/jshERP-web/src/views/bill/modules/OtherInModal.vue +++ b/jshERP-web/src/views/bill/modules/OtherInModal.vue @@ -175,9 +175,9 @@ { title: '序列号', key: 'snList', width: '12%', type: FormTypes.input, placeholder: '多个序列号用逗号隔开', validateRules: [{ pattern: /^\S{1,100}$/, message: '请小于100位字符' }] }, - { title: '批号', key: 'batchNumber', width: '5%', type: FormTypes.input }, + { title: '批号', key: 'batchNumber', width: '7%', type: FormTypes.input }, { title: '有效期', key: 'expirationDate',width: '7%', type: FormTypes.date }, - { title: '多属性', key: 'sku', width: '4%', type: FormTypes.normal }, + { title: '多属性', key: 'sku', width: '9%', type: FormTypes.normal }, { title: '数量', key: 'operNumber', width: '5%', type: FormTypes.inputNumber, statistics: true, validateRules: [{ required: true, message: '${title}不能为空' }] }, diff --git a/jshERP-web/src/views/bill/modules/OtherOutModal.vue b/jshERP-web/src/views/bill/modules/OtherOutModal.vue index 02c49e02..e17d9ce2 100644 --- a/jshERP-web/src/views/bill/modules/OtherOutModal.vue +++ b/jshERP-web/src/views/bill/modules/OtherOutModal.vue @@ -174,8 +174,8 @@ { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal }, { title: '序列号', key: 'snList', width: '12%', type: FormTypes.popupJsh, kind: 'sn', multi: true }, { title: '批号', key: 'batchNumber', width: '7%', type: FormTypes.popupJsh, kind: 'batch', multi: false }, - { title: '有效期', key: 'expirationDate',width: '6%', type: FormTypes.normal }, - { title: '多属性', key: 'sku', width: '4%', type: FormTypes.normal }, + { title: '有效期', key: 'expirationDate',width: '7%', type: FormTypes.normal }, + { title: '多属性', key: 'sku', width: '9%', type: FormTypes.normal }, { title: '数量', key: 'operNumber', width: '5%', type: FormTypes.inputNumber, statistics: true, validateRules: [{ required: true, message: '${title}不能为空' }] }, diff --git a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue index e0232a0c..be96f52d 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue @@ -244,8 +244,8 @@ { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal }, { title: '序列号', key: 'snList', width: '12%', type: FormTypes.popupJsh, kind: 'sn', multi: true }, { title: '批号', key: 'batchNumber', width: '7%', type: FormTypes.popupJsh, kind: 'batch', multi: false }, - { title: '有效期', key: 'expirationDate',width: '6%', type: FormTypes.normal }, - { title: '多属性', key: 'sku', width: '4%', type: FormTypes.normal }, + { title: '有效期', key: 'expirationDate',width: '7%', type: FormTypes.normal }, + { title: '多属性', key: 'sku', width: '9%', type: FormTypes.normal }, { title: '数量', key: 'operNumber', width: '5%', type: FormTypes.inputNumber, statistics: true, validateRules: [{ required: true, message: '${title}不能为空' }] }, diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue index 2199e8b4..ab710ce8 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue @@ -272,9 +272,9 @@ { title: '序列号', key: 'snList', width: '12%', type: FormTypes.input, placeholder: '多个序列号用逗号隔开', validateRules: [{ pattern: /^\S{1,100}$/, message: '请小于100位字符' }] }, - { title: '批号', key: 'batchNumber', width: '5%', type: FormTypes.input }, + { title: '批号', key: 'batchNumber', width: '7%', type: FormTypes.input }, { title: '有效期', key: 'expirationDate',width: '7%', type: FormTypes.date }, - { title: '多属性', key: 'sku', width: '4%', type: FormTypes.normal }, + { title: '多属性', key: 'sku', width: '9%', type: FormTypes.normal }, { title: '原数量', key: 'preNumber', width: '4%', type: FormTypes.normal }, { title: '已入库', key: 'finishNumber', width: '4%', type: FormTypes.normal }, { title: '数量', key: 'operNumber', width: '4%', type: FormTypes.inputNumber, statistics: true, diff --git a/jshERP-web/src/views/bill/modules/RetailBackModal.vue b/jshERP-web/src/views/bill/modules/RetailBackModal.vue index 467e354c..422c5460 100644 --- a/jshERP-web/src/views/bill/modules/RetailBackModal.vue +++ b/jshERP-web/src/views/bill/modules/RetailBackModal.vue @@ -234,14 +234,14 @@ { title: '序列号', key: 'snList', width: '12%', type: FormTypes.input, placeholder: '多个序列号用逗号隔开', validateRules: [{ pattern: /^\S{1,100}$/, message: '请小于100位字符' }] }, - { title: '批号', key: 'batchNumber', width: '7%', type: FormTypes.input }, + { title: '批号', key: 'batchNumber', width: '8%', type: FormTypes.input }, { title: '有效期', key: 'expirationDate',width: '9%', type: FormTypes.date }, - { title: '多属性', key: 'sku', width: '5%', type: FormTypes.normal }, - { title: '数量', key: 'operNumber', width: '5%', type: FormTypes.inputNumber, statistics: true, + { title: '多属性', key: 'sku', width: '9%', type: FormTypes.normal }, + { title: '数量', key: 'operNumber', width: '6%', type: FormTypes.inputNumber, statistics: true, validateRules: [{ required: true, message: '${title}不能为空' }] }, - { title: '单价', key: 'unitPrice', width: '5%', type: FormTypes.inputNumber}, - { title: '金额', key: 'allPrice', width: '5%', type: FormTypes.inputNumber, statistics: true }, + { title: '单价', key: 'unitPrice', width: '6%', type: FormTypes.inputNumber}, + { title: '金额', key: 'allPrice', width: '6%', type: FormTypes.inputNumber, statistics: true }, { title: '备注', key: 'remark', width: '7%', type: FormTypes.input } ] }, diff --git a/jshERP-web/src/views/bill/modules/RetailOutModal.vue b/jshERP-web/src/views/bill/modules/RetailOutModal.vue index d4b45c67..66351319 100644 --- a/jshERP-web/src/views/bill/modules/RetailOutModal.vue +++ b/jshERP-web/src/views/bill/modules/RetailOutModal.vue @@ -244,14 +244,14 @@ { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal }, { title: '单位', key: 'unit', width: '5%', type: FormTypes.normal }, { title: '序列号', key: 'snList', width: '12%', type: FormTypes.popupJsh, kind: 'sn', multi: true }, - { title: '批号', key: 'batchNumber', width: '7%', type: FormTypes.popupJsh, kind: 'batch', multi: false }, - { title: '有效期', key: 'expirationDate',width: '7%', type: FormTypes.normal }, - { title: '多属性', key: 'sku', width: '5%', type: FormTypes.normal }, - { title: '数量', key: 'operNumber', width: '5%', type: FormTypes.inputNumber, statistics: true, + { title: '批号', key: 'batchNumber', width: '8%', type: FormTypes.popupJsh, kind: 'batch', multi: false }, + { title: '有效期', key: 'expirationDate',width: '9%', type: FormTypes.normal }, + { title: '多属性', key: 'sku', width: '9%', type: FormTypes.normal }, + { title: '数量', key: 'operNumber', width: '6%', type: FormTypes.inputNumber, statistics: true, validateRules: [{ required: true, message: '${title}不能为空' }] }, - { title: '单价', key: 'unitPrice', width: '5%', type: FormTypes.inputNumber}, - { title: '金额', key: 'allPrice', width: '5%', type: FormTypes.inputNumber, statistics: true }, + { title: '单价', key: 'unitPrice', width: '6%', type: FormTypes.inputNumber}, + { title: '金额', key: 'allPrice', width: '6%', type: FormTypes.inputNumber, statistics: true }, { title: '备注', key: 'remark', width: '7%', type: FormTypes.input } ] }, diff --git a/jshERP-web/src/views/bill/modules/SaleBackModal.vue b/jshERP-web/src/views/bill/modules/SaleBackModal.vue index eebb6480..847abc86 100644 --- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue @@ -250,9 +250,9 @@ { title: '序列号', key: 'snList', width: '12%', type: FormTypes.input, placeholder: '多个序列号用逗号隔开', validateRules: [{ pattern: /^\S{1,100}$/, message: '请小于100位字符' }] }, - { title: '批号', key: 'batchNumber', width: '5%', type: FormTypes.input }, + { title: '批号', key: 'batchNumber', width: '7%', type: FormTypes.input }, { title: '有效期', key: 'expirationDate',width: '7%', type: FormTypes.date }, - { title: '多属性', key: 'sku', width: '4%', type: FormTypes.normal }, + { title: '多属性', key: 'sku', width: '9%', type: FormTypes.normal }, { title: '数量', key: 'operNumber', width: '5%', type: FormTypes.inputNumber, statistics: true, validateRules: [{ required: true, message: '${title}不能为空' }] }, diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue index 9188e376..b46bfc6a 100644 --- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue @@ -287,8 +287,8 @@ { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal }, { title: '序列号', key: 'snList', width: '12%', type: FormTypes.popupJsh, kind: 'sn', multi: true }, { title: '批号', key: 'batchNumber', width: '7%', type: FormTypes.popupJsh, kind: 'batch', multi: false }, - { title: '有效期', key: 'expirationDate',width: '6%', type: FormTypes.normal }, - { title: '多属性', key: 'sku', width: '4%', type: FormTypes.normal }, + { title: '有效期', key: 'expirationDate',width: '7%', type: FormTypes.normal }, + { title: '多属性', key: 'sku', width: '9%', type: FormTypes.normal }, { title: '原数量', key: 'preNumber', width: '4%', type: FormTypes.normal }, { title: '已出库', key: 'finishNumber', width: '4%', type: FormTypes.normal }, { title: '数量', key: 'operNumber', width: '4%', type: FormTypes.inputNumber, statistics: true,