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 {
return false;
}
// console.log("insured === ", insured);
var time = new Date(this.data.contactDate.replace(/\-/g, "/") + " 00:00:00").getTime();
var time = new Date(ddMMyyyy2yyyyMMdd(this.data.contactDate).replace(/\-/g, "/") + " 00:00:00").getTime();
// var time = new Date(this.data.contactDate.replace(/\-/g, "/") + " 00:00:00").getTime();
for (let index = 0; index < insured.policyInfoList.length; index++) {
let policy = insured.policyInfoList[index];
// 有效期为生效日至满期日+60天
......
......@@ -103,7 +103,7 @@
<div class="down-arrow"></div>
<div class="cont">
<div class="ipt-date">
<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>
<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>
</div>
</div>
</div>
......
......@@ -130,7 +130,7 @@ export default {
this.step = 2;
},
handleShowModal(model) {
console.log(model);
// console.log(model);
if (model.action == 1) {
this.modelType = model.type;
this.showModal1 = true;
......