Merge branch 'xiaoqin' into trycode1

src/HDrpManagement/projectData/index.vue

@@ -287,16 +287,26 @@
                 <div class="panel-table">
                   <div class="mt-10 inline-16" style="margin-top:10px;display:flex !important;justify-content:space-between">
                     <span style="font-size:16px;color:#333333">{{ scoreStatus ? scoreStatus : '全部' }}</span>
-                    <div>
-                      <label  class="search__label" >评估分档位:</label>
-                      <el-select v-model="scoreTableParam1.content.where.taskType" filterable placeholder="请选择" size="small"
-                      @change="$refs.scoreTable.listData()"
-                      >
-                        <el-option label="全部" value="" />
-                        <el-option label="高分档" value="高分档" />
-                        <el-option label="中分档" value="中分档" />
-                        <el-option label="低分档" value="低分档" />
-                      </el-select>
+                    <div style="display:flex;align-items:center">
+                      <div>
+                        <label  class="search__label" >评估分档位:</label>
+                        <el-select v-model="scoreTableParam1.content.where.taskType" filterable placeholder="请选择" size="small"
+                        @change="$refs.scoreTable.listData()"
+                        >
+                          <el-option label="全部" value="" />
+                          <el-option label="高分档" value="高分档" />
+                          <el-option label="中分档" value="中分档" />
+                          <el-option label="低分档" value="低分档" />
+                        </el-select>
+                      </div>
+                      <el-tooltip class="item" effect="dark" placement="top">
+                        <template #content>
+                            <div>高分档: 200分以上</div>
+                            <div>中分档:100-200分</div>
+                            <div>低分档:100分以下</div>
+                        </template>
+                        <img style="vertical-align: middle;margin-left:10px" src="@/assets/icons/prompt_icon.svg" alt="">
+                      </el-tooltip>
                     </div>
                   </div>
                   <pageTable
@@ -920,7 +930,12 @@
             <!--项目生命周期分析-->
             <div style="margin-top:40px">
               <div class="panel-header">
-                <div class="title">项目生命周期分析</div>
+                <div class="title">
+                  项目生命周期分析
+                  <el-tooltip class="item" effect="dark" content="统计项目生命周期中的会个关键节点之间平均周期" placement="top">
+                    <img style="vertical-align: middle" src="@/assets/icons/prompt_icon.svg" alt="">
+                  </el-tooltip>
+                </div>
               </div>
               <div class="progress" v-if="dateList.length">
                   <div class="progress-item" :style="[{'--bg':colorArr[index]},{'--width':item.avg}]" v-for="(item,index) in dateList" :key="index">
@@ -1003,7 +1018,7 @@
                 <selectProject :projectType="projectType" :projectLead="projectLead" :tradefieldSelect="tradefieldSelect"  @selectRow="selectRow" ref="selectProject">
                   <div slot="input" style="display:flex;align-items:center">
                     <el-input v-model="projectname" style="width:300px" size="small" placeholder="请选择项目" @focus="$refs.selectProject.visible=true"></el-input>
-                    <el-button style="margin-left:10px" @click="projectname='';dateParam.content.where.sa_projectid='';getDate()" size="mini" type="text" v-if="dateParam.content.where.sa_projectid">清空</el-button>
+                    <el-button style="margin-left:10px" @click="clearSelect" size="mini" type="text" v-if="dateParam.content.where.sa_projectid">清空</el-button>
                   </div>
                 </selectProject>
               </div>
