Merge branch 'blueBranch' into allTestUrgent

src/HDrpManagement/customerData/index.vue

@@ -999,7 +999,7 @@
                   <div :style="{height:windowWidth>1521 || isFull?'calc(72% - 100px)':'calc(61% - 100px)'}">
                     <pageTable
                       ref="customerUnfllowTable"
-                      :tablecols="tool.tabelCol($route.name).typeTable1.tablecols.splice(0,tool.tabelCol($route.name).typeTable1.tablecols.length - 1)"
+                      :tablecols="tool.tabelCol($route.name).typeTable1.tablecols"
                       :param="unfllowTableParam"
                       :custom="true"
                       setName="customerUnfllow"
@@ -1009,9 +1009,6 @@
                         <div v-if="scope.data.columnname == 'sys_tag'">
                           <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index" style="margin-right: 5px">{{ $t(item) }}</el-tag>
                         </div>
-                        <div v-else-if="scope.data.columnname == 'operation'">
-<!--                          <el-button type="text" size="small" @click="goDetail(scope.data.data,'customerUnfllowTable',unfllowTableParam,'sa_customersid')">{{$t('详情')}}</el-button>-->
-                        </div>
                         <div v-else-if="scope.data.columnname === 'industry'">
                           <el-tag size="small" v-for="(item,index) in scope.data.data.industry" :key="index" style="margin-right: 5px">{{ $t(item) }}</el-tag>
                         </div>
@@ -1025,10 +1022,15 @@
                           <span style="color:#52c41a" v-else-if="scope.data.data[[scope.data.columnname]] == '合作中'">{{$t(scope.data.data[[scope.data.columnname]])}}</span>
                           <span style="color:#999999" v-else-if="scope.data.data[[scope.data.columnname]] == '已终止'">{{$t(scope.data.data[[scope.data.columnname]])}}</span>
                         </div>
+                        <div v-else-if="scope.data.columnname == 'operation'">
+                          <drawerTemp class="inline-16" v-if="detailPath" :data="scope.data.data" :detailPath="detailPath" :idName="idName"  :disabled="isFull"
+                                      :listqueryid="detailDataSet.gradTable.listqueryid" :total="detailDataSet.gradTable.total" :overview="false"></drawerTemp>
+                        </div>
                         <div v-else>
                           {{ $t(scope.data.data[scope.data.columnname]) }}
                         </div>
                       </template>
+
                     </pageTable>
                   </div>
                 </div>
@@ -1189,6 +1191,10 @@ export default {
         typeTable:{
           listqueryid:'',
           total:'',
+        },
+        unfllowTable:{
+          listqueryid:'',
+          total:'',
         }
       },
       dateType:'本年',

src/HDrpManagement/projectData/index.vue

@@ -1550,18 +1550,16 @@
                       style="height:calc(100% - 50px)"
                       v-if="projectType[0].value != ''"
                       ref="customerUnfllowTable"
-                      :tablecols="tool.tabelCol($route.name).projectTable1.tablecols.splice(0,tool.tabelCol($route.name).projectTable1.tablecols.length - 1)"
+                      :tablecols="tool.tabelCol($route.name).projectTable1.tablecols"
                       :param="unfllowTableParam"
                       :custom="true"
                       @handleParam="handleUnfllowParam"
+                      @detailSet="detailSet"
                     >
                       <template v-slot:custom="scope">
                         <div v-if="scope.data.columnname == 'sys_tag'">
                           <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index" style="margin-right: 5px">{{ $t(item) }}</el-tag>
                         </div>
-                        <div v-else-if="scope.data.columnname == 'operation'">
-                          <el-button type="text" size="small" @click="goDetail(scope.data.data,'customerUnfllowTable',unfllowTableParam,'sa_projectid')">{{$t('详情')}}</el-button>
-                        </div>
                         <div v-else-if="scope.data.columnname == 'signamount_due'">
                           {{ tool.formatAmount(scope.data.data.signamount_due,2,'￥') }}
                         </div>
@@ -1578,6 +1576,10 @@
                           <span style="color:#52c41a" v-else-if="scope.data.data[[scope.data.columnname]] == '跟进中'">{{$t(scope.data.data[[scope.data.columnname]])}}</span>
                           <span style="color:#999999" v-else-if="scope.data.data[[scope.data.columnname]] == '已失败' || scope.data.data[[scope.data.columnname]] == '已结案'">{{$t(scope.data.data[[scope.data.columnname]])}}</span>
                         </div>
