From 1aa3d94bb7319b80ec9ced0a2001f5c89e81dd98 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 01:15:50 +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

---
 .../src/components/jeecg/JEditableTable.vue     |  8 +++++---
 jshERP-web/src/views/bill/dialog/BillDetail.vue |  3 +++
 .../src/views/bill/mixins/BillModalMixin.js     |  2 ++
 .../views/bill/modules/AllocationOutModal.vue   |  1 +
 .../src/views/bill/modules/AssembleModal.vue    |  1 +
 .../src/views/bill/modules/DisassembleModal.vue |  1 +
 .../src/views/bill/modules/OtherInModal.vue     |  1 +
 .../src/views/bill/modules/OtherOutModal.vue    |  1 +
 .../views/bill/modules/PurchaseBackModal.vue    |  1 +
 .../src/views/bill/modules/PurchaseInModal.vue  |  1 +
 .../views/bill/modules/PurchaseOrderModal.vue   |  1 +
 .../src/views/bill/modules/RetailBackModal.vue  | 17 ++++++++++-------
 .../src/views/bill/modules/RetailOutModal.vue   | 17 ++++++++++-------
 .../src/views/bill/modules/SaleBackModal.vue    |  1 +
 .../src/views/bill/modules/SaleOrderModal.vue   |  1 +
 .../src/views/bill/modules/SaleOutModal.vue     |  1 +
 16 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/jshERP-web/src/components/jeecg/JEditableTable.vue b/jshERP-web/src/components/jeecg/JEditableTable.vue
index 0b7ae685..993376d0 100644
--- a/jshERP-web/src/components/jeecg/JEditableTable.vue
+++ b/jshERP-web/src/components/jeecg/JEditableTable.vue
@@ -818,6 +818,11 @@
         type: Boolean,
         default: false
       },
+      // 页面是否在加载中
+      minWidth: {
+        type: Number,
+        default: 1500
+      },
       maxHeight: {
         type: Number,
         default: 400
@@ -914,7 +919,6 @@
         statisticsColumns: {},
         // 只有在行编辑被销毁时才主动清空GroupRequest的内存
         destroyCleanGroupRequest: false,
-        minWidth: 1500,
       }
     },
     created() {
@@ -922,8 +926,6 @@
       // 当前显示的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 63e2343d..0434f948 100644
--- a/jshERP-web/src/views/bill/dialog/BillDetail.vue
+++ b/jshERP-web/src/views/bill/dialog/BillDetail.vue
@@ -1302,6 +1302,9 @@
       this.tableWidth = {
         'width': realScreenWidth<1500?'1250px':'1500px'
       }
+      this.tableWidthRetail = {
+        'width': realScreenWidth<1500?'900px':'1100px'
+      }
     },
     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 b0828fe4..fe88ea0a 100644
