Skip to content

dev / pingan-life-index-pro

Go to a project
Toggle navigation
Toggle navigation pinning
00614d72 by simon
Options

默认提交

1 parent 2e716e32
Inline Side-by-side
Showing 5 changed files with 76 additions and 68 deletions
......@@ -150,54 +150,60 @@ export default {
curData.standards = 0;
let date = index + 1;
let buildDate = Date.parse(`${year}.${month}.${date}`);
let nowDate = new Date();
let day = buildDate.getDay();
let isWeekend = day == 0 || day == 6;
let disable = false; // 判断是否不可选
if (this.filtModel.indexOf("weekend") >= 0) {
disable = isWeekend;
}
if (!disable && this.filtModel.indexOf("future") >= 0) {
buildDate.setHours(23, 59, 59, 999);
disable = buildDate.getTime() > nowDate.getTime()
}
if (!disable && this.filtModel.indexOf("history") >= 0) {
buildDate.setHours(0, 0, 0, 0);
disable = buildDate.getTime() < nowDate.getTime()
}
if (!disable && this.filtModel.indexOf("today") >= 0) {
buildDate.setHours(0, 0, 0, 0);
nowDate.setHours(0, 0, 0, 0);
disable = buildDate.getTime() == nowDate.getTime();
}
// disable = isWeekend && !this.weekend; // 判断周末不可选
let filterDates = this.filterDates;
filterDates.forEach(element => {
let curDate = `${year}-${month}-${date}`;
if (element == curDate) {
disable = true;
if (buildDate) {
let nowDate = new Date();
let day = buildDate.getDay();
let isWeekend = day == 0 || day == 6;
let disable = false; // 判断是否不可选
if (this.filtModel.indexOf("weekend") >= 0) {
disable = isWeekend;
}
});
curData = Object.assign({
year: year,
month: month,
date: date, // (1~31)
day: day,
isWeekend: isWeekend,
disable: disable,
}, curData);
result.push(curData);
if (!disable && this.filtModel.indexOf("future") >= 0) {
buildDate.setHours(23, 59, 59, 999);
disable = buildDate.getTime() > nowDate.getTime()
}
if (!disable && this.filtModel.indexOf("history") >= 0) {
buildDate.setHours(0, 0, 0, 0);
disable = buildDate.getTime() < nowDate.getTime()
}
if (!disable && this.filtModel.indexOf("today") >= 0) {
buildDate.setHours(0, 0, 0, 0);
nowDate.setHours(0, 0, 0, 0);
disable = buildDate.getTime() == nowDate.getTime();
}
// disable = isWeekend && !this.weekend; // 判断周末不可选
let filterDates = this.filterDates;
filterDates.forEach(element => {
let curDate = `${year}-${month}-${date}`;
if (element == curDate) {
disable = true;
}
});
curData = Object.assign({
year: year,
month: month,
date: date, // (1~31)
day: day,
isWeekend: isWeekend,
disable: disable,
}, curData);
result.push(curData);
}
}
// 当月1号星期几 0-6 往前塞值
let dateStr = month + '.' + '1' + '.' + year;
let firstDay = Date.parse(dateStr).getDay();
let firstDate = Date.parse(dateStr);
if (firstDate) {
let firstDay = Date.parse(dateStr).getDay();
// 根据星期几在前面补空格 星期日0格子，星期一1格子，星期六6格子
for (let index = 0; index < firstDay; index++) {
result.unshift(null);
// 根据星期几在前面补空格 星期日0格子，星期一1格子，星期六6格子
for (let index = 0; index < firstDay; index++) {
result.unshift(null);
}
this.fortmatMonthData = result;
}
this.fortmatMonthData = result;
},
// 加/减 月份
addMonths(value) {
......@@ -372,6 +378,7 @@ export default {
fortmatMonthData.forEach((element, idx) => {
if (element) {
let curDate = `${element.year}-${element.month}-${element.date}`;
curDate = Date.parse(curDate).toString("yyyy-MM-dd"); //转成yyyy-MM-dd
if (curDate == dateValue && element.disable == true) {
disable = true;
}
......
......@@ -21,6 +21,7 @@
@extend .bb;
max-width: 450px;
min-width: 100%;
height: 320px;
border-radius: $borderRadius;
background-color: wheat;
......
......@@ -60,7 +60,6 @@
.n-item {
cursor: pointer;
min-width: 14.75rem;
}
}
......@@ -99,7 +98,8 @@
// 公共组件
.n-item {
margin-bottom: 2rem;
padding-right: .833333rem ;
// padding-right: .833333rem ;
padding-right: 3rem ;
color: #dcdddd;
&:first-child {
......
......@@ -60,7 +60,7 @@
<div class="label">{{dataForm.insuredIdNumber}}</div>
</div>
</div>
</div>
</div>
......@@ -138,7 +138,7 @@
<div class="td w2">{{$t('customService.insuranceQuery.t4Allocation')}}</div>
</div>
<div class="separator-h"></div>
<div v-for="(item,index) in dataForm.benefitList" :key="index">
<div class="data-line">
<div class="td w2">{{item.name}}</div>
......
@import '@/styles/_support';
.list-container {
overflow-x: scroll;
overflow-x: auto;
padding-bottom: 2rem;
}
......@@ -32,15 +32,15 @@
.cell-group {
margin-bottom: 1rem;
&:last-child {
margin-bottom: 0;
}
div {
color: #4c4948;
}
.w1 {
// width: 10rem;
width: 20rem;
......@@ -52,7 +52,7 @@
width: 12.5rem;
text-align: center;
}
.table-header {
// width: 64.166667rem;
height: 3.25rem;
......@@ -61,7 +61,7 @@
background-color: #f2f2f2;
display: flex;
align-items: center;
.normal-header {
// width: 58.833333rem;
@extend .bb;
......@@ -71,12 +71,12 @@
display: flex;
justify-content: space-between;
align-items: center;
.title {
font-weight: bold;
color: #575453;
}
.guide {
transition: all 0.5s;
cursor: pointer;
......@@ -85,17 +85,17 @@
background: url("~@/assets/images/insurance-query/triangle-down.png") no-repeat center center;
background-size: 100% 100%;
}
.rotate180 {
transform: rotate(180deg);
transition: all 0.5s;
}
}
}
.table-content {
// width: 64.166667rem;
height: auto;
max-height: 50rem;
// display: inline-block;
......@@ -107,8 +107,8 @@
padding: 0 2.75rem;
// max-height: 41.666667rem;
transition: max-height ease-out 0.3s !important;
overflow: scroll;
overflow: auto;
.data-line {
// padding: 0 2.75rem;
height: 4.416667rem;
......@@ -116,20 +116,20 @@
display: flex;
justify-content: space-between;
align-items: center;
.td {
display: flex;
justify-content: center;
align-items: center;
}
.cell1 {
width: 98%;
display: flex;
justify-content: space-between;
margin: auto;
}
.separator-v {
height: 2.5rem;
width: .166667rem;
......@@ -137,29 +137,29 @@
margin: 0 .916667rem;
}
}
.label span {
color: $cOrange;
margin-left: .583333rem;
cursor: pointer;
text-decoration: underline;
}
.separator-h {
width: 100%;
height: 1px;
background-color: #f2f2f2;
}
}
.orange {
background-color: $cOrange !important;
div {
color: #ffffff;
}
}
.hide {
max-height: 0;
border-bottom: none;
......@@ -182,7 +182,7 @@
cursor: pointer;
justify-content: center !important;
}
.pointer {
cursor: pointer;
}
......@@ -214,4 +214,4 @@
color: $cOrange;
}
}
}
\ No newline at end of file
}
......