|
|
@@ -18,13 +18,15 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="官方分类">
|
|
|
- <el-cascader v-model="formInline.classifyId" :options="categoryList" clearable :props="{
|
|
|
- checkStrictly: true,
|
|
|
- expandTrigger: 'hover',
|
|
|
- label: 'categoryName',
|
|
|
- value: 'id',
|
|
|
- children: 'childs'
|
|
|
- }" />
|
|
|
+ <el-cascader
|
|
|
+ v-model="formInline.classifyId" :options="categoryList" clearable :props="{
|
|
|
+ checkStrictly: true,
|
|
|
+ expandTrigger: 'hover',
|
|
|
+ label: 'categoryName',
|
|
|
+ value: 'id',
|
|
|
+ children: 'childs'
|
|
|
+ }"
|
|
|
+ />
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
<el-button type="primary" plain @click="handleSearch">查询</el-button>
|
|
|
@@ -40,8 +42,10 @@
|
|
|
</div>
|
|
|
<!-- 表格 -->
|
|
|
<div class="tableBox">
|
|
|
- <el-table ref="multipleTable" :data="tableData" border
|
|
|
- :header-cell-style="{ background: '#EEF3FF', color: '#333333' }" tooltip-effect="dark" style="width: 100%">
|
|
|
+ <el-table
|
|
|
+ ref="multipleTable" :data="tableData" border
|
|
|
+ :header-cell-style="{ background: '#EEF3FF', color: '#333333' }" tooltip-effect="dark" style="width: 100%"
|
|
|
+ >
|
|
|
<el-table-column prop="productId" label="商品id" show-overflow-tooltip />
|
|
|
<el-table-column label="商品主图" width="150" align="center">
|
|
|
<template slot-scope="scope">
|
|
|
@@ -85,18 +89,23 @@
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
<div class="fenye">
|
|
|
- <el-pagination :current-page="formInline.page" :page-sizes="[10, 20, 50, 100]" :page-size="10"
|
|
|
+ <el-pagination
|
|
|
+ :current-page="formInline.page" :page-sizes="[10, 20, 50, 100]" :page-size="10"
|
|
|
layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handleSizeChange"
|
|
|
- @current-change="handleCurrentChange" />
|
|
|
+ @current-change="handleCurrentChange"
|
|
|
+ />
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
<!-- 批量导入 -->
|
|
|
<el-dialog title="批量导入商品" :visible.sync="batchAdd" :close-on-click-modal="false" center width="400px">
|
|
|
<div class="uploadDialog">
|
|
|
- <el-upload drag :limit="1" :auto-upload="false" accept=".xlsx" :headers="headers" :action="UploadUrls"
|
|
|
+ <el-upload
|
|
|
+ drag :limit="1" :auto-upload="false" accept=".xlsx"
|
|
|
+ :headers="headers" :action="UploadUrls"
|
|
|
:before-upload="beforeUploadFile" :on-change="fileChange" :on-remove="batchRemove" :on-exceed="exceedFile"
|
|
|
- :on-success="handleSuccess" :on-error="handleError" :file-list="batchFileList">
|
|
|
+ :on-success="handleSuccess" :on-error="handleError" :file-list="batchFileList"
|
|
|
+ >
|
|
|
<i class="el-icon-upload" />
|
|
|
<div class="el-upload__text">
|
|
|
<em>点击上传</em>
|
|
|
@@ -151,10 +160,15 @@
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
<!-- 新增/修改商品弹窗 -->
|
|
|
- <el-dialog :title="!commId ? '新增商品' : '编辑商品'" :visible.sync="commidyVisible" width="74%" center top="10vh"
|
|
|
- :close-on-click-modal="false" @before-close="closeModal" @close="closeModal">
|
|
|
- <CommAdd ref="child" :voucher-list="voucherList" :show-tinymce="showTinymce" :product-id="commId"
|
|
|
- @cancel="cancelForm" />
|
|
|
+ <el-dialog
|
|
|
+ :title="!commId ? '新增商品' : '编辑商品'" :visible.sync="commidyVisible" width="74%" center
|
|
|
+ top="10vh"
|
|
|
+ :close-on-click-modal="false" @before-close="closeModal" @close="closeModal"
|
|
|
+ >
|
|
|
+ <CommAdd
|
|
|
+ ref="child" :voucher-list="voucherList" :show-tinymce="showTinymce" :product-id="commId"
|
|
|
+ @cancel="cancelForm"
|
|
|
+ />
|
|
|
</el-dialog>
|
|
|
</div>
|
|
|
</template>
|
|
|
@@ -228,15 +242,15 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
created() {
|
|
|
- getVoucher().then((res) => { // 获取可选的代金卷，用于创建和修改商品时定义代金卷的使用规则
|
|
|
+ getVoucher().then((res) => { // 获取可选的代金券，用于创建和修改商品时定义代金券的使用规则
|
|
|
this.voucherList = res.data
|
|
|
this.voucherList.push({
|
|
|
- voucherName: '不使用代金卷',
|
|
|
+ voucherName: '不使用代金券',
|
|
|
updateTime: '123123123123',
|
|
|
ratio: 'xxx',
|
|
|
enabled: '666',
|
|
|
id: 0,
|
|
|
- desc: '不支持代金卷'
|
|
|
+ desc: '不支持代金券'
|
|
|
})
|
|
|
})
|
|
|
},
|
|
|
@@ -310,9 +324,9 @@ export default {
|
|
|
message: '数据导出中，请勿重复操作！',
|
|
|
type: 'success'
|
|
|
})
|
|
|
- const res = await productExport(this.formInline);
|
|
|
+ const res = await productExport(this.formInline)
|
|
|
if (!res) { return }
|
|
|
- const blob = new Blob([res], { type: 'application/vnd.ms-excel' })
|
|
|
+ const blob = new Blob([ res ], { type: 'application/vnd.ms-excel' })
|
|
|
const fileName = '商品数据明细表.xls'
|
|
|
if ('download' in document.createElement('a')) {
|
|
|
// 非IE下载
|
|
|
@@ -529,7 +543,7 @@ export default {
|
|
|
downloadTemplate().then((res) => {
|
|
|
console.log(res, 1111)
|
|
|
// const content = res
|
|
|
- const blob = new Blob([res])
|
|
|
+ const blob = new Blob([ res ])
|
|
|
const fileName = '批量导入商品模板.xlsx'
|
|
|
if ('download' in document.createElement('a')) {
|
|
|
// 非IE下载
|
zweiqin