Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-ui/src/api/business/intermediaryPerson.js

@@ -2,35 +2,35 @@ import request from '@/utils/request'
 
 // 中介人员条件查询
 export function listPage(data) {
-    return request({
+  return request({
-      url: '/base/v1/basemiddleman/listPage',
+    url: '/base/v1/basemiddleman/listPage',
-      data,
+    data,
-      method: 'post',
+    method: 'post',
-      headers: {'Content-Type': 'application/json'}
+    headers: {'Content-Type': 'application/json'}
-    })
+  })
 }
 // 添加
 export function save(data) {
-    return request({
+  return request({
-      url: '/base/v1/basemiddleman/save',
+    url: '/base/v1/basemiddleman/save',
-      data,
+    data,
-      method: 'post',
+    method: 'post',
-      headers: {'Content-Type': 'application/json'}
+    headers: {'Content-Type': 'application/json'}
-    })
+  })
 }
 // 删除
 export function deleteBySids(data) {
-    return request({
+  return request({
-      url: '/base/v1/basemiddleman/delBySids',
+    url: '/base/v1/basemiddleman/delBySids',
-      method: 'DELETE',
+    method: 'DELETE',
-      data: data,
+    data: data,
-      headers: {'Content-Type': 'application/json'}
+    headers: {'Content-Type': 'application/json'}
-    })
+  })
 }
 // 详情及修改回显
 export function details(data) {
-    return request({
+  return request({
-        url: '/base/v1/basemiddleman/fetchDetailsBySid/' + data,
+    url: '/base/v1/basemiddleman/fetchDetailsBySid/' + data,
-        method: 'get'
+    method: 'get'
-    })
+  })
 }

anrui-base/anrui-base-ui/src/components/pagination/index.vue

