Commit 43af6059 by chenxin

fix: build

parent fe1ca64e
<!DOCTYPE html><html lang=cn><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/welfare/favicon2.ico><link rel=stylesheet href=/welfare/static/css/index.css><link href=https://cdn.bootcss.com/element-ui/2.12.0/theme-chalk/index.css rel=stylesheet><link href=//at.alicdn.com/t/font_1434755_89ndzcq2ndm.css rel=stylesheet><link rel=stylesheet type=text/css href=//at.alicdn.com/t/font_1418963_hrpaaxicjis.css><link rel=stylesheet type=text/css href=//at.alicdn.com/t/font_1393418_z4h4445tiwe.css><link rel=stylesheet type=text/css href=//at.alicdn.com/t/font_2349215_oprmr2ef7em.css><link rel=stylesheet type=text/css href=//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.58.3.css><script src=//at.alicdn.com/t/font_1418963_hrpaaxicjis.js></script><link href=/welfare/css/card-package.ac4691b9.css rel=prefetch><link href=/welfare/css/card-package~gic-card.78656863.css rel=prefetch><link href=/welfare/css/chunk-02062f99.757fd252.css rel=prefetch><link href=/welfare/css/chunk-2107e6c5.4536701d.css rel=prefetch><link href=/welfare/css/chunk-4b84bff4.963b4aa0.css rel=prefetch><link href=/welfare/css/chunk-53f4695c.9908b7cb.css rel=prefetch><link href=/welfare/css/chunk-8a171d34.8af5c3d1.css rel=prefetch><link href=/welfare/css/chunk-9f31dcfe.75b8fd67.css rel=prefetch><link href=/welfare/css/gic-card.14cc8356.css rel=prefetch><link href=/welfare/js/card-package.d0a8c0b7.js rel=prefetch><link href=/welfare/js/card-package~gic-card.dfadd734.js rel=prefetch><link href=/welfare/js/chunk-02062f99.072e616f.js rel=prefetch><link href=/welfare/js/chunk-2107e6c5.f2137ad1.js rel=prefetch><link href=/welfare/js/chunk-35ba1f02.32555561.js rel=prefetch><link href=/welfare/js/chunk-4b84bff4.fc2c14d9.js rel=prefetch><link href=/welfare/js/chunk-53f4695c.23f8f592.js rel=prefetch><link href=/welfare/js/chunk-8a171d34.53b72a0e.js rel=prefetch><link href=/welfare/js/chunk-9f31dcfe.2b85ba0c.js rel=prefetch><link href=/welfare/js/gic-card.d1eaadaf.js rel=prefetch><link href=/welfare/css/app.760c95a6.css rel=preload as=style><link href=/welfare/js/app.83b9b57a.js rel=preload as=script><link href=/welfare/js/chunk-vendors.e8c008b5.js rel=preload as=script><link href=/welfare/css/app.760c95a6.css rel=stylesheet></head><body class=damolish><noscript><strong>We're sorry but damolish doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib-4.0/vue/2.6.10/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib-4.0/vue-router/3.0.3/vue-router.js></script><script src=//web-1251519181.file.myqcloud.com/lib-4.0/vuex/3.0.1/vuex.js></script><script src=//web-1251519181.file.myqcloud.com/lib-4.0/axios/0.19.0/axios.min.js></script><script src=//web-1251519181.file.myqcloud.com/components/base.1.0.0.17.js></script><script src=//web-1251519181.file.myqcloud.com/components/layout.1.2.59.js></script><script src=//web-1251519181.file.myqcloud.com/components/input.2.0.20.js></script><script src=//web-1251519181.file.myqcloud.com/components/people-selector.1.0.10.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-select.1.1.78.js></script><script src=//web-1251519181.file.myqcloud.com/components/goods-selector.1.0.51.js></script><script src=//web-1251519181.file.myqcloud.com/components/card-select.1.0.33.js></script><script src=//web-1251519181.file.myqcloud.com/components/link-tools.2.1.21.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-data.1.1.1.js></script><script src=//web-1251519181.file.myqcloud.com/components/integral-select.1.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/rule-engine.1.0.86.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.10.js></script><script src=//web-1251519181.file.myqcloud.com/components/perm-button.1.0.1.js></script><script src=//web-1251519181.file.myqcloud.com/components/steps.1.0.1.js></script><script src=//web-1251519181.file.myqcloud.com/components/upload-picture.1.0.6.js></script><script src=//web-1251519181.file.myqcloud.com/components/upload-file.1.0.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/app-info.1.0.5.js></script><script src=//web-1251519181.file.myqcloud.com/components/preview-img.1.0.3.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.1.1.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/input-number.1.0.10.js></script><script src=//web-1251519181.file.myqcloud.com/components/acc-group-select.1.0.3.js></script><script src=//web-1251519181.file.myqcloud.com/components/editor.1.1.12.js></script><script src=/welfare/js/chunk-vendors.e8c008b5.js></script><script src=/welfare/js/app.83b9b57a.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html lang=cn><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/welfare/favicon2.ico><link rel=stylesheet href=/welfare/static/css/index.css><link href=https://cdn.bootcss.com/element-ui/2.12.0/theme-chalk/index.css rel=stylesheet><link href=//at.alicdn.com/t/font_1434755_89ndzcq2ndm.css rel=stylesheet><link rel=stylesheet type=text/css href=//at.alicdn.com/t/font_1418963_hrpaaxicjis.css><link rel=stylesheet type=text/css href=//at.alicdn.com/t/font_1393418_z4h4445tiwe.css><link rel=stylesheet type=text/css href=//at.alicdn.com/t/font_2349215_oprmr2ef7em.css><link rel=stylesheet type=text/css href=//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.58.3.css><script src=//at.alicdn.com/t/font_1418963_hrpaaxicjis.js></script><link href=/welfare/css/card-package.ac4691b9.css rel=prefetch><link href=/welfare/css/card-package~gic-card.78656863.css rel=prefetch><link href=/welfare/css/chunk-02062f99.757fd252.css rel=prefetch><link href=/welfare/css/chunk-2107e6c5.4536701d.css rel=prefetch><link href=/welfare/css/chunk-4b84bff4.963b4aa0.css rel=prefetch><link href=/welfare/css/chunk-53f4695c.9908b7cb.css rel=prefetch><link href=/welfare/css/chunk-8a171d34.8af5c3d1.css rel=prefetch><link href=/welfare/css/chunk-9f31dcfe.75b8fd67.css rel=prefetch><link href=/welfare/css/gic-card.237db503.css rel=prefetch><link href=/welfare/js/card-package.d0a8c0b7.js rel=prefetch><link href=/welfare/js/card-package~gic-card.dfadd734.js rel=prefetch><link href=/welfare/js/chunk-02062f99.072e616f.js rel=prefetch><link href=/welfare/js/chunk-2107e6c5.f2137ad1.js rel=prefetch><link href=/welfare/js/chunk-35ba1f02.32555561.js rel=prefetch><link href=/welfare/js/chunk-4b84bff4.fc2c14d9.js rel=prefetch><link href=/welfare/js/chunk-53f4695c.23f8f592.js rel=prefetch><link href=/welfare/js/chunk-8a171d34.53b72a0e.js rel=prefetch><link href=/welfare/js/chunk-9f31dcfe.2b85ba0c.js rel=prefetch><link href=/welfare/js/gic-card.31f69f18.js rel=prefetch><link href=/welfare/css/app.760c95a6.css rel=preload as=style><link href=/welfare/js/app.63579662.js rel=preload as=script><link href=/welfare/js/chunk-vendors.e8c008b5.js rel=preload as=script><link href=/welfare/css/app.760c95a6.css rel=stylesheet></head><body class=damolish><noscript><strong>We're sorry but damolish doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib-4.0/vue/2.6.10/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib-4.0/vue-router/3.0.3/vue-router.js></script><script src=//web-1251519181.file.myqcloud.com/lib-4.0/vuex/3.0.1/vuex.js></script><script src=//web-1251519181.file.myqcloud.com/lib-4.0/axios/0.19.0/axios.min.js></script><script src=//web-1251519181.file.myqcloud.com/components/base.1.0.0.17.js></script><script src=//web-1251519181.file.myqcloud.com/components/layout.1.2.59.js></script><script src=//web-1251519181.file.myqcloud.com/components/input.2.0.20.js></script><script src=//web-1251519181.file.myqcloud.com/components/people-selector.1.0.10.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-select.1.1.78.js></script><script src=//web-1251519181.file.myqcloud.com/components/goods-selector.1.0.51.js></script><script src=//web-1251519181.file.myqcloud.com/components/card-select.1.0.33.js></script><script src=//web-1251519181.file.myqcloud.com/components/link-tools.2.1.21.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-data.1.1.1.js></script><script src=//web-1251519181.file.myqcloud.com/components/integral-select.1.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/rule-engine.1.0.86.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.10.js></script><script src=//web-1251519181.file.myqcloud.com/components/perm-button.1.0.1.js></script><script src=//web-1251519181.file.myqcloud.com/components/steps.1.0.1.js></script><script src=//web-1251519181.file.myqcloud.com/components/upload-picture.1.0.6.js></script><script src=//web-1251519181.file.myqcloud.com/components/upload-file.1.0.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/app-info.1.0.5.js></script><script src=//web-1251519181.file.myqcloud.com/components/preview-img.1.0.3.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.1.1.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/input-number.1.0.10.js></script><script src=//web-1251519181.file.myqcloud.com/components/acc-group-select.1.0.3.js></script><script src=//web-1251519181.file.myqcloud.com/components/editor.1.1.12.js></script><script src=/welfare/js/chunk-vendors.e8c008b5.js></script><script src=/welfare/js/app.63579662.js></script></body></html>
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -57,7 +57,7 @@ destory = getFetch(destory, welfarePrefix);
export default { ...card, ...destory };
export const downloadCouponCSV = config.api + welfarePrefix + '/destroy-plugin/download-destroy-code-template'; // 下载导入GIC券号csv示例文件 TODO:
export const downloadCouponCSV = config.api + welfarePrefix + '/destroy-plugin/download-destroy-code-template'; // 下载导入GIC券号csv示例文件
export const importCode = config.api + welfarePrefix + '/destroy-plugin/import-destroy-code'; // 导入券码
export const importDestoryCode = welfarePrefix + '/destroy-plugin/import-destroy-code'; // 上传销毁code列表
export const downloadDestroyCodeTemplate = config.api + welfarePrefix + '/destroy-plugin/download-destroy-code-template'; // 下载销毁模板示例
......
......@@ -15,11 +15,11 @@
<span v-else>{{ scope.row[v.prop] || '--' }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="left" width="120px" fixed="right">
<!-- <el-table-column label="操作" align="left" width="120px" fixed="right">
<template slot-scope="scope">
<dm-perm-button type="text" @click="showExport(scope.row)" :disabled="$itemPerm($itemCode.gicCardDestoryExport)">导出结果</dm-perm-button>
</template>
</el-table-column>
</el-table-column> -->
</el-table>
<div class="clearfix">
<dm-pagination class="fr mb0" v-if="tableList.length" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></dm-pagination>
......@@ -75,7 +75,7 @@ export default {
align: 'left',
fixed: 'left',
formatter: function(row) {
return `<span p-key="couponId" title="${row.couponId}">${ row.cardName }</span>`;
return `<span p-key="couponId" title="${row.couponId}">${ row.cardName || '--' }</span>`;
}
},
{
......
......@@ -4,8 +4,9 @@
<el-alert class="mb10" title="卡券销毁将不可撤回,请谨慎操作" type="warning" show-icon :closable="false"></el-alert>
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="130px" class="pt20">
<el-form-item label="选择卡券" prop="couponId">
{{ ruleForm.couponId }}
<!-- 只有卡券销毁处传isDestory这个参数 -->
<dm-card-select v-if="show" ref="cardSelect" class="cardSelect" :member-card-id="currentAreaId" @selectData="selectData" fix-member-card is-destory />
<!-- <dm-card-select v-if="show" ref="cardSelect" class="cardSelect" :member-card-id="currentAreaId" @selectData="selectData" fix-member-card is-destory /> -->
</el-form-item>
<el-form-item label="销毁方式" prop="destroyMode">
<el-radio-group :disabled="type !== 'add'" v-model="ruleForm.destroyMode">
......@@ -17,8 +18,21 @@
<div>
<!-- eslint-disable-nextline -->
<div v-if="ruleForm.fileId" class="inline-block">已导入</div>
<dm-upload-file
:disabled="!ruleForm.destroyMode"
v-if="!ruleForm.fileId"
action="/api-welfare/destroy-plugin/import-destroy-code"
width="120px"
trigger-text="点击上传"
accept=".csv"
@beforeUpload="beforeUpload"
:show-file-list="false"
:limit="1"
style="display:inline-block;">
<span slot="tip" style="display:none;">tips</span>
</dm-upload-file>
<!-- TODO: 用组件库组件 -->
<file v-if="!ruleForm.fileId" :unuse="!ruleForm.destroyMode" need-extra-params :upload-params="{ destroyPlanId: ruleForm.destroyPlanId }" ref="fileUpload" class="dashed-btn inline-block" label="点击上传" @backImg="backImg" accept-type=".csv" tips="" :url="uploadUrl" width="50" icon-class="el-icon-upload2" /><!-- 上传 -->
<!-- <file v-if="!ruleForm.fileId" :unuse="!ruleForm.destroyMode" need-extra-params :upload-params="{ destroyPlanId: ruleForm.destroyPlanId }" ref="fileUpload" class="dashed-btn inline-block" label="点击上传" @backImg="backImg" accept-type=".csv" tips="" :url="uploadUrl" width="50" icon-class="el-icon-upload2" />上传 -->
<el-button type="text" class="ml10" @click="download">点击下载文件模板</el-button>
</div>
<p class="gray03 fz12 line-height1 mt10">券码数量单次最多不超过 5000 条</p>
......@@ -35,16 +49,12 @@
<script>
import { _debounce } from '@/utils/index';
// import file from '@/components/upload/file';
import commonApi from '@/api/common.js';
import gicCardApi, { importDestoryCode, downloadDestroyCodeTemplate } from '@/api/gic-card.js';
const { getRelationId } = commonApi;
const { saveCoupDestoryPlan } = gicCardApi;
export default {
name: 'DestoryDialog',
// components: {
// file
// },
props: {
show: {
type: Boolean,
......@@ -73,7 +83,7 @@ export default {
uploadUrl: importDestoryCode,
ruleForm: {
destroyPlanId: '',
couponId: '',
couponId: '235835986990465059',
cardName: '',
fileId: '',
destroyMode: 0
......@@ -93,6 +103,9 @@ export default {
this.$refs.ruleForm.resetFields();
this.$emit('update:show', false);
},
beforeUpload() {
return;
},
submit: _debounce(function() {
if (this.loading) {
return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment