|
@@ -8,7 +8,8 @@
|
|
|
</div>
|
|
|
<ul class="week_many">
|
|
|
<li class="option_week" v-for="(item, index) in listWeek" :key="index">
|
|
|
- <span class="list_span" v-for="(data, i) in item" :class='{active:i==isActive&&index==isIndexActive, getlastmonth:i==lastIndex}' :key="i" @click="getWeek(index, i, data)">{{data}}月</span>
|
|
|
+ <!-- <span class="list_span" v-for="(data, i) in item" :class='{active:i==isActive&&index==isIndexActive, getlastmonth:i==lastIndex}' :key="i" @click="getWeek(index, i, data)">{{data}}月</span> -->
|
|
|
+ <span class="list_span" v-for="(data, i) in item" :class='{active:i==isActive&&index==isIndexActive}' :key="i" @click="getWeek(index, i, data)">{{data}}月</span>
|
|
|
</li>
|
|
|
</ul>
|
|
|
<div class="putaway" @click="getManyTimes()" v-if="isMany">
|
|
@@ -84,10 +85,11 @@ export default {
|
|
|
week = date.slice(4, 6)
|
|
|
}
|
|
|
console.log(week)
|
|
|
- for (let a = week; a <= Number(nowweek); a++) {
|
|
|
+ for (let a = week; a <= 12; a++) {
|
|
|
var weeks = a
|
|
|
aloneWeek.push(weeks + '')
|
|
|
}
|
|
|
+ console.log(aloneWeek)
|
|
|
if (this.getTypeTime.judgeTime === 'month') {
|
|
|
this.isActive = aloneWeek.length - 2
|
|
|
} else {
|
|
@@ -101,7 +103,6 @@ export default {
|
|
|
_this.lastIndex = i
|
|
|
}
|
|
|
})
|
|
|
- this.listWeek.push(aloneWeek)
|
|
|
// 处理年份、添加12月
|
|
|
const nowyear = dateFormatter(new Date(), 'yyyy')
|
|
|
let year = date.slice(0, 4)
|
|
@@ -111,11 +112,11 @@ export default {
|
|
|
} else {
|
|
|
this.isMany = true
|
|
|
}
|
|
|
- this.listYear.push(Number(year))
|
|
|
+ this.listYear.push(nowyear)
|
|
|
var newArr = []
|
|
|
for (var i = year; i < nowyear; i++) {
|
|
|
- year = year - 1
|
|
|
- this.listYear.push(year + '')
|
|
|
+ // year = year - 1
|
|
|
+ this.listYear.push(year)
|
|
|
for (var tw = 1; tw <= 12; tw++) {
|
|
|
var twM = tw
|
|
|
twM = '' + twM
|
|
@@ -123,6 +124,13 @@ export default {
|
|
|
}
|
|
|
this.listWeek.push(newArr)
|
|
|
}
|
|
|
+ this.listWeek.push(aloneWeek)
|
|
|
+ this.listWeek[0].forEach(function (item, index) {
|
|
|
+ console.log(item)
|
|
|
+ if (item === nowweek) {
|
|
|
+ _this.listWeek[0] = _this.listWeek[0].splice(0, index + 1)
|
|
|
+ }
|
|
|
+ })
|
|
|
},
|
|
|
getWeek (index, i, month) {
|
|
|
console.log(index, i, month)
|
|
@@ -180,6 +188,7 @@ export default {
|
|
|
display: flex;
|
|
|
margin-bottom: 16px;
|
|
|
width: 44px;
|
|
|
+ height: 30px;
|
|
|
opacity: 1;
|
|
|
font-size: 13px;
|
|
|
font-weight: 400;
|
|
@@ -192,6 +201,7 @@ export default {
|
|
|
flex-direction: column;
|
|
|
margin-left: 32px;
|
|
|
.option_week{
|
|
|
+ height: 30px;
|
|
|
margin-bottom: 16px;
|
|
|
.list_span{
|
|
|
margin-right: 24px;
|
|
@@ -213,7 +223,7 @@ export default {
|
|
|
}
|
|
|
.putaway{
|
|
|
position: absolute;
|
|
|
- right: 0;
|
|
|
+ right: 40px;
|
|
|
bottom: 16px;
|
|
|
color: #2cb7ca;
|
|
|
cursor: pointer;
|