Merge branch 'mergeBranch' of http://124.70.211.186:3000/zhangqi/yos_web into mergeBranch

src/views/clueData/index.vue

@@ -7,7 +7,7 @@
       </template>
       <template #content>
         <div style="overflow: auto;height: calc(100vh - 150px)" ref="rollRef">
-          <div style="margin: 10px 24px 10px 24px;" >
+          <div style="margin: 10px 24px 20px 24px;" >
             <div class="inline-16">
               <label  class="search__label" >部门:</label>
 <!--              <el-cascader ref="selectdep" size="small" v-model="departmentid" :options="deplist" :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  @change="selectDep"  clearable></el-cascader>-->

src/views/salesData/components/accountBalanceDetail.vue

@@ -1,5 +1,5 @@
 <template>
-  <div style=" display: inline-block !important;">
+  <div>
     <el-button type="primary" size="small" @click="showVisible">账户余额明细<i class="el-icon-arrow-right el-icon--right"></i></el-button>
     <el-drawer
         title="客户账户余额明细"

src/views/salesData/components/departmentSalesperson.vue

@@ -3,7 +3,7 @@
     <span class="search__label inline-16">部门:</span>
     <el-cascader  class="inline-16" ref="selectdep" size="small" v-model="depment" :options="deplist" :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  @change="selectDep" ></el-cascader>
     <span class="search__label inline-16">业务员:</span>
-    <el-select  v-model="person" filterable placeholder="请选择" size="small"  @change="selectPerson" >
+    <el-select  v-model="person" filterable placeholder="请选择" size="small" class="inline-16"  @change="selectPerson" >
       <el-option
           v-for="item in personnelList"
           :popper-append-to-body="false"

src/views/salesData/index.vue

