From d791191adbeed0ab9dce3fe14fa75ff538b898d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Wed, 8 Jun 2022 00:11:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8D=95=E6=8D=AE=E7=9A=84?= =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E5=B1=8F=E5=B9=95=E8=87=AA=E9=80=82=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jshERP-web/src/components/jeecg/JEditableTable.vue | 8 +++----- jshERP-web/src/views/bill/dialog/BillDetail.vue | 7 +++++-- jshERP-web/src/views/bill/mixins/BillModalMixin.js | 2 +- jshERP-web/src/views/bill/modules/PurchaseBackModal.vue | 2 +- jshERP-web/src/views/bill/modules/PurchaseInModal.vue | 4 ++-- jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue | 4 ++-- jshERP-web/src/views/bill/modules/SaleBackModal.vue | 4 ++-- jshERP-web/src/views/bill/modules/SaleOrderModal.vue | 4 ++-- jshERP-web/src/views/bill/modules/SaleOutModal.vue | 4 ++-- jshERP-web/src/views/financial/dialog/FinancialDetail.vue | 2 +- .../src/views/financial/mixins/FinancialModalMixin.js | 2 +- 11 files changed, 22 insertions(+), 21 deletions(-) diff --git a/jshERP-web/src/components/jeecg/JEditableTable.vue b/jshERP-web/src/components/jeecg/JEditableTable.vue index 12aa508c..0b7ae685 100644 --- a/jshERP-web/src/components/jeecg/JEditableTable.vue +++ b/jshERP-web/src/components/jeecg/JEditableTable.vue @@ -818,11 +818,6 @@ type: Boolean, default: false }, - // 页面是否在加载中 - minWidth: { - type: Number, - default: 1550 - }, maxHeight: { type: Number, default: 400 @@ -919,6 +914,7 @@ statisticsColumns: {}, // 只有在行编辑被销毁时才主动清空GroupRequest的内存 destroyCleanGroupRequest: false, + minWidth: 1500, } }, created() { @@ -926,6 +922,8 @@ // 当前显示的tr this.visibleTrEls = [] this.disabledRowIds = (this.disabledRowIds || []) + let realScreenWidth = window.screen.width * window.devicePixelRatio + this.minWidth = realScreenWidth<1500?1250:1500 }, // 计算属性 computed: { diff --git a/jshERP-web/src/views/bill/dialog/BillDetail.vue b/jshERP-web/src/views/bill/dialog/BillDetail.vue index 3ca8ed17..63e2343d 100644 --- a/jshERP-web/src/views/bill/dialog/BillDetail.vue +++ b/jshERP-web/src/views/bill/dialog/BillDetail.vue @@ -1000,7 +1000,7 @@ purchaseBySaleFlag: false, financialBillNoList: [], tableWidth: { - 'width': '1550px' + 'width': '1500px' }, tableWidthRetail: { 'width': '1150px' @@ -1298,7 +1298,10 @@ }, created () { let realScreenWidth = window.screen.width * window.devicePixelRatio - this.width = realScreenWidth<1600?'1300px':'1600px' + this.width = realScreenWidth<1500?'1300px':'1550px' + this.tableWidth = { + 'width': realScreenWidth<1500?'1250px':'1500px' + } }, methods: { initSetting(record, type, ds) { diff --git a/jshERP-web/src/views/bill/mixins/BillModalMixin.js b/jshERP-web/src/views/bill/mixins/BillModalMixin.js index 0bf5a2ba..b0828fe4 100644 --- a/jshERP-web/src/views/bill/mixins/BillModalMixin.js +++ b/jshERP-web/src/views/bill/mixins/BillModalMixin.js @@ -54,7 +54,7 @@ export const BillModalMixin = { let userInfo = Vue.ls.get(USER_INFO) this.isTenant = userInfo.id === userInfo.tenantId? true:false let realScreenWidth = window.screen.width * window.devicePixelRatio - this.width = realScreenWidth<1600?'1300px':'1600px' + this.width = realScreenWidth<1500?'1300px':'1550px' }, computed: { readOnly: function() { diff --git a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue index a5c4bb80..0383b3ca 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue @@ -252,7 +252,7 @@ { title: '金额', key: 'allPrice', width: '5%', type: FormTypes.inputNumber, statistics: true }, { title: '税率', key: 'taxRate', width: '4%', type: FormTypes.inputNumber,placeholder: '%'}, { title: '税额', key: 'taxMoney', width: '5%', type: FormTypes.inputNumber, readonly: true, statistics: true }, - { title: '价税合计', key: 'taxLastMoney', width: '5%', type: FormTypes.inputNumber, statistics: true }, + { title: '价税合计', key: 'taxLastMoney', width: '6%', type: FormTypes.inputNumber, statistics: true }, { title: '备注', key: 'remark', width: '5%', type: FormTypes.input } ] }, diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue index 68addc0a..bb75aca1 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue @@ -281,9 +281,9 @@ }, { title: '单价', key: 'unitPrice', width: '4%', type: FormTypes.inputNumber}, { title: '金额', key: 'allPrice', width: '5%', type: FormTypes.inputNumber, statistics: true }, - { title: '税率', key: 'taxRate', width: '3%', type: FormTypes.inputNumber,placeholder: '%'}, + { title: '税率', key: 'taxRate', width: '4%', type: FormTypes.inputNumber,placeholder: '%'}, { title: '税额', key: 'taxMoney', width: '5%', type: FormTypes.inputNumber, readonly: true, statistics: true }, - { title: '价税合计', key: 'taxLastMoney', width: '5%', type: FormTypes.inputNumber, statistics: true }, + { title: '价税合计', key: 'taxLastMoney', width: '6%', type: FormTypes.inputNumber, statistics: true }, { title: '备注', key: 'remark', width: '5%', type: FormTypes.input }, { title: '关联id', key: 'linkId', width: '5%', type: FormTypes.hidden }, ] diff --git a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue index 1d2d579d..e4b27b58 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue @@ -246,9 +246,9 @@ }, { title: '单价', key: 'unitPrice', width: '5%', type: FormTypes.inputNumber }, { title: '金额', key: 'allPrice', width: '5%', type: FormTypes.inputNumber, statistics: true }, - { title: '税率', key: 'taxRate', width: '3%', type: FormTypes.inputNumber,placeholder: '%'}, + { title: '税率', key: 'taxRate', width: '4%', type: FormTypes.inputNumber,placeholder: '%'}, { title: '税额', key: 'taxMoney', width: '5%', type: FormTypes.inputNumber, readonly: true, statistics: true }, - { title: '价税合计', key: 'taxLastMoney', width: '5%', type: FormTypes.inputNumber, statistics: true }, + { title: '价税合计', key: 'taxLastMoney', width: '6%', type: FormTypes.inputNumber, statistics: true }, { title: '备注', key: 'remark', width: '5%', type: FormTypes.input}, { title: '关联id', key: 'linkId', width: '5%', type: FormTypes.hidden }, ] diff --git a/jshERP-web/src/views/bill/modules/SaleBackModal.vue b/jshERP-web/src/views/bill/modules/SaleBackModal.vue index 3de5be42..ba479a05 100644 --- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue @@ -257,9 +257,9 @@ }, { title: '单价', key: 'unitPrice', width: '5%', type: FormTypes.inputNumber}, { title: '金额', key: 'allPrice', width: '5%', type: FormTypes.inputNumber, statistics: true }, - { title: '税率', key: 'taxRate', width: '3%', type: FormTypes.inputNumber,placeholder: '%'}, + { title: '税率', key: 'taxRate', width: '4%', type: FormTypes.inputNumber,placeholder: '%'}, { title: '税额', key: 'taxMoney', width: '5%', type: FormTypes.inputNumber, readonly: true, statistics: true }, - { title: '价税合计', key: 'taxLastMoney', width: '5%', type: FormTypes.inputNumber, statistics: true }, + { title: '价税合计', key: 'taxLastMoney', width: '6%', type: FormTypes.inputNumber, statistics: true }, { title: '备注', key: 'remark', width: '5%', type: FormTypes.input } ] }, diff --git a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue index df36c601..91e3c45f 100644 --- a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue @@ -237,9 +237,9 @@ }, { title: '单价', key: 'unitPrice', width: '5%', type: FormTypes.inputNumber}, { title: '金额', key: 'allPrice', width: '5%', type: FormTypes.inputNumber, statistics: true }, - { title: '税率', key: 'taxRate', width: '3%', type: FormTypes.inputNumber,placeholder: '%'}, + { title: '税率', key: 'taxRate', width: '4%', type: FormTypes.inputNumber,placeholder: '%'}, { title: '税额', key: 'taxMoney', width: '5%', type: FormTypes.inputNumber, readonly: true, statistics: true }, - { title: '价税合计', key: 'taxLastMoney', width: '5%', type: FormTypes.inputNumber, statistics: true }, + { title: '价税合计', key: 'taxLastMoney', width: '6%', type: FormTypes.inputNumber, statistics: true }, { title: '备注', key: 'remark', width: '5%', type: FormTypes.input } ] }, diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue index 7e43c449..eeff640d 100644 --- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue @@ -295,9 +295,9 @@ }, { title: '单价', key: 'unitPrice', width: '4%', type: FormTypes.inputNumber}, { title: '金额', key: 'allPrice', width: '5%', type: FormTypes.inputNumber, statistics: true }, - { title: '税率', key: 'taxRate', width: '3%', type: FormTypes.inputNumber,placeholder: '%'}, + { title: '税率', key: 'taxRate', width: '4%', type: FormTypes.inputNumber,placeholder: '%'}, { title: '税额', key: 'taxMoney', width: '5%', type: FormTypes.inputNumber, readonly: true, statistics: true }, - { title: '价税合计', key: 'taxLastMoney', width: '5%', type: FormTypes.inputNumber, statistics: true }, + { title: '价税合计', key: 'taxLastMoney', width: '6%', type: FormTypes.inputNumber, statistics: true }, { title: '备注', key: 'remark', width: '5%', type: FormTypes.input }, { title: '关联id', key: 'linkId', width: '5%', type: FormTypes.hidden }, ] diff --git a/jshERP-web/src/views/financial/dialog/FinancialDetail.vue b/jshERP-web/src/views/financial/dialog/FinancialDetail.vue index 979e813a..5e0ce04c 100644 --- a/jshERP-web/src/views/financial/dialog/FinancialDetail.vue +++ b/jshERP-web/src/views/financial/dialog/FinancialDetail.vue @@ -468,7 +468,7 @@ }, created () { let realScreenWidth = window.screen.width * window.devicePixelRatio - this.width = realScreenWidth<1600?'1300px':'1600px' + this.width = realScreenWidth<1500?'1300px':'1550px' }, methods: { show(record, type) { diff --git a/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js b/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js index 908e0714..6a37b4a9 100644 --- a/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js +++ b/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js @@ -37,7 +37,7 @@ export const FinancialModalMixin = { let userInfo = Vue.ls.get(USER_INFO) this.isTenant = userInfo.id === userInfo.tenantId? true:false let realScreenWidth = window.screen.width * window.devicePixelRatio - this.width = realScreenWidth<1600?'1300px':'1600px' + this.width = realScreenWidth<1500?'1300px':'1550px' }, computed: { readOnly: function() {