فهرست منبع

Merge branch 'develop_yh21' of jianguan-web/qpls-md-html into develop_yh22

李磊 1 سال پیش
والد
کامیت
b787fd4d88

+ 1 - 1
src/views/productManagement/newProduct/list.vue

@@ -66,7 +66,7 @@
         </template>
         <!-- 上/下线时间 内容 -->
         <template slot="auditTime" slot-scope="text, record">
-          {{ $route.params.onlineFalg=='1'?record.onlineAuditTime:record.offlineAuditTime }}
+          {{ $route.params.onlineFalg=='1'?record.onlineAuditTime:record.auditTime }}
         </template>
         <!-- 产品分类 -->
         <template slot="productType" slot-scope="text, record">

+ 1 - 1
src/views/productManagement/newProduct/modal.vue

@@ -69,7 +69,7 @@ export default {
       if (this.onlineFalg == '1') {
         arr.push({ title: '上线时间', dataIndex: 'auditTime', width: 140, align: 'center', customRender: function (text) { return text || '--' } })
       } else if (this.onlineFalg == '0') {
-        arr.push({ title: '下线时间', dataIndex: 'offlineAuditTime', width: 140, align: 'center', customRender: function (text) { return text || '--' } })
+        arr.push({ title: '下线时间', dataIndex: 'auditTime', width: 140, align: 'center', customRender: function (text) { return text || '--' } })
       }
       return arr
     }

+ 2 - 3
src/views/productManagement/productOnlineInfo/list.vue

@@ -115,8 +115,8 @@ export default {
         productTypeSn1: '', //  产品一级分类
         productTypeSn2: '', //  产品二级分类
         productTypeSn3: '', //  产品三级分类
-        onlineFalg: '1',
-        isOnlinePage: '1'
+        isOnlinePage: '1',
+        bizType:'ONLINE'
       },
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false, // 导出loading
@@ -174,7 +174,6 @@ export default {
       this.queryParam.productTypeSn1 = ''
       this.queryParam.productTypeSn2 = ''
       this.queryParam.productTypeSn3 = ''
-      this.queryParam.onlineFalg = '1'
       this.queryParam.isOnlinePage = '1'
       this.productType = []
       this.$refs.table.refresh(true)