Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

src/HDrpManagement/publicCustomer/index.vue

@@ -14,7 +14,7 @@
       <template #titleRight>
       </template>
       <template #custom>
-      <div>
+      <div class="mt-10">
         <label class="search__label">公海池:</label>
         <el-select class="inline-16" v-model="selectParam.sa_customerpoolid" size="small" placeholder="请选择公海池" @change="selectChange" clearable>
           <el-option
@@ -25,7 +25,7 @@
           </el-option>
         </el-select>
       </div>
-      <div>
+      <div  class="mt-10">
         <label class="search__label">客户类型:</label>
         <el-select class="inline-16" v-model="selectParam.type" size="small" placeholder="请选择" @change="selectChange" clearable>
           <el-option
@@ -36,7 +36,7 @@
           </el-option>
         </el-select>
       </div>
-      <div>
+      <div  class="mt-10">
         <label class="search__label">客户等级:</label>
         <el-select class="inline-16" v-model="selectParam.customergrade" size="small" placeholder="请选择" @change="selectChange" clearable>
           <el-option
@@ -47,7 +47,7 @@
           </el-option>
         </el-select>
       </div>
-      <div>
+      <div  class="mt-10">
         <label class="search__label">客户行业:</label>
         <el-select class="inline-16" v-model="selectParam.industry" size="small" placeholder="请选择" @change="selectChange" clearable>
           <el-option
@@ -58,7 +58,7 @@
           </el-option>
         </el-select>
       </div>
-      <div>
+      <div  class="mt-10">
         <label class="search__label">客户状态:</label>
         <el-select class="inline-16" v-model="selectParam.status" size="small" placeholder="请选择" @change="selectChange" clearable>
           <el-option
@@ -69,7 +69,7 @@
           </el-option>
         </el-select>
       </div>
-      <div>
+      <div  class="mt-10">
         <label class="search__label">创建时间:</label>
         <el-date-picker
             style="margin-right: 24px !important;"

src/HManagement/marketing2/saler/area/detail/index.vue

@@ -14,32 +14,13 @@
         @pageChange="pageChange"
         @onEditSuccess="queryMainData($route.query.id)">
       <div slot="tags">
-        <!-- 使用此插槽可不传[tags] -->
-        <!-- :tabs="['经销商团队','代理区域','营销类别','账户余额']" -->
-        <!--        <tagPanl slot="tags" :data="tags" :id="mainData.sa_customersid" @onSuccess="queryMainData"/>-->
       </div>
       <div slot="customOperation" >
-        <!-- 此区域提供了自定义操作按钮 -->
-        <!--      <transaction_status class="inline-16" v-if="tool.checkAuth($route.name,'transaction')" :id="mainData.sa_customersid" @onshow="onSuccess" @shareSuccess="onSuccess"></transaction_status>-->
-        <!--<lock class="inline-16" v-if="tool.checkAuth($route.name,'lock')"   :id="mainData.sa_customersid" @onshow="onSuccess"></lock>-->
-        <!--<unlock class="inline-16" v-if="tool.checkAuth($route.name,'unlock')" :id="mainData.sa_customersid" @onshow="onSuccess"></unlock> -->
-        <!--      <share class="inline-16" v-if="tool.checkAuth($route.name,'share') && mainData.poolname === ''" :id="mainData.sa_customersid" @onshow="onSuccess" @shareSuccess="onSuccess"></share>
-              <send_back style="display:inline" v-if="tool.checkAuth($route.name,'back') "  :data="mainData" @onshow="onSuccess" @backSuccess="onSuccess"></send_back>
-              <to_void class="inline-16" v-if="tool.checkAuth($route.name,'toVoid')" :id="mainData.sa_customersid" @onshow="onSuccess" @toVoidSuccess="onSuccess"></to_void>
-              <recovery class="inline-16" v-if="tool.checkAuth($route.name,'recovery') "  :data="mainData" @onshow="onSuccess" @backSuccess="onSuccess"></recovery>-->
+        
       </div>
       <div slot="slot0" >
         <detailed ref="detailed"></detailed>
       </div>
-      <!--    <div slot="slot0" >
-            <detailed ref="detailed"></detailed>
-          </div>
-          <div slot="slot1" class="container normal-panel"  >
-            <contacts :data="mainData"  @onSuccess="onSuccess" v-if="flag"></contacts>
-          </div>
-          <div slot="slot2" class="container normal-panel">
-            <address_manage :data="mainData"  v-if="flag"></address_manage>
-          </div>-->
     </basicDetails>
   </div>
 </template>
