chenrui 1 سال پیش
والد
کامیت
7b994ad213

+ 1 - 1
src/views/purchasingManagement/purchaseOrder/detail.vue

@@ -96,7 +96,7 @@
               </template>
               <!-- 采购金额 -->
               <template slot="amount" slot-scope="text, record">
-                <span v-if="record.promotionFlag && (record.promotionFlag=='GIFT' || record.promotionFlag=='DISCOUNT')">{{ record.discountedAmount||record.discountedAmount==0?toThousands(record.discountedAmount) : '--' }}{{ record.origPrice ? '(' + toThousands(record.origPrice) + ')' : '' }}</span>
+                <span v-if="record.promotionFlag && (record.promotionFlag=='GIFT' || record.promotionFlag=='DISCOUNT')">{{ record.discountedAmount||record.discountedAmount==0?toThousands(record.discountedAmount) : '--' }}{{ record.totalOrigAmount ? '(' + toThousands(record.totalOrigAmount) + ')' : '' }}</span>
                 <span v-else>{{ toThousands(record.discountedAmount) }}</span>
               </template>
             </s-table>

+ 1 - 1
src/views/purchasingManagement/purchaseOrderNew/detail.vue

@@ -100,7 +100,7 @@
           </template>
           <!-- 采购金额 -->
           <template slot="amount" slot-scope="text, record">
-            <span v-if="record.promotionFlag && (record.promotionFlag=='GIFT' || record.promotionFlag=='DISCOUNT')">{{ record.discountedAmount||record.discountedAmount==0?toThousands(record.discountedAmount) : '--' }}{{ record.origPrice ? '(' + toThousands(record.origPrice) + ')' : '' }}</span>
+            <span v-if="record.promotionFlag && (record.promotionFlag=='GIFT' || record.promotionFlag=='DISCOUNT')">{{ record.discountedAmount||record.discountedAmount==0?toThousands(record.discountedAmount) : '--' }}{{ record.totalOrigAmount ? '(' + toThousands(record.totalOrigAmount) + ')' : '' }}</span>
             <span v-else>{{ toThousands(record.discountedAmount||0) }}</span>
           </template>
         </s-table>

+ 6 - 1
src/views/purchasingManagement/purchaseOutOfStock/detailModal.vue

@@ -45,6 +45,11 @@
           <a-badge v-if="record.promotionFlag && record.promotionFlag=='GIFT'" count="促" :number-style="{ backgroundColor: '#52c41a', zoom:'86%',marginLeft:'8px' }"></a-badge>
           <a-badge v-if="record.promotionFlag && record.promotionFlag=='DISCOUNT'" count="特" :number-style="{ backgroundColor: '#faad14', zoom:'86%',marginLeft:'8px' }"></a-badge>
         </template>
+        <!-- 缺货单价 -->
+        <template slot="unitPrice" slot-scope="text, record">
+          <span v-if="record.promotionFlag && (record.promotionFlag=='GIFT' || record.promotionFlag=='DISCOUNT')">{{ record.price||record.price==0? toThousands(record.price): '--' }}{{ record.origPrice ? '(' + toThousands(record.origPrice) + ')' : '' }}</span>
+          <span v-else>{{ toThousands(record.price||0) }}</span>
+        </template>
       </s-table>
       <div class="btn-cont">
         <a-button id="inventoryQueryDetail-detail-modal-back" @click="isShow = false">返回列表</a-button>
@@ -86,7 +91,7 @@ export default {
         { title: '原厂编码', dataIndex: 'origCode', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单位', dataIndex: 'unit', width: '10%', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '缺货数量', dataIndex: 'qty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '单价', dataIndex: 'price', width: '11%', align: 'right', customRender: function (text, record) { return ((text || text == 0) ? _this.toThousands(text) + (record.origPrice ? '(' + _this.toThousands(record.origPrice) + ')' : '') : '--') } },
+        { title: '单价', dataIndex: 'price', width: '11%', align: 'right', scopedSlots: { customRender: 'unitPrice' } },
         { title: '缺货金额', dataIndex: 'totalAmount', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
       ]
       return arr