Browse Source

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

lilei 9 months ago
parent
commit
d7223fbfe2

BIN
public/templ/产品信息列表(自建)导入模板.xlsx


+ 216 - 0
src/views/productManagement/productInfo/chooseImportModal.vue

@@ -0,0 +1,216 @@
+<template>
+  <a-modal
+    centered
+    class="chooseImport-modal"
+    :footer="null"
+    :maskClosable="false"
+    title="导入"
+    v-model="isShow"
+    @cancel="isShow=false"
+    width="65%">
+    <div class="chooseImport-con">
+      <!-- 可导入数据 -->
+      <p class="">可导入数据{{ loadData.length }}条</p>
+      <a-table
+        class="sTable"
+        ref="table"
+        size="small"
+        :rowKey="(record) => record.shelfSn"
+        :columns="nowColumns"
+        :dataSource="loadData"
+        :loading="loading"
+        :scroll="{ y: 200 }"
+        :pagination="false"
+        bordered>
+      </a-table>
+      <a-divider />
+      <!-- 不可导入数据 -->
+      <p class="red">不可导入数据{{ unLoadData.length }}条</p>
+      <a-table
+        class="sTable unTable"
+        ref="unTable"
+        size="small"
+        :rowKey="(record) => record.errorDesc"
+        :columns="nowUnColumns"
+        :dataSource="unLoadData"
+        :loading="loading"
+        :scroll="{ y: 200 }"
+        :pagination="false"
+        bordered>
+        <!-- <template slot="errorMsg" slot-scope="text,record">
+          <a-popover placement="topRight">
+            <template slot="content">
+              <p v-for="d in record.importErrorMsgSet" v-if="d">{{ d }};</p>
+            </template>
+            <a-button type="link">
+              查看
+            </a-button>
+          </a-popover>
+        </template> -->
+      </a-table>
+      <!-- 按钮 -->
+      <div class="btn-con">
+        <a-button
+          type="primary"
+          id="chooseImport-submit"
+          size="large"
+          :class="loadData.length==0?'button-grey':'button-primary'"
+          @click="handleSubmit"
+          style="padding: 0 40px;">确认导入</a-button>
+        <a-button
+          id="chooseImport-cancel"
+          size="large"
+          class="button-cancel"
+          @click="isShow=false"
+          style="padding: 0 40px;margin-left: 15px;">取消</a-button>
+        <a-button
+          type="primary"
+          id="chooseImport-error"
+          size="large"
+          class="button-error"
+          @click="handleError"
+          style="padding: 0 40px;margin-left: 15px;">导出错误项</a-button>
+      </div>
+    </div>
+  </a-modal>
+</template>
+
+<script>
+import { commonMixin } from '@/utils/mixin'
+import { productImportPrice, productExportError, productImportPriceInsertBatch } from '@/api/product'
+import { hdExportExcel } from '@/libs/exportExcel'
+export default {
+  name: 'ChooseImportModal',
+  mixins: [commonMixin],
+  props: {
+    openModal: { //  弹框显示状态
+      type: Boolean,
+      default: false
+    },
+    paramsData: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    }
+  },
+  data () {
+    const _this = this
+    return {
+      isShow: this.openModal, //  是否打开弹框
+      nowColumns: [ //  可导入
+        { title: '序号', dataIndex: 'no', width: '6%', align: 'center' },
+        { title: '产品编码', dataIndex: 'productCode', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', width: '20%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '原厂编码', dataIndex: 'inTransit', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'inTransit', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品分类', dataIndex: 'inTransit', width: '16%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '经销商批发价', dataIndex: 'terminalPrice', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '终端价', dataIndex: 'terminalPrice', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '车主价', dataIndex: 'terminalPrice', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '可用库存', dataIndex: 'carOwnersPrice', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
+      ],
+      nowUnColumns: [ //  不可导入
+        { title: '序号', dataIndex: 'no', width: '6%', align: 'center' },
+        { title: '产品编码', dataIndex: 'productCode', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', width: '18%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '原厂编码', dataIndex: 'inTransit', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'inTransit', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品分类', dataIndex: 'inTransit', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '经销商批发价', dataIndex: 'terminalPrice', width: '12%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '终端价', dataIndex: 'terminalPrice', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '车主价', dataIndex: 'terminalPrice', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '可用库存', dataIndex: 'carOwnersPrice', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '备注', dataIndex: 'errorMsg', width: '16%', align: 'center', customRender: function (text) { return text || '--' } }
+      ],
+      loadData: [],
+      unLoadData: [],
+      loading: false
+    }
+  },
+  methods: {
+    getData () {
+      const _this = this
+      this.loading = true
+      productImportPrice(this.paramsData).then(res => {
+        this.loading = false
+        if (res.status == 200) {
+          if (res.data.rightList && res.data.rightList.length > 0) {
+            res.data.rightList.map((item, index) => {
+              item.no = index + 1
+            })
+          }
+          if (res.data.errorList && res.data.errorList.length > 0) {
+            res.data.errorList.map((item, index) => {
+              item.no = index + 1
+              item.importErrorMsgSet = item.errorMsg ? item.errorMsg.split(';') : []
+            })
+          }
+          _this.loadData = res.data.rightList || []
+          _this.unLoadData = res.data.errorList || []
+        }
+      })
+    },
+    // 确认导入
+    handleSubmit () {
+      if (this.loadData.length == 0) {
+        this.$message.warning('暂无可导入产品!')
+      } else {
+        this.spinning = true
+        productImportPriceInsertBatch(this.loadData).then(res => {
+          if (res.status == 200) {
+            this.$emit('ok', this.loadData)
+            this.isShow = false
+          }
+          this.spinning = false
+        })
+      }
+    },
+    // 导出错误项
+    handleError () {
+      const _this = this
+      if (_this.unLoadData.length < 1) {
+        _this.$message.info('暂无可导出错误项~')
+        return
+      }
+      _this.spinning = true
+      hdExportExcel(productExportError, _this.unLoadData, '库存预警产品导入错误项', function () {
+        _this.spinning = false
+      })
+    }
+  },
+  watch: {
+    //  父页面传过来的弹框状态
+    openModal (newValue, oldValue) {
+      this.isShow = newValue
+    },
+    //  重定义的弹框状态
+    isShow (newValue, oldValue) {
+      if (!newValue) {
+        this.$emit('close')
+        this.loadData = []
+        this.unLoadData = []
+      } else {
+        this.getData()
+      }
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+  .chooseImport-modal{
+    .chooseImport-con{
+      .red{
+        color: #f30;
+      }
+      .btn-con{
+        text-align: center;
+        margin: 30px 0 20px;
+        .button-cancel,.button-error{
+          font-size: 12px;
+        }
+      }
+    }
+  }
+</style>

+ 186 - 0
src/views/productManagement/productInfo/importGuideModal.vue

@@ -0,0 +1,186 @@
+<template>
+  <a-modal
+    centered
+    class="importGuide-modal"
+    :footer="null"
+    :maskClosable="false"
+    title="导入产品"
+    v-model="isShow"
+    @cancel="isShow=false"
+    :width="750">
+    <div class="importGuide-con">
+      <div class="explain-con">
+        <div class="explain-item">
+          <div class="explain-tit">
+            <span>1</span>准备导入
+          </div>
+          <ul>
+            <li>1)必填项为"产品名称"、"产品编码"、"产品品牌"、"产品一级分类"。</li>
+            <li>2)错误项忽略不能导入,正确项可直接导入。</li>
+            <li>3)支持上传文件格式:.xls、.xlsx。</li>
+            <li><a :href="templUrl" id="importGuide-tpl-link"><a-icon type="download" />下载导入模板</a></li>
+          </ul>
+        </div>
+        <div class="explain-item">
+          <div class="explain-tit">
+            <span>2</span>上传数据文件
+          </div>
+          <p>目前支持的文件类型*.xls,*.xlsx.</p>
+          <div style="overflow: hidden;padding-left: 23px;">
+            <Upload
+              id="importGuide-attachList"
+              ref="importUpload"
+              :maxNums="1"
+              fileType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel"
+              uploadType="import"
+              :action="attachAction"
+              :uploadParams="uploadParams"
+              upText="选择导入文件"
+              @change="changeImport"></Upload>
+          </div>
+        </div>
+      </div>
+      <!-- 按钮 -->
+      <div class="btn-con">
+        <a-button
+          type="primary"
+          id="importGuide-nextStep"
+          size="large"
+          class="button-primary"
+          @click="handlerNextStep"
+          style="padding: 0 60px;">下一步</a-button>
+        <a-button
+          id="importGuide-cancel"
+          size="large"
+          class="button-cancel"
+          @click="isShow=false"
+          style="padding: 0 60px;margin-left: 15px;">取消</a-button>
+      </div>
+    </div>
+    <!-- 导入 -->
+    <chooseImportModal :openModal="openImportModal" :paramsData="paramsData" @close="handleClose" @ok="hanldeOk" />
+  </a-modal>
+</template>
+
+<script>
+import ChooseImportModal from './chooseImportModal.vue'
+import { Upload } from '@/components'
+export default {
+  name: 'ImportGuideModal',
+  components: { ChooseImportModal, Upload },
+  props: {
+    openModal: { //  弹框显示状态
+      type: Boolean,
+      default: false
+    },
+    params: {
+      type: Object,
+      default: null
+    }
+  },
+  data () {
+    return {
+      isShow: this.openModal, //  是否打开弹框
+      openImportModal: false, //  导入
+      attachAction: process.env.VUE_APP_API_BASE_URL + '/upload',
+      paramsData: null,
+      uploadParams: {
+        savePathType: 'local'
+      },
+      templUrl: location.protocol + '//' + location.host + '/templ/产品信息列表(自建)导入模板.xlsx'
+    }
+  },
+  methods: {
+    // 下一步
+    handlerNextStep () {
+      if (this.paramsData) {
+        this.openImportModal = true
+      } else {
+        this.$message.warning('添加文件后再进行下一步操作!')
+      }
+    },
+    // 上传文件  change
+    changeImport (file) {
+      if (file) {
+        this.paramsData = {
+          path: file
+        }
+      }
+    },
+    // 导入
+    hanldeOk (obj) {
+      if (obj && obj.length > 0) {
+        this.$emit('ok', obj)
+        this.isShow = false
+      }
+    },
+    // 关闭
+    handleClose () {
+      this.openImportModal = false
+      this.isShow = false
+    }
+  },
+  watch: {
+    //  父页面传过来的弹框状态
+    openModal (newValue, oldValue) {
+      this.isShow = newValue
+    },
+    //  重定义的弹框状态
+    isShow (newValue, oldValue) {
+      if (!newValue) {
+        this.$emit('close')
+        this.paramsData = null
+        this.$refs.importUpload.setFileList('')
+      }
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+  .importGuide-modal{
+    .importGuide-con{
+      .explain-con{
+        .explain-item{
+          margin-bottom: 10px;
+          .explain-tit{
+            font-weight: bold;
+            span{
+              display: inline-block;
+              width: 18px;
+              height: 18px;
+              line-height: 16px;
+              text-align: center;
+              margin-right: 5px;
+              border-radius: 50%;
+              border: 1px solid rgba(0, 0, 0, 0.3);
+            }
+          }
+          p{
+            margin: 8px 0;
+            padding-left: 23px;
+          }
+          ul{
+            list-style: none;
+            padding: 0;
+            padding-left: 23px;
+            margin: 0;
+            li{
+              line-height: 26px;
+            }
+          }
+        }
+        #importGuide-attachList{
+          width: 100%;
+        }
+      }
+      .btn-con{
+        margin: 10px 0 20px;
+        text-align: center;
+        .button-cancel{
+          font-size: 12px;
+        }
+      }
+    }
+  }
+</style>

+ 10 - 2
src/views/productManagement/productInfo/list.vue

@@ -65,7 +65,7 @@
           <a-button id="productInfoList-menus-action" type="danger" ghost style="margin:0 15px 0 5px;">批量操作 <a-icon type="down" /> </a-button>
           <a-button id="productInfoList-menus-action" type="danger" ghost style="margin:0 15px 0 5px;">批量操作 <a-icon type="down" /> </a-button>
         </a-dropdown>
         </a-dropdown>
         <span v-if="rowSelectionInfo&&rowSelectionInfo.selectedRowKeys">已选 {{ rowSelectionInfo.selectedRowKeys.length }} 项</span>
         <span v-if="rowSelectionInfo&&rowSelectionInfo.selectedRowKeys">已选 {{ rowSelectionInfo.selectedRowKeys.length }} 项</span>
-        <a-button class="button-primary" type="primary">导入</a-button>
+        <a-button class="button-primary" type="primary" @click="importProduct">导入</a-button>
       </div>
       </div>
       <!-- 列表 -->
       <!-- 列表 -->
       <s-table
       <s-table
@@ -132,6 +132,8 @@
     </a-spin>
     </a-spin>
     <!-- 产品详情 -->
     <!-- 产品详情 -->
     <product-info-detail-modal :openModal="openModal" :itemId="itemId" @close="closeModal" />
     <product-info-detail-modal :openModal="openModal" :itemId="itemId" @close="closeModal" />
+    <!-- 导入产品 -->
+    <importGuideModal :openModal="openGuideModal" @close="openGuideModal=false" @ok="resetSearchForm" />
   </a-card>
   </a-card>
 </template>
 </template>
 
 
@@ -142,10 +144,11 @@ import ProductBrand from '../../common/productBrand.js'
 import { dealerProductList, dealerProductUpdate, dealerProductExport } from '@/api/dealerProduct'
 import { dealerProductList, dealerProductUpdate, dealerProductExport } from '@/api/dealerProduct'
 import { STable, VSelect } from '@/components'
 import { STable, VSelect } from '@/components'
 import productInfoDetailModal from './detailModal.vue'
 import productInfoDetailModal from './detailModal.vue'
+import importGuideModal from './importGuideModal.vue'
 import { downloadExcel } from '@/libs/JGPrint.js'
 import { downloadExcel } from '@/libs/JGPrint.js'
 export default {
 export default {
   name: 'ProductList',
   name: 'ProductList',
-  components: { STable, VSelect, productInfoDetailModal, ProductType, ProductBrand },
+  components: { STable, VSelect, productInfoDetailModal, ProductType, ProductBrand, importGuideModal },
   mixins: [commonMixin],
   mixins: [commonMixin],
   data () {
   data () {
     const _this = this
     const _this = this
@@ -169,6 +172,7 @@ export default {
       },
       },
       disabled: false, //  查询、重置按钮是否可操作
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false, // 导出loading
       exportLoading: false, // 导出loading
+      openGuideModal: false,
       columns: [
       columns: [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         {
         {
@@ -391,6 +395,10 @@ export default {
         }
         }
       })
       })
     },
     },
+    // 导入产品
+    importProduct () {
+      this.openGuideModal = true
+    },
     // 表格选中项
     // 表格选中项
     rowSelectionFun (obj) {
     rowSelectionFun (obj) {
       this.rowSelectionInfo = obj || null
       this.rowSelectionInfo = obj || null

+ 22 - 65
src/views/promotionManagement/promotionInfo/list.vue

@@ -3,11 +3,11 @@
     <a-spin :spinning="spinning" tip="Loading...">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 搜索条件 -->
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
       <div ref="tableSearch" class="table-page-search-wrapper">
-        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)" id="promotionInfoList-form">
           <a-row :gutter="15">
           <a-row :gutter="15">
             <a-col :md="5" :sm="24">
             <a-col :md="5" :sm="24">
               <a-form-item label="发布时间">
               <a-form-item label="发布时间">
-                <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
+                <rangeDate id="promotionInfoList-time" ref="rangeDate" :value="time" @change="dateChange" />
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
             <a-col :md="5" :sm="24">
             <a-col :md="5" :sm="24">
@@ -62,7 +62,7 @@
         </template>
         </template>
         <!-- 促销展示 -->
         <!-- 促销展示 -->
         <template slot="salesShow" slot-scope="text, record">
         <template slot="salesShow" slot-scope="text, record">
-          <div @click="handleDescModal(record)" v-if="record.imageUrl">
+          <div @click="handleDescModal(record)" v-if="record.imageUrl" :id="'promotionInfoList-img-'+record.id">
             <img :src="record.imageUrl" alt="图片走丢啦" width="60" />
             <img :src="record.imageUrl" alt="图片走丢啦" width="60" />
           </div>
           </div>
           <span v-else>--</span>
           <span v-else>--</span>
@@ -76,24 +76,19 @@
             class="button-primary"
             class="button-primary"
             @click="handleOpenOrClose(record,'1')"
             @click="handleOpenOrClose(record,'1')"
             v-if="record.dealerOpenFlag==='1'&&record.dealerOpenState=='0'&&(record.promoState=='IS_CLOSE'||record.promoState=='NOT_RELEASE')&&$hasPermissions('B_publishActiveBtn')"
             v-if="record.dealerOpenFlag==='1'&&record.dealerOpenState=='0'&&(record.promoState=='IS_CLOSE'||record.promoState=='NOT_RELEASE')&&$hasPermissions('B_publishActiveBtn')"
-            id="productOnlineInfoList-detail-btn">开启</a-button>
+            :id="'promotionInfoList-openBtn-'+record.id">开启</a-button>
           <a-button
           <a-button
             size="small"
             size="small"
             type="link"
             type="link"
             class="button-primary"
             class="button-primary"
             v-if="record.dealerOpenFlag==='1'&&record.dealerOpenState=='1'&&record.promoState=='HAVE_RELEASE'&&$hasPermissions('B_closeActiveBtn')"
             v-if="record.dealerOpenFlag==='1'&&record.dealerOpenState=='1'&&record.promoState=='HAVE_RELEASE'&&$hasPermissions('B_closeActiveBtn')"
             @click="handleOpenOrClose(record,'0')"
             @click="handleOpenOrClose(record,'0')"
-            id="productOnlineInfoList-detail-btn">关闭</a-button>
-          <a-button
-            size="small"
-            type="link"
-            class="button-primary"
-            v-if="record.dealerEditFlag==='1'&&record.dealerPublishState!='END'&&$hasPermissions('B_promoActiveEditBtn')"
-            @click="handleEdit(record,'edit')">编辑</a-button>
+            :id="'promotionInfoList-closeBtn-'+record.id">关闭</a-button>
           <a-button
           <a-button
             size="small"
             size="small"
             type="link"
             type="link"
             class="button-success"
             class="button-success"
+            :id="'promotionInfoList-seeBtn-'+record.id"
             v-if="$hasPermissions('B_promoActiveSeeBtn')"
             v-if="$hasPermissions('B_promoActiveSeeBtn')"
             @click="handleSee(record)">查看</a-button>
             @click="handleSee(record)">查看</a-button>
         </template>
         </template>
@@ -108,36 +103,39 @@
 
 
 <script>
 <script>
 import { commonMixin } from '@/utils/mixin'
 import { commonMixin } from '@/utils/mixin'
+// 组件
 import { STable, VSelect } from '@/components'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import rangeDate from '@/views/common/rangeDate.vue'
 import promotionDescModal from './promotionDescModal'
 import promotionDescModal from './promotionDescModal'
 import promotionShowModal from './promotionShowModal'
 import promotionShowModal from './promotionShowModal'
 import detailModal from './detailModal'
 import detailModal from './detailModal'
+// 接口
 import { shopPromoList, openOrCloseActive } from '@/api/shopPromo'
 import { shopPromoList, openOrCloseActive } from '@/api/shopPromo'
 import { closeActive } from '@/api/promoActive'
 import { closeActive } from '@/api/promoActive'
 
 
 export default {
 export default {
-  name: 'UrgentOffsetList',
+  name: 'PromotionInfoList',
   components: { STable, VSelect, rangeDate, promotionDescModal, promotionShowModal, detailModal },
   components: { STable, VSelect, rangeDate, promotionDescModal, promotionShowModal, detailModal },
   mixins: [commonMixin],
   mixins: [commonMixin],
   data () {
   data () {
     return {
     return {
       spinning: false,
       spinning: false,
-      tableHeight: 0,
-      openDescModal: false, // 促销描述弹窗
-      openShowModal: false, // 促销展示弹窗
-      time: [],
-      queryParam: { //  查询条件
-        beginDate: undefined,
-        endDate: undefined,
+      tableHeight: 0, // 表格高度
+      openDescModal: false, // 促销展示弹窗
+      time: [], // 发布时间
+      //  查询条件
+      queryParam: {
+        beginDate: undefined, // 发布开始时间
+        endDate: undefined, // 发布结束时间
         promoName: '', //  促销名称
         promoName: '', //  促销名称
         promoType: '', // 促销类型
         promoType: '', // 促销类型
         promoState: undefined// 促销状态
         promoState: undefined// 促销状态
       },
       },
-      descInfo: '', // 促销描述
+      descInfo: '', // 促销展示内容
       itemId: null, // 促销当前行sn
       itemId: null, // 促销当前行sn
       disabled: false, //  查询、重置按钮是否可操作
       disabled: false, //  查询、重置按钮是否可操作
-      openDetailModal: false,
+      openDetailModal: false, // 打开详情弹窗
+      // 表头
       columns: [
       columns: [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '发布时间', dataIndex: 'createDate', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '发布时间', dataIndex: 'createDate', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -156,10 +154,10 @@ export default {
           let data
           let data
           if (res.status == 200) {
           if (res.status == 200) {
             data = res.data
             data = res.data
+            // 计算表格序号
             const no = (data.pageNo - 1) * data.pageSize
             const no = (data.pageNo - 1) * data.pageSize
             for (var i = 0; i < data.list.length; i++) {
             for (var i = 0; i < data.list.length; i++) {
               data.list[i].no = no + i + 1
               data.list[i].no = no + i + 1
-              data.list[i].images = data.list[i].images ? data.list[i].images.split(',') : []
             }
             }
             this.disabled = false
             this.disabled = false
           }
           }
@@ -185,7 +183,7 @@ export default {
       this.queryParam.beginDate = date[0]
       this.queryParam.beginDate = date[0]
       this.queryParam.endDate = date[1]
       this.queryParam.endDate = date[1]
     },
     },
-    // 查看促销描述
+    // 促销展示 查看大图
     handleDescModal (row) {
     handleDescModal (row) {
       this.descInfo = row.imageUrl
       this.descInfo = row.imageUrl
       const _this = this
       const _this = this
@@ -193,14 +191,6 @@ export default {
         _this.openDescModal = true
         _this.openDescModal = true
       })
       })
     },
     },
-    // 促销展示
-    handleSaleShow (row) {
-      const _this = this
-      _this.openShowModal = true
-      this.$nextTick(() => {
-        _this.$refs.promotionShow.getDetail({ id: row.promoActiveSn, showType: row.contentType })
-      })
-    },
     // 开启
     // 开启
     handleOpenOrClose (row, val) {
     handleOpenOrClose (row, val) {
       const _this = this
       const _this = this
@@ -222,42 +212,9 @@ export default {
         }
         }
       })
       })
     },
     },
-    // 关闭
-    handleClose (row) {
-      const _this = this
-      this.$confirm({
-        title: '提示',
-        content: '促销活动一旦,客户无法参与活动。确认关闭吗?',
-        centered: true,
-        onOk () {
-          _this.spinning = true
-          closeActive({ sn: row.promoActiveSn }).then(res => {
-            if (res.status == 200) {
-              _this.$message.success(res.message)
-              _this.$refs.table.refresh()
-              _this.spinning = false
-            } else {
-              _this.spinning = false
-            }
-          })
-        }
-      })
-    },
-    // 编辑
-    handleEdit (row, type) {
-      const _this = this
-      if (row.dealerPublishState === 'PUBLISH' && type === 'edit') {
-        _this.$warning({
-          title: '提示',
-          content: '请先关闭活动,活动关闭后可编辑活动'
-        })
-      } else {
-        const nameInfo = type === 'edit' ? 'promotionInfoEdit' : 'promotionInfoDetail'
-        _this.$router.push({ name: nameInfo, params: { sn: row.promoActiveSn, pageType: type } })
-      }
-    },
     //  重置
     //  重置
     resetSearchForm () {
     resetSearchForm () {
+      this.time = []
       this.$refs.rangeDate.resetDate(this.time)
       this.$refs.rangeDate.resetDate(this.time)
       this.queryParam.beginDate = undefined
       this.queryParam.beginDate = undefined
       this.queryParam.endDate = undefined
       this.queryParam.endDate = undefined