@@ -121,9 +121,9 @@ export default {
       /*账户余额分析*/
       this.$refs.customerAccountBalanceAnalysis.listData(dataid)
       /*this.$refs.customerAccountBalanceAnalysis.$refs.departmentSalesperson.depment = dataid*/
-      this.$refs.customerAccountBalanceAnalysis.$refs.departmentSalesperson.person = dataid
-      this.$refs.customerAccountBalanceAnalysis.$refs.departmentSalesperson.deplist = this.deplist
-      this.$refs.customerAccountBalanceAnalysis.$refs.departmentSalesperson.personnelList = this.personnelList
+      this.$refs.customerAccountBalanceAnalysis.person = dataid
+      this.$refs.customerAccountBalanceAnalysis.deplist = this.deplist
+      this.$refs.customerAccountBalanceAnalysis.personnelList = this.personnelList
       /*客户销售*/
       this.$refs.customer.param.content.dataid = dataid
       this.$refs.salesperson.param.content.dataid = dataid
@@ -193,10 +193,10 @@ export default {
       /*账户余额分析*/
       this.$refs.customerAccountBalanceAnalysis.param.content.type = type
       this.$refs.customerAccountBalanceAnalysis.queryModel(dataid)
-      this.$refs.customerAccountBalanceAnalysis.$refs.departmentSalesperson.depment = type == '1'?dataid:''
-      this.$refs.customerAccountBalanceAnalysis.$refs.departmentSalesperson.person = type == '0'?dataid:''
-      this.$refs.customerAccountBalanceAnalysis.$refs.departmentSalesperson.deplist = this.deplist
-      this.$refs.customerAccountBalanceAnalysis.$refs.departmentSalesperson.personnelList = this.personnelList
+      this.$refs.customerAccountBalanceAnalysis.depment = type == '1'?dataid:''
+      this.$refs.customerAccountBalanceAnalysis.person = type == '0'?dataid:''
+      this.$refs.customerAccountBalanceAnalysis.deplist = this.deplist
+      this.$refs.customerAccountBalanceAnalysis.personnelList = this.personnelList
       /*客户销售*/
       this.$refs.customer.param.content.dataid = dataid
       this.$refs.customer.param.content.type = type

src/views/salesData/modules/customerAccountBalanceAnalysis.vue

@@ -7,35 +7,57 @@
         <boxLine :title="item.accountname" :data="item.balance" :content="'统计到当前查询时间为止的客户'+item.accountname+'总余额'" ></boxLine>
       </div>
     </div>
-    <div style="height: 451px;margin-top: 10px">
-      <div style="height: 32px">
-        <div style="float: left">近12月客户账户余额分析</div>
-        <div style="float: right">
-          <departmentSalesperson ref="departmentSalesperson" class="inline-16" @depSelect="depSelect" @personSelect="personSelect"></departmentSalesperson>
-          <span class="search__label inline-16">账户类型:</span>
-          <el-select v-model="param.content.accountno" placeholder="请选择账户类型" size="small" class="inline-16">
-            <el-option
-                v-for="item in accountList"
-                :key="item.rowindex"
-                :label="item.accountname"
-                :value="item.accountno">
-            </el-option>
-          </el-select>
-          <span class="search__label inline-16">分析日期:</span>
-          <el-date-picker
-              v-model="endDate"
-              style="margin-right: 10px !important;"
-              type="date"
-              :clearable="false"
-              @change="changeDate"
-              format="yyyy-MM-dd"
-              value-format="yyyy-MM-dd"
-              size="small"
-              range-separator="至"
-              start-placeholder="开始月份"
-              end-placeholder="结束月份">
-          </el-date-picker>
-          <accountBalanceDetail ref="accountBalanceDetail" :type="param.content.type" :dataid="param.content.dataid" :enddate="param.content.enddate" :accountno="param.content.accountno"></accountBalanceDetail>
+    <div :style="{height: windowWidth > 1789?'451px':'491px',margin:'10px 0 0 0'}">
+      <div style="display: flex;justify-content: space-between;align-items: center;margin-bottom: 10px;">
+        <div class="mt-10" style="min-width: 220px;">近12月客户账户余额分析</div>
+        <div style="display: flex;flex-wrap: wrap;align-items: center;">
+          <div class="inline-16 mt-10">
+            <label class="search__label">部门:</label>
+            <el-cascader  ref="selectdep" size="small" v-model="depment" :options="deplist" :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  @change="depSelect" ></el-cascader>
+          </div>
+          <div class="inline-16 mt-10">
+            <label class="search__label">业务员:</label>
+            <el-select  v-model="person" filterable placeholder="请选择" size="small"  @change="personSelect" >
+              <el-option
+                  v-for="item in personnelList"
+                  :popper-append-to-body="false"
+                  :key="item.index"
+                  :label="item.name"
+                  :value="item.userid">
+              </el-option>
+            </el-select>
+          </div>
+          <div class="inline-16 mt-10">
+            <label class="search__label" >账户类型:</label>
+            <el-select v-model="param.content.accountno" placeholder="请选择账户类型" size="small"  @change="accountSelect">
+              <el-option
+                  v-for="item in accountList"
+                  :key="item.rowindex"
+                  :label="item.accountname"
+                  :value="item.accountno">
+              </el-option>
+            </el-select>
+          </div>
+          <div class="inline-16 mt-10">
+            <label class="search__label ">分析日期:</label>
+            <el-date-picker
+                v-model="endDate"
+                style=" margin: 0 10px 0 0"
+                type="date"
+                :clearable="false"
+                @change="changeDate"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+                size="small"
+                range-separator="至"
+                start-placeholder="开始月份"
+                end-placeholder="结束月份">
+            </el-date-picker>
+          </div>
+          <div class="mt-10">
+            <accountBalanceDetail  ref="accountBalanceDetail" :type="param.content.type" :dataid="param.content.dataid" :enddate="param.content.enddate" :accountno="param.content.accountno"></accountBalanceDetail>
+          </div>
+
         </div>
       </div>
       <div style="height: 400px;position: relative;">
@@ -99,11 +121,15 @@ export default {
               }
         },
         "id":20221008134803
-      }
+      },
+      depment:'',
+      deplist:[],
+      person:'',
+      personnelList:[]
       /*windowWidth: document.documentElement.clientWidth,  //实时屏幕宽度*/
     }
   },
- /* watch: {
+/*  watch: {
     windowWidth (val) {
       console.log("实时屏幕宽度：",val );
     }
@@ -182,14 +208,18 @@ export default {
     },
     /*选择部门*/
     depSelect(val){
+      this.person = ''
+      this.depment = val
       this.param.content.type = 1
-      this.param.content.dataid = val
-      this.queryModel(val)
+      this.param.content.dataid = val[val.length -1]
+      this.queryModel(val[val.length -1])
     },
     /*选择业务员*/
     personSelect(val){
+      this.depment = ''
+      this.person = val
       this.param.content.type = 0
-      this.param.content.dataid = val
+      this.param.content.dataid = this.person
       this.queryModel(val)
     },
     /*账户类型*/
@@ -197,6 +227,9 @@ export default {
       const res = await this.$api.requested(this.accountParam)
       this.accountList = res.data
       this.param.content.accountno = res.data[0].accountno
+    },
+    accountSelect(){
+      this.queryModel(this.param.content.dataid)
     }
   },
   mounted() {