Browse Source

销售单

chenrui 2 years ago
parent
commit
e851f72c1e

+ 10 - 2
src/views/salesManagement/productPricing/list.vue

@@ -75,6 +75,14 @@
       :scroll="{ y: tableHeight }"
       :defaultLoadData="false"
       bordered>
+      <!-- 车主价 -->
+      <template slot="carOwners" slot-scope="text, record">
+        {{ (record.carOwnersPrice ||record.carOwnersPrice==0)?toThousands(record.carOwnersPrice):'--' }}/{{ record.dealerProductPrice &&(record.dealerProductPrice.carOwnersPrice ||record.dealerProductPrice.carOwnersPrice==0)? toThousands(record.dealerProductPrice.carOwnersPrice):'--' }}
+      </template>
+      <!-- 终端价 -->
+      <template slot="terminal" slot-scope="text, record">
+        {{ (record.terminalPrice ||record.terminalPrice==0)?toThousands(record.terminalPrice):'--' }}/{{ record.dealerProductPrice &&(record.dealerProductPrice.terminalPrice ||record.dealerProductPrice.terminalPrice==0)? toThousands(record.dealerProductPrice.terminalPrice):'--' }}
+      </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
         <a-button
@@ -157,7 +165,7 @@ export default {
         { title: '原厂编码', dataIndex: 'origCode', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'productBrandName', width: '11%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
         { title: '库存数量', dataIndex: 'stockQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '车主价', dataIndex: 'carOwnersPrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '车主价/自定义车主价', scopedSlots: { customRender: 'carOwners' }, width: '12%', align: 'right' },
         { title: '产品状态', dataIndex: 'onlineFalgDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '6%', align: 'center' }
       ]
@@ -180,7 +188,7 @@ export default {
         arr.splice(ind, 0, { title: '特约价', dataIndex: 'specialPrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       if (this.isTerminalPrice) {
-        arr.splice(arr.length - 2, 0, { title: '终端会员价', dataIndex: 'terminalPrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(arr.length - 2, 0, { title: '终端价/自定义终端价', scopedSlots: { customRender: 'terminal' }, width: '12%', align: 'right' })
       }
       return arr
     }

+ 1 - 1
src/views/salesManagement/salesQuery/queryPart.vue

@@ -323,7 +323,7 @@ export default {
             data.list[i].no = data.list[i].productSn + '_' + (no + i + 1)
             data.list[i].salesNums = 1
             data.list[i].currentQty = data.list[i].currentQty || 0
-            data.list[i].price = data.list[i].lastSalePrice ? data.list[i].lastSalePrice : data.list[i].salePrice
+            data.list[i].price = data.list[i].origSalePriceFlag == 0 ? data.list[i].lastSalePrice : data.list[i].origSalePriceFlag == 1 ? data.list[i].salePrice : data.list[i].selfSaleprice
             data.list[i].productOrigCode = data.list[i].productOrigCode ? data.list[i].productOrigCode.trim() : ''
           }
           if (!params.vinCode) {