Forráskód Böngészése

Merge branch 'deploy' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into deploy

chenrui 4 éve
szülő
commit
af1e14952f

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

@@ -25,7 +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.settleStyleDictValue || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="收款方式">{{ detailData.settleStyleEntity.name || '--' }}</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>
@@ -107,7 +107,7 @@ export default {
         { 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' },
-        { title: '销售类型', dataIndex: 'salesBillType', width: 100, align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '是否急件', dataIndex: 'oosFlagDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 0 - 6
src/views/salesManagement/salesQuery/list.vue

@@ -150,12 +150,6 @@
           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>
     <!-- 选择客户弹框 -->