Procházet zdrojové kódy

Merge commit '748bf4e7c84780c768269fb28c2c81e9b76313df' into HEAD

gitadmin před 1 měsícem
rodič
revize
0a3c91a911

+ 2 - 0
src/views/reportData/promotionSalesRealTimeReport/index.vue

@@ -168,6 +168,7 @@
                       <a-col span="4">采购额超出:{{ (totalData && (totalData.outPromoGiftsAmount || totalData.outPromoGiftsAmount==0)) ? toThousands(totalData.outPromoGiftsAmount) : '--' }}</a-col>
                       <a-col span="4">转采购额数量:{{ (totalData && (totalData.convertPromoGiftsQty || totalData.convertPromoGiftsQty==0)) ? totalData.convertPromoGiftsQty : '--' }}</a-col>
                       <a-col span="4">转采购额金额:{{ (totalData && (totalData.convertPromoGiftsAmount || totalData.convertPromoGiftsAmount==0)) ? toThousands(totalData.convertPromoGiftsAmount) : '--' }}</a-col>
+                      <a-col span="4">促销金额:{{ (totalData && (totalData.promoAmount || totalData.promoAmount==0)) ? toThousands(totalData.promoAmount) : '--' }}</a-col>
                     </a-row>
                   </a-col>
                 </a-row>
@@ -271,6 +272,7 @@ export default {
         { title: <a-tooltip placement='top' title='即促销产品转采购额金额,促销产品转采购额数量*销售价'>转采购额金额&nbsp;<a-icon type="question-circle" /></a-tooltip>, dataIndex: 'convertPromoGiftsAmount', width: '100px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '采购额结余', dataIndex: 'surplusPromoGiftsAmount', width: '100px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '采购额超出', dataIndex: 'outPromoGiftsAmount', width: '100px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '促销金额', dataIndex: 'promoAmount', width: '90px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '促销品费用归属品牌', dataIndex: 'promoProductBrandName', width: '120px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '促销品费用归属分类', dataIndex: 'promoProductTypeName', width: '120px', align: 'center', customRender: function (text) { return text || '--' } }
       ],

+ 1 - 0
src/views/reportData/tireSubsidyReport/incrementalSubsidyList.vue

@@ -203,6 +203,7 @@ export default {
         { title: '总部退货数量', dataIndex: 'returnQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总部合计数量', dataIndex: 'headTotalQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '转单订货数量', dataIndex: 'transferQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '轮胎省仓销售数量', dataIndex: 'qplsSalesQty', width: '11%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '合计订货数量', dataIndex: 'totalQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '季度目标', dataIndex: 'subsidyTarget', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '季度增量补贴', dataIndex: 'subsidyValue', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },

+ 2 - 1
src/views/reportData/tireSubsidyReport/incrementalSubsidyYearList.vue

@@ -224,12 +224,13 @@ export default {
         { title: '总部退货数量', dataIndex: 'returnQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总部合计数量', dataIndex: 'headTotalQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '转单订货数量', dataIndex: 'transferQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '轮胎省仓销售数量', dataIndex: 'qplsSalesQty', width: '11%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '合计订货数量', dataIndex: 'totalQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '年度目标', dataIndex: 'subsidyTarget', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '年度增量补贴', dataIndex: 'subsidyValue', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '增量补贴金额', dataIndex: 'subsidyAmount', width: '10%', align: 'right', scopedSlots: { customRender: 'subsidyAmount' } },
         { title: '增量已补金额', dataIndex: 'settleAmountFinish', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '剩余增量补贴金额', dataIndex: 'settleAmountWait', width: '10%', align: 'right', scopedSlots: { customRender: 'settleAmountWait' } }
+        { title: '剩余增量补贴金额', dataIndex: 'settleAmountWait', width: '11%', align: 'right', scopedSlots: { customRender: 'settleAmountWait' } }
       ]
       return arr
     }

+ 14 - 7
src/views/salesManagement/salesQueryNew/list.vue

@@ -159,8 +159,12 @@
                 <div v-if="$hasPermissions('M_salesQueryList_salesPrice')">待审核金额:<strong>{{ totalData&&(totalData.totalWaitAuditAmount || totalData.totalWaitAuditAmount==0) ? toThousands(totalData.totalWaitAuditAmount) : '0' }}</strong>;</div>
               </div>
               <div class="tongji-bar-col">
-                <div>待下推数量:<strong>{{ totalData&&(totalData.totalUnpushedQty || totalData.totalUnpushedQty==0) ? totalData.totalUnpushedQty : '0' }}</strong>;</div>
-                <div v-if="$hasPermissions('M_salesQueryList_salesPrice')">待下推金额:<strong>{{ totalData&&(totalData.totalUnpushedAmount || totalData.totalUnpushedAmount==0) ? toThousands(totalData.totalUnpushedAmount) : '0' }}</strong>;</div>
+                <div>待下推数量(含缺货):<strong>{{ totalData&&(totalData.totalUnpushedQty || totalData.totalUnpushedQty==0) ? totalData.totalUnpushedQty : '0' }}</strong>;</div>
+                <div v-if="$hasPermissions('M_salesQueryList_salesPrice')">待下推金额(含缺货):<strong>{{ totalData&&(totalData.totalUnpushedAmount || totalData.totalUnpushedAmount==0) ? toThousands(totalData.totalUnpushedAmount) : '0' }}</strong>;</div>
+              </div>
+              <div class="tongji-bar-col">
+                <div>缺货数量:<strong>{{ totalData&&(totalData.totalOosQty || totalData.totalOosQty==0) ? totalData.totalOosQty : '0' }}</strong>;</div>
+                <div>缺货金额:<strong>{{ totalData&&(totalData.totalOosAmount || totalData.totalOosAmount==0) ? toThousands(totalData.totalOosAmount) : '0' }}</strong>;</div>
               </div>
               <div class="tongji-bar-col">
                 <div>下推数量:<strong>{{ totalData&&(totalData.totalPushedQty || totalData.totalPushedQty==0) ? totalData.totalPushedQty : '0' }}</strong>;</div>
@@ -557,14 +561,17 @@ export default {
       ]
       // 根据权限及勾选按固定顺序动态显示列
       arr.map(item => {
-        if (this.$hasPermissions('M_salesQueryList_salesPrice')) {
-          item.isShow = ['totalAmount', 'totalPushedAmount', 'totalUnpushedAmount', 'totalConvertPromoGiftsAmount'].includes(item.dataIndex)
+        item.isShow = true
+        const arr = ['totalAmount', 'totalPushedAmount', 'totalUnpushedAmount', 'totalConvertPromoGiftsAmount']
+        if (arr.includes(item.dataIndex)) {
+          item.isShow = _this.$hasPermissions('M_salesQueryList_salesPrice')
         }
-        if (this.colsArr.find(k => k.value == item.dataIndex)) {
-          item.isShow = this.showCols.includes(item.dataIndex)
+        if (_this.colsArr.find(k => k.value == item.dataIndex)) {
+          item.isShow = _this.showCols.includes(item.dataIndex)
         }
       })
-      return arr.filter(item => !this.colsArr.find(k => k.value == item.dataIndex) || item.isShow)
+      console.log(arr, _this.$hasPermissions('M_salesQueryList_salesPrice'))
+      return arr.filter(item => item.isShow)
     }
   },
   methods: {