+                        <div v-else-if="scope.data.columnname == 'operation'">
+                          <drawerTemp class="inline-16" v-if="detailPath" :data="scope.data.data" :detailPath="detailPath" :idName="idName"  :disabled="isFull"
+                                      :listqueryid="detailDataSet.unfllowTable.listqueryid" :total="detailDataSet.unfllowTable.total" :overview="false"></drawerTemp>
+                        </div>
                         <div v-else>
                           {{ $t(scope.data.data[scope.data.columnname]) }}
                         </div>
@@ -1834,6 +1836,7 @@ export default {
   },
   data () {
     return {
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid,
       detailPath:{
         path:'/projectProjectDetail'
       },
@@ -1862,6 +1865,10 @@ export default {
         scoreTable:{
           listqueryid:'',
           total:'',
+        },
+        unfllowTable:{
+          listqueryid:'',
+          total:'',
         }
       },
       dateType:'本年',
@@ -2087,7 +2094,8 @@ export default {
               "begdate":"",
               "enddate":"",
               "unfinish":'0',
-              "isleave":"1"
+              "isleave":"1",
+              "status":JSON.parse(sessionStorage.getItem('active_account')).siteid == 'HY' || JSON.parse(sessionStorage.getItem('active_account')).siteid == 'YOSTEST1' ?['跟进中']:[]
           }
         }
       },
@@ -2103,7 +2111,8 @@ export default {
               "begdate":"",
               "enddate":"",
               "unfinish":'0',
-              "isleave":"1"
+              "isleave":"1",
+              "status":JSON.parse(sessionStorage.getItem('active_account')).siteid == 'HY' || JSON.parse(sessionStorage.getItem('active_account')).siteid == 'YOSTEST1' ?['跟进中']:[]
           }
         }
       },
@@ -2125,7 +2134,8 @@ export default {
               "begdate":"",
               "enddate":"",
               "unfinish":'0',
-              "isleave":'1'
+              "isleave":'1',
+              "status":JSON.parse(sessionStorage.getItem('active_account')).siteid == 'HY' || JSON.parse(sessionStorage.getItem('active_account')).siteid == 'YOSTEST1' ?['跟进中']:[]
           }
         }
       },
@@ -2141,7 +2151,8 @@ export default {
               "begdate":"",
               "enddate":"",
               "unfinish":'0',
-              "isleave":'1'
+              "isleave":'1',
+              "status":JSON.parse(sessionStorage.getItem('active_account')).siteid == 'HY' || JSON.parse(sessionStorage.getItem('active_account')).siteid == 'YOSTEST1' ?['跟进中']:[]
           }
         }
       },
@@ -2163,7 +2174,8 @@ export default {
               "begdate":"",
               "enddate":"",
               "unfinish":'0',
-              "isleave":'1'
+              "isleave":'1',
+              "status":JSON.parse(sessionStorage.getItem('active_account')).siteid == 'HY' || JSON.parse(sessionStorage.getItem('active_account')).siteid == 'YOSTEST1' ?['跟进中']:[]
           }
         }
       },
@@ -2179,7 +2191,8 @@ export default {
               "begdate":"",
               "enddate":"",
               "unfinish":'0',
-              "isleave":'1'
+              "isleave":'1',
+              "status":JSON.parse(sessionStorage.getItem('active_account')).siteid == 'HY' || JSON.parse(sessionStorage.getItem('active_account')).siteid == 'YOSTEST1' ?['跟进中']:[]
           }
         }
       },
@@ -2236,7 +2249,8 @@ export default {
             "where": {
                 "projecttype":"",
                 "unfinish":'0',
-                "isleave":'1'
+                "isleave":'1',
+                "status":JSON.parse(sessionStorage.getItem('active_account')).siteid == 'HY' || JSON.parse(sessionStorage.getItem('active_account')).siteid == 'YOSTEST1' ?['跟进中']:[]
             }
         }
       },
@@ -2251,7 +2265,8 @@ export default {
               "projecttype":"",
               "dateType":"",
               "unfinish":'0',
-              "isleave":'1'
+              "isleave":'1',
+             "status":JSON.parse(sessionStorage.getItem('active_account')).siteid == 'HY' || JSON.parse(sessionStorage.getItem('active_account')).siteid == 'YOSTEST1' ?['跟进中']:[]
           }
         }
       },
