Explorar o código

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

chenrui hai 1 ano
pai
achega
fec4b25ab2

+ 7 - 2
src/views/salesManagement/salesQueryNew/stockOutDetailModal.vue

@@ -6,7 +6,7 @@
     title="销售单缺货明细"
     v-model="isShow"
     @cancel="isShow=false"
-    width="50%">
+    width="70%">
     <a-descriptions size="small" :column="2">
       <a-descriptions-item label="销售单号">
         {{ detailData&&detailData.salesBillNo || '--' }}
@@ -32,6 +32,11 @@
           <a-badge count="促" v-if="record.promotionFlag=='GIFT'" :number-style="{ backgroundColor: '#52c41a', zoom:'80%' }"></a-badge>
           <a-badge count="特" v-if="record.promotionFlag=='DISCOUNT'" :number-style="{ backgroundColor: '#faad14', zoom:'80%' }"></a-badge>
         </template>
+        <!-- 销售价 -->
+        <template slot="price" slot-scope="text, record">
+            {{ toThousands(text) }}
+            <span v-if="record.promotionFlag=='GIFT'||record.promotionFlag=='DISCOUNT'" title="原价">({{ toThousands(record.origPrice) }})</span>
+        </template>
       </s-table>
       <div class="btn-cont" style="padding:20px 20px 0;text-align: center;">
         <!-- <a-button @click="isShow=false">关闭</a-button> -->
@@ -122,7 +127,7 @@ export default {
       ]
       
       if (this.$hasPermissions('B_salesDetail_salesPrice')) { // 售价权限
-        arr.splice(6, 0, { title: '销售价', dataIndex: 'price', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(6, 0, { title: '销售价', dataIndex: 'price', width: '8%', align: 'right', scopedSlots: { customRender: 'price' } })
         arr.splice(7, 0, { title: '销售金额', dataIndex: 'salesAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.splice(8, 0, { title: '缺货金额', dataIndex: 'totalAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }