lilei 2 weeks ago
parent
commit
2378905c6d

+ 5 - 5
src/views/salesManagement/salesQueryNew/comps/detailProductList.vue

@@ -269,20 +269,20 @@ export default {
       }
       //  审核,需用到库存
       if (this.showStock) {
-        arr.push({ title: '库存', field: 'stockQty', width: 80, key: 'm', align: 'center', operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return numsFormat(row[column.field]) } })
+        arr.push({ title: '库存', field: 'stockQty', width: 80, key: 'm', align: 'center', operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return row.borrowFlag != '1' ? numsFormat(row[column.field]) : '--' } })
         if (this.showStockCol) {
-          arr.push({ title: '第三方库存', field: 'thirdStockQty', width: 80, key: 'mm', align: 'center', operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return numsFormat(row[column.field]) } })
+          arr.push({ title: '第三方库存', field: 'thirdStockQty', width: 80, key: 'mm', align: 'center', operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return row.borrowFlag != '1' ? numsFormat(row[column.field]) : '--' } })
         }
       }
       if (this.showTransferDealer && this.type == 'normal') {
         arr.push({ title: '发货经销商库存', field: 'transferDealerStockQty', width: 100, key: 'tt', align: 'center', operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return transferDealerInfo(row, row[column.field], h) } })
       }
       arr = arr.concat([
-        { title: '待下推数', field: 'unpushedQty', width: 80, key: 'o', align: 'center', operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return numsFormat(row[column.field]) } },
-        { title: '已下推数', field: 'pushedQty', width: 80, key: 'p', align: 'center', operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return numsFormat(row[column.field]) } }
+        { title: '待下推数', field: 'unpushedQty', width: 80, key: 'o', align: 'center', operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return row.borrowFlag != '1' ? numsFormat(row[column.field]) : '--' } },
+        { title: '已下推数', field: 'pushedQty', width: 80, key: 'p', align: 'center', operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return row.borrowFlag != '1' ? numsFormat(row[column.field]) : '--' } }
       ])
 
-      arr.push({ title: '已取消数', field: 'cancelQty', width: 80, key: 'q', align: 'center', operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return numsFormat(row[column.field]) } })
+      arr.push({ title: '已取消数', field: 'cancelQty', width: 80, key: 'q', align: 'center', operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return row.borrowFlag != '1' ? numsFormat(row[column.field]) : '--' } })
       if (this.showAveragePrice) {
         this.colspanNums = this.colspanNums + 4
         arr.push({ title: '单重(kg)', field: 'weightKg', width: 80, key: 'q1', align: 'center', operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return numsFormat(row[column.field]) } })

+ 2 - 2
src/views/salesManagement/salesQueryNew/comps/productActiveList.vue

@@ -377,7 +377,7 @@ export default {
                 </a-popover> : '--'
             )
           } },
-        { title: '起订量', field: 'promoUnit', key: '5', width: 60, align: 'center', operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return row[column.field] || '--' } },
+        { title: '起订量', field: 'promoUnit', key: '5', width: 60, align: 'center', operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return (row.borrowFlag != '1' ? row[column.field] : '--') } },
         {
           title: '销售数量',
           field: 'salesNums',
@@ -412,7 +412,7 @@ export default {
           operationColumn: false,
           renderBodyCell: ({ row, column, rowIndex }, h) => {
             return (
-              (row.stockQty || row.stockQty == 0)
+              (row.stockQty || row.stockQty == 0) && row.borrowFlag != '1'
                 ? <div>
                   {
                     Number(row.stockQty) < Number(row.unpushedQty)