chenrui před 4 roky
rodič
revize
58057bbfd1

+ 5 - 3
src/views/salesManagement/salesQuery/chooseActive.vue

@@ -26,7 +26,7 @@
         :columns="columns"
         :data-source="list"
         :loading="loading"
-        :scroll="{ y: 350 }"
+        :scroll="{ x: 1190, y: 350 }"
         bordered>
         <!-- 销售数量 -->
         <template slot="salesNums" slot-scope="text, record">
@@ -84,9 +84,9 @@ export default {
         { title: '成本价', dataIndex: 'cost', align: 'center', customRender: function (text) { return (text == undefined ? '--' : ('¥' + text)) } },
         { title: '原售价', dataIndex: 'productPrice', align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
         { title: '促销价', dataIndex: 'promoRuleGoods.goodsPrice', align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
-        { title: '数量', dataIndex: 'qty', scopedSlots: { customRender: 'salesNums' }, align: 'center' },
+        { title: '数量', dataIndex: 'qty', scopedSlots: { customRender: 'salesNums' }, width: 150, align: 'center' },
         { title: '单位', dataIndex: 'unit', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '促销类型', dataIndex: 'promoRuleGoods.promoRuleTypeName', align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '促销类型', dataIndex: 'promoRuleGoods.promoRuleTypeName', width: 200, align: 'center', customRender: function (text) { return text || '--' } }
       ],
       selectedRowKeys: [], // Check here to configure the default column
       selectedRows: [],
@@ -99,6 +99,8 @@ export default {
     getData (row) {
       this.loading = true
       this.salesBillDetailSn = row.salesBillDetailSn
+      this.selectedRowKeys = []
+      this.selectedRows = []
       getPromoGoodsList({ salesBillDetailSn: row.salesBillDetailSn, buyerSn: this.buyerSn }).then(res => {
         res.data.map(item => {
           item.qty = 1

+ 3 - 4
src/views/salesManagement/salesQuery/queryPromotable.vue

@@ -7,14 +7,13 @@
     :rowKey="(record) => record.id"
     :columns="columns"
     :data="loadData"
-    :scroll="{ x:1470, y: 300 }"
+    :scroll="{ x:1430, y: 300 }"
     :defaultLoadData="false"
     bordered>
     <!-- 产品名称 -->
     <template slot="productName" slot-scope="text, record">
       <span>{{ text }}</span>
     </template>
-
     <!-- 销售数量 -->
     <template slot="salesNums" slot-scope="text, record">
       <editable-cell
@@ -68,8 +67,8 @@ export default {
         { title: '促销价', dataIndex: 'price', width: 120, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
         { title: '数量', dataIndex: 'qty', scopedSlots: { customRender: 'salesNums' }, width: 150, align: 'center' },
         { title: '单位', dataIndex: 'productEntity.unit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '促销类型', dataIndex: 'promotionRulesName', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 200, align: 'center', fixed: 'right' }
+        { title: '促销类型', dataIndex: 'promotionRulesName', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {