diff --git a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue index 4a394bb3..3fb27071 100644 --- a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue +++ b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue @@ -137,19 +137,19 @@ loading: false, dataSource: [], columns: [ - { title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [], + { title: '仓库名称', key: 'depotId', width: '8%', type: FormTypes.select, placeholder: '请选择${title}', options: [], allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }] }, - { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, kind: 'material', multi: true, + { title: '条码', key: 'barCode', width: '10%', type: FormTypes.popupJsh, kind: 'material', multi: true, validateRules: [{ required: true, message: '${title}不能为空' }] }, { title: '名称', key: 'name', width: '8%', type: FormTypes.normal }, - { title: '规格', key: 'standard', width: '5%', type: FormTypes.normal }, - { title: '型号', key: 'model', width: '5%', type: FormTypes.normal }, + { title: '规格', key: 'standard', width: '7%', type: FormTypes.normal }, + { title: '型号', key: 'model', width: '6%', type: FormTypes.normal }, { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal }, { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal }, { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal }, - { title: '调入仓库', key: 'anotherDepotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [], allowSearch:true}, + { title: '调入仓库', key: 'anotherDepotId', width: '8%', type: FormTypes.select, placeholder: '请选择${title}', options: [], allowSearch:true}, { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal }, { title: '多属性', key: 'sku', width: '9%', type: FormTypes.normal }, { title: '数量', key: 'operNumber', width: '5%', type: FormTypes.inputNumber, statistics: true, diff --git a/jshERP-web/src/views/bill/modules/AssembleModal.vue b/jshERP-web/src/views/bill/modules/AssembleModal.vue index 0200b3bd..9d007b6b 100644 --- a/jshERP-web/src/views/bill/modules/AssembleModal.vue +++ b/jshERP-web/src/views/bill/modules/AssembleModal.vue @@ -138,15 +138,15 @@ dataSource: [], columns: [ { title: '商品类型',key: 'mType',width:'7%', type: FormTypes.normal }, - { title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [], + { title: '仓库名称', key: 'depotId', width: '8%', type: FormTypes.select, placeholder: '请选择${title}', options: [], allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }] }, - { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, kind: 'material', multi: true, + { title: '条码', key: 'barCode', width: '10%', type: FormTypes.popupJsh, kind: 'material', multi: true, validateRules: [{ required: true, message: '${title}不能为空' }] }, { title: '名称', key: 'name', width: '8%', type: FormTypes.normal }, - { title: '规格', key: 'standard', width: '5%', type: FormTypes.normal }, - { title: '型号', key: 'model', width: '5%', type: FormTypes.normal }, + { title: '规格', key: 'standard', width: '7%', type: FormTypes.normal }, + { title: '型号', key: 'model', width: '6%', type: FormTypes.normal }, { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal }, { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal }, { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal }, diff --git a/jshERP-web/src/views/bill/modules/DisassembleModal.vue b/jshERP-web/src/views/bill/modules/DisassembleModal.vue index c16a5e97..9ea8e23b 100644 --- a/jshERP-web/src/views/bill/modules/DisassembleModal.vue +++ b/jshERP-web/src/views/bill/modules/DisassembleModal.vue @@ -138,15 +138,15 @@ dataSource: [], columns: [ { title: '商品类型',key: 'mType',width:'7%', type: FormTypes.normal }, - { title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [], + { title: '仓库名称', key: 'depotId', width: '8%', type: FormTypes.select, placeholder: '请选择${title}', options: [], allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }] }, - { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, kind: 'material', multi: true, + { title: '条码', key: 'barCode', width: '10%', type: FormTypes.popupJsh, kind: 'material', multi: true, validateRules: [{ required: true, message: '${title}不能为空' }] }, { title: '名称', key: 'name', width: '8%', type: FormTypes.normal }, - { title: '规格', key: 'standard', width: '5%', type: FormTypes.normal }, - { title: '型号', key: 'model', width: '5%', type: FormTypes.normal }, + { title: '规格', key: 'standard', width: '7%', type: FormTypes.normal }, + { title: '型号', key: 'model', width: '6%', type: FormTypes.normal }, { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal }, { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal }, { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal }, diff --git a/jshERP-web/src/views/bill/modules/OtherInModal.vue b/jshERP-web/src/views/bill/modules/OtherInModal.vue index 1aaf4ec0..fc851c7e 100644 --- a/jshERP-web/src/views/bill/modules/OtherInModal.vue +++ b/jshERP-web/src/views/bill/modules/OtherInModal.vue @@ -159,15 +159,15 @@ loading: false, dataSource: [], columns: [ - { title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [], + { title: '仓库名称', key: 'depotId', width: '8%', type: FormTypes.select, placeholder: '请选择${title}', options: [], allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }] }, - { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, kind: 'material', multi: true, + { title: '条码', key: 'barCode', width: '10%', type: FormTypes.popupJsh, kind: 'material', multi: true, validateRules: [{ required: true, message: '${title}不能为空' }] }, { title: '名称', key: 'name', width: '8%', type: FormTypes.normal }, - { title: '规格', key: 'standard', width: '5%', type: FormTypes.normal }, - { title: '型号', key: 'model', width: '5%', type: FormTypes.normal }, + { title: '规格', key: 'standard', width: '7%', type: FormTypes.normal }, + { title: '型号', key: 'model', width: '6%', type: FormTypes.normal }, { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal }, { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal }, { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal }, diff --git a/jshERP-web/src/views/bill/modules/OtherOutModal.vue b/jshERP-web/src/views/bill/modules/OtherOutModal.vue index 834cd741..4af8d760 100644 --- a/jshERP-web/src/views/bill/modules/OtherOutModal.vue +++ b/jshERP-web/src/views/bill/modules/OtherOutModal.vue @@ -159,15 +159,15 @@ loading: false, dataSource: [], columns: [ - { title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [], + { title: '仓库名称', key: 'depotId', width: '8%', type: FormTypes.select, placeholder: '请选择${title}', options: [], allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }] }, - { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, kind: 'material', multi: true, + { title: '条码', key: 'barCode', width: '10%', type: FormTypes.popupJsh, kind: 'material', multi: true, validateRules: [{ required: true, message: '${title}不能为空' }] }, { title: '名称', key: 'name', width: '8%', type: FormTypes.normal }, - { title: '规格', key: 'standard', width: '5%', type: FormTypes.normal }, - { title: '型号', key: 'model', width: '5%', type: FormTypes.normal }, + { title: '规格', key: 'standard', width: '7%', type: FormTypes.normal }, + { title: '型号', key: 'model', width: '6%', type: FormTypes.normal }, { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal }, { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal }, { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal }, diff --git a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue index e7dc8e6d..1e59e304 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue @@ -229,15 +229,15 @@ loading: false, dataSource: [], columns: [ - { title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [], + { title: '仓库名称', key: 'depotId', width: '8%', type: FormTypes.select, placeholder: '请选择${title}', options: [], allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }] }, - { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, kind: 'material', multi: true, + { title: '条码', key: 'barCode', width: '10%', type: FormTypes.popupJsh, kind: 'material', multi: true, validateRules: [{ required: true, message: '${title}不能为空' }] }, { title: '名称', key: 'name', width: '8%', type: FormTypes.normal }, - { title: '规格', key: 'standard', width: '5%', type: FormTypes.normal }, - { title: '型号', key: 'model', width: '5%', type: FormTypes.normal }, + { title: '规格', key: 'standard', width: '7%', type: FormTypes.normal }, + { title: '型号', key: 'model', width: '6%', type: FormTypes.normal }, { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal }, { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal }, { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal }, diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue index edd14a53..147ddc46 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue @@ -256,15 +256,15 @@ loading: false, dataSource: [], columns: [ - { title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [], + { title: '仓库名称', key: 'depotId', width: '8%', type: FormTypes.select, placeholder: '请选择${title}', options: [], allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }] }, - { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, kind: 'material', multi: true, + { title: '条码', key: 'barCode', width: '10%', type: FormTypes.popupJsh, kind: 'material', multi: true, validateRules: [{ required: true, message: '${title}不能为空' }] }, { title: '名称', key: 'name', width: '8%', type: FormTypes.normal }, - { title: '规格', key: 'standard', width: '5%', type: FormTypes.normal }, - { title: '型号', key: 'model', width: '5%', type: FormTypes.normal }, + { title: '规格', key: 'standard', width: '7%', type: FormTypes.normal }, + { title: '型号', key: 'model', width: '6%', type: FormTypes.normal }, { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal }, { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal }, { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal }, diff --git a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue index b5a00aa6..677b2ac8 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue @@ -228,13 +228,13 @@ loading: false, dataSource: [], columns: [ - { title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.hidden }, - { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, kind: 'material', multi: true, + { title: '仓库名称', key: 'depotId', width: '8%', type: FormTypes.hidden }, + { title: '条码', key: 'barCode', width: '10%', type: FormTypes.popupJsh, kind: 'material', multi: true, validateRules: [{ required: true, message: '${title}不能为空' }] }, { title: '名称', key: 'name', width: '8%', type: FormTypes.normal }, - { title: '规格', key: 'standard', width: '5%', type: FormTypes.normal }, - { title: '型号', key: 'model', width: '5%', type: FormTypes.normal }, + { title: '规格', key: 'standard', width: '7%', type: FormTypes.normal }, + { title: '型号', key: 'model', width: '6%', type: FormTypes.normal }, { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal }, { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal }, { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal }, diff --git a/jshERP-web/src/views/bill/modules/RetailBackModal.vue b/jshERP-web/src/views/bill/modules/RetailBackModal.vue index 75e3154c..53f1cbe0 100644 --- a/jshERP-web/src/views/bill/modules/RetailBackModal.vue +++ b/jshERP-web/src/views/bill/modules/RetailBackModal.vue @@ -218,15 +218,15 @@ loading: false, dataSource: [], columns: [ - { title: '仓库名称', key: 'depotId', width: '9%', type: FormTypes.select, placeholder: '请选择${title}', options: [], + { title: '仓库名称', key: 'depotId', width: '10%', type: FormTypes.select, placeholder: '请选择${title}', options: [], allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }] }, - { title: '条码', key: 'barCode', width: '12%', type: FormTypes.popupJsh, kind: 'material', multi: true, + { title: '条码', key: 'barCode', width: '14%', type: FormTypes.popupJsh, kind: 'material', multi: true, validateRules: [{ required: true, message: '${title}不能为空' }] }, { title: '名称', key: 'name', width: '10%', type: FormTypes.normal }, - { title: '规格', key: 'standard', width: '6%', type: FormTypes.normal }, - { title: '型号', key: 'model', width: '6%', type: FormTypes.normal }, + { title: '规格', key: 'standard', width: '8%', type: FormTypes.normal }, + { title: '型号', key: 'model', width: '7%', type: FormTypes.normal }, { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal }, { title: '扩展信息', key: 'materialOther', width: '7%', type: FormTypes.normal }, { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal }, diff --git a/jshERP-web/src/views/bill/modules/RetailOutModal.vue b/jshERP-web/src/views/bill/modules/RetailOutModal.vue index 0a6b99f8..9771ad9d 100644 --- a/jshERP-web/src/views/bill/modules/RetailOutModal.vue +++ b/jshERP-web/src/views/bill/modules/RetailOutModal.vue @@ -230,15 +230,15 @@ loading: false, dataSource: [], columns: [ - { title: '仓库名称', key: 'depotId', width: '9%', type: FormTypes.select, placeholder: '请选择${title}', options: [], + { title: '仓库名称', key: 'depotId', width: '10%', type: FormTypes.select, placeholder: '请选择${title}', options: [], allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }] }, - { title: '条码', key: 'barCode', width: '12%', type: FormTypes.popupJsh, kind: 'material', multi: true, + { title: '条码', key: 'barCode', width: '14%', type: FormTypes.popupJsh, kind: 'material', multi: true, validateRules: [{ required: true, message: '${title}不能为空' }] }, { title: '名称', key: 'name', width: '10%', type: FormTypes.normal }, - { title: '规格', key: 'standard', width: '6%', type: FormTypes.normal }, - { title: '型号', key: 'model', width: '5%', type: FormTypes.normal }, + { title: '规格', key: 'standard', width: '8%', type: FormTypes.normal }, + { title: '型号', key: 'model', width: '7%', type: FormTypes.normal }, { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal }, { title: '扩展信息', key: 'materialOther', width: '7%', type: FormTypes.normal }, { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal }, diff --git a/jshERP-web/src/views/bill/modules/SaleBackModal.vue b/jshERP-web/src/views/bill/modules/SaleBackModal.vue index 7da8ceeb..4bed508b 100644 --- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue @@ -234,15 +234,15 @@ loading: false, dataSource: [], columns: [ - { title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [], + { title: '仓库名称', key: 'depotId', width: '8%', type: FormTypes.select, placeholder: '请选择${title}', options: [], allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }] }, - { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, kind: 'material', multi: true, + { title: '条码', key: 'barCode', width: '10%', type: FormTypes.popupJsh, kind: 'material', multi: true, validateRules: [{ required: true, message: '${title}不能为空' }] }, { title: '名称', key: 'name', width: '8%', type: FormTypes.normal }, - { title: '规格', key: 'standard', width: '5%', type: FormTypes.normal }, - { title: '型号', key: 'model', width: '5%', type: FormTypes.normal }, + { title: '规格', key: 'standard', width: '7%', type: FormTypes.normal }, + { title: '型号', key: 'model', width: '6%', type: FormTypes.normal }, { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal }, { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal }, { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal }, diff --git a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue index 6e398c43..f2ed7cfb 100644 --- a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue @@ -221,13 +221,13 @@ loading: false, dataSource: [], columns: [ - { title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.hidden }, - { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, kind: 'material', multi: true, + { title: '仓库名称', key: 'depotId', width: '8%', type: FormTypes.hidden }, + { title: '条码', key: 'barCode', width: '10%', type: FormTypes.popupJsh, kind: 'material', multi: true, validateRules: [{ required: true, message: '${title}不能为空' }] }, { title: '名称', key: 'name', width: '8%', type: FormTypes.normal }, - { title: '规格', key: 'standard', width: '5%', type: FormTypes.normal }, - { title: '型号', key: 'model', width: '5%', type: FormTypes.normal }, + { title: '规格', key: 'standard', width: '7%', type: FormTypes.normal }, + { title: '型号', key: 'model', width: '6%', type: FormTypes.normal }, { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal }, { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal }, { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal }, diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue index bdf820d1..c2ac4997 100644 --- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue @@ -272,15 +272,15 @@ loading: false, dataSource: [], columns: [ - { title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [], + { title: '仓库名称', key: 'depotId', width: '8%', type: FormTypes.select, placeholder: '请选择${title}', options: [], allowSearch:true, validateRules: [{ required: true, message: '${title}不能为空' }] }, - { title: '条码', key: 'barCode', width: '8%', type: FormTypes.popupJsh, kind: 'material', multi: true, + { title: '条码', key: 'barCode', width: '10%', type: FormTypes.popupJsh, kind: 'material', multi: true, validateRules: [{ required: true, message: '${title}不能为空' }] }, { title: '名称', key: 'name', width: '8%', type: FormTypes.normal }, - { title: '规格', key: 'standard', width: '5%', type: FormTypes.normal }, - { title: '型号', key: 'model', width: '5%', type: FormTypes.normal }, + { title: '规格', key: 'standard', width: '7%', type: FormTypes.normal }, + { title: '型号', key: 'model', width: '6%', type: FormTypes.normal }, { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal }, { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal }, { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },