Ver código fonte

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

lilei 1 ano atrás
pai
commit
22d648a49f

+ 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)

+ 0 - 12
src/views/reportData/salesOutofStockReport/detailModal.vue

@@ -10,7 +10,6 @@
     width="70%">
     <!-- 详情 -->
     <div class="mainContent">
-      <div class="printBox"><Print :disabled="localDataSource.length==0" :showExport="false" @handlePrint="handlePrint"></Print></div>
       <a-spin :spinning="spinning" tip="Loading...">
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="基础信息">
@@ -123,17 +122,6 @@ export default {
     }
   },
   methods: {
-    // 打印预览/快捷打印
-    handlePrint (type, printerType) {
-      const _this = this
-      _this.spinning = true
-      const url = allocLinkagePutDetailPrint
-      const params = { sn: this.$route.params.sn, type: printerType, showFlag: this.$hasPermissions('M_ShowAllCost') ? 1 : 0 }
-      // 打印或导出
-      hdPrint(printerType, type, url, params, '连锁调入单', function () {
-        _this.spinning = false
-      })
-    },
     //  获取详情
     getDetail (id) {
       findPayDetail({ id: id }).then(res => {