From 0bb9445ecd6f40fb7e212356cf2bc5ee83d2777e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Mon, 12 Dec 2022 23:09:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8D=95=E6=8D=AE=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=85=A8=E5=B1=8F=E7=9A=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/assets/less/common.less               | 12 ++++++++++++
 .../views/financial/mixins/FinancialModalMixin.js    |  1 +
 .../src/views/financial/modules/AdvanceInModal.vue   |  1 +
 jshERP-web/src/views/financial/modules/GiroModal.vue |  1 +
 .../src/views/financial/modules/ItemInModal.vue      |  1 +
 .../src/views/financial/modules/ItemOutModal.vue     |  1 +
 .../src/views/financial/modules/MoneyInModal.vue     |  1 +
 .../src/views/financial/modules/MoneyOutModal.vue    |  1 +
 .../src/views/material/modules/MaterialModal.vue     |  4 ++--
 .../src/views/report/modules/DebtAccountList.vue     |  4 ++--
 .../src/views/report/modules/MaterialInOutList.vue   |  6 +++---
 jshERP-web/src/views/system/modules/VendorModal.vue  |  2 +-
 12 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/jshERP-web/src/assets/less/common.less b/jshERP-web/src/assets/less/common.less
index d7b276db..875b2d4a 100644
--- a/jshERP-web/src/assets/less/common.less
+++ b/jshERP-web/src/assets/less/common.less
@@ -38,6 +38,12 @@
 .ant-modal-cust-warp .ant-form-item {
   margin-bottom: 12px;
 }
