qymljy пре 1 година
родитељ
комит
62d08afba6

+ 15 - 2
src/HDrpManagement/customerPortrait/modules/detail.vue

@@ -99,8 +99,21 @@
               :custom="true"
             >
               <template v-slot:custom="scope">
-                <div style="text-wrap:wrap">
-                  {{ scope.data.data[scope.data.columnname] }}
+                <p v-if="scope.data.columnname === 'followname'">
+                  <span v-if="scope.data.data.followname.length > 0">
+                    <span v-for="(item,index) in scope.data.data.followname">
+                      <span v-if="index === scope.data.data.followname.length -1">
+                        {{item}}
+                      </span>
+                      <span v-else>
+                        {{item + ','}}
+                      </span>
+                    </span>
+                  </span>
+                  <span v-else>--</span>
+                </p>
+                <div v-else style="text-wrap:wrap">
+                  {{ scope.data.data[scope.data.columnname] || '--' }}
                 </div>
               </template>
             </pageTable>

+ 14 - 1
src/HDrpManagement/dataanalysis/modules/customer.vue

@@ -62,7 +62,20 @@
         </el-row>
         <tableLayout style="margin-top: 10px" :layout="tablecolsFollow" :data="listFollow" :opwidth="200" :custom="true" :height="tableHieght">
           <template v-slot:customcol="scope">
-            <p>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</p>
+            <p v-if="scope.column.columnname === 'followname'">
+              <span v-if="scope.column.data.followname.length > 0">
+                <span v-for="(item,index) in scope.column.data.followname">
+                <span v-if="index === scope.column.data.followname.length -1">
+                  {{item}}
+                </span>
+                <span v-else>
+                  {{item + ','}}
+                </span>
+              </span>
+              </span>
+              <span v-else>--</span>
+            </p>
+            <p v-else>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</p>
           </template>
         </tableLayout>
         <div class="container normal-panel" style="text-align:right">

+ 14 - 1
src/HDrpManagement/dataanalysis/modules/project.vue

@@ -62,7 +62,20 @@
         </el-row>
         <tableLayout style="margin-top: 10px" :layout="tablecolsFollow" :data="listFollow" :opwidth="200" :custom="true" :height="tableHieght">
           <template v-slot:customcol="scope">
-            <p>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</p>
+            <p v-if="scope.column.columnname === 'followname'">
+              <span v-if="scope.column.data.followname.length > 0">
+                <span v-for="(item,index) in scope.column.data.followname">
+                <span v-if="index === scope.column.data.followname.length -1">
+                  {{item}}
+                </span>
+                <span v-else>
+                  {{item + ','}}
+                </span>
+              </span>
+              </span>
+              <span v-else>--</span>
+            </p>
+            <p v-else>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</p>
           </template>
         </tableLayout>
         <div class="container normal-panel" style="text-align:right">

+ 15 - 2
src/HDrpManagement/projectPortrait/modules/detail.vue

@@ -129,8 +129,21 @@
               :custom="true"
             >
               <template v-slot:custom="scope">
-                <div style="text-wrap:wrap">
-                  {{ scope.data.data[scope.data.columnname] }}
+                <p v-if="scope.data.columnname === 'followname'">
+                  <span v-if="scope.data.data.followname.length > 0">
+                    <span v-for="(item,index) in scope.data.data.followname">
+                      <span v-if="index === scope.data.data.followname.length -1">
+                        {{item}}
+                      </span>
+                      <span v-else>
+                        {{item + ','}}
+                      </span>
+                    </span>
+                  </span>
+                  <span v-else>--</span>
+                </p>
+                <div v-else style="text-wrap:wrap">
+                  {{ scope.data.data[scope.data.columnname] || '--' }}
                 </div>
               </template>
             </pageTable>

+ 50 - 24
src/HDrpManagement/salerPortrait/modules/detail.vue

@@ -42,7 +42,7 @@
               <myRadio :value1="param1.content" key1="type" @clickBtn="getPerformance" :btnOptions="[{label:'本年',value:3},{label:'本季',value:2},{label:'本月',value:1}]">
               </myRadio>
             </div>
