소스 검색

Merge branch 'develop_cuxiao' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_cuxiao

lilei 1 년 전
부모
커밋
f8a990f083
2개의 변경된 파일3개의 추가작업 그리고 2개의 파일을 삭제
  1. 2 2
      src/views/reportData/promotionSalesRealTimeReport/index.vue
  2. 1 0
      src/views/salesReturnManagement/custConfirm/setPriceModal.vue

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

@@ -235,8 +235,8 @@ export default {
         { title: '成本金额', dataIndex: 'totalRealCost', width: '100px', align: 'center', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '损失成本', dataIndex: 'lossCost', width: '100px', align: 'center', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '损失费用', dataIndex: 'lossAmount', width: '100px', align: 'center', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '采购额结余', dataIndex: 'surplusPromoGiftsAmount', width: '100px', align: 'center', customRender: function (text) { return (text ? _this.toThousands(text) : '--') } },
-        { title: '采购额超出', dataIndex: 'outPromoGiftsAmount', width: '100px', align: 'center', customRender: function (text) { return (text ? _this.toThousands(text) : '--') } },
+        { title: '采购额结余', dataIndex: 'surplusPromoGiftsAmount', width: '100px', align: 'center', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '采购额超出', dataIndex: 'outPromoGiftsAmount', width: '100px', align: 'center', 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/salesReturnManagement/custConfirm/setPriceModal.vue

@@ -218,6 +218,7 @@ export default {
             const flag = newList.some(item => Object.keys(item).length > 2)
             if (flag) {
               _this.listInfo = newList.filter(con => Object.keys(con).length > 2)
+               _this.openGrabOrderModal = !!_this.isShow
               const noShowList = newList.filter(con => Object.keys(con).length <= 2)
               _this.noShowBillSnList = _this.getNewSalesBillList(noShowList)
               _this.salesBillSnList = _this.noShowBillSnList ? _this.noShowBillSnList : []