From a8f0783987079f91df401f10b741de78efa32712 Mon Sep 17 00:00:00 2001
From: 13208366016 <47278630@qq.com>
Date: Fri, 13 Oct 2023 09:03:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/option/basic/basicProperty.js             |  4 +-
 src/styles/element-ui.scss                    |  4 ++
 src/views/basic/deline/basicDeline.vue        | 40 ++++++++++++++++++
 src/views/basic/deline/basicdeLineform.vue    |  8 ++--
 src/views/basic/line/basicLine.vue            | 41 ++++++++++++++++---
 src/views/basic/material/basicMaterial.vue    |  4 +-
 src/views/basic/property/basicProperty.vue    | 16 ++++++++
 .../basic/property/basicPropertyDetails.vue   | 39 ++++++++++++++++++
 .../BasicdataGoodsAllocation.vue              |  4 +-
 .../goodsArea/basicdataGoodsArea.vue          | 10 ++---
 .../goodsShelf/basicdataGoodsShelf.vue        |  8 ++--
 .../warehouse/tray/basicdataTray.vue          |  8 ++--
 .../warehouse/basicdataWarehouse.vue          |  2 +
 .../inventory/distrilbutionBillLading.vue     |  4 +-
 src/views/system/dept.vue                     | 28 +++++++------
 src/views/system/user.vue                     |  2 +-
 16 files changed, 178 insertions(+), 44 deletions(-)

diff --git a/src/option/basic/basicProperty.js b/src/option/basic/basicProperty.js
index b320899e..148dd0dc 100644
--- a/src/option/basic/basicProperty.js
+++ b/src/option/basic/basicProperty.js
@@ -158,7 +158,7 @@ export default {
       prop: "assetName",
       type: "input",
       labelWidth:'150',
-      width:"200px",
+      width:"270px",
       align:'center',
       span:11,
       search: true,
@@ -186,7 +186,7 @@ export default {
       prop: "node",
       type: "input",
       labelWidth:'150',
-      width:"340px",
+      width:"360px",
       align:'center',
       span:11,
     },
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 15640575..f510f39c 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -68,3 +68,7 @@
 .avue--detail .el-form-item {
   background-color: #fafafa;
 }
+// 页码组件激活样式字体不加粗
+li.is-active{
+  font-weight: normal !important;
+}
\ No newline at end of file
diff --git a/src/views/basic/deline/basicDeline.vue b/src/views/basic/deline/basicDeline.vue
index 871a2fb3..57700f71 100644
--- a/src/views/basic/deline/basicDeline.vue
+++ b/src/views/basic/deline/basicDeline.vue
@@ -284,6 +284,7 @@ export default {
 </script>
 
 <style scoped lang="scss">
+
 :deep(.avue-form__group) {
   width: 100%;
   align-items: flex-start;
@@ -298,4 +299,43 @@ export default {
     margin-right: 8px;
   }
 }
+
+:deep(.avue-form__row){
+  max-width:324px;
+}
+
+:deep(.avue-form__row):nth-child(1),:deep(.avue-form__row):nth-child(2){
+  max-width:100%;
+  .el-form-item{
+    margin-right:0;
+    display: flex;
+  }
+  .el-input-number,.el-input__wrapper{
+        height: 33px;
+  }
+  .el-table__header{
+    width: 100% !important;
+  }
+  .el-table__body{
+    width: 100% !important;
+  }
+}
+
+:deep(.avue-form__row):first-of-type {
+  max-width:100%;
+  .el-form-item{
+    margin-right:0;
+    display: flex;
+  }
+  .el-input-number,.el-input__wrapper{
+        height: 33px;
+  }
+  .el-table__header{
+    width: 100% !important;
+  }
+  .el-table__body{
+    width: 100% !important;
+  }
+}
+
 </style>
diff --git a/src/views/basic/deline/basicdeLineform.vue b/src/views/basic/deline/basicdeLineform.vue
index 21b94af5..b245b3d3 100644
--- a/src/views/basic/deline/basicdeLineform.vue
+++ b/src/views/basic/deline/basicdeLineform.vue
@@ -1,17 +1,17 @@
 <template>
   <el-form>
-    <div style="background-color: #ffffff; height: 845px; padding: 2% 4%">
+    <div style="background-color: #ffffff; height: 100vh; padding: 10px">
       <avue-form :option="option" ref="myForm" v-model="form">
         <template #input="{ row }">
           <el-tag>序号:{{ row.$index }}-数据:{{ row.input }}</el-tag>
         </template>
       </avue-form>
-      <div style="position: fixed; bottom: 7%; left: 40%; width: 100%">
-        <div style="width: 100%">
+      <div >
+        <div>
           <el-button
             type="primary"
             @click="submitForm"
-            style="margin-right: 20%"
+           
             :disabled="this.isDis"
             >确定</el-button
           >
diff --git a/src/views/basic/line/basicLine.vue b/src/views/basic/line/basicLine.vue
index afad77d2..4a86656c 100644
--- a/src/views/basic/line/basicLine.vue
+++ b/src/views/basic/line/basicLine.vue
@@ -283,14 +283,43 @@ export default {
   justify-content: space-between !important;
 }
 :deep(.avue-form__group--flex) {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
 }
 :deep(.avue-form__row){
-  max-width:100%
+  max-width:324px;
+  .el-form-item{
+    margin-right: 10px;
+  }
 }
-:deep(.el-form-item){
-  width: max-content;
+:deep(.avue-form__row):first-of-type {
+  max-width:100%;
+  .el-form-item{
+    margin-right:0;
+    display: flex;
+  }
+  .el-input-number,.el-input__wrapper{
+        height: 33px;
+  }
+  .el-table__header{
+    width: 100% !important;
+  }
+  .el-table__body{
+    width: 100% !important;
+  }
 }
+:deep(.el-table__header){
+width: 100%;
+}
+:deep(.avue-form__row){
+  margin-left:10px;
+}
+:deep(.avue-form__row):nth-child(1),
+:deep(.avue-form__row):nth-child(2),
+:deep(.avue-form__row):nth-child(7) {
+   margin-left:0px;
+}
+
+
 </style>
diff --git a/src/views/basic/material/basicMaterial.vue b/src/views/basic/material/basicMaterial.vue
index 82dc1ccd..534a79fa 100644
--- a/src/views/basic/material/basicMaterial.vue
+++ b/src/views/basic/material/basicMaterial.vue
@@ -321,5 +321,7 @@
 :deep(.no-print ){
   margin-left: auto !important;
 }
-
+:deep(.el-form-item__label){
+  width:auto !important;
+}
 </style>
diff --git a/src/views/basic/property/basicProperty.vue b/src/views/basic/property/basicProperty.vue
index e6853f13..7d88e6a4 100644
--- a/src/views/basic/property/basicProperty.vue
+++ b/src/views/basic/property/basicProperty.vue
@@ -255,4 +255,20 @@ export default {
 :deep(.no-print ){
   margin-left: auto !important;
 }
+:deep(.el-form-item__label){
+  width:auto !important;
+}
+// :deep(.el-table__header){
+//   width: inherit !important;
+// }
+// :deep(.el-table__row){
+//     width: inherit !important;
+// }
+// :deep(.el-scrollbar__view){
+//   width: inherit !important;
+ 
+// }
+//  :deep(.el-table__body){
+//     width: inherit !important;
+//   }
 </style>
diff --git a/src/views/basic/property/basicPropertyDetails.vue b/src/views/basic/property/basicPropertyDetails.vue
index 8b6ad56c..a6c8db0f 100644
--- a/src/views/basic/property/basicPropertyDetails.vue
+++ b/src/views/basic/property/basicPropertyDetails.vue
@@ -641,4 +641,43 @@ export default {
 :deep(.no-print ){
   margin-left: auto !important;
 }
+:deep(.el-form-item__label){
+  width:auto !important;
+}
+// nth-child
+:deep(.avue-form__row){
+  margin-right:30px;
+  .el-form-item{
+    margin-right:0;
+  }
+}
+:deep(.avue-form__row){
+    margin-right:0px;
+    margin-left:0px;
+}
+:deep(.avue-form__row:nth-child(7)){
+    margin-left:35px;
+}
+:deep(.avue-form__row:nth-child(8)){
+    margin-left:35px;
+}
+:deep(.avue-form__row){
+  margin-left:10px;
+}
+:deep(.avue-form__row:first-child) {
+    margin-left:0px;
+}
+:deep(.avue-form__row:nth-child(6)){
+     margin-left:0px;
+}
+:deep(.avue-form__group--flex){
+  justify-content: space-between;
+}
+:deep(.el-tabs--border-card){
+  border:0;
+}
+:deep(.el-tabs__content){
+  padding:0;
+}
+
 </style>
diff --git a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
index 13330678..b65ed5dc 100644
--- a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
+++ b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
@@ -25,10 +25,10 @@
         <el-button type="danger" icon="el-icon-delete" plain @click="handleDisable"
           >禁 用
         </el-button>
-        <el-button type="danger" icon="el-icon-delete" plain @click="handleEnable"
+        <el-button type="danger" icon="el-icon-check" plain @click="handleEnable"
           >启 用
         </el-button>
-        <el-button type="danger" icon="el-icon-delete" plain @click="downAllocation"
+        <el-button type="danger" icon="el-icon-minus" plain @click="downAllocation"
           >一 键 下 架
         </el-button>
         <!--        <el-button type="warning"-->
diff --git a/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue b/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue
index e12f16d9..b40b3cde 100644
--- a/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue
+++ b/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue
@@ -61,19 +61,19 @@
             <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain
               >删 除</el-button
             >
-            <el-button type="danger" icon="el-icon-delete" @click="handleExport" plain
+            <el-button type="danger" icon="el-icon-download" @click="handleExport" plain
               >导 出 货 区</el-button
             >
-            <el-button type="danger" icon="el-icon-delete" plain @click="handleImport"
+            <el-button type="danger" icon="el-icon-upload" plain @click="handleImport"
               >导 入 货 区
             </el-button>
-            <el-button type="danger" icon="el-icon-delete" @click="handleDisable" plain
+            <el-button type="danger" icon="el-icon-close" @click="handleDisable" plain
               >禁 用</el-button
             >
-            <el-button type="danger" icon="el-icon-delete" @click="handleEnable" plain
+            <el-button type="danger" icon="el-icon-check" @click="handleEnable" plain
               >启 用</el-button
             >
-          </div>
+          </div>  
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
             <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
index c5b57744..cf27693c 100644
--- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
+++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
@@ -38,19 +38,19 @@
       </el-row>
       <el-row>
         <div class="avue-crud__header">
-          <!-- 头部左侧按钮模块 -->
+         <!-- 头部左侧按钮模块 -->
           <div class="avue-crud__left">
             <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
             <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain
               >删 除</el-button
             >
-            <el-button type="danger" icon="el-icon-delete" @click="handleDisable" plain
+            <el-button type="danger" icon="el-icon-close" @click="handleDisable" plain
               >禁 用</el-button
             >
-            <el-button type="danger" icon="el-icon-delete" @click="handleEnable" plain
+            <el-button type="danger" icon="el-icon-check" @click="handleEnable" plain
               >启 用</el-button
             >
-            <el-button type="danger" icon="el-icon-delete" plain @click="handleImport"
+            <el-button type="danger" icon="el-icon-upload" plain @click="handleImport"
               >导 入 货 架
             </el-button>
             <!--            <el-button type="danger" icon="el-icon-delete" @click="aaa" plain>导出二维码</el-button>-->
diff --git a/src/views/basicdata/warehouse/tray/basicdataTray.vue b/src/views/basicdata/warehouse/tray/basicdataTray.vue
index d8a49218..c87b783e 100644
--- a/src/views/basicdata/warehouse/tray/basicdataTray.vue
+++ b/src/views/basicdata/warehouse/tray/basicdataTray.vue
@@ -36,10 +36,10 @@
         <el-button type="warning" plain icon="el-icon-camera" @click="handleqr"
           >查看二维码
         </el-button>
-        <el-button type="warning" plain icon="el-icon-camera" @click="lossess">报 损 </el-button>
-        <el-button type="warning" plain icon="el-icon-camera" @click="disable">禁 用 </el-button>
-        <el-button type="warning" plain icon="el-icon-camera" @click="addable">启 用 </el-button>
-        <el-button type="warning" plain icon="el-icon-camera" @click="vacants"
+        <el-button type="warning" plain icon="el-icon-edit" @click="lossess">报 损 </el-button>
+        <el-button type="warning" plain icon="el-icon-circle-close" @click="disable">禁 用 </el-button>
+        <el-button type="warning" plain icon="el-icon-check" @click="addable">启 用 </el-button>
+        <el-button type="warning" plain icon="el-icon-refresh" @click="vacants"
           >一 键 空 置
         </el-button>
       </template>
diff --git a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
index 36573837..f6123310 100644
--- a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
+++ b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
@@ -1186,6 +1186,7 @@ export default {
 :deep(.no-print){
   // margin-left:auto;
   max-width:300px !important;
+  margin-left: inherit;
   .el-button{
      margin-right:0;
   }
@@ -1196,4 +1197,5 @@ export default {
 :deep(.avue-form__group--flex) {
     justify-content: space-between;
 }
+
 </style>
\ No newline at end of file
diff --git a/src/views/distribution/inventory/distrilbutionBillLading.vue b/src/views/distribution/inventory/distrilbutionBillLading.vue
index 60e72ba3..791e0cd0 100644
--- a/src/views/distribution/inventory/distrilbutionBillLading.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLading.vue
@@ -469,8 +469,8 @@
     <el-dialog v-model="dialogFormZeroOrderVisible" title="修改订单信息" center style="width: 50%">
       <template v-if="zeroOrderFormList">
         <div style="display: flex; align-items: center; text-align: center">
-          <div style="width: 120px">名称</div>
-          <div style="flex: 1">数量</div>
+          <div style="width: 120px; display: flex">名称</div>
+          <div style="display: flex">数量</div>
         </div>
         <el-form-item
           :label="item.firsts"
diff --git a/src/views/system/dept.vue b/src/views/system/dept.vue
index 041bb5c4..f744aa31 100644
--- a/src/views/system/dept.vue
+++ b/src/views/system/dept.vue
@@ -376,24 +376,26 @@ export default {
 };
 </script>
 
-<style scoped lang='scss'>
-
-:deep(.avue-form__row){
-  margin-left:10px;
-  max-width:300px!important;
+<style scoped lang="scss">
+:deep(.avue-form__row) {
+  margin-left: 10px;
+  max-width: 300px !important;
 }
-:deep(.no-print){
+:deep(.no-print) {
   margin-left: auto;
 }
-:deep(.avue-form__row){
-  margin-left:0;
+:deep(.avue-form__row) {
+  margin-left: 0;
 }
-:deep(.no-print){
-  .el-button{
-     margin-right:0
+:deep(.no-print) {
+  .el-button {
+    margin-right: 0;
   }
 }
-:deep(.el-form-item__label){
-  width:auto !important;
+:deep(.el-form-item__label) {
+  width: auto !important;
+}
+:deep(.el-table__empty-block) {
+  height: 100vh !important;
 }
 </style>
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 05ed12fa..71fb5ce4 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -74,7 +74,7 @@
               >账号解封
             </el-button>
             <el-button
-              type="success"
+              type="warning"
               plain
               v-if="userInfo.role_name.includes('admin')"
               icon="el-icon-upload"