From b9228e13d3fdef986686aaef4c8a37d56ff6471d Mon Sep 17 00:00:00 2001
From: Zhao Qiqi <1287235164@qq.com>
Date: Wed, 20 Jul 2022 10:11:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E2=80=94?=
 =?UTF-8?q?=E2=80=94=E8=B0=83=E6=95=B4=E9=83=A8=E5=88=86=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/tab-search/index.vue       |  2 +-
 .../src/layout/components/AppMain.vue         |  2 +-
 .../anrui-base-ui/src/styles/index.scss       | 26 ++++++++++++++-----
 .../changshangguanli/changshangguanli.vue     |  7 +----
 .../changshangguanli/changshanglook.vue       |  4 +--
 .../guakaogongsiguanli/guakaogongsiguanli.vue |  4 ---
 .../jingxiaoshangguanli.vue                   |  4 ---
 .../pinpai/pinpaiguanli/pinpaiguanli.vue      |  6 +----
 8 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/anrui-base/anrui-base-ui/src/components/tab-search/index.vue b/anrui-base/anrui-base-ui/src/components/tab-search/index.vue
index 2c79d53c12..e7ae124608 100644
--- a/anrui-base/anrui-base-ui/src/components/tab-search/index.vue
+++ b/anrui-base/anrui-base-ui/src/components/tab-search/index.vue
@@ -37,7 +37,7 @@
   @import "~@/styles/variables.scss";
 	.tab-header {
 			background-color: $search-bg;
-			padding: 8px 20px;
+			padding: 5px 20px;
 			.tab-search{
 				padding: 9px 0px;
 			}
diff --git a/anrui-base/anrui-base-ui/src/layout/components/AppMain.vue b/anrui-base/anrui-base-ui/src/layout/components/AppMain.vue
index b8c891f811..966c6c40c9 100644
--- a/anrui-base/anrui-base-ui/src/layout/components/AppMain.vue
+++ b/anrui-base/anrui-base-ui/src/layout/components/AppMain.vue
@@ -29,7 +29,7 @@ export default {
   position: relative;
   background-color: #FFFFFF;
   /* margin-left:10px; */
-  padding: 0 20px;
+  /*padding: 0 20px;*/
   overflow-x: hidden;
   overflow-y: hidden;
 }
diff --git a/anrui-base/anrui-base-ui/src/styles/index.scss b/anrui-base/anrui-base-ui/src/styles/index.scss
index bca5f38c72..e0f46a85a2 100644
--- a/anrui-base/anrui-base-ui/src/styles/index.scss
+++ b/anrui-base/anrui-base-ui/src/styles/index.scss
@@ -108,7 +108,7 @@ div:focus {
   background-color: #fff;
 }
 // 设置了滚动区域
-.main-content{ overflow-x: hidden;overflow-y: auto;height: calc(100vh - 186px);}
+.main-content{ overflow-x: hidden;overflow-y: auto;height: calc(100vh - 186px);padding: 0 20px}
 .listcon{height: calc(100vh - 425px);overflow-y: hidden;overflow-x: hidden;}
 .listconadd{height: calc(100vh - 200px);overflow-y: auto;overflow-x: hidden;}
 .listconsub{height: calc(100vh - 310px);overflow-y: auto;overflow-x: hidden;}
@@ -123,15 +123,29 @@ div:focus {
   align-items: center; margin-bottom: 0px !important;
   font-size: 20px;
 }
-.tab-header{
-  background-color: #edf1f7;
-  padding: 9px 20px;
+.tab-header {
+  font-size: 20px;
+  font-weight: bold;
 }
+
 .filter-item {
-  padding-right:10px;
+  padding-right: 10px;
   width: 220px;
   display: inline-block;
 }
+
+.search {
+  .tab-header {
+    .el-form-item {
+      margin-right: 30px;
+      .el-form-item__label {
+        font-size: 16px;
+        font-weight: 500;
+      }
+    }
+  }
+}
+
 .listtop {
   display: flex;
   flex-direction: row;
@@ -169,7 +183,7 @@ div:focus {
   margin-right: 4px;
 }
 .formadd {
-	padding: 88px 20px 0 20px;
+	padding: 88px 40px 0 40px;
   font-size: 16px;
   // height: calc(100vh - 200px);overflow-y: auto;
 	.title {
diff --git a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue
index 59d82af19f..f9739cd46f 100644
--- a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue
+++ b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue
@@ -7,7 +7,7 @@
         <div class="searchcon">
           <el-button size="medium" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
           <div v-show="isSearchShow" class="search">
-            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="110px" class="tab-header">
               <el-form-item label="厂商名称">
                 <el-select v-model="listQuery.params.manufacturerName" filterable class="filter-item" clearable
                            placeholder="请选择厂商名称">
@@ -36,7 +36,6 @@
               <el-input v-model="listQuery.params.contactName" maxlength="125" placeholder="" class="addinputw"
                         clearable/>
             </el-form-item>
-
           </el-form>
           <div class="btn">
             <el-button type="primary" size="medium" @click="handleFilter">查询</el-button>
@@ -546,8 +545,4 @@ export default {
   /deep/ .el-collapse-item__header {
     border-bottom: 0px solid #e6ebf5;
   }
-
-  .tab-header /deep/ .el-form-item {
-    margin-bottom: 10px;
-  }
 </style>
diff --git a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshanglook.vue b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshanglook.vue
index 0c78f08c3c..e116c235c1 100644
--- a/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshanglook.vue
+++ b/anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshanglook.vue
@@ -4,9 +4,7 @@
       <div>厂商管理详情</div>
       <div>
         <!-- <el-button type="primary" size="small" @click="dialogStatus==='create'?handleCreate():updateData()">保存</el-button> -->
-        <el-button type="info" size="small" @click="handleReturn()"
-          >返回</el-button
-        >
+        <el-button type="info" size="small" @click="handleReturn()">返回</el-button>
       </div>
     </div>
     <div  class="listconadd">
diff --git a/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiguanli.vue b/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiguanli.vue
index 318987e2a3..2037394c60 100644
--- a/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiguanli.vue
+++ b/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiguanli.vue
@@ -595,10 +595,6 @@ export default {
   padding: 8px 20px;
   margin-bottom: 0 !important;
 }
-
-.tab-header /deep/ .el-form-item {
-  margin-bottom: 10px;
-}
 .listtop{
   position: relative;
 }
diff --git a/anrui-base/anrui-base-ui/src/views/jingxiaoshang/jingxiaoshangguanli/jingxiaoshangguanli.vue b/anrui-base/anrui-base-ui/src/views/jingxiaoshang/jingxiaoshangguanli/jingxiaoshangguanli.vue
index 1a8a2ed2c3..1b3d1d11b3 100644
--- a/anrui-base/anrui-base-ui/src/views/jingxiaoshang/jingxiaoshangguanli/jingxiaoshangguanli.vue
+++ b/anrui-base/anrui-base-ui/src/views/jingxiaoshang/jingxiaoshangguanli/jingxiaoshangguanli.vue
@@ -403,8 +403,4 @@ export default {
   padding: 8px 20px;
   margin-bottom: 0 !important;
 }
-
-.tab-header /deep/ .el-form-item {
-  margin-bottom: 10px;
-}
 </style>
diff --git a/anrui-base/anrui-base-ui/src/views/pinpai/pinpaiguanli/pinpaiguanli.vue b/anrui-base/anrui-base-ui/src/views/pinpai/pinpaiguanli/pinpaiguanli.vue
index bda411030d..2a40c3e136 100644
--- a/anrui-base/anrui-base-ui/src/views/pinpai/pinpaiguanli/pinpaiguanli.vue
+++ b/anrui-base/anrui-base-ui/src/views/pinpai/pinpaiguanli/pinpaiguanli.vue
@@ -330,7 +330,7 @@ export default {
       return pageindex
     },
     // 获取当前登陆人的分公司
-    
+
     // 查询列表信息
     getList() {
       this.listLoading = true
@@ -732,8 +732,4 @@ export default {
   padding: 8px 20px;
   margin-bottom: 0 !important;
 }
-
-.tab-header /deep/ .el-form-item {
-  margin-bottom: 10px;
-}
 </style>