--- a/jshERP-web/src/views/bill/mixins/BillModalMixin.js
+++ b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
@@ -26,6 +26,7 @@ export const BillModalMixin = {
       scanBarCode: '',
       scanStatus: true,
       billStatus: '0',
+      minWidth: 1100,
       isCanCheck: true,
       isTenant: false,
       validatorRules:{
@@ -55,6 +56,7 @@ export const BillModalMixin = {
     this.isTenant = userInfo.id === userInfo.tenantId? true:false
     let realScreenWidth = window.screen.width * window.devicePixelRatio
     this.width = realScreenWidth<1500?'1300px':'1550px'
+    this.minWidth = realScreenWidth<1500?1250:1500
   },
   computed: {
     readOnly: function() {
diff --git a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue
index b218f020..4c32424e 100644
--- a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue
@@ -37,6 +37,7 @@
           :loading="materialTable.loading"
           :columns="materialTable.columns"
           :dataSource="materialTable.dataSource"
+          :minWidth="minWidth"
           :maxHeight="300"
           :rowNumber="false"
           :rowSelection="true"
diff --git a/jshERP-web/src/views/bill/modules/AssembleModal.vue b/jshERP-web/src/views/bill/modules/AssembleModal.vue
index 4014136d..7bf2838f 100644
--- a/jshERP-web/src/views/bill/modules/AssembleModal.vue
+++ b/jshERP-web/src/views/bill/modules/AssembleModal.vue
@@ -37,6 +37,7 @@
           :loading="materialTable.loading"
           :columns="materialTable.columns"
           :dataSource="materialTable.dataSource"
+          :minWidth="minWidth"
           :maxHeight="300"
           :rowNumber="false"
           :rowSelection="true"
diff --git a/jshERP-web/src/views/bill/modules/DisassembleModal.vue b/jshERP-web/src/views/bill/modules/DisassembleModal.vue
index 9c076f9f..4e2622d2 100644
--- a/jshERP-web/src/views/bill/modules/DisassembleModal.vue
+++ b/jshERP-web/src/views/bill/modules/DisassembleModal.vue
@@ -37,6 +37,7 @@
           :loading="materialTable.loading"
           :columns="materialTable.columns"
           :dataSource="materialTable.dataSource"
+          :minWidth="minWidth"
           :maxHeight="300"
           :rowNumber="false"
           :rowSelection="true"
diff --git a/jshERP-web/src/views/bill/modules/OtherInModal.vue b/jshERP-web/src/views/bill/modules/OtherInModal.vue
index 50c9602a..c31e8acc 100644
--- a/jshERP-web/src/views/bill/modules/OtherInModal.vue
+++ b/jshERP-web/src/views/bill/modules/OtherInModal.vue
@@ -52,6 +52,7 @@
           :loading="materialTable.loading"
           :columns="materialTable.columns"
           :dataSource="materialTable.dataSource"
+          :minWidth="minWidth"
           :maxHeight="300"
           :rowNumber="false"
           :rowSelection="true"
diff --git a/jshERP-web/src/views/bill/modules/OtherOutModal.vue b/jshERP-web/src/views/bill/modules/OtherOutModal.vue
index 2f52ea14..3a528eaa 100644
--- a/jshERP-web/src/views/bill/modules/OtherOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/OtherOutModal.vue
@@ -52,6 +52,7 @@
           :loading="materialTable.loading"
           :columns="materialTable.columns"
           :dataSource="materialTable.dataSource"
+          :minWidth="minWidth"
           :maxHeight="300"
           :rowNumber="false"
           :rowSelection="true"
diff --git a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
index 0383b3ca..02234eb0 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
@@ -56,6 +56,7 @@
           :loading="materialTable.loading"
           :columns="materialTable.columns"
           :dataSource="materialTable.dataSource"
+          :minWidth="minWidth"
           :maxHeight="300"
           :rowNumber="false"
           :rowSelection="rowCanEdit"
diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
index bb75aca1..bd8ec141 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
@@ -63,6 +63,7 @@
           :loading="materialTable.loading"
           :columns="materialTable.columns"
           :dataSource="materialTable.dataSource"
+          :minWidth="minWidth"
           :maxHeight="300"
           :rowNumber="false"
           :rowSelection="rowCanEdit"
diff --git a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
index e4b27b58..7f479099 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
@@ -63,6 +63,7 @@
           :loading="materialTable.loading"
           :columns="materialTable.columns"
           :dataSource="materialTable.dataSource"
+          :minWidth="minWidth"
           :maxHeight="300"
           :rowNumber="false"
           :rowSelection="rowCanEdit"
diff --git a/jshERP-web/src/views/bill/modules/RetailBackModal.vue b/jshERP-web/src/views/bill/modules/RetailBackModal.vue
index d6e82d5a..fed0038d 100644
--- a/jshERP-web/src/views/bill/modules/RetailBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/RetailBackModal.vue
@@ -58,7 +58,7 @@
               :loading="materialTable.loading"
               :columns="materialTable.columns"
               :dataSource="materialTable.dataSource"
-              :minWidth="1100"
+              :minWidth="minWidth"
               :maxHeight="300"
               :rowNumber="false"
               :rowSelection="rowCanEdit"
@@ -113,25 +113,25 @@
                 <a-col :lg="24" :md="6" :sm="6"><br/><br/></a-col>
                 <a-col :lg="24" :md="6" :sm="6">
                   <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <span slot="label" style="font-size: 24px;line-height:24px">单据金额</span>
+                    <span slot="label" style="font-size: 20px;line-height:20px">单据金额</span>
                     <a-input v-decorator.trim="[ 'changeAmount' ]" :style="{color:'purple'}" :readOnly="true"/>
                   </a-form-item>
                 </a-col>
                 <a-col :lg="24" :md="6" :sm="6">
                   <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <span slot="label" style="font-size: 24px;line-height:24px">付款金额</span>
+                    <span slot="label" style="font-size: 20px;line-height:20px">付款金额</span>
                     <a-input v-decorator.trim="[ 'getAmount' ]" :style="{color:'red'}" defaultValue="0" @keyup="onKeyUpGetAmount"/>
                   </a-form-item>
                 </a-col>
                 <a-col :lg="24" :md="6" :sm="6">
                   <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <span slot="label" style="font-size: 24px;line-height:24px">找零</span>
+                    <span slot="label" style="font-size: 20px;line-height:20px">找零</span>
                     <a-input v-decorator.trim="[ 'backAmount' ]" :style="{color:'green'}" :readOnly="true" defaultValue="0"/>
                   </a-form-item>
                 </a-col>
                 <a-col :lg="24" :md="6" :sm="6">
                   <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <span slot="label" style="font-size: 24px;line-height:24px">付款账户</span>
+                    <span slot="label" style="font-size: 20px;line-height:20px">付款账户</span>
                     <a-select placeholder="选择付款账户" style="font-size:20px;" v-decorator="[ 'accountId', validatorRules.accountId ]" :dropdownMatchSelectWidth="false">
                       <div slot="dropdownRender" slot-scope="menu">
                         <v-nodes :vnodes="menu" />
@@ -201,6 +201,7 @@
         operTimeStr: '',
         prefixNo: 'LSTH',
         fileList:[],
+        minWidth: 1100,
         rowCanEdit: true,
         model: {},
         labelCol: {
@@ -217,7 +218,7 @@
           loading: false,
           dataSource: [],
           columns: [
-            { title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
+            { title: '仓库名称', key: 'depotId', width: '9%', 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,
@@ -229,7 +230,7 @@
             { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
             { title: '扩展信息', key: 'materialOther', width: '7%', type: FormTypes.normal },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
-            { title: '单位', key: 'unit', width: '4%', type: FormTypes.normal },
+            { title: '单位', key: 'unit', width: '5%', type: FormTypes.normal },
             { title: '序列号', key: 'snList', width: '12%', type: FormTypes.input, placeholder: '多个序列号请用逗号隔开',
               validateRules: [{ pattern: /^\S{1,100}$/, message: '请小于100位字符' }]
             },
@@ -265,6 +266,8 @@
       }
     },
     created () {
+      let realScreenWidth = window.screen.width * window.devicePixelRatio
+      this.minWidth = realScreenWidth<1500?900:1100
     },
     methods: {
       //调用完edit()方法之后会自动调用此方法
diff --git a/jshERP-web/src/views/bill/modules/RetailOutModal.vue b/jshERP-web/src/views/bill/modules/RetailOutModal.vue
index 88800491..75ebc10b 100644
--- a/jshERP-web/src/views/bill/modules/RetailOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/RetailOutModal.vue
@@ -68,7 +68,7 @@
               :loading="materialTable.loading"
               :columns="materialTable.columns"
               :dataSource="materialTable.dataSource"
-              :minWidth="1100"
+              :minWidth="minWidth"
               :maxHeight="300"
               :rowNumber="false"
               :rowSelection="true"
@@ -125,28 +125,28 @@
                 <a-col :lg="24" :md="6" :sm="6">
                   <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" data-step="5" data-title="单据金额"
                                data-intro="单据金额等于左侧商品的总金额">
-                    <span slot="label" style="font-size: 24px;line-height:24px">单据金额</span>
+                    <span slot="label" style="font-size: 20px;line-height:20px">单据金额</span>
                     <a-input v-decorator.trim="[ 'changeAmount' ]" :style="{color:'purple'}" :readOnly="true"/>
                   </a-form-item>
                 </a-col>
                 <a-col :lg="24" :md="6" :sm="6">
                   <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" data-step="6" data-title="收款金额"
                                data-intro="收款金额为收银员收取用户的实际金额">
-                    <span slot="label" style="font-size: 24px;line-height:24px">收款金额</span>
+                    <span slot="label" style="font-size: 20px;line-height:20px">收款金额</span>
                     <a-input v-decorator.trim="[ 'getAmount' ]" :style="{color:'red'}" defaultValue="0" @keyup="onKeyUpGetAmount"/>
                   </a-form-item>
                 </a-col>
                 <a-col :lg="24" :md="6" :sm="6">
                   <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" data-step="7" data-title="找零"
                                data-intro="找零等于收款金额减去实收金额">
-                    <span slot="label" style="font-size: 24px;line-height:24px">找零</span>
+                    <span slot="label" style="font-size: 20px;line-height:20px">找零</span>
                     <a-input v-decorator.trim="[ 'backAmount' ]" :style="{color:'green'}" :readOnly="true" defaultValue="0"/>
                   </a-form-item>
                 </a-col>
                 <a-col :lg="24" :md="6" :sm="6">
                   <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" data-step="8" data-title="收款账户"
                                data-intro="收款账户的信息来自基本资料菜单下的【结算账户】">
-                    <span slot="label" style="font-size: 24px;line-height:24px">收款账户</span>
+                    <span slot="label" style="font-size: 20px;line-height:20px">收款账户</span>
                     <a-select placeholder="选择收款账户" style="font-size:20px;" v-decorator="[ 'accountId', validatorRules.accountId ]" :dropdownMatchSelectWidth="false">
                       <div slot="dropdownRender" slot-scope="menu">
                         <v-nodes :vnodes="menu" />
@@ -214,6 +214,7 @@
         prefixNo: 'LSCK',
         fileList:[],
         payTypeList: [],
+        minWidth: 1100,
         model: {},
         labelCol: {
           xs: { span: 24 },
@@ -229,7 +230,7 @@
           loading: false,
           dataSource: [],
           columns: [
-            { title: '仓库名称', key: 'depotId', width: '7%', type: FormTypes.select, placeholder: '请选择${title}', options: [],
+            { title: '仓库名称', key: 'depotId', width: '9%', 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,
@@ -241,7 +242,7 @@
             { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
             { title: '扩展信息', key: 'materialOther', width: '7%', type: FormTypes.normal },
             { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
-            { title: '单位', key: 'unit', width: '4%', 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 },
@@ -276,6 +277,8 @@
     },
     created () {
       this.initPayTypeList()
+      let realScreenWidth = window.screen.width * window.devicePixelRatio
+      this.minWidth = realScreenWidth<1500?900:1100
     },
     methods: {
       //调用完edit()方法之后会自动调用此方法
diff --git a/jshERP-web/src/views/bill/modules/SaleBackModal.vue b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
index ba479a05..34b07a7f 100644
--- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
@@ -56,6 +56,7 @@
           :loading="materialTable.loading"
           :columns="materialTable.columns"
           :dataSource="materialTable.dataSource"
+          :minWidth="minWidth"
           :maxHeight="300"
           :rowNumber="false"
           :rowSelection="rowCanEdit"
diff --git a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
index 91e3c45f..1e4cda10 100644
--- a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
@@ -63,6 +63,7 @@
           :loading="materialTable.loading"
           :columns="materialTable.columns"
           :dataSource="materialTable.dataSource"
+          :minWidth="minWidth"
           :maxHeight="300"
           :rowNumber="false"
           :rowSelection="true"
diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
index eeff640d..53ff95ed 100644
--- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
@@ -64,6 +64,7 @@
           :loading="materialTable.loading"
           :columns="materialTable.columns"
           :dataSource="materialTable.dataSource"
+          :minWidth="minWidth"
           :maxHeight="300"
           :rowNumber="false"
           :rowSelection="rowCanEdit"