Browse Source

bug修复

chenrui 3 years ago
parent
commit
c3220501b7
1 changed files with 7 additions and 2 deletions
  1. 7 2
      src/views/productManagement/newProduct/list.vue

+ 7 - 2
src/views/productManagement/newProduct/list.vue

@@ -78,9 +78,14 @@
         :defaultLoadData="false"
         :defaultLoadData="false"
         :scroll="{ x: 1090, y: tableHeight }"
         :scroll="{ x: 1090, y: tableHeight }"
         bordered>
         bordered>
-        <template slot="auditTime">
+        <!-- 上/下线时间 表头 -->
+        <template slot="auditTimeTit">
           {{ $route.params.onlineFalg=='1'?'上':'下' }}线时间
           {{ $route.params.onlineFalg=='1'?'上':'下' }}线时间
         </template>
         </template>
+        <!-- 上/下线时间 内容 -->
+        <template slot="auditTime" slot-scope="text, record">
+          {{ $route.params.onlineFalg=='1'?record.onlineAuditTime:record.offlineAuditTime }}
+        </template>
         <!-- 产品分类 -->
         <!-- 产品分类 -->
         <template slot="productType" slot-scope="text, record">
         <template slot="productType" slot-scope="text, record">
           <span v-if="record.productTypeName2 || record.productTypeName3">{{ record.productTypeName2 }} {{ record.productTypeName3 ? '>' : '' }} {{ record.productTypeName3 }}</span>
           <span v-if="record.productTypeName2 || record.productTypeName3">{{ record.productTypeName2 }} {{ record.productTypeName3 ? '>' : '' }} {{ record.productTypeName3 }}</span>
@@ -131,7 +136,7 @@ export default {
       exportLoading: false, // 导出loading
       exportLoading: false, // 导出loading
       columns: [
       columns: [
         { title: '序号', dataIndex: 'no', width: 50, align: 'center' },
         { title: '序号', dataIndex: 'no', width: 50, align: 'center' },
-        { slots: { title: 'auditTime' }, dataIndex: 'onlineAuditTime', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { slots: { title: 'auditTimeTit' }, scopedSlots: { customRender: 'auditTime' }, width: 140, align: 'center' },
         { title: '产品品牌', dataIndex: 'productBrandName', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品品牌', dataIndex: 'productBrandName', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: 140, align: 'center' },
         { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: 140, align: 'center' },
         { title: '产品名称', dataIndex: 'name', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'name', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },