Browse Source

bug 修复

lilei 4 years ago
parent
commit
243ec37c34

+ 2 - 3
src/views/salesManagement/salesQuery/detail.vue

@@ -25,8 +25,7 @@
           <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.payType || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="收款方式">{{ detailData.settleStyleSn || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="收款方式">{{ detailData.settleStyleDictValue || '--' }}</a-descriptions-item>
             <a-descriptions-item label="联系电话">{{ detailData.consigneeTel || '--' }}</a-descriptions-item>
             <a-descriptions-item label="备注">{{ detailData.buyerName || '--' }}</a-descriptions-item>
             <a-descriptions-item label="销售单号">{{ detailData.salesBillNo || '--' }}</a-descriptions-item>
@@ -104,7 +103,7 @@ export default {
         { title: '销售数量', dataIndex: 'qty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '单位', dataIndex: 'productOrigUnit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '售价小计', dataIndex: 'totalAmount', width: 100, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
-        { title: '折后小计', dataIndex: 'totalCost', width: 100, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
+        { title: '折后小计', dataIndex: 'discountedAmount', width: 100, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
         { title: '折扣金额', dataIndex: 'discountAmount', width: 100, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
         { title: '仓库', dataIndex: 'warehouseName', width: 100, align: 'center' },
         { title: '仓位', dataIndex: 'warehouseLocationName', width: 100, align: 'center' },

+ 7 - 7
src/views/salesManagement/salesQuery/list.vue

@@ -139,12 +139,6 @@
           v-if="record.billStatus !== 'CANCEL' && record.billStatus !== 'FINISH' && record.billStatus != 'WAIT_OUT_STOCK'"
           @click="handleEdit(record)"
           id="salesManagementList-edit-btn">编辑</a-button>
-        <a-button
-          size="small"
-          type="primary"
-          class="button-success"
-          @click="handleDetail(record)"
-          id="salesManagementList-view-btn">详情</a-button>
         <a-button
           size="small"
           type="primary"
@@ -152,6 +146,12 @@
           v-if="record.billStatus !== 'FINISH' && record.financialStatus !== 'FINISH'"
           @click="handleDel(record)"
           id="salesManagementList-del-btn">删除</a-button>
+        <a-button
+          size="small"
+          type="primary"
+          class="button-success"
+          @click="handleDetail(record)"
+          id="salesManagementList-view-btn">详情</a-button>
       </template>
     </s-table>
     <!-- 选择客户弹框 -->
@@ -210,7 +210,7 @@ export default {
         { title: '急件', dataIndex: 'oosFlag', scopedSlots: { customRender: 'oosFlag' }, width: 100, align: 'center' },
         { title: '业务状态', dataIndex: 'billStatusDictValue', width: 110, align: 'center' },
         { title: '财务状态', dataIndex: 'financialStatusDictValue', width: 110, align: 'center' },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 250, align: 'center', fixed: 'right' }
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 280, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {