lilei 4 лет назад
Родитель
Сommit
a9711d542e

+ 4 - 4
src/views/salesManagement/salesQuery/edit.vue

@@ -13,7 +13,7 @@
         <a-button key="1" type="primary" id="salesEdit-print-btn">快速打印</a-button>
       </template>
     </a-page-header>
-    <a-card size="small" :bordered="false" class="salesEdit-cont">
+    <a-card :bordered="false" class="salesEdit-cont">
       <div slot="title">
         <div class="p-title">
           选择产品
@@ -74,7 +74,7 @@
         bordered>
         <!-- 产品名称 -->
         <template slot="productName" slot-scope="text, record">
-          <a-badge count="活动" v-if="record.oosFlag == 1">
+          <a-badge count="活动" v-if="record.promotableFlag == 1">
             <div style="padding-right: 15px;">{{ text }}</div>
           </a-badge>
           <span v-else>{{ text }}</span>
@@ -151,8 +151,8 @@ export default {
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '产品编码', dataIndex: 'productEntity.code', scopedSlots: { customRender: 'productCode' }, width: 200, align: 'center', sorter: true },
-        { title: '产品名称', dataIndex: 'productEntity.name', scopedSlots: { customRender: 'productName' }, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'productEntity.code', width: 150, align: 'center', sorter: true },
+        { title: '产品名称', dataIndex: 'productEntity.name', scopedSlots: { customRender: 'productName' }, align: 'center' },
         { title: '售价', dataIndex: 'price', width: 150, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
         { title: '销售数量', scopedSlots: { customRender: 'salesNums' }, width: 150, align: 'center' },
         { title: '单位', dataIndex: 'productEntity.unit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },

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

@@ -72,7 +72,7 @@
       </template>
       <!-- 产品名称 -->
       <template slot="productName" slot-scope="text, record">
-        <a-badge count="活动" v-if="record.oosFlag == 1">
+        <a-badge count="活动" v-if="record.promotableFlag == 1">
           <div style="padding-right: 15px;">{{ text }}</div>
         </a-badge>
         <span v-else>{{ text }}</span>
@@ -124,9 +124,10 @@ export default {
       exportLoading: false, // 导出loading
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '产品名称', dataIndex: 'productName', scopedSlots: { customRender: 'productName' }, width: 200, align: 'center' },
+        { title: '产品编码', dataIndex: 'productCode', width: 150, align: 'center' },
+        { title: '产品名称', dataIndex: 'productName', scopedSlots: { customRender: 'productName' }, align: 'center' },
         { title: '原厂编码', dataIndex: 'productOrigCode', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '品牌', dataIndex: 'productBrandName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '品牌', dataIndex: 'productBrandName', width: 150, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '库存数量', dataIndex: 'currentStockQty', width: 100, align: 'center', customRender: function (text) { return text || 0 } },
         { title: '单位', dataIndex: 'productUnit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '售价', dataIndex: 'productPrice', width: 150, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },