Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

src/HDrpManagement/dispatch/details/index.vue

@@ -62,7 +62,7 @@ import defaultInfo from '../modules/defaultInfo.vue'
             "sa_dispatchid":this.$route.query.id
           }
         })
-        this.mainData = res.data
+        if (res.data) this.mainData = res.data
         console.log(this.mainData)
         this.changeDataStructure()
       },

src/SDrpManagement/salerPrivatecustomer/detail/customerDetail.vue

@@ -29,7 +29,7 @@
 
       </div>
       <div slot="slot0" >
-        <detailed :data="mainData" ref="baseDetail"></detailed>
+        <detailed :data="mainData" v-if="Object.keys(mainData).length > 1" ref="baseDetail"></detailed>
       </div>
       <div slot="slot1" class=" normal-panel"  >
         <contacts :data="mainData"   @onSuccess="onSuccess" v-if="flag"></contacts>
@@ -174,6 +174,7 @@ export default {
   },
   methods:{
     async queryMainData(id) {
+      console.log('触发');
       const res = await this.$api.requested({
         "id": 20221012164302,
         "content": {
@@ -182,11 +183,11 @@ export default {
       })
      /* this.mainData = res.data*/
       this.mainData = Object.assign({},this.mainData,res.data)
+      console.log(this.mainData,"输出数据用户id",res.data)
       this.$refs['details'].param.content.type = this.$route.query.tabIndex
       this.$refs['details'].param.content.isExport = false
       this.changeDataStructure()
       this.flag = true
-      console.log(this.mainData,"输出数据用户id")
     },
     show(){
       this.visible = false
@@ -268,7 +269,7 @@ export default {
         },
         {
           label:'负责人',
-          value:this.mainData.leader.length === 0?"--":this.mainData.leader[0].name
+          value:this.mainData.leader && this.mainData.leader[0].name
         },
         {
           label:'归属经销商',

src/SDrpManagement/salerPrivatecustomer/detail/index.vue

@@ -117,6 +117,7 @@ export default {
       this.changeDataStructure()
       this.$refs.detailed.detailedList(this.mainData)
       this.flag = true
+      console.log(this.mainData,'触发')
     },
     show(){
       this.visible = false

src/SDrpManagement/salerPrivatecustomer/detail/modules/detailedData.vue

@@ -2,19 +2,19 @@
   <div class="normal-panel">
     <div class=" normal-panel normal-margin">
       <el-descriptions title="基本信息" border :column="2" labelClassName="my-label" contentClassName="my-content">
-        <el-descriptions-item label-class-name="my-label" label="客户名称">{{ basic.enterprisename?basic.enterprisename:"--" }}</el-descriptions-item>
-        <el-descriptions-item label-class-name="my-label" label="客户编号">{{ basic.sa_customersid?basic.sa_customersid:"--" }}</el-descriptions-item>
-        <el-descriptions-item label-class-name="my-label" label="erp编号">{{ basic.erpagentnum?basic.erpagentnum:"--" }}</el-descriptions-item>
-        <el-descriptions-item label-class-name="my-label" label="企业简称">{{ basic.abbreviation?basic.abbreviation:"--"}}</el-descriptions-item>
-        <el-descriptions-item label-class-name="my-label" label="客户类型">{{ basic.type?basic.type:"--" }}</el-descriptions-item>
+        <el-descriptions-item label-class-name="my-label" label="客户名称">{{ data.enterprisename?data.enterprisename:"--" }}</el-descriptions-item>
+        <el-descriptions-item label-class-name="my-label" label="客户编号">{{ data.sa_customersid?data.sa_customersid:"--" }}</el-descriptions-item>
+        <el-descriptions-item label-class-name="my-label" label="erp编号">{{ data.erpagentnum?data.erpagentnum:"--" }}</el-descriptions-item>
+        <el-descriptions-item label-class-name="my-label" label="企业简称">{{ data.abbreviation?data.abbreviation:"--"}}</el-descriptions-item>
+        <el-descriptions-item label-class-name="my-label" label="客户类型">{{ data.type?data.type:"--" }}</el-descriptions-item>
 
-        <el-descriptions-item label-class-name="my-label" label="客户等级">{{ basic.grade?basic.grade:"--" }}</el-descriptions-item>
-        <el-descriptions-item label-class-name="my-label" label="客户分类">{{ basic.customergrade?basic.customergrade:"--" }}</el-descriptions-item>
+        <el-descriptions-item label-class-name="my-label" label="客户等级">{{ data.grade?data.grade:"--" }}</el-descriptions-item>
+        <el-descriptions-item label-class-name="my-label" label="客户分类">{{ data.customergrade?data.customergrade:"--" }}</el-descriptions-item>
 
         <el-descriptions-item label-class-name="my-label" label="客户行业">
-          <div v-if="basic.industry">
-             <span v-for="(item,index) in basic.industry">
-              {{basic.industry.length === 0?item:index === basic.industry.length -1?item:item+','}}
+          <div v-if="data.industry">
+             <span v-for="(item,index) in data.industry">
+              {{data.industry.length === 0?item:index === data.industry.length -1?item:item+','}}
             </span>
           </div>
           <div v-else>
@@ -22,29 +22,29 @@
           </div>
 
         </el-descriptions-item>
-        <el-descriptions-item label-class-name="my-label" label="税号">{{ basic.taxno?basic.taxno:"--" }}</el-descriptions-item>
+        <el-descriptions-item label-class-name="my-label" label="税号">{{ data.taxno?data.taxno:"--" }}</el-descriptions-item>
 
-        <el-descriptions-item label-class-name="my-label" label="法人">{{ basic.contact?basic.contact:"--" }}</el-descriptions-item>
-        <el-descriptions-item label-class-name="my-label" label="电话">{{ basic.telephone?basic.telephone:"--" }}</el-descriptions-item>
+        <el-descriptions-item label-class-name="my-label" label="法人">{{ data.contact?data.contact:"--" }}</el-descriptions-item>
+        <el-descriptions-item label-class-name="my-label" label="电话">{{ data.telephone?data.telephone:"--" }}</el-descriptions-item>
 
-        <el-descriptions-item label-class-name="my-label" label="省市县">{{ basic.province?basic.province + '-' + basic.city + '-' + basic.county:"--" }}</el-descriptions-item>
-        <el-descriptions-item label-class-name="my-label" label="详细地址">{{ basic.address?basic.address:"--" }}</el-descriptions-item>
+        <el-descriptions-item label-class-name="my-label" label="省市县">{{ data.province?data.province + '-' + data.city + '-' + data.county:"--" }}</el-descriptions-item>
+        <el-descriptions-item label-class-name="my-label" label="详细地址">{{ data.address?data.address:"--" }}</el-descriptions-item>
 
-        <el-descriptions-item label-class-name="my-label" label="上级企业">{{ basic.superiorenterprisename?basic.superiorenterprisename:"--" }}</el-descriptions-item>
-        <el-descriptions-item label-class-name="my-label" label="客户来源">{{ basic.source?basic.source:"--" }}</el-descriptions-item>
-        <el-descriptions-item label-class-name="my-label" label="来源公海">{{ basic.sourcepoolname?basic.sourcepoolname:"--" }}</el-descriptions-item>
+        <el-descriptions-item label-class-name="my-label" label="上级企业">{{ data.superiorenterprisename?data.superiorenterprisename:"--" }}</el-descriptions-item>
+        <el-descriptions-item label-class-name="my-label" label="客户来源">{{ data.source?data.source:"--" }}</el-descriptions-item>
+        <el-descriptions-item label-class-name="my-label" label="来源公海">{{ data.sourcepoolname?data.sourcepoolname:"--" }}</el-descriptions-item>
 
 
         <el-descriptions-item label-class-name="my-label" label="成交状态" >
-          <span :style="tradingstatusStyle">{{ basic.tradingstatus?basic.tradingstatus:"--" }}</span>
+          <span :style="tradingstatusStyle">{{ data.tradingstatus?data.tradingstatus:"--" }}</span>
         </el-descriptions-item>
         <el-descriptions-item label-class-name="my-label" label="成交次数">
-          {{ basic.contact_signnum === 0?0:basic.contact_signnum }}
+          {{ data.contact_signnum === 0?0:data.contact_signnum }}
         </el-descriptions-item>
         <el-descriptions-item label-class-name="my-label" label="合作状态">
-          <span :style="statusStyle">{{ basic.status?basic.status:"--" }}</span>
+          <span :style="statusStyle">{{ data.status?data.status:"--" }}</span>
         </el-descriptions-item>
-        <el-descriptions-item label-class-name="my-label" label="负责人">{{ basic.leader?basic.leader.length !== 0 ?basic.leader[0].name:'--':"--" }}</el-descriptions-item>
+        <el-descriptions-item label-class-name="my-label" label="负责人">{{ data.leader?data.leader.length !== 0 ?data.leader[0].name:'--':"--" }}</el-descriptions-item>
 
 
 
@@ -71,7 +71,6 @@ export default {
   props:["data"],
   data(){
     return {
-      basic:[],
       system:[],
       sa_customersid:"",
       tradingstatusStyle:{
@@ -83,8 +82,11 @@ export default {
     }
   },
   mounted() {
-    this.basicData(this.$route.query.id)
+    // this.dataData(this.$route.query.id)
     this.systemData(this.$route.query.id)
+    this.style(this.data)
+      this.styleStatus(this.data)
+
   },
   methods:{
     /*基本信息*/

src/components/normal-basic-layout/details/index.vue

@@ -179,7 +179,8 @@ export default {
         }
       })
       
-      this.reportCenterLsit = res.data
+      this.reportCenterLsit = res.data || []
+      console.log('报表',this.reportCenterLsit);
     },
     async printBtn (data,data2) {
       let res = await this.$api.requested({