lilei %!s(int64=4) %!d(string=hai) anos
pai
achega
1566cc89fe
Modificáronse 1 ficheiros con 15 adicións e 9 borrados
  1. 15 9
      src/views/salesManagement/salesQuery/detail.vue

+ 15 - 9
src/views/salesManagement/salesQuery/detail.vue

@@ -24,10 +24,10 @@
         <a-collapse-panel key="1" header="基础信息">
           <a-descriptions size="small" :column="3" v-if="detailData">
             <a-descriptions-item label="客户名称">{{ detailData.buyerName || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="收货地址">{{ detailData.shippingAddressProvinceName || '--' }}{{ detailData.shippingAddressCityName || '--' }}{{ detailData.shippingAddressCountyName || '--' }}{{ detailData.shippingAddress || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="收款方式">{{ detailData.settleStyleSn || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="收货人">{{ detailData.operatorName || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="收货电话">{{ detailData.consigneeTel || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="收货地址">{{ detailData.salesBillExtEntity.shippingAddrProvinceName || '--' }}{{ detailData.salesBillExtEntity.shippingAddrCityName || '--' }}{{ detailData.salesBillExtEntity.shippingAddrCountyName || '--' }}{{ detailData.salesBillExtEntity.shippingAddr || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="收款方式">{{ detailData.settleStyleSnDictValue || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="收货人">{{ detailData.salesBillExtEntity.consigneeName || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="收货电话">{{ detailData.salesBillExtEntity.consigneeTel || '--' }}</a-descriptions-item>
             <a-descriptions-item label="备注">{{ detailData.remarks || '--' }}</a-descriptions-item>
             <a-descriptions-item label="审核时间">{{ detailData.auditDate || '--' }}</a-descriptions-item>
             <a-descriptions-item label="业务状态">{{ detailData.billStatusDictValue || '--' }}</a-descriptions-item>
@@ -40,8 +40,8 @@
       <!-- alert -->
       <a-alert type="info" style="margin-bottom: 15px;" v-if="detailData">
         <div slot="message">
-          总销售数量:<strong>{{ detailData.totalQty || 0 }}</strong>;已取消数量:<strong>{{ detailData.cancelQty || 0 }}</strong>;已下推数量:<strong>{{ detailData.pushedQty || 0 }}</strong>;待下推数量:<strong>{{ detailData.unpushedQty || 0 }}</strong>;<br/>
-          总售价:<strong>{{ detailData.totalAmount || 0 }}</strong>;总成本:<strong>{{ detailData.totalCost || 0 }}</strong>;总毛利:<strong>{{ detailData.grossProfit || 0 }}</strong>;已取消金额:<strong>{{ detailData.totalCancelAmount || 0 }}</strong>;已下推金额:<strong>{{ detailData.totalPushedAmount || 0 }}%</strong>;待下推金额:<strong>{{ detailData.totalUnpushedAmount || 0 }}</strong>;
+          总销售数量:<strong>{{ detailData.totalQty || 0 }}</strong>;已取消数量:<strong>{{ detailData.totalCancelQty || 0 }}</strong>;已下推数量:<strong>{{ detailData.totalPushedQty || 0 }}</strong>;待下推数量:<strong>{{ detailData.totalUnpushedQty || 0 }}</strong>;<br/>
+          总售价:<strong>{{ detailData.totalAmount || 0 }}</strong>;总成本:<strong>{{ detailData.totalCost || 0 }}</strong>;总毛利:<strong>{{ detailData.grossProfit || 0 }}</strong>;已取消金额:<strong>{{ detailData.totalCancelAmount || 0 }}</strong>;已下推金额:<strong>{{ detailData.totalPushedAmount || 0 }}</strong>;待下推金额:<strong>{{ detailData.totalUnpushedAmount || 0 }}</strong>;
         </div>
       </a-alert>
       <!-- 列表 -->
@@ -54,6 +54,13 @@
         :data="loadData"
         :scroll="{ x: 1660 }"
         bordered>
+        <!-- 产品编码 -->
+        <template slot="productCode" slot-scope="text, record">
+          <a-badge count="促" v-if="record.promotionFlag == 1">
+            <div style="padding-right: 15px;">{{ text }}</div>
+          </a-badge>
+          <span v-else>{{ text }}</span>
+        </template>
       </s-table>
     </a-card>
     <a-card size="small" :bordered="false" class="footer-cont">
@@ -106,13 +113,12 @@ export default {
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
-        { title: '产品编码', dataIndex: 'productCode', width: 140, align: 'center' },
+        { title: '产品编码', dataIndex: 'productCode', width: 140, scopedSlots: { customRender: 'productCode' }, align: 'center' },
         { title: '产品名称', dataIndex: 'productName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '原厂编码', dataIndex: 'productOrigCode', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '成本价', dataIndex: 'realCost', width: 100, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
+        { title: '成本价', dataIndex: 'showCost', width: 100, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
         { title: '销售价', dataIndex: 'price', width: 100, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
         { title: '单位', dataIndex: 'productOrigUnit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '可用库存数量', dataIndex: 'refundableQty', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '销售数量', dataIndex: 'qty', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '已取消数', dataIndex: 'cancelQty', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '已下推数', dataIndex: 'pushedQty', width: 100, align: 'center', customRender: function (text) { return text || '--' } },