优化单据的宽度屏幕自适应

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: {

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) {

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() {

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 }
           ]
         },

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 },
           ]

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 },
           ]

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 }
           ]
         },

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 }
           ]
         },

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 },
           ]

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) {

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() {