f2729acc by simon

Merge branch 'master' of 120.27.44.69:dev/pingan-life-index-pro

2 parents d1dd0e9a 43607170
...@@ -276,7 +276,8 @@ export default { ...@@ -276,7 +276,8 @@ export default {
276 return false; 276 return false;
277 } 277 }
278 // console.log("insured === ", insured); 278 // console.log("insured === ", insured);
279 var time = new Date(this.data.contactDate.replace(/\-/g, "/") + " 00:00:00").getTime(); 279 var time = new Date(ddMMyyyy2yyyyMMdd(this.data.contactDate).replace(/\-/g, "/") + " 00:00:00").getTime();
280 // var time = new Date(this.data.contactDate.replace(/\-/g, "/") + " 00:00:00").getTime();
280 for (let index = 0; index < insured.policyInfoList.length; index++) { 281 for (let index = 0; index < insured.policyInfoList.length; index++) {
281 let policy = insured.policyInfoList[index]; 282 let policy = insured.policyInfoList[index];
282 // 有效期为生效日至满期日+60天 283 // 有效期为生效日至满期日+60天
......
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
103 <div class="down-arrow"></div> 103 <div class="down-arrow"></div>
104 <div class="cont"> 104 <div class="cont">
105 <div class="ipt-date"> 105 <div class="ipt-date">
106 <date-picker v-model="data.contactDate" :formatter="'dd-MM-yyyy'" :filtModel="['future']" :check="checkDate" :cusStyle="{border:'none !important','background-color':'transparent !important','height':'58px', 'color':'#ff6839','font-weight':'bold','text-align': 'center'}"></date-picker> 106 <date-picker v-model="data.contactDate" :formatter="'dd-MM-yyyy'" :filtModel="['future']" :check="checkDate" :readonly="true" :cusStyle="{border:'none !important','background-color':'transparent !important','height':'58px', 'color':'#ff6839','font-weight':'bold','text-align': 'center'}"></date-picker>
107 </div> 107 </div>
108 </div> 108 </div>
109 </div> 109 </div>
......
...@@ -130,7 +130,7 @@ export default { ...@@ -130,7 +130,7 @@ export default {
130 this.step = 2; 130 this.step = 2;
131 }, 131 },
132 handleShowModal(model) { 132 handleShowModal(model) {
133 console.log(model); 133 // console.log(model);
134 if (model.action == 1) { 134 if (model.action == 1) {
135 this.modelType = model.type; 135 this.modelType = model.type;
136 this.showModal1 = true; 136 this.showModal1 = true;
......