Merge branch 'blueBranch' into mergeBranch

src/HDrpManagement/recvoucher/index.vue

@@ -11,34 +11,42 @@
           path:'/recvoucherDetails'
         }"
         @listCreate="list">
-      <div slot="custom" style="display:flex">
-        <label class="search__label " style="margin: auto;width: 70px;">账户类型:</label>
-        <el-select style="margin-right: 24px !important;" class="inline-16" @change="selectChange" v-model="selectParam.accountname" placeholder="请选择账户类型" size="small" clearable>
-          <el-option v-for="(item,index) in accountNameList" :key="index" :value="item.accountname" :label="item.accountname"></el-option>
-        </el-select>
-        <label class="search__label " style="margin: auto;width: 35px;">状态:</label>
-        <el-select style="margin-right: 24px !important;" class="inline-16" @change="selectChange" v-model="selectParam.status" placeholder="请选择状态" size="small" clearable>
-          <el-option v-for="(item,index) in statusData" :key="index" :value="item.value" :label="item.value"></el-option>
-        </el-select>
-        <label class="search__label " style="margin: auto;width: 70px;">核销状态:</label>
-        <el-select style="margin-right: 24px !important;" class="inline-16" @change="selectChange" v-model="selectParam.iswriteoffamount " placeholder="请选择核销状态" size="small" clearable>
-          <el-option value="已核销" label="已核销"></el-option>
-          <el-option value="未核销" label="未核销"></el-option>
-        </el-select>
-        <label class="search__label" style="margin: auto;width: 65px;">单据日期:</label>
-        <el-date-picker
-            style="margin-right: 24px !important;"
-            size="small"
-            @change="selectChange"
-            value-format="yyyy-MM-dd"
-            v-model="dateSelect"
-            type="daterange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            clearable>
-        </el-date-picker>
-      </div>
+      <template #custom>
+        <div class="mt-10">
+          <label class="search__label " >账户类型:</label>
+          <el-select  class="inline-16" @change="selectChange" v-model="selectParam.accountname" placeholder="请选择账户类型" size="small" clearable>
+            <el-option v-for="(item,index) in accountNameList" :key="index" :value="item.accountname" :label="item.accountname"></el-option>
+          </el-select>
+        </div>
+        <div class="mt-10">
+          <label class="search__label " >状态:</label>
+          <el-select  class="inline-16" @change="selectChange" v-model="selectParam.status" placeholder="请选择状态" size="small" clearable>
+            <el-option v-for="(item,index) in statusData" :key="index" :value="item.value" :label="item.value"></el-option>
+          </el-select>
+        </div>
+        <div class="mt-10">
+          <label class="search__label " >核销状态:</label>
+          <el-select  class="inline-16" @change="selectChange" v-model="selectParam.iswriteoffamount " placeholder="请选择核销状态" size="small" clearable>
+            <el-option value="已核销" label="已核销"></el-option>
+            <el-option value="未核销" label="未核销"></el-option>
+          </el-select>
+        </div>
+        <div class="mt-10">
+          <label class="search__label" >单据日期:</label>
+          <el-date-picker
+              style="margin-right: 24px !important;"
+              size="small"
+              @change="selectChange"
+              value-format="yyyy-MM-dd"
+              v-model="dateSelect"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              clearable>
+          </el-date-picker>
+        </div>
+      </template>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'amount'">
           <span :style="+scope.data.column.data.amount >= 0 ? 'color:green' : 'color:red'">{{ tool.formatAmount(scope.data.column.data.amount,2) }}</span>
@@ -132,4 +140,4 @@ export default {
 </script>
 
 <style scoped>
-</style>
+</style>

src/HManagement/marketing/saler/modules/saler_detail.vue

@@ -115,4 +115,4 @@ export default {
 
 </script>
 <style>
-</style>
+</style>

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

@@ -127,7 +127,7 @@ export default {
         },
         {
           label:'手机号',
-          value:this.mainData.phonenumber
+          value:this.mainData.userphonenumber
         },
         {
           label:'邮箱',

src/HManagement/marketing2/saler/area/detail/modules/detailedData.vue

@@ -7,7 +7,7 @@
         <el-descriptions-item label="业务员">{{ detailData.name?detailData.name:"--" }}</el-descriptions-item>
         <el-descriptions-item label="登录账号">{{ detailData.accountno?detailData.accountno:"--"}}</el-descriptions-item>
         <el-descriptions-item label="部门">{{ detailData.depname?detailData.depname:"--"}}</el-descriptions-item>
-        <el-descriptions-item label="手机号">{{ detailData.phonenumber?detailData.phonenumber:"--" }}</el-descriptions-item>
+        <el-descriptions-item label="手机号">{{ detailData.userphonenumber?detailData.userphonenumber:"--" }}</el-descriptions-item>
         <el-descriptions-item label="邮箱">{{ detailData.email?detailData.email:"--" }}</el-descriptions-item>
         <el-descriptions-item label="负责区域">{{ detailData.areaname?detailData.areaname:"--" }}</el-descriptions-item>
         <el-descriptions-item label="汇报对象">{{ detailData.reporthrname?detailData.reporthrname:"--" }}</el-descriptions-item>