@@ -2372,13 +2387,8 @@ export default {
       this.getdataAll()
     },
     detailSet(listqueryid,total,setName){
-      console.log('输出内容listqueryid')
-      console.log( this.detailDataSet[setName],'d*********')
-      console.log(listqueryid,'listqueryid')
-      console.log(setName,'setName')
       this.detailDataSet[setName].listqueryid = listqueryid
       this.detailDataSet[setName].total = total
-      console.log(this.detailDataSet,'detailDataSet')
     },
     goDetail (data,refData,paramData,fieldname) {
       sessionStorage.setItem('listqueryid',this.$refs[refData].listqueryid)
@@ -3374,31 +3384,37 @@ export default {
         this.baojiaParam.content.username = ''
         this.baojiaFun()
 
-        /*近12月项目跟进分析*/
+        /*项目跟进情况统计*/
         this.fllowMapParam.content.dataid = id
         this.fllowMapParam.content.type = 1
+        this.fllowMapParam.content.where.status = this.siteid == 'HY' || this.siteid == 'YOSTEST1' ? ['跟进中'] : []
         this.fllowInit()
         this.fllowTableParam.content.dataid = id
         this.fllowTableParam.content.type = 1
         this.fllowTableParam.content.username = ''
+        this.fllowTableParam.content.where.status = this.siteid == 'HY' || this.siteid == 'YOSTEST1' ? ['跟进中'] : []
         this.$refs.projectFllowTable.listData()
 
         /*项目联系人情况统计*/
         this.contactMapParam.content.dataid = id
         this.contactMapParam.content.type = 1
+        this.contactMapParam.content.where.status = this.siteid == 'HY' || this.siteid == 'YOSTEST1' ? ['跟进中'] : []
         this.contactInit()
         this.contactTableParam.content.dataid = id
         this.contactTableParam.content.type = 1
         this.contactTableParam.content.username = ''
+        this.contactTableParam.content.where.status = this.siteid == 'HY' || this.siteid == 'YOSTEST1' ? ['跟进中'] : []
         this.$refs.projectContactTable.listData()
 
         /*项目关联客户情况统计*/
         this.customerMapParam.content.dataid = id
         this.customerMapParam.content.type = 1
+        this.customerMapParam.content.where.status = this.siteid == 'HY' || this.siteid == 'YOSTEST1' ? ['跟进中'] : []
         this.customerInit()
         this.customerTableParam.content.dataid = id
         this.customerTableParam.content.type = 1
         this.customerTableParam.content.username = ''
+        this.customerTableParam.content.where.status = this.siteid == 'HY' || this.siteid == 'YOSTEST1' ? ['跟进中'] : []
         this.$refs.projectCustomerTable.listData()
 
         /*项目评估情况统计*/
@@ -3413,10 +3429,12 @@ export default {
         /*有效项目未跟进天数分析*/
         this.unfllowMapParam.content.dataid = id
         this.unfllowMapParam.content.type = 1
+        this.unfllowMapParam.content.where.status = this.siteid == 'HY' || this.siteid == 'YOSTEST1' ? ['跟进中'] : []
         this.customerUnfllowInit()
         this.unfllowTableParam.content.dataid = id
         this.unfllowTableParam.content.type = 1
         this.unfllowTableParam.content.username = ''
+        this.unfllowTableParam.content.where.status = this.siteid == 'HY' || this.siteid == 'YOSTEST1' ? ['跟进中'] : []
         this.$refs.customerUnfllowTable.listData()
 
         /*项目生命周期分析*/

src/SManagement/orderclue_detail/index.vue

@@ -593,8 +593,12 @@ export default {
     // 监听切换数据,上一页,下一页
     pageChange (id,rowindex,tabIndex) {
       this.flag = false
-      tabIndex = this.$route.query.tabIndex
-      this.$router.replace({path:'/orderclue_detail',query:{id:id,rowindex:rowindex,tabIndex:tabIndex}})
+      if (this.$route.query.listqueryid && this.$route.query.listqueryid !== 'undefined'){
+
+      }else {
+        tabIndex = this.$route.query.tabIndex
+        this.$router.replace({path:'/orderclue_detail',query:{id:id,rowindex:rowindex,tabIndex:tabIndex}})
+      }
       this.queryMainData(id)
     },
     onFollow(){

src/router/index.js

@@ -139,7 +139,18 @@ let routes = [
           title: '线索数据',
           ast_nav:true
         },
-        component: () => import(/* webpackChunkName: "about" */ '@/views/clueData/index')
+        component: () => import(/* webpackChunkName: "about" */ '@/views/clueData/index'),
+        children:[
+          {
+            path: '/clueDataClueDetail',
+            name: 'clueData',
+            meta: {
+              title: '线索数据线索详情',
+              ast_nav:false
+            },
+            component: () => import(/* webpackChunkName: "about" */ '@/SManagement/orderclue_detail/index')
+          },
+        ]
       }
       ]
   },

src/views/clueData/modules/clueUnFollow.vue

@@ -44,7 +44,7 @@
       </div>
       <div style="font-size: 16px;color: #333333;margin: 10px 0 10px 0">{{param.content.dateType?param.content.dateType:'全部'}}</div>
       <div :style="{height: heightTable}">
-        <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 === 'province'">
               {{scope.column.data.province !== '' && scope.column.data.city !== '' && scope.column.data.county !== ''?scope.column.data.province+scope.column.data.city+scope.column.data.county:'--'}}
@@ -60,7 +60,11 @@
             <p v-else-if="scope.column.columnname === 'unqty'">
               <span> {{scope.column.data[scope.column.columnname] == 0?0:scope.column.data[scope.column.columnname]?$t(scope.column.data[scope.column.columnname]):'--'}}</span>
             </p>
-            <p v-else>{{scope.column.data[scope.column.columnname]?$t(scope.column.data[scope.column.columnname]):'--'}}</p>
+            <p v-else>{{scope.column.data[scope.column.columnname] || scope.column.columnname === 'operation'?$t(scope.column.data[scope.column.columnname]):'--'}}</p>
+          </template>
+          <template v-slot:opreation="scope">
+            <drawerTemp class="inline-16" v-if="detailPath" :data="scope.data" :detailPath="detailPath" :idName="idName"  :disabled="isFull"
+                        :listqueryid="detailDataSet.clueUnFollowTable.listqueryid" :total="detailDataSet.clueUnFollowTable.total" :overview="false"></drawerTemp>
           </template>
         </tableTemplate>
         <div class="container normal-panel" style="text-align:right;float: right">
@@ -89,11 +93,22 @@ import exportFile from '@/components/export_file/index'
 import {Column} from "@antv/g2plot";
 export default {
   name: "clueUnFollow",
-  components:{departmentSalesperson,tableTemplate,fullScreen,exportFile},
+  components:{departmentSalesperson,tableTemplate,fullScreen,exportFile,
+    drawerTemp:() =>  import('@/components/normal-basic-layout/drawerDetail/index'),},
   props:['scrollHeight','windowWidth'],
   data(){
     return {
       chartColumn:null,
+      detailPath:{
+        path:'/clueDataClueDetail'
+      },
+      idName:'sat_orderclueid',
+      detailDataSet:{
+        clueUnFollowTable:{
+          listqueryid:'',
+          total:'',
+        }
+      },
       param:{
         "id": 20231015130604,
         "content": {
@@ -115,6 +130,8 @@ export default {
       list:[],
       currentPage:0,
       total:0,
+      listqueryid:'',
+      pageTotal:0,
       hoverData:[],
       heightChart:'100%',
       heightTable:'403px',
@@ -126,6 +143,10 @@ export default {
     async listData(val){
       this.renderPie(val)
     },
+    // detailSet(listqueryid,total,setName){
+    //   this.detailDataSet[setName].listqueryid = listqueryid
+    //   this.detailDataSet[setName].total = total
+    // },
     async queryTable(val,isleave){
       this.param.content.dataid = val || this.dataid
       this.param.content.enddate = this.enddate
@@ -140,11 +161,19 @@ export default {
           this.list = res.data
           this.total = res.total
           this.currentPage = res.pageNumber
+          this.detailDataSet.clueUnFollowTable.listqueryid = res.listqueryid
+          this.detailDataSet.clueUnFollowTable.pageTotal = res.pageTotal
+          sessionStorage.setItem('listqueryid',res.listqueryid)
+          sessionStorage.setItem('total',res.total)
         }
       }else {
         this.list = res.data
         this.total = res.total
         this.currentPage = res.pageNumber
+        this.detailDataSet.clueUnFollowTable.listqueryid = res.listqueryid
+        this.detailDataSet.clueUnFollowTable.pageTotal = res.pageTotal
+        sessionStorage.setItem('listqueryid',res.listqueryid)
+        sessionStorage.setItem('total',res.total)
       }
 
     },
@@ -168,11 +197,19 @@ export default {
           this.list = res.data
           this.total = res.total
           this.currentPage = res.data.pageNumber
+          this.detailDataSet.clueUnFollowTable.listqueryid = res.listqueryid
+          this.detailDataSet.clueUnFollowTable.pageTotal = res.pageTotal
+          sessionStorage.setItem('listqueryid',res.listqueryid)
+          sessionStorage.setItem('total',res.total)
         }
       }else {
         this.list = res.data
         this.total = res.total
         this.currentPage = res.data.pageNumber
+        this.detailDataSet.clueUnFollowTable.listqueryid = res.listqueryid
+        this.detailDataSet.clueUnFollowTable.pageTotal = res.pageTotal
+        sessionStorage.setItem('listqueryid',res.listqueryid)
+        sessionStorage.setItem('total',res.total)
       }
 
       this.columnData = res.data[0].trend