|
@@ -19,11 +19,11 @@
|
|
:key="cols+'td'"
|
|
:key="cols+'td'"
|
|
:width="cols==2?350:150"
|
|
:width="cols==2?350:150"
|
|
v-if="item['col'+cols]!==''"
|
|
v-if="item['col'+cols]!==''"
|
|
- :rowspan="hasRowspan(item['col'+cols])[1]"
|
|
|
|
- :align="item['col'+cols].indexOf('.')>=0 ? (hasRate(item)&&cols>2?'center':'right'):'center'"
|
|
|
|
- :class="item.key=='currRealFinish'||item.key=='currRealTireFinish'?'red':''"
|
|
|
|
|
|
+ :rowspan="hasRowspan(item['col'+cols])?hasRowspan(item['col'+cols])[1]:''"
|
|
|
|
+ :align="item['col'+cols]&&item['col'+cols].indexOf('.')>=0 ? (hasRate(item)&&cols>2?'center':'right'):'center'"
|
|
|
|
+ :class="item.key=='currRealFinish'||item.key=='currRealTireFinish'||item.key=='currNgkRealFinish'?'red':''"
|
|
>
|
|
>
|
|
- {{ hasRowspan(item['col'+cols])[1] ? hasRowspan(item['col'+cols])[0] : item['col'+cols] }}{{ hasRate(item)&&cols>2?'%':'' }}
|
|
|
|
|
|
+ {{ hasRowspan(item['col'+cols])&&hasRowspan(item['col'+cols])[1] ? hasRowspan(item['col'+cols])[0] : item['col'+cols] }}{{ hasRate(item)&&cols>2?'%':'' }}
|
|
</td>
|
|
</td>
|
|
</tr>
|
|
</tr>
|
|
</tbody>
|
|
</tbody>
|
|
@@ -72,6 +72,7 @@ export default {
|
|
getmonths () {
|
|
getmonths () {
|
|
this.months = this.month.split('-')[1]
|
|
this.months = this.month.split('-')[1]
|
|
this.dateStr = this.month.replace('-', '年') + '月'
|
|
this.dateStr = this.month.replace('-', '年') + '月'
|
|
|
|
+ console.log(this.dateStr)
|
|
},
|
|
},
|
|
// 是否显示截止日期
|
|
// 是否显示截止日期
|
|
getshowDz () {
|
|
getshowDz () {
|
|
@@ -112,7 +113,14 @@ export default {
|
|
'预估完成|currExpectTireFinish',
|
|
'预估完成|currExpectTireFinish',
|
|
'离目标差额条数|currTargetTireDiff'
|
|
'离目标差额条数|currTargetTireDiff'
|
|
]
|
|
]
|
|
- const row3 = ['本月实际销售额|totalCurrRealFinish', '本月预估完成|totalCurrExpectFinish']
|
|
|
|
|
|
+ const row3 = [
|
|
|
|
+ '截止1-' + (this.months - 1) + '月销售实际完成|histNgkSalesReal',
|
|
|
|
+ '累计' + this.months + '月销售实际截止完成|accuNgkSalesReal',
|
|
|
|
+ '本月实际销售|currNgkSalesReal',
|
|
|
|
+ '本月销售实际退货|currNgkReturnReal',
|
|
|
|
+ '本月销售实际完成|currNgkRealFinish'
|
|
|
|
+ ]
|
|
|
|
+ const row4 = ['本月实际销售额|totalCurrRealFinish', '本月预估完成|totalCurrExpectFinish']
|
|
const getRows = function (row, arr, name) {
|
|
const getRows = function (row, arr, name) {
|
|
row.forEach((item, i) => {
|
|
row.forEach((item, i) => {
|
|
const nameArr = item.split('|')
|
|
const nameArr = item.split('|')
|
|
@@ -127,8 +135,10 @@ export default {
|
|
getRows(row1, rets, '品牌')
|
|
getRows(row1, rets, '品牌')
|
|
// 轮胎
|
|
// 轮胎
|
|
getRows(row2, rets, '轮胎')
|
|
getRows(row2, rets, '轮胎')
|
|
- // 品牌+轮胎
|
|
|
|
- getRows(row3, rets, '品牌+轮胎')
|
|
|
|
|
|
+ // NGK
|
|
|
|
+ getRows(row3, rets, 'NGK')
|
|
|
|
+ // 品牌+轮胎+NGK
|
|
|
|
+ getRows(row4, rets, '品牌+轮胎+NGK')
|
|
// 循环列
|
|
// 循环列
|
|
rets.forEach(item => {
|
|
rets.forEach(item => {
|
|
this.tableData.forEach((cols, i) => {
|
|
this.tableData.forEach((cols, i) => {
|