chenrui 1 gadu atpakaļ
vecāks
revīzija
3206f93257
1 mainītis faili ar 26 papildinājumiem un 8 dzēšanām
  1. 26 8
      src/views/salesManagement/salesQueryNew/list.vue

+ 26 - 8
src/views/salesManagement/salesQueryNew/list.vue

@@ -460,6 +460,12 @@ export default {
           value: 'showPurchaseQty',
           key: 'showPurchaseQty',
           disabled: false
+        },
+        {
+          title: '转采购额金额',
+          value: 'showPurchasePrice',
+          key: 'showPurchasePrice',
+          disabled: !this.$hasPermissions('M_salesQueryList_salesPrice')
         }
       ]
     }
@@ -474,8 +480,15 @@ export default {
         { title: '客户名称', dataIndex: 'buyerName', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '出库仓库', scopedSlots: { customRender: 'warehouseBox' }, width: '8%', align: 'left', ellipsis: true },
         { title: '总数量', dataIndex: 'totalQty', scopedSlots: { customRender: 'totalQty' }, width: '4%', align: 'center' },
+        // { title: '总售价', dataIndex: 'totalAmount', width: '4%', align: 'right',isShow:true,customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '已下推数量', dataIndex: 'totalPushedQty', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        // { title: '下推总金额', dataIndex: 'totalPushedAmount', width: '4%', align: 'right', isShow:true, customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        // { title: '待下推数量', dataIndex: 'totalUnpushedQty', width: '4%', align: 'center', isShow:true, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        // { title: '待下推金额', dataIndex: 'totalUnpushedAmount', width: '4%', align: 'right',isShow:true,  customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '已发货数量', dataIndex: 'totalDispatchQty', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        // { title: '已取消数量', dataIndex: 'totalCancelQty', width: '4%', align: 'center',isShow:true,  customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        // { title: '转采购额数量', dataIndex: 'totalConvertPromoGiftsQty', width: '4%', align: 'center',isShow:true,  customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        // { title: '转采购额金额', dataIndex: 'totalConvertPromoGiftsAmount', width: '4%', align: 'right',isShow:true,  customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '收款方式', dataIndex: 'settleStyleSnDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '审核时间', dataIndex: 'auditDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
         { title: '最近备货时间', dataIndex: 'lastStockUpDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
@@ -487,24 +500,29 @@ export default {
       if (this.$hasPermissions('M_salesQueryList_salesPrice')) { // 售价权限
         arr.splice(6, 0, { title: '总售价', dataIndex: 'totalAmount', width: '4%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.splice(8, 0, { title: '下推总金额', dataIndex: 'totalPushedAmount', width: '4%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-      }
-      if (this.showCols.includes('showCancelQty')) {
-        const pos = this.$hasPermissions('M_salesQueryList_salesPrice') ? 9 : 7
-        arr.splice(pos, 0, { title: '已取消数量', dataIndex: 'totalCancelQty', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        if (this.showCols.includes('showPushedPrice')) {
+          const pos = this.showCols.includes('showPushedQty') ? 10 : 8
+          arr.splice(pos, 0, { title: '待下推金额', dataIndex: 'totalUnpushedAmount', width: '4%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        }
       }
       if (this.showCols.includes('showPushedQty')) {
-        const pos = this.$hasPermissions('M_salesQueryList_salesPrice') && this.showCols.includes('showCancelQty') ? 11 : 8
+        const pos = this.$hasPermissions('M_salesQueryList_salesPrice') ? 9 : 7
         arr.splice(pos, 0, { title: '待下推数量', dataIndex: 'totalUnpushedQty', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
       }
-      if (this.$hasPermissions('M_salesQueryList_salesPrice') && this.showCols.includes('showPushedPrice')) {
-        const pos = this.showCols.includes('showCancelQty') && this.showCols.includes('showPushedQty') ? 12 : 10
-        arr.splice(pos, 0, { title: '待下推金额', dataIndex: 'totalUnpushedAmount', width: '4%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+
+      if (this.showCols.includes('showCancelQty')) {
+        const pos = this.$hasPermissions('M_salesQueryList_salesPrice') ? 9 : 7
+        arr.splice(pos, 0, { title: '已取消数量', dataIndex: 'totalCancelQty', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
       }
 
       if (this.showCols.includes('showPurchaseQty')) {
         const pos = this.$hasPermissions('M_salesQueryList_salesPrice') && this.showCols.includes('showCancelQty') && this.showCols.includes('showPushedQty') ? 13 : 10
         arr.splice(pos, 0, { title: '转采购额数量', dataIndex: 'totalConvertPromoGiftsQty', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
       }
+      if (this.$hasPermissions('M_salesQueryList_salesPrice') && this.showCols.includes('showPurchasePrice')) {
+        const pos = this.$hasPermissions('M_salesQueryList_salesPrice') && this.showCols.includes('showCancelQty') && this.showCols.includes('showPushedQty') ? 13 : 10
+        arr.splice(pos + 1, 0, { title: '转采购额金额', dataIndex: 'totalConvertPromoGiftsAmount', width: '4%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      }
       return arr
     }
   },