@@ -110,6 +110,12 @@ export default {
 .pagination-container.hidden {
   display: none;
 }
+.el-pagination {
+  white-space: nowrap;
+  color: #303133;
+  font-weight: bold;
+  height: 28px;
+}
 .el-pagination.is-background .btn-next, .el-pagination.is-background .btn-prev{
 	padding: 0 20px;
 	border: 1px solid #ccc;

anrui-base/anrui-base-ui/src/components/tab-search/index.vue

@@ -37,10 +37,9 @@
   @import "~@/styles/variables.scss";
 	.tab-header {
 			background-color: $search-bg;
-			padding: 8px 20px;
+			padding: 5px 20px;
-			margin-bottom: 15px;
 			.tab-search{
-				padding: 8px 0px;
+				padding: 9px 0px;
 			}
 			.tab-btn{
 				.search-from{

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 10px;
+  /*padding: 0 20px;*/
   overflow-x: hidden;
   overflow-y: hidden;
 }

anrui-base/anrui-base-ui/src/styles/element-table.scss

@@ -1,19 +1,30 @@
 .el-table {
-  .el-table__header{
+  .el-table__header {
-    tr th{
+    tr th {
       background: #edf1f7;
       color: #333333;
+      padding: 8px 0;
+      font-size: 16px;
     }
   }
 }
 
-.table-describe{
+.el-table {
+  .el-table__body {
+    tr td {
+      padding: 6px 0 !important;
+    }
+  }
+}
+
+.table-describe {
   border: 1px solid #dfe4ed;
   border-bottom: 0px solid #dfe4ed;
-  h4{
+
+  h4 {
     float: left;
     margin: 0;
     line-height: 34px;
-    padding:0 15px;
+    padding: 0 15px;
   }
 }

anrui-base/anrui-base-ui/src/styles/index.scss

@@ -103,11 +103,12 @@ div:focus {
 }
 
 // 添加样式
-.app-container {margin: 5px;
+.app-container {
+  margin: 5px 0 5px 0;
   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;}
@@ -120,28 +121,58 @@ div:focus {
   flex-direction: row;
   justify-content: space-between !important;
   align-items: center; margin-bottom: 0px !important;
+  font-size: 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;
   justify-content: space-between;
   align-items: center;
-  padding: 0px 0px 10px 15px;
+  padding: 0 0 0 15px;
+  margin-top: 0;
+  border: 1px solid #dfe4ed;
+  height: 42px;
+  line-height: 42px;
+}
+
+.listtop .tit {
+  font-weight: bold;
+  font-size: 16px
+}
+
+.listtop .pagination {
   margin: 0;
+  padding: 0;
 }
-.listtop .tit{font-weight: bold;}
-.listtop .pagination{margin: 0;padding: 0;}
 .pages {
   display: flex;
   flex-direction: row;
   justify-content: flex-end;
   align-items: flex-end;
-  padding: 0px 0px 15px 15px;
+  padding: 0 0 15px 15px;
 }
 .pages .tit{font-weight: bold;}
 .pages .pagination{margin: 0;}
@@ -152,13 +183,14 @@ div:focus {
   margin-right: 4px;
 }
 .formadd {
-	padding: 20px 0;
+	padding: 88px 40px 0 40px;
+  font-size: 16px;
   // height: calc(100vh - 200px);overflow-y: auto;
 	.title {
-		padding: 10px;font-weight: bold;
+		padding: 12px;font-weight: bold;
-    font-size: 20px;
+    font-size: 16px;
     background-color: $header-bg;
-    text-align: center;
+    text-align: left;
     color: #ffffff;
 	}
   .el-row {
@@ -168,8 +200,8 @@ div:focus {
       .el-col{
         border-right: 1px solid $table-border-color;
         border-bottom: 1px solid $table-border-color;
-        padding: 5px 15px 5px 15px !important;
+        padding: 0 15px;
-        min-height: 50px;
+        min-height: 42px;
         line-height: 1;
         .el-form-item{
           margin-bottom: 0;
@@ -201,7 +233,7 @@ div:focus {
       .el-col{
         border-right: 1px solid $table-border-color;
         border-bottom: 1px solid $table-border-color;
-        padding: 0px 15px 0px 15px !important;
+        padding: 0 15px 0 15px !important;
         min-height: 50px;
         line-height: 50px;
         font-size: 14px;
@@ -218,29 +250,56 @@ div:focus {
 .bluezi{color: $header-bg;cursor:pointer;}
 // 经销商添加样式
 .titcon{
-  display: flex;flex-direction: row;justify-content: space-around; background-color: #0294d7;flex: 3;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-around;
+  background-color: #0294d7;
+  flex: 3;
 }
-.titcon .title{
+
-  	padding: 10px;font-weight: bold;
+.titcon .title {
-    font-size: 20px;
+  padding: 10px;
-    text-align: center;
+  font-weight: bold;
-    color: #ffffff;
+  font-size: 20px;
+  text-align: center;
+  color: #ffffff;
+}
+
+.titcon .baocun {
+  text-align: right;
+  flex: 2;
+  padding: 5px 20px;
 }
-.titcon .baocun{text-align: right;flex: 2;padding: 5px 20px;}
-.addinputwda{width: 600px;}
-.searchcon{margin: 0px 0 10px 0;}
-.searchcon .searchbtn{margin: 10px 0;}
 
+.addinputwda {
+  width: 600px;
+}
 
+//.searchcon{margin: 0px 0 10px 0;}
+.searchcon .searchbtn {
+  margin: 3px 0;
+}
+
+.search .btn {
+  padding: 5px 0;
+  border: 1px solid #e0e3eb;
+  text-align: center;
+  margin-bottom: 5px;
+}
 
 // 弹出窗口按钮
-.btnCancel{
+.btnCancel {
-    background: #e84026 !important;outline: none;border: none;color: #fff !important;
+  background: #e84026 !important;
+  outline: none;
+  border: none;
+  color: #fff !important;
 }
-.btnCancel:hover{
+
-    background: #ed6651 !important;
+.btnCancel:hover {
+  background: #ed6651 !important;
 }
-.btnFalses{
+
+.btnFalses {
     background: #2cab69 !important;outline: none;border: none;
 }
 .btnFalses:hover{

anrui-base/anrui-base-ui/src/styles/sidebar.scss

@@ -9,9 +9,6 @@
     position: relative;
     overflow: hidden;
   }
-  .TagsView{
-    height: 50px;
-  }
   .home-box{
   	position: fixed;
   	top: 60px;

anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue

@@ -5,9 +5,9 @@
       <button-bar view-title="厂商管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
       <div class="main-content">
         <div class="searchcon">
-          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <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,11 +36,10 @@
               <el-input v-model="listQuery.params.contactName" maxlength="125" placeholder="" class="addinputw"
                         clearable/>
             </el-form-item>
-
           </el-form>
-          <div class="btn" style="text-align: center;">
+          <div class="btn">
-            <el-button type="primary" @click="handleFilter">查询</el-button>
+            <el-button type="primary" size="medium" @click="handleFilter">查询</el-button>
-            <el-button type="primary" @click="handleReset">重置</el-button>
+            <el-button type="primary" size="medium" @click="handleReset">重置</el-button>
           </div>
         </div>
       </div>
@@ -70,7 +69,7 @@
                 <span>{{ scope.row.supplierTypeValue }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="厂商通讯地址" width="" align="left">
+            <el-table-column label="厂商通讯地址" width="" header-align="center" align="left">
               <template slot-scope="scope">
                 <span>{{ scope.row.manufacturerAddress }}</span>
               </template>
@@ -546,19 +545,4 @@ export default {
   /deep/ .el-collapse-item__header {
     border-bottom: 0px solid #e6ebf5;
   }
-
-  .btn {
-    padding: 15px 0 15px 0;
-    border: 1px solid #e0e3eb;
-  }
-
-  .tab-header {
-    background-color: #edf1f7;
-    padding: 8px 20px;
-    margin-bottom: 0 !important;
-  }
-
-  .tab-header /deep/ .el-form-item {
-    margin-bottom: 10px;
-  }
 </style>

anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanliAdd.vue

@@ -16,37 +16,37 @@
       <el-form ref="dataForm" :title="textMap[dialogStatus]" :model="temp" class="formadd" :rules="rules">
         <div class="title">基本信息</div>
         <el-row>
-          <el-col :span="3">
+          <el-col :span="4">
             <span><span class="icon">*</span>厂商名称</span>
           </el-col>
-          <el-col :span="9">
+          <el-col :span="8">
             <el-form-item prop="manufacturerName">
               <!--              <span slot="label">厂商名称：</span>-->
               <el-input v-model="temp.manufacturerName" maxlength="20" placeholder="" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
-          <el-col :span="3">
+          <el-col :span="4">
             <span>简称</span>
           </el-col>
-          <el-col :span="9">
+          <el-col :span="8">
             <el-form-item>
               <el-input v-model="temp.manufacturerAs" maxlength="20" placeholder="" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="3">
+          <el-col :span="4">
             <span>编码</span>
           </el-col>
-          <el-col :span="9">
+          <el-col :span="8">
             <el-form-item>
               <el-input v-model="temp.manufacturerCode" maxlength="20" placeholder="" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
-          <el-col :span="3">
+          <el-col :span="4">
             <span><span class="icon">*</span>分类</span>
           </el-col>
-          <el-col :span="9">
+          <el-col :span="8">
             <el-form-item prop="supplierType">
               <el-select v-model="temp.supplierType" class="addinputw" placeholder="" @change="getSupplierType">
                 <el-option v-for="(item, index) in supplierType_list" :key="index.dictKey" :label="item.dictValue"
@@ -56,83 +56,83 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="3">
+          <el-col :span="4">
             <span><span class="icon">*</span>通讯地址</span>
           </el-col>
-          <el-col :span="21">
+          <el-col :span="20">
             <el-form-item prop="manufacturerAddress">
-              <el-input v-model="temp.manufacturerAddress" maxlength="80" placeholder="" class="addinputw" clearable/>
+              <el-input v-model="temp.manufacturerAddress" maxlength="80" placeholder="" class="addinputw addinputw01" clearable/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="3">
+          <el-col :span="4">
             <span><span class="icon">*</span>厂商办公电话</span>
           </el-col>
-          <el-col :span="9">
+          <el-col :span="8">
             <el-form-item prop="manufacturerTelePhone">
               <el-input v-model="temp.manufacturerTelePhone" maxlength="20" placeholder="" class="addinputw"
                         clearable/>
             </el-form-item>
           </el-col>
-          <el-col :span="3">
+          <el-col :span="4">
             <span>传真</span>
           </el-col>
-          <el-col :span="9">
+          <el-col :span="8">
             <el-form-item prop="manufacturerFax">
               <el-input v-model="temp.manufacturerFax" maxlength="20" placeholder="" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="3">
+          <el-col :span="4">
             <span><span class="icon">*</span>联系人姓名</span>
           </el-col>
-          <el-col :span="9">
+          <el-col :span="8">
             <el-form-item prop="contactName">
               <el-input v-model="temp.contactName" maxlength="5" placeholder="" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
-          <el-col :span="3">
+          <el-col :span="4">
             <span><span class="icon">*</span>联系人手机号</span>
           </el-col>
-          <el-col :span="9">
+          <el-col :span="8">
             <el-form-item prop="contactMobile">
               <el-input v-model="temp.contactMobile" maxlength="11" placeholder="" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="3">
+          <el-col :span="4">
             <span>联系人办公电话</span>
           </el-col>
-          <el-col :span="9">
+          <el-col :span="8">
             <el-form-item prop="contactTelePhone">
-              <el-input v-model="temp.contactTelePhone" maxlength="13" placeholder="" class="addinputw" clearable/>
+              <el-input v-model="temp.contactTelePhone" maxlength="14" placeholder="" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
-          <el-col :span="3">
+          <el-col :span="4">
             <span>微信号</span>
           </el-col>
-          <el-col :span="9">
+          <el-col :span="8">
             <el-form-item prop="weChatID">
               <el-input v-model="temp.weChatID" maxlength="11" placeholder="" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="3">
+          <el-col :span="4">
             <span>邮编</span>
           </el-col>
-          <el-col :span="9">
+          <el-col :span="8">
             <el-form-item prop="">
               <el-input v-model="temp.zipCode" maxlength="20" placeholder="" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
-          <el-col :span="3">
+          <el-col :span="4">
             <span>邮箱</span>
           </el-col>
-          <el-col :span="9">
+          <el-col :span="8">
             <el-form-item prop="">
               <el-input v-model="temp.email" maxlength="20" placeholder="" class="addinputw" clearable/>
             </el-form-item>
@@ -306,73 +306,73 @@
         <!--          </el-row>-->
         <div class="title">供应厂商开户行信息</div>
         <el-row>
-          <el-col :span="3">
+          <el-col :span="4">
             <span>国家</span>
           </el-col>
-          <el-col :span="9">
+          <el-col :span="8">
             <el-form-item>
               <el-input v-model="temp2.country" maxlength="125" placeholder="" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
-          <el-col :span="3">
+          <el-col :span="4">
             <span>开户银行</span>
           </el-col>
-          <el-col :span="9">
+          <el-col :span="8">
             <el-form-item prop="depositBank">
               <el-input v-model="temp2.depositBank" maxlength="125" placeholder="" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="3">
+          <el-col :span="4">
             <span>银行账号</span>
           </el-col>
-          <el-col :span="9">
+          <el-col :span="8">
             <el-form-item prop="bankAccount">
               <el-input v-model="temp2.bankAccount" maxlength="125" placeholder="" class="addinputw" clearable
                         @keyup.native="temp2.bankAccount = oninput(temp2.bankAccount,2)"/>
             </el-form-item>
           </el-col>
-          <el-col :span="3">
+          <el-col :span="4">
             <span>账户名称</span>
           </el-col>
-          <el-col :span="9">
+          <el-col :span="8">
             <el-form-item prop="accountName">
               <el-input v-model="temp2.accountName" maxlength="125" placeholder="" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="3">
+          <el-col :span="4">
             <span>收款银行</span>
           </el-col>
-          <el-col :span="9">
+          <el-col :span="8">
             <el-form-item prop="dueBank">
               <el-input v-model="temp2.dueBank" maxlength="125" placeholder="" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
-          <el-col :span="3">
+          <el-col :span="4">
             <span>银行网点</span>
           </el-col>
-          <el-col :span="9">
+          <el-col :span="8">
             <el-form-item prop="bankingOutlets">
               <el-input v-model="temp2.bankingOutlets" maxlength="125" placeholder="" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="3">
+          <el-col :span="4">
             <span>开户行地址</span>
           </el-col>
-          <el-col :span="9">
+          <el-col :span="8">
             <el-form-item prop="bankAddress">
               <el-input v-model="temp2.bankAddress" maxlength="125" placeholder="" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
-          <el-col :span="3">
+          <el-col :span="4">
             <span>联行号</span>
           </el-col>
-          <el-col :span="9">
+          <el-col :span="8">
             <el-form-item prop="paymentLines">
               <el-input v-model="temp2.paymentLines" maxlength="125" placeholder="" class="addinputw" clearable
                         @keyup.native="temp2.paymentLines = oninput(temp2.paymentLines,2)"/>
@@ -380,28 +380,28 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="3">
+          <el-col :span="4">
             <span>Swiftcode(银行代码)</span>
           </el-col>
-          <el-col :span="9">
+          <el-col :span="8">
             <el-form-item prop="swiftCode">
               <el-input v-model="temp2.swiftCode" maxlength="125" placeholder="" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
-          <el-col :span="3">
+          <el-col :span="4">
             <span>币种</span>
           </el-col>
-          <el-col :span="9">
+          <el-col :span="8">
             <el-form-item prop="currency">
               <el-input v-model="temp2.currency" maxlength="125" placeholder="" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="3">
+          <el-col :span="4">
             <span>描述</span>
           </el-col>
-          <el-col :span="9">
+          <el-col :span="8">
             <el-form-item>
               <el-input v-model="temp2.remarks" maxlength="125" placeholder="" class="addinputw" clearable/>
             </el-form-item>
@@ -1261,13 +1261,21 @@ export default {
   width: 27%;
   padding-right: 10px;
 }
-
+.addinputw01{
+  width: 92% !important;
+}
 /deep/ .el-col-3 {
   text-align: right;
   float: left;
-  font-size: 14px;
   color: #606266;
-  line-height: 40px !important;
+  line-height: 42px !important;
+  font-weight: 600;
+}
+/deep/ .el-col-4 {
+  text-align: right;
+  float: left;
+  color: #606266;
+  line-height: 42px !important;
   font-weight: 600;
 }
 </style>

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 type="info" size="small" @click="handleReturn()">返回</el-button>
-          >返回</el-button
-        >
       </div>
     </div>
     <div  class="listconadd">

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;
 }

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>

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>

anrui-base/anrui-base-ui/src/views/zhongjierenyuan/zhongjierenyuan.vue

@@ -373,7 +373,7 @@ export default {
 
 .tab-header {
   background-color: #edf1f7;
-  padding: 8px 20px;
+  padding: 9px 20px;
   margin-bottom: 0 !important;
 }
 </style>

anrui-scm/anrui-scm-ui/src/views/examinePage/chukushenhe/relation/userInfoLook.vue

@@ -169,9 +169,6 @@
     font-weight: 600;
     border-left: 1px solid #e0e3eb;
   }
-  .formadd {
-  padding: 20px 0;
-}
 .formadd .tit {
   font-size: 32px;
   text-align: center;