Merge remote-tracking branch 'origin/master'

dgtis-ui/src/views/system/userInfo/components/claim.vue

@@ -16,7 +16,7 @@
       </el-col>
       <el-col :span="12">
         <span class="name">损失发生时间</span>
-        <span class="value">{{item.losstime}}</span>
+        <span class="value">{{parseTime(item.losstime,'{yy}-{mm}-{dd}')}}</span>
       </el-col>
       <el-col :span="12">
         <span class="name">报案人名称</span>
@@ -28,7 +28,7 @@
       </el-col>
       <el-col :span="12">
         <span class="name">报案日期</span>
-        <span class="value">{{item.cndate}}</span>
+        <span class="value">{{parseTime(item.cndate,'{yy}-{mm}-{dd}')}}</span>
       </el-col>
       <el-col :span="12">
         <span class="name">损失原因</span>
@@ -36,7 +36,7 @@
       </el-col>
       <el-col :span="12">
         <span class="name">立案日期</span>
-        <span class="value">{{item.crdate}}</span>
+        <span class="value">{{parseTime(item.crdate,'{yy}-{mm}-{dd}')}}</span>
       </el-col>
       <el-col :span="12">
         <span class="name">报案描述</span>
@@ -51,8 +51,8 @@
         <span class="value">{{item.ccno}}</span>
       </el-col>
       <el-col :span="12">
-        <span class="name">险种代码</span>
-        <span class="value">{{item.productid}}</span>
+        <span class="name">险种名称</span>
+        <span class="value">{{item.productname}}</span>
       </el-col>
       <el-col :span="12">
         <span class="name">赔付金额</span>

dgtis-ui/src/views/system/userInfo/components/contact.vue

@@ -2,7 +2,11 @@
 <template>
   <div class="userInfoPanel mt10 pd15">
     <el-table v-loading="loading" :data="data">
-      <el-table-column label="地址描述" width="90" align="center" prop="des" />
+      <el-table-column label="地址描述" width="90" align="center">
+        <template slot-scope="scope">
+          <span>联系地址</span>
+        </template>
+      </el-table-column>
       <el-table-column label="国家" align="center" prop="nation" />
       <el-table-column label="省" align="center">
         <template slot-scope="scope">

dgtis-ui/src/views/system/userInfo/components/health.vue

@@ -7,7 +7,7 @@
       </el-col>
       <el-col :span="12">
         <span class="name">身高</span>
-        <span class="value" v-if="data.height">t{{data.height}}</span>
+        <span class="value">{{data.height}}</span>
       </el-col>
       <el-col :span="12">
         <span class="name">体重</span>

dgtis-ui/src/views/system/userInfo/index.vue

@@ -86,7 +86,7 @@
           </el-col>
           <el-col :span="12">
             <span class="name">联系地址</span>
-            <span class="value" style="width: 70%;display: inline-block;line-height: 20px;vertical-align: top;">{{custInfo.ral}}</span>
+            <span class="value" style="width: 70%;display: inline-block;vertical-align: top;">{{custInfo.ral}}</span>
           </el-col>
         </el-row>
       </div>
@@ -113,8 +113,8 @@
             <claim :data="claimData"></claim>
           </el-tab-pane>
           <el-tab-pane label="接触信息" name="jcxx">
-<!--            <touched :data="touchedData"></touched>-->
-            <nodata></nodata>
+            <touched :data="touchedData"></touched>
+<!--            <nodata></nodata>-->
           </el-tab-pane>
           <el-tab-pane label="标签信息" name="bqxx">
             <tags :data="tagsData" v-if="tagsData && tagsData.length > 0"></tags>
