lilei 2 dagar sedan
förälder
incheckning
7d1f3c7b2a

+ 17 - 7
src/views/reportData/dailyReport/table0.vue

@@ -19,11 +19,11 @@
             :key="cols+'td'"
             :width="cols==2?350:150"
             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>
         </tr>
       </tbody>
@@ -72,6 +72,7 @@ export default {
     getmonths () {
       this.months = this.month.split('-')[1]
       this.dateStr = this.month.replace('-', '年') + '月'
+      console.log(this.dateStr)
     },
     // 是否显示截止日期
     getshowDz () {
@@ -112,7 +113,14 @@ export default {
         '预估完成|currExpectTireFinish',
         '离目标差额条数|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) {
         row.forEach((item, i) => {
           const nameArr = item.split('|')
@@ -127,8 +135,10 @@ export default {
       getRows(row1, rets, '品牌')
       // 轮胎
       getRows(row2, rets, '轮胎')
-      // 品牌+轮胎
-      getRows(row3, rets, '品牌+轮胎')
+      // NGK
+      getRows(row3, rets, 'NGK')
+      // 品牌+轮胎+NGK
+      getRows(row4, rets, '品牌+轮胎+NGK')
       // 循环列
       rets.forEach(item => {
         this.tableData.forEach((cols, i) => {

+ 3 - 1
src/views/salesManagement/salesQueryNew/printModal.vue

@@ -205,11 +205,13 @@ export default {
             if (_this.form.averagePrice == '1') {
               _this.form.priceType += '_WEIGHT'
             }
+            if (_this.form.origCode == '1') {
+              _this.form.priceType += '_ORIG_CODE'
+            }
             const obj = {
               salesBillSn: _this.itemData.salesBillSn,
               priceType: _this.form.priceType,
               dataScope: _this.form.dataScope == 'all' ? '' : _this.form.dataScope,
-              origCode: _this.form.origCode,
               type: isPrint || 'preview'
             }
             _this.$emit('ok', obj)