diff --git a/jshERP-web/src/components/jeecg/JEditableTable.vue b/jshERP-web/src/components/jeecg/JEditableTable.vue index 03715b2e..445a6324 100644 --- a/jshERP-web/src/components/jeecg/JEditableTable.vue +++ b/jshERP-web/src/components/jeecg/JEditableTable.vue @@ -34,7 +34,7 @@ -
+
@@ -814,6 +814,10 @@ default: false }, // 页面是否在加载中 + minWidth: { + type: Number, + default: 1550 + }, maxHeight: { type: Number, default: 400 @@ -2758,7 +2762,6 @@ .input-table { max-width: 100%; - min-width: 1550px; overflow-x: hidden; overflow-y: hidden; position: relative; diff --git a/jshERP-web/src/views/bill/modules/RetailBackModal.vue b/jshERP-web/src/views/bill/modules/RetailBackModal.vue index 344fe720..278016f4 100644 --- a/jshERP-web/src/views/bill/modules/RetailBackModal.vue +++ b/jshERP-web/src/views/bill/modules/RetailBackModal.vue @@ -49,6 +49,7 @@ :loading="materialTable.loading" :columns="materialTable.columns" :dataSource="materialTable.dataSource" + :minWidth="1100" :maxHeight="300" :rowNumber="false" :rowSelection="true" @@ -159,9 +160,9 @@ { title: '条码', key: 'barCode', width: '12%', type: FormTypes.popupJsh, multi: true, validateRules: [{ required: true, message: '${title}不能为空' }] }, - { title: '名称', key: 'name', width: '8%', type: FormTypes.input, readonly: true }, - { title: '规格', key: 'standard', width: '5%', type: FormTypes.input, readonly: true }, - { title: '型号', key: 'model', width: '5%', type: FormTypes.input, readonly: true }, + { title: '名称', key: 'name', width: '9%', type: FormTypes.input, readonly: true }, + { title: '规格', key: 'standard', width: '6%', type: FormTypes.input, readonly: true }, + { title: '型号', key: 'model', width: '6%', type: FormTypes.input, readonly: true }, { title: '扩展信息', key: 'materialOther', width: '7%', type: FormTypes.input, readonly: true }, { title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true }, { title: '单位', key: 'unit', width: '4%', type: FormTypes.input, readonly: true }, @@ -171,7 +172,7 @@ }, { title: '单价', key: 'unitPrice', width: '5%', type: FormTypes.inputNumber}, { title: '金额', key: 'allPrice', width: '5%', type: FormTypes.inputNumber, statistics: true }, - { title: '备注', key: 'remark', width: '5%', type: FormTypes.input } + { title: '备注', key: 'remark', width: '7%', type: FormTypes.input } ] }, confirmLoading: false, diff --git a/jshERP-web/src/views/bill/modules/RetailOutModal.vue b/jshERP-web/src/views/bill/modules/RetailOutModal.vue index 82d2dfa7..1a50e2a3 100644 --- a/jshERP-web/src/views/bill/modules/RetailOutModal.vue +++ b/jshERP-web/src/views/bill/modules/RetailOutModal.vue @@ -52,6 +52,7 @@ :loading="materialTable.loading" :columns="materialTable.columns" :dataSource="materialTable.dataSource" + :minWidth="1100" :maxHeight="300" :rowNumber="false" :rowSelection="true" @@ -159,8 +160,8 @@ { title: '条码', key: 'barCode', width: '12%', type: FormTypes.popupJsh, multi: true, validateRules: [{ required: true, message: '${title}不能为空' }] }, - { title: '名称', key: 'name', width: '8%', type: FormTypes.input, readonly: true }, - { title: '规格', key: 'standard', width: '5%', type: FormTypes.input, readonly: true }, + { title: '名称', key: 'name', width: '9%', type: FormTypes.input, readonly: true }, + { title: '规格', key: 'standard', width: '6%', type: FormTypes.input, readonly: true }, { title: '型号', key: 'model', width: '5%', type: FormTypes.input, readonly: true }, { title: '扩展信息', key: 'materialOther', width: '7%', type: FormTypes.input, readonly: true }, { title: '库存', key: 'stock', width: '5%', type: FormTypes.input, readonly: true }, @@ -171,7 +172,7 @@ }, { title: '单价', key: 'unitPrice', width: '5%', type: FormTypes.inputNumber}, { title: '金额', key: 'allPrice', width: '5%', type: FormTypes.inputNumber, statistics: true }, - { title: '备注', key: 'remark', width: '5%', type: FormTypes.input } + { title: '备注', key: 'remark', width: '7%', type: FormTypes.input } ] }, confirmLoading: false,