+/*全屏模式*/
+.ant-modal-cust-warp .fullscreen .ant-modal-body {
+  padding: 24px 24px 12px 24px;
+  height: calc(100% - 200px) !important;
+  overflow-y: auto
+}
 /*商品-列表页面弹出modal*/
 .ant-modal-material-warp {
   margin-top: 89px;
@@ -59,6 +65,12 @@
 .ant-modal-material-warp .ant-form-item {
   margin-bottom: 12px;
 }
+/*全屏模式*/
+.ant-modal-material-warp .fullscreen .ant-modal-body {
+  padding: 24px 24px 12px 24px;
+  height: calc(100% - 200px) !important;
+  overflow-y: auto
+}
 /*列表中有图片的加这个样式 参考用户管理*/
 .anty-img-wrap {
   height: 25px;
diff --git a/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js b/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js
index 41ba81a7..b9a0a9d1 100644
--- a/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js
+++ b/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js
@@ -38,6 +38,7 @@ export const FinancialModalMixin = {
     this.isTenant = userInfo.id === userInfo.tenantId? true:false
     let realScreenWidth = window.screen.width
     this.width = realScreenWidth<1500?'1200px':'1550px'
+    this.minWidth = realScreenWidth<1500?1150:1500
   },
   computed: {
     readOnly: function() {
diff --git a/jshERP-web/src/views/financial/modules/AdvanceInModal.vue b/jshERP-web/src/views/financial/modules/AdvanceInModal.vue
index b4d049f5..3ea43f1b 100644
--- a/jshERP-web/src/views/financial/modules/AdvanceInModal.vue
+++ b/jshERP-web/src/views/financial/modules/AdvanceInModal.vue
@@ -61,6 +61,7 @@
           :loading="accountTable.loading"
           :columns="accountTable.columns"
           :dataSource="accountTable.dataSource"
+          :minWidth="minWidth"
           :maxHeight="300"
           :rowNumber="false"
           :rowSelection="true"
diff --git a/jshERP-web/src/views/financial/modules/GiroModal.vue b/jshERP-web/src/views/financial/modules/GiroModal.vue
index e9d7168c..827b4af3 100644
--- a/jshERP-web/src/views/financial/modules/GiroModal.vue
+++ b/jshERP-web/src/views/financial/modules/GiroModal.vue
@@ -53,6 +53,7 @@
           :loading="accountTable.loading"
           :columns="accountTable.columns"
           :dataSource="accountTable.dataSource"
+          :minWidth="minWidth"
           :maxHeight="300"
           :rowNumber="false"
           :rowSelection="true"
diff --git a/jshERP-web/src/views/financial/modules/ItemInModal.vue b/jshERP-web/src/views/financial/modules/ItemInModal.vue
index a49c83db..84750181 100644
--- a/jshERP-web/src/views/financial/modules/ItemInModal.vue
+++ b/jshERP-web/src/views/financial/modules/ItemInModal.vue
@@ -61,6 +61,7 @@
           :loading="accountTable.loading"
           :columns="accountTable.columns"
           :dataSource="accountTable.dataSource"
+          :minWidth="minWidth"
           :maxHeight="300"
           :rowNumber="false"
           :rowSelection="true"
diff --git a/jshERP-web/src/views/financial/modules/ItemOutModal.vue b/jshERP-web/src/views/financial/modules/ItemOutModal.vue
index 22af3ea9..361ebf29 100644
--- a/jshERP-web/src/views/financial/modules/ItemOutModal.vue
+++ b/jshERP-web/src/views/financial/modules/ItemOutModal.vue
@@ -61,6 +61,7 @@
           :loading="accountTable.loading"
           :columns="accountTable.columns"
           :dataSource="accountTable.dataSource"
+          :minWidth="minWidth"
           :maxHeight="300"
           :rowNumber="false"
           :rowSelection="true"
diff --git a/jshERP-web/src/views/financial/modules/MoneyInModal.vue b/jshERP-web/src/views/financial/modules/MoneyInModal.vue
index 67379c5e..fdcb7633 100644
--- a/jshERP-web/src/views/financial/modules/MoneyInModal.vue
+++ b/jshERP-web/src/views/financial/modules/MoneyInModal.vue
@@ -79,6 +79,7 @@
               :loading="accountTable.loading"
               :columns="accountTable.columns"
               :dataSource="accountTable.dataSource"
+              :minWidth="minWidth"
               :maxHeight="300"
               :rowNumber="false"
               :rowSelection="false"
diff --git a/jshERP-web/src/views/financial/modules/MoneyOutModal.vue b/jshERP-web/src/views/financial/modules/MoneyOutModal.vue
index f0cd499b..b13f5935 100644
--- a/jshERP-web/src/views/financial/modules/MoneyOutModal.vue
+++ b/jshERP-web/src/views/financial/modules/MoneyOutModal.vue
@@ -79,6 +79,7 @@
               :loading="accountTable.loading"
               :columns="accountTable.columns"
               :dataSource="accountTable.dataSource"
+              :minWidth="minWidth"
               :maxHeight="300"
               :rowNumber="false"
               :rowSelection="false"
diff --git a/jshERP-web/src/views/material/modules/MaterialModal.vue b/jshERP-web/src/views/material/modules/MaterialModal.vue
index df1466ae..646a2f86 100644
--- a/jshERP-web/src/views/material/modules/MaterialModal.vue
+++ b/jshERP-web/src/views/material/modules/MaterialModal.vue
@@ -44,7 +44,7 @@
                   data-step="4" data-title="单位" data-intro="此处支持单个单位和多单位，勾选多单位就可以切换到多单位的下拉框，多单位需要先在【计量单位】页面进行录入。
                   比如牛奶有瓶和箱两种单位，12瓶=1箱，这就构成了多单位，多单位中有个换算比例">
                   <a-row class="form-row" :gutter="24">
-                    <a-col :lg="14" :md="14" :sm="24">
+                    <a-col :lg="15" :md="15" :sm="24">
                       <a-input placeholder="输入单位" v-if="!unitChecked" v-decorator.trim="[ 'unit', validatorRules.unit ]" @change="onlyUnitOnChange" />
                       <a-select :value="unitList" placeholder="选择多单位" v-decorator="[ 'unitId', validatorRules.unitId ]" @change="manyUnitOnChange"
                         showSearch optionFilterProp="children" v-if="unitChecked" :dropdownMatchSelectWidth="false">
@@ -60,7 +60,7 @@
                         </a-select-option>
                       </a-select>
                     </a-col>
-                    <a-col :lg="10" :md="10" :sm="24">
+                    <a-col :lg="9" :md="9" :sm="24">
                       <a-checkbox :checked="unitChecked" @change="unitOnChange">多单位</a-checkbox>
                     </a-col>
                   </a-row>
diff --git a/jshERP-web/src/views/report/modules/DebtAccountList.vue b/jshERP-web/src/views/report/modules/DebtAccountList.vue
index 900324b7..a9bec884 100644
--- a/jshERP-web/src/views/report/modules/DebtAccountList.vue
+++ b/jshERP-web/src/views/report/modules/DebtAccountList.vue
@@ -2,7 +2,7 @@
   <div ref="container">
     <a-modal
       :title="title"
-      :width="1250"
+      :width="1200"
       :visible="visible"
       :getContainer="() => $refs.container"
       :maskStyle="{'top':'89px','left':'151px'}"
@@ -127,7 +127,7 @@
             }
           },
           { title: '单据日期', dataIndex: 'operTimeStr',width:130},
-          { title: '操作员', dataIndex: 'userName',width:60},
+          { title: '操作员', dataIndex: 'userName',width:60, ellipsis:true},
           { title: '本单欠款', dataIndex: 'needDebt',width:70},
           { dataIndex: 'realNeedDebt',width:80,
             slots: { title: 'customTitle' }
diff --git a/jshERP-web/src/views/report/modules/MaterialInOutList.vue b/jshERP-web/src/views/report/modules/MaterialInOutList.vue
index de559dbc..3834969b 100644
--- a/jshERP-web/src/views/report/modules/MaterialInOutList.vue
+++ b/jshERP-web/src/views/report/modules/MaterialInOutList.vue
@@ -2,7 +2,7 @@
   <div ref="container">
     <a-modal
       :title="title"
-      :width="1250"
+      :width="1200"
       :visible="visible"
       :getContainer="() => $refs.container"
       :maskStyle="{'top':'89px','left':'151px'}"
@@ -79,8 +79,8 @@
           { title: '条码', dataIndex: 'barCode', width: 100},
           { title: '名称', dataIndex: 'materialName', width: 200},
           { title: '仓库名称', dataIndex: 'depotName', width: 80},
-          { title: '数量', dataIndex: 'basicNumber', width: 80},
-          { title: '日期', dataIndex: 'operTime', width: 100}
+          { title: '数量', dataIndex: 'basicNumber', width: 70},
+          { title: '日期', dataIndex: 'operTime', width: 110}
         ],
         labelCol: {
           xs: { span: 1 },
diff --git a/jshERP-web/src/views/system/modules/VendorModal.vue b/jshERP-web/src/views/system/modules/VendorModal.vue
index f15b1731..87a6b282 100644
--- a/jshERP-web/src/views/system/modules/VendorModal.vue
+++ b/jshERP-web/src/views/system/modules/VendorModal.vue
@@ -12,7 +12,7 @@
       @cancel="handleCancel"
       cancelText="关闭"
       wrapClassName="ant-modal-cust-warp"
-      style="top:100px; height: 80%;overflow-y: hidden">
+      style="top:10%;height: 80%;overflow-y: hidden">
       <template slot="footer">
         <a-button key="back" v-if="isReadOnly" @click="handleCancel">
           关闭