@@ -2100,18 +2115,22 @@ export default {
 
         this.addParam.content.dataid = id
         this.addParam.content.type = 1
+        this.addParam.content.username = ''
         this.addFun()
 
         this.baobeiParam.content.dataid = id
         this.baobeiParam.content.type = 1
+        this.baobeiParam.content.username = ''
         this.baojiaFun()
 
         this.fllowParam.content.dataid = id
         this.fllowParam.content.type = 1
+        this.fllowParam.content.username = ''
         this.fllowFun()
 
         this.baojiaParam.content.dataid = id
         this.baojiaParam.content.type = 1
+        this.baojiaParam.content.username = ''
         this.baojiaFun()
 
         this.fllowMapParam.content.dataid = id
@@ -2185,18 +2204,22 @@ export default {
 
         this.addParam.content.dataid = ''
         this.addParam.content.type = ''
+        this.addParam.content.username = name
         this.addFun()
 
         this.baobeiParam.content.dataid = ''
         this.baobeiParam.content.type = ''
+        this.baobeiParam.content.username = name
         this.baojiaFun()
 
         this.fllowParam.content.dataid = ''
         this.fllowParam.content.type = ''
+        this.fllowParam.content.username = name
         this.fllowFun()
 
         this.baojiaParam.content.dataid = ''
         this.baojiaParam.content.type = ''
+        this.baojiaParam.content.username = name
         this.baojiaFun()
 
         this.fllowMapParam.content.dataid = ''
@@ -2246,6 +2269,17 @@ export default {
     selectRow (data) {
       this.projectname = data.projectname
       this.dateParam.content.where.sa_projectid = data.sa_projectid
+      this.dateParam.content.type = ''
+      this.dateParam.content.dataid = ''
+      this.dateParam.content.where.projecttype = ''
+      this.dateParam.content.where.grade = ''
+      this.dateParam.content.where.tradefield = ''
+      this.getDate()
+    },
+    clearSelect () {
+      this.projectname=''
+      this.dateParam.content.where.sa_projectid=''
+      this.dateParam.content.where.projecttype = this.projectType.length ? this.projectType[0].value : ''
       this.getDate()
     },
     handleUnfllowParam (param) {

src/views/clueData/index.vue

@@ -2,7 +2,7 @@
   <div>
     <normalLayout>
       <template #refresh>
-        <el-button size="mini" type="text" style="margin-right: 15px;color: #999999" @click="toTop">返回顶部</el-button>
+        <el-button size="mini" type="text" style="margin-right: 15px;color: #999999;font-size: 14px" @click="toTop">返回顶部</el-button>
 <!--        <i class="el-icon-refresh-right"></i>-->
       </template>
       <template #content>

src/views/salesData/components/accountBalanceDetail.vue

@@ -60,7 +60,7 @@
           </div>
         </div>
 
-        <tableTemplate ref="table" :layout="tablecols" :data="list" :opwidth="200" :custom="true" :height="height">
+        <tableTemplate ref="table" :layout="tablecols" :data="list" :opwidth="200" :custom="true" :height="height" fixedName="operation">
           <template v-slot:customcol="scope">
             <p v-if="scope.column.columnname === 'operation'">
             </p>
@@ -231,10 +231,25 @@ export default {
       this.param.content.dataid = dataid
       this.param.content.enddate = endDate
       const res = await this.$api.requested(this.param)
-      this.list = res.data
-      this.counts = res.data[0].counts
-      this.total = res.total
-      this.currentPage = res.data.pageNUmber
+      if (res.data.length === 1){
+        if (res.data[0].isEmpty == 1){
+          this.list = []
+          this.counts = []
+          this.total = 0
+          this.currentPage = 0
+        }else {
+          this.list = res.data
+          this.counts = res.data[0].counts
+          this.total = res.total
+          this.currentPage = res.pageNUmber
+        }
+      }else {
+        this.list = res.data
+        this.counts = res.data[0].counts
+        this.total = res.total
+        this.currentPage = res.pageNUmber
+      }
+
     },
     /*获取账号类型*/
     async getAccountType () {

src/views/salesData/components/allSalesTemplate.vue

@@ -208,6 +208,13 @@ export default {
       this.title = '订单'
       this.param.content.pageNumber = 1
       this.param.content.pageSize = 50
+      if (this.param.content.type == 0){
+        this.person = this.param.content.dataid
+        this.depment = ''
+      }else {
+        this.depment = this.param.content.dataid
+        this.person = ''
+      }
       this.queryOptions()
       this.departmentrtment()
     },
@@ -226,7 +233,8 @@ export default {
       const res = await this.$api.requested(this.depmentParam)
       this.deplist = this.createMenu(res.data.dep)
       this.personnelList = res.data.hr
-      if (this.dataid){
+      this.listData()
+      /*if (this.dataid){
         this.depment = this.dataid
         this.param.content.dataid = this.dataid
         this.param.content.type = 1
@@ -238,8 +246,7 @@ export default {
         this.param.content.dataid = userid
         this.param.content.type = 0
         this.listData()
-      }
-
+      }*/
     },
     createMenu (array) {
       var that = this

src/views/salesData/index.vue

@@ -2,7 +2,7 @@
   <div>
     <normalLayout>
       <template #refresh>
-        <el-button size="mini" type="text" style="margin-right: 15px;color: #999999;" @click="toTop">返回顶部</el-button>
+        <el-button size="mini" type="text" style="margin-right: 15px;color: #999999;font-size: 14px" @click="toTop">返回顶部</el-button>
 <!--        <i class="el-icon-refresh-right"></i>-->
       </template>
       <template #content>
@@ -125,6 +125,8 @@ export default {
       this.$refs.customerAccountBalanceAnalysis.$refs.departmentSalesperson.deplist = this.deplist
       this.$refs.customerAccountBalanceAnalysis.$refs.departmentSalesperson.personnelList = this.personnelList
       /*客户销售*/
+      this.$refs.customer.param.content.dataid = dataid
+      this.$refs.salesperson.param.content.dataid = dataid
       this.$refs.customer.listData(dataid)
       this.activeName = '客户销售'
       /*报价分析*/
@@ -196,9 +198,15 @@ export default {
       this.$refs.customerAccountBalanceAnalysis.$refs.departmentSalesperson.deplist = this.deplist
       this.$refs.customerAccountBalanceAnalysis.$refs.departmentSalesperson.personnelList = this.personnelList
       /*客户销售*/
+      this.$refs.customer.param.content.dataid = dataid
       this.$refs.customer.param.content.type = type
+      this.$refs.customer.param.content.pageNumber = 1
+      this.$refs.customer.param.content.pageSize = 10
       this.$refs.customer.listData(dataid)
+      this.$refs.salesperson.param.content.dataid = dataid
       this.$refs.salesperson.param.content.type = type
+      this.$refs.salesperson.param.content.pageNumber = 1
+      this.$refs.salesperson.param.content.pageSize = 10
       this.$refs.salesperson.listData(dataid)
       /*报价分析*/
       this.$refs.quotationAnalysis.param.content.type = type
@@ -330,9 +338,9 @@ export default {
     handleClick(tab, event) {
       console.log(this.activeName);
       if (this.activeName === '客户销售'){
-        this.$refs.customer.listData()
+        this.$refs.customer.listData(this.$refs.customer.param.content.dataid)
       }else {
-        this.$refs.salesperson.listData()
+        this.$refs.salesperson.listData(this.$refs.salesperson.param.content.dataid)
       }
 
     },

src/views/salesData/modules/financialCollectionAnalysis.vue

@@ -12,7 +12,7 @@
     </div>
     <div style="font-size: 16px">{{tableParam.content.unwriteoffamounttype?tableParam.content.unwriteoffamounttype:''}}</div>
     <div :style="{height:list.length < 5 ? '366px':'985px'}">
-      <tableTemplate style="margin-top: 10px" ref="table" :layout="tablecols" :data="list" :opwidth="200" :custom="true" :height="list.length < 5 ? '242px':'862px'">
+      <tableTemplate style="margin-top: 10px" ref="table" :layout="tablecols" :data="list" :opwidth="200" :custom="true" :height="list.length < 5 ? '242px':'862px'" fixedName="operation">
         <template v-slot:customcol="scope">
           <p v-if="scope.column.columnname === 'total'">
             ¥{{tool.formatAmount(scope.column.data[scope.column.columnname],2)}}
@@ -164,12 +164,13 @@ export default {
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
-      this.param.content.pageSize = val
+
+      this.tableParam.content.pageSize = val
       this.tableData(this.param.content.dataid)
     },
     handleCurrentChange(val) {
       // console.log(`当前页: ${val}`);
-      this.param.content.pageNumber = val
+      this.tableParam.content.pageNumber = val
       this.tableData(this.param.content.dataid)
     },
   },

src/views/salesData/modules/orderType.vue

@@ -30,7 +30,7 @@
     <div class="chart">
       <div id="orderTypeChart" style="height: 300px;width: 30%;float: left;margin-right: 2%"></div>
       <div style="float: right;width: 68%">
-        <tableTemplate style="margin-top: 10px" ref="table" :layout="tablecols" :data="list" :opwidth="200" :custom="true" height="260px">
+        <tableTemplate style="margin-top: 10px" ref="table" :layout="tablecols" :data="list" :opwidth="200" :custom="true" height="260px" fixedName="operation">
           <template v-slot:customcol="scope">
             <p v-if="scope.column.columnname === 'operation'">
             </p>

src/views/salesData/modules/salespersonSales.vue

@@ -33,7 +33,7 @@ export default {
   },
   methods:{
     listData(val){
-      this.param.content.dataid = this.dataid || val
+      this.param.content.dataid = val  || this.dataid
       this.$refs.sales.listData()
     }
   },

src/views/salesData/modules/shippingUninvoiceAnalysis.vue

@@ -11,7 +11,7 @@
       <div id="shippingUninvoiceAnalysisChart" style="height: 300px;"></div>
     </div>
     <div :style="{height:list.length < 5 ? '295px':'904px'}">
-      <tableTemplate style="margin-top: 10px" ref="table" :layout="tablecols" :data="list" :opwidth="200" :custom="true" :height="list.length < 5 ? '242px':'862px'">
+      <tableTemplate style="margin-top: 10px" ref="table" :layout="tablecols" :data="list" :opwidth="200" :custom="true" :height="list.length < 5 ? '242px':'862px'" fixedName="operation">
         <template v-slot:customcol="scope">
           <p v-if="scope.column.columnname === 'total'">
                 <span v-if="scope.column.data[scope.column.columnname]">