-            <myCard 
+            <myCard
               :list="
               [
                 {custom:'dingdan',data:performance,title:'订单目标',value2descript:'差额',value:performance.orderCR,value2:unitCompile(performance.amount - performance.target_l),bg:'#F3F9FC',color:'#3874F6'},
@@ -85,7 +85,7 @@
                 <el-option :label="item.value" :value="item.value" v-for="(item,index) in orderTypeList" :key="index"></el-option>
               </el-select>
             </div>
-            <myCard 
+            <myCard
               :list="
               [
                 {title:'订单数量',value:$refs.dingdan && $refs.dingdan.list && $refs.dingdan.list[0] && $refs.dingdan.list[0].allOrderQty,bg:'#F3F9FC',color:'#3874F6'},
@@ -97,7 +97,7 @@
               ]"
             ></myCard>
             <showIsNone title="订单明细">
-            <pageTable 
+            <pageTable
               ref="dingdan"
               :tablecols="tool.tabelCol($route.name).orderTable.tablecols"
               :param="param2"
@@ -136,7 +136,7 @@
               <myRadio :value1="param3.content" key1="type" @clickBtn="refreshTable('param3','xiansuo');param8.content.type=param3.content.type;refreshTable('param8','fllow')" :btnOptions="[{label:'本年',value:3},{label:'本季',value:2},{label:'本月',value:1}]">
               </myRadio>
             </div>
-            <myCard 
+            <myCard
               :list="
               [
                 {title:'线索数',value:$refs.xiansuo && $refs.xiansuo.list[0] && $refs.xiansuo.list[0].orderclueSize,bg:'#F3F9FC',color:'#3874F6'},
@@ -148,7 +148,7 @@
             >
             </myCard>
             <showIsNone title="销售线索明细">
-            <pageTable 
+            <pageTable
               ref="xiansuo"
               :tablecols="tool.tabelCol($route.name).orderclueList.tablecols"
               :param="param3"
@@ -169,7 +169,7 @@
             </showIsNone>
 
             <showIsNone title="线索跟进记录明细">
-            <pageTable 
+            <pageTable
               ref="fllow"
               :tablecols="tool.tabelCol($route.name).clueFollow.tablecols"
               :param="param8"
@@ -204,7 +204,7 @@
             >
             </myCard>
             <showIsNone title="客户明细">
-            <pageTable 
+            <pageTable
               ref="kehu"
               :tablecols="tool.tabelCol($route.name).publicCustomerTable.tablecols"
               :param="param4"
@@ -212,10 +212,10 @@
             >
             <template v-slot:custom="scope">
               <div v-if="scope.data.columnname == 'sys_tag'">
-                <el-tag size="mini" v-for="(item,index) in scope.data.data.sys_tag" :key="index">{{ item }}</el-tag>  
+                <el-tag size="mini" v-for="(item,index) in scope.data.data.sys_tag" :key="index">{{ item }}</el-tag>
               </div>
               <div v-else-if="scope.data.columnname == 'industry'">
-                <el-tag size="mini" v-for="(item,index) in scope.data.data.industry" :key="index">{{ item }}</el-tag>  
+                <el-tag size="mini" v-for="(item,index) in scope.data.data.industry" :key="index">{{ item }}</el-tag>
               </div>
               <div v-else>
                 {{ scope.data.data[scope.data.columnname] }}
@@ -225,15 +225,28 @@
             </showIsNone>
 
             <showIsNone title="客户跟进记录明细">
-            <pageTable 
+            <pageTable
               ref="fllowkehu"
               :tablecols="tool.tabelCol($route.name).customerFollow.tablecols"
               :param="param9"
               :custom="true"
             >
               <template v-slot:custom="scope">
-                <div style="text-wrap:wrap">
-                  {{ scope.data.data[scope.data.columnname] }}
+                <p v-if="scope.data.columnname === 'followname'">
+                  <span v-if="scope.data.data.followname.length > 0">
+                    <span v-for="(item,index) in scope.data.data.followname">
+                      <span v-if="index === scope.data.data.followname.length -1">
+                        {{item}}
+                      </span>
+                      <span v-else>
+                        {{item + ','}}
+                      </span>
+                    </span>
+                  </span>
+                  <span v-else>--</span>
+                </p>
+                <div v-else style="text-wrap:wrap">
+                  {{ scope.data.data[scope.data.columnname] || '--' }}
                 </div>
               </template>
             </pageTable>
@@ -249,7 +262,7 @@
               <myRadio :value1="param5.content" key1="type" @clickBtn="refreshTable('param5','project');param10.content.type=param5.content.type;refreshTable('param10','projectfllow')" :btnOptions="[{label:'本年',value:3},{label:'本季',value:2},{label:'本月',value:1}]">
               </myRadio>
             </div>
-            <myCard 
+            <myCard
               :list="
               [
                 {title:'项目数',value:$refs.project && $refs.project.list && $refs.project.list[0] && $refs.project.list[0].projectSize,bg:'#F3F9FC',color:'#3874F6'},
@@ -261,7 +274,7 @@
             ></myCard>
 
             <showIsNone title="项目明细">
-            <pageTable 
+            <pageTable
               ref="project"
               :tablecols="tool.tabelCol($route.name).competeProjectsTable.tablecols"
               :param="param5"
@@ -285,15 +298,28 @@
             </showIsNone>
 
             <showIsNone title="项目跟进记录明细">
-            <pageTable 
+            <pageTable
               ref="projectfllow"
               :tablecols="tool.tabelCol($route.name).projectFollow.tablecols"
               :param="param10"
               :custom="true"
             >
               <template v-slot:custom="scope">
-                <div style="text-wrap:wrap">
-                  {{ scope.data.data[scope.data.columnname] }}
+                <p v-if="scope.data.columnname === 'followname'">
+                  <span v-if="scope.data.data.followname.length > 0">
+                    <span v-for="(item,index) in scope.data.data.followname">
+                      <span v-if="index === scope.data.data.followname.length -1">
+                        {{item}}
+                      </span>
+                      <span v-else>
+                        {{item + ','}}
+                      </span>
+                    </span>
+                  </span>
+                  <span v-else>--</span>
+                </p>
+                <div v-else style="text-wrap:wrap">
+                  {{ scope.data.data[scope.data.columnname] || '--' }}
                 </div>
               </template>
             </pageTable>
@@ -310,7 +336,7 @@
               <myRadio :value1="param6.content" key1="isAll" @clickBtn="refreshTable('param6','baojiadan')" :btnOptions="[{label:'全部',value:1},{label:'本年',value:0}]">
               </myRadio>
             </div>
-            <myCard 
+            <myCard
               :list="
               [
                 {title:'报价次数',value:$refs.baojiadan && $refs.baojiadan.total,bg:'#F3F9FC',color:'#3874F6'},
@@ -319,7 +345,7 @@
               ]"
             ></myCard>
             <showIsNone title="报价单明细">
-            <pageTable 
+            <pageTable
               ref="baojiadan"
               :tablecols="tool.tabelCol($route.name).quotedPriceTable.tablecols"
               :param="param6"
@@ -357,7 +383,7 @@
                 <el-option :label="item.remarks" :value="item.value" v-for="(item,index) in contractTypeList" :key="index"></el-option>
               </el-select>
             </div>
-            <myCard 
+            <myCard
               :list="
               [
                 {title:'合同总数',value:$refs.hetong && $refs.hetong.list && $refs.hetong.list[0] && $refs.hetong.list[0].allQty,bg:'#F3F9FC',color:'#3874F6'},
@@ -371,7 +397,7 @@
               ]"
             ></myCard>
             <showIsNone title="合同明细">
-            <pageTable 
+            <pageTable
               ref="hetong"
               :tablecols="tool.tabelCol($route.name).contractTable.tablecols"
               :param="param7"
@@ -390,9 +416,9 @@
           </el-card>
         </div>
 
-  
+
       </div>
-      
+
     </div>
   </el-drawer>
 </template>
@@ -603,7 +629,7 @@ export default {
 }
 
 /deep/.el-drawer {
-  background:#F5F5F5 !important; 
+  background:#F5F5F5 !important;
 }
 /deep/.el-drawer__header{
   display: none !important;