@@ -231,28 +231,28 @@ export default {
                   console.log(that.custInfo.ral)
                   that.relationshipData = response.data.relationship;
                   that.habitData.ctype = response.data.custInfo.ctype;
-                  response.data.custInfo.hobby1 ? response.data.custInfo.hobby1 = response.data.custInfo.hobby1+'、' : response.data.custInfo.hobby1 ='';
-                  response.data.custInfo.hobby2 ? response.data.custInfo.hobby2 = response.data.custInfo.hobby2+'、' : response.data.custInfo.hobby2 ='';
-                  response.data.custInfo.hobby3 ? response.data.custInfo.hobby3 = response.data.custInfo.hobby3 : response.data.custInfo.hobby3 ='';
+                  response.data.custInfo.hobby1 != undefined ? response.data.custInfo.hobby1 = response.data.custInfo.hobby1+'、' : response.data.custInfo.hobby1 ='';
+                  response.data.custInfo.hobby2 != undefined ? response.data.custInfo.hobby2 = response.data.custInfo.hobby2+'、' : response.data.custInfo.hobby2 ='';
+                  response.data.custInfo.hobby3 != undefined ? response.data.custInfo.hobby3 = response.data.custInfo.hobby3 : response.data.custInfo.hobby3 ='';
                   that.habitData.hobby = response.data.custInfo.hobby1 + response.data.custInfo.hobby2 +response.data.custInfo.hobby3;
-                  response.data.custInfo.evadate ? that.healthData.evadate = response.data.custInfo.evadate : that.healthData.evadate = '';
-                  response.data.custInfo.height ? that.healthData.height = response.data.custInfo.height : that.healthData.height = '';
-                  response.data.custInfo.weight ? that.healthData.weight = response.data.custInfo.weight : that.healthData.weight = '';
-                  response.data.custInfo.bmi ? that.healthData.bmi = response.data.custInfo.bmi : that.healthData.bmi = '';
+                  response.data.custInfo.evadate != undefined ? that.healthData.evadate = response.data.custInfo.evadate : that.healthData.evadate = '';
+                  response.data.custInfo.height != undefined ? that.healthData.height = response.data.custInfo.height : that.healthData.height = '';
+                  response.data.custInfo.weight != undefined ? that.healthData.weight = response.data.custInfo.weight : that.healthData.weight = '';
+                  response.data.custInfo.bmi != undefined ? that.healthData.bmi = response.data.custInfo.bmi : that.healthData.bmi = '';
                   that.labelAll();
                   that.labelHy();
-                  response.data.insuranceclaimthread?that.claimData = response.data.insuranceclaimthread:that.claimData = [];
-                  response.data.insurancearrangement?that.contractInformationData = response.data.insurancearrangement:that.contractInformationData = [];
+                  response.data.insuranceclaimthread != undefined?that.claimData = response.data.insuranceclaimthread:that.claimData = [];
+                  response.data.insurancearrangement != undefined?that.contractInformationData = response.data.insurancearrangement:that.contractInformationData = [];
                   var contactDataItem = {};
-                  response.data.custInfo.nation ? contactDataItem.nation = response.data.custInfo.nation : '';
-                  response.data.custInfo.sobirth ? contactDataItem.province = response.data.custInfo.sobirth:'';
-                  response.data.custInfo.raid ? contactDataItem.raid = response.data.custInfo.raid :'';
-                  response.data.custInfo.qq ? contactDataItem.qq = response.data.custInfo.qq:'';
-                  response.data.custInfo.email ? contactDataItem.email = response.data.custInfo.email:'';
-                  response.data.custInfo.wechat ? contactDataItem.wechat = response.data.custInfo.wechat:'';
-                  response.data.custInfo.pmphone ? contactDataItem.pmphone = response.data.custInfo.pmphone:'';
-                  response.data.custInfo.ral ? contactDataItem.ral = response.data.custInfo.ral:'';
-                  response.data.custInfo.zipcode ? contactDataItem.zipcode = response.data.custInfo.zipcode:'';
+                  response.data.custInfo.nation != undefined ? contactDataItem.nation = response.data.custInfo.nation : '';
+                  response.data.custInfo.sobirth != undefined ? contactDataItem.province = response.data.custInfo.sobirth:'';
+                  response.data.custInfo.raid != undefined ? contactDataItem.raid = response.data.custInfo.raid :'';
+                  response.data.custInfo.qq != undefined ? contactDataItem.qq = response.data.custInfo.qq:'';
+                  response.data.custInfo.email != undefined != undefined ? contactDataItem.email = response.data.custInfo.email:'';
+                  response.data.custInfo.wechat != undefined ? contactDataItem.wechat = response.data.custInfo.wechat:'';
+                  response.data.custInfo.pmphone != undefined ? contactDataItem.pmphone = response.data.custInfo.pmphone:'';
+                  response.data.custInfo.ral != undefined ? contactDataItem.ral = response.data.custInfo.ral:'';
+                  response.data.custInfo.zipcode != undefined ? contactDataItem.zipcode = response.data.custInfo.zipcode:'';
                   JSON.stringify(contactDataItem) == "{}" ? that.contactData = []: that.contactData.push(contactDataItem);
               }
           );
@@ -278,14 +278,17 @@ export default {
         } )
       },
       hasHealthData(){
-        if(this.healthData.evadate ){
+        console.log(this.healthData);
+        if(this.healthData.evadate != undefined ){
           return true;
-        }else if(this.healthData.height){
+        }else if(this.healthData.height != undefined){
           return true;
-        }else if(this.healthData.weight){
+        }else if(this.healthData.weight != undefined){
           return true;
-        }else if(this.healthData.bmi){
+        }else if(this.healthData.bmi != undefined){
           return true;
+        }else{
+          return false;
         }
       },
       hasHabitData(){