@@ -64,14 +45,12 @@ export default {
         }
       })
       this.mainData = res.data
-      console.log("输出获取的数据")
-      console.log(this.mainData)
+      this.$refs['details'].param.content.sa_saleareaid = this.mainData.sa_saleareaid
       this.changeDataStructure()
       this.$refs.detailed.detailedList(this.mainData)
     },
     // 监听切换数据,上一页,下一页
     pageChange (id,rowindex) {
-      this.$refs[details].param.content.sa_saleareaid = id
       this.$router.replace({path:'/saler_detail',query:{id:id,rowindex:rowindex}})
       this.queryMainData(id)
     },

src/SDrpManagement/salerPrivatecustomer/index.vue

@@ -43,7 +43,7 @@
         </el-select>
       </template> -->
       <template #custom>
-        <div>
+        <div class="mt-10">
           <label class="search__label">范围:</label>
           <el-select class="inline-16" v-model="value" size="small" placeholder="请选择数据分类" @change="selectChange" clearable>
             <el-option
@@ -54,7 +54,7 @@
             </el-option>
           </el-select>
         </div>
-        <div>
+        <div  class="mt-10">
           <label class="search__label">客户类型:</label>
           <el-select class="inline-16" v-model="selectParam.type" size="small" placeholder="请选择" @change="selectChange" clearable>
             <el-option
@@ -65,7 +65,7 @@
             </el-option>
           </el-select>
         </div>
-        <div>
+        <div  class="mt-10">
           <label class="search__label">客户等级:</label>
           <el-select v-model="selectParam.customergrade" size="small" placeholder="请选择" @change="selectChange" clearable>
             <el-option
@@ -76,7 +76,7 @@
             </el-option>
           </el-select>
         </div>
-        <div>
+        <div  class="mt-10">
           <label class="search__label">所属行业:</label>
           <el-select v-model="selectParam.industry" size="small" placeholder="请选择" @change="selectChange" clearable>
             <el-option
@@ -87,7 +87,7 @@
             </el-option>
           </el-select>
         </div>
-        <div>
+        <div  class="mt-10">
             <label class="search__label">合作状态:</label>
           <el-select v-model="selectParam.status" size="small" placeholder="请选择" @change="selectChange" clearable>
             <el-option
@@ -98,7 +98,7 @@
             </el-option>
           </el-select>
         </div>
-        <div>
+        <div  class="mt-10">
           <label class="search__label" >创建时间:</label>
           <el-date-picker
               style="margin-right: 24px !important;"

src/components/normal-basic-layout/details/index.vue

@@ -93,6 +93,7 @@ export default {
       this.total = res.total
       this.$emit('pageChange',res.data[0][this.idname],res.data[0].rowindex)
       this.$refs['tag'].queryTag()
+      
     },
     next () {
       this.rowindex += 1

src/components/normal-basic-layout/index.vue

@@ -28,9 +28,9 @@
             <i class="el-icon-refresh" @click="listData(param.content.pageNumber = 1,param.content.where.condition = '')"></i>
           </div>
         </div>
-        <div class="flex-align-center" style="min-width:800px">
+        <div class="flex-align-stretch" style="min-width:800px">
           <slot name="custom"></slot>
-          <el-input style="width:200px;" placeholder="请输入搜索内容" suffix-icon="el-icon-search" @input="searchChange" v-model="param.content.where.condition" @keyup.native.enter="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" size="small" class="input-with-select inline-16" clearable>
+          <el-input style="width:200px;" placeholder="请输入搜索内容" suffix-icon="el-icon-search" @input="searchChange" v-model="param.content.where.condition" @keyup.native.enter="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
           </el-input>
         </div>
       </div>
@@ -249,6 +249,9 @@ export default {
   border: 1px solid #dcdfe6 !important;
   cursor: pointer;
 }
+.layout_search__panel .el-input__suffix{
+  margin-top:-4px
+}
 </style>
 <style scoped>
 

src/style/style.css

@@ -216,3 +216,6 @@ ul{
   display: flex;
   align-items: center;
 }
+.mt-10{
+  margin-bottom: 10px;
+}