Skip to content

W
welfare
Commit e60c589a by 黑潮
Options

fix: UI调整

parent eb6c5730
Showing with 74 additions and 65 deletions
src/components/stock-list/dialog.vue
<template>
<el-dialog title="活动统计" :visible.sync="dialogVisible" width="800px" @close="close">
<div class="mb20">
<el-select v-model="appCodes" class="w140 mr10" multiple placeholder="全部应用" clearable @change="changeAppCode">
<el-select v-model="appCodes" class="mr10" style="width:180px" multiple placeholder="全部应用" clearable collapse-tags @change="changeAppCode">
<el-option v-for="item in appList" :key="item.appCode" :label="item.appName" :value="item.appCode"></el-option>
</el-select>
<el-input class="mr10 w300" v-model="listParams.activityName" clearable placeholder="请输入活动名称" @change="refresh"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
......@@ -17,9 +17,9 @@
没有分页
<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>
</div> -->
<span slot="footer" class="dialog-footer">
<!-- <span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">关闭</el-button>
</span>
</span> -->
</el-dialog>
</template>
......
src/components/stock-list/index.vue
......@@ -13,7 +13,7 @@
<el-select class="mr10 w160" clearable v-model="listParams.modifyType" placeholder="所有类型" @change="refresh">
<el-option v-for="item in stockAdjustType" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
<el-select v-model="appCodes" class="w180 mr10" multiple placeholder="所有应用" :collapse-tags="true" clearable @change="changeAppCode">
<el-select v-model="appCodes" class="mr10" style="width:180px" multiple placeholder="所有应用" collapse-tags clearable @change="changeAppCode">
<el-option v-for="item in appList" :key="item.appCode" :label="item.appName" :value="item.appCode"></el-option>
</el-select>
<el-input class="mr10 w260" v-model="listParams.activityName" clearable placeholder="请输入活动名称" @change="refresh"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
......
src/components/stock-upload-record/index.vue
......@@ -44,7 +44,7 @@
<el-table-column label="上传结果" min-width="180px">
<template slot-scope="scope">
<div v-if="scope.row.statusFlag === 1">
成功<span class="success-color">{{ scope.row.successNum }}</span>条，失败<span class="danger-color">{{ scope.row.errorNum }}</span>条
成功<span class="success-color"> {{ scope.row.successNum }} </span>条，失败<span class="danger-color"> {{ scope.row.errorNum }} </span>条
</div>
<div v-else-if="scope.row.statusFlag === 0" class="state-point state-point-loading">上传中</div>
<div v-else class="state-point state-point-error">上传失败</div>
......
src/views/card/card-package/form.vue
......@@ -8,10 +8,10 @@
{{ $store.state.currentAreaName || '--' }}
</el-form-item>
<el-form-item prop="name" label="卡券包名称">
<dm-input :disabled="canEdit" v-model="ruleForm.name" class="w400" placeholder="请输入卡券包名称" :byte-type="1" :maxlength="9"></dm-input>
<dm-input :disabled="canEdit" v-model="ruleForm.name" class="w400" placeholder="如：双十一优惠券" :byte-type="1" :maxlength="9"></dm-input>
</el-form-item>
<el-form-item prop="remarkName" label="备注名">
<dm-input :disabled="canEdit" v-model="ruleForm.remarkName" class="w400" placeholder="请输入备注名" :byte-type="1" :maxlength="10"></dm-input>
<dm-input :disabled="canEdit" v-model="ruleForm.remarkName" class="w400" placeholder="仅内部可见" :byte-type="1" :maxlength="10"></dm-input>
</el-form-item>
<el-form-item prop="effectiveMode" label="有效期限">
<el-date-picker :disabled="canEdit" class="w400" v-model="dateTime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions"></el-date-picker>
......@@ -29,10 +29,10 @@
<el-form-item label="操作人权限" prop="operAuthType">
<dm-acc-group-select :etype.sync="ruleForm.operAuthType" :group-ids.sync="ruleForm.operAuth" />
</el-form-item>
<el-form-item>
<!-- <el-form-item>
<el-button type="primary" v-if="isAdd" @click="addForm">保存并添加卡券</el-button>
<el-button type="primary" :disabled="ruleForm.packageStock == info.packageStock" v-else @click="editForm">保存</el-button>
</el-form-item>
</el-form-item> -->
<el-form-item v-if="!isAdd" class="is-required">
<el-tooltip content="若添加的卡券为固定有效期，仅允许添加和有效期限时间重合的卡券" placement="bottom" slot="label" open-delay="200">
<span class="tooltip-icon">添加卡券</span>
......@@ -72,6 +72,10 @@
</div>
</div>
</el-form-item>
<el-form-item>
<el-button type="primary" v-if="isAdd" @click="addForm">保存并添加卡券</el-button>
<el-button type="primary" :disabled="ruleForm.packageStock == info.packageStock" v-else @click="editForm">保存</el-button>
</el-form-item>
</el-form>
<div class="hidden">
<!-- 20210302 产品要求 卡券包中添加卡券只能选择固定库存 -->
......@@ -139,7 +143,7 @@ export default {
remarkName: '',
beginDate: '',
endDate: '',
packageStock: undefined,
packageStock: 0,
stockUseType: '', // 库存使用类型（0:占用,1:动态 , 2占用+动态）
operAuthType: 1, // 1所有账号2部分账号3仅创建人
operAuth: []
......@@ -171,7 +175,7 @@ export default {
};
},
created() {
this.$emit('updateBread', [ { breadName: '福利中心' }, { breadName: 'GIC卡券包', breadPath: '/card-package/list' }, { breadName: this.isAdd ? '新建卡券包' : '编辑卡券包', breadPath: '' } ]);
this.$emit('updateBread', [ { breadName: '卡券包列表', breadPath: '/card-package/list' }, { breadName: this.isAdd ? '新建卡券包' : '编辑卡券包', breadPath: '' } ]);
},
mounted() {
if(this.currentAreaId) {
......
src/views/card/card-package/list.vue
......@@ -8,7 +8,7 @@
<el-option label="未生效" :value="3"></el-option>
</el-select>
<el-button type="text" @click="isOpen = !isOpen">{{ isOpen ? '收起' : '展开' }}<i :class="`${isOpen ? 'el-icon-arrow-up' : 'el-icon-arrow-down'} el-icon--right ml5`"></i></el-button>
<el-button class="specter mlAuto" :disabled="!multipleSelection.length" type="danger" @click="mutiDel">批量删除</el-button>
<el-button class="specter mlAuto" type="danger" @click="mutiDel">批量删除</el-button>
<dm-perm-button :disabled="$itemPerm($itemCode.gicAddPackage)" type="primary" @click="$router.push('/card-package/add')">新建卡券包</dm-perm-button>
</div>
<div v-show="isOpen" class="filter-block">
......@@ -40,13 +40,13 @@
<div class="card">
<img :src="scope.row.imgUrl" draggable="false" />
<p class="name ellipsis-100" :title="scope.row.cardName">{{ scope.row.name }}</p>
<p :title="scope.row.remarkName" class="fz12 gray-lighter ellipsis-100" style="line-height:17px;">
<p :title="scope.row.remarkName" class="fz12 ellipsis-100" style="line-height:17px;color:#909399">
<el-popover placement="top-start" width="300" trigger="hover" open-delay="200" :offset="-8">
<div class="gray01 fz14">
<p style="margin-bottom:5px;">卡券包ID：{{ scope.row.couponPackageId }}</p>
<p>更新时间：{{ formatDateTimeByType(scope.row.updateTime, 'yyyy-MM-dd HH:mm:ss') }}</p>
</div>
<i class="el-icon-question cursor fz12 gray-lighter" slot="reference"></i>
<i class="el-icon-question cursor fz14" slot="reference"></i>
</el-popover>
{{ scope.row.remarkName }}
</p>
......@@ -63,7 +63,7 @@
<template slot-scope="scope">
<span :class="{ 'danger-color': (scope.row.totalCouponSize > scope.row.useCouponSize || scope.row.totalCouponSize == 0) }">{{scope.row.useCouponSize==scope.row.totalCouponSize?scope.row.totalCouponSize:(scope.row.useCouponSize+'/'+scope.row.totalCouponSize)}}</span>
<el-popover placement="top-start" width="200" trigger="hover" open-delay="200" :content="scope.row.totalCouponSize > scope.row.useCouponSize?'存在已过期或已删除的卡券':'卡券包中未添加卡券'" v-if="(scope.row.totalCouponSize > scope.row.useCouponSize || scope.row.totalCouponSize == 0)">
<i class="el-icon-question ml5 cursor gray-lighter" slot="reference"></i>
<i class="el-icon-question ml5 cursor" style="color:#909399" slot="reference"></i>
</el-popover>
</template>
</el-table-column>
......@@ -82,7 +82,7 @@
<p style="margin-bottom:5px;">已占用：{{ scope.row.occupyStock || 0 }}</p>
<p>总库存：{{ scope.row.totalStock || 0 }}</p>
</div>
<i class="el-icon-question cursor fz12 gray-lighter" slot="reference" style="position:relative;"></i>
<i class="el-icon-question cursor fz14" slot="reference" style="position:relative;color:#909399"></i>
</el-popover>
{{ scope.row.remainedStock || 0 }}
<el-button @click="preAdjustStock(scope.row)" class="hover-btn" icon="el-icon-edit-outline ml5" type="text" v-if="scope.row.useStatus == 1"></el-button>
......@@ -197,7 +197,7 @@ export default {
};
},
created() {
this.$emit('updateBread', [ { breadName: '福利中心' }, { breadName: 'GIC卡券包' }, { breadName: '卡券包列表' } ]);
this.$emit('updateBread', [ { breadName: '卡券包列表' } ]);
},
mounted() {
this.getTableList();
......@@ -251,6 +251,9 @@ export default {
},
// 批量删除
mutiDel() {
if(this.multipleSelection.length == 0) {
return this.$message.warning('请勾选卡券包');
}
showConfirm('<div>删除卡券包后不可找回，确认批量删除？</div>', () => {
this.del(this.multipleSelection.map(v => v.couponPackageId));
});
......@@ -339,7 +342,7 @@ export default {
}
.card {
padding-left: 70px;
min-height: 70px;
min-height: 60px;
position: relative;
img {
position: absolute;
......
src/views/card/card-package/send-list.vue
......@@ -134,7 +134,11 @@ export default {
};
},
created() {
this.$emit('updateBread', [ { breadName: '福利中心' }, { breadName: 'GIC卡券包', breadPath: '/card-package/list' }, { breadName: '卡券包发放记录' } ]);
if('id' in this.$route.query) {
this.$emit('updateBread', [ { breadName: '卡券包列表', breadPath: '/card-package/list' }, { breadName: '卡券包发放记录' } ]);
} else {
this.$emit('updateBread', [ { breadName: '卡券包发放记录' } ]);
}
},
mounted() {
this.getTableList();
......
src/views/card/card-package/stock-list.vue
......@@ -10,7 +10,7 @@ export default {
stockList
},
created() {
this.$emit('updateBread', [ { breadName: '福利中心' }, { breadName: 'GIC卡券包', breadPath: '/card-package/list' }, { breadName: '库存记录' } ]);
this.$emit('updateBread', [ { breadName: '卡券包列表', breadPath: '/card-package/list' }, { breadName: '库存记录' } ]);
}
};
</script>
src/views/card/gic-card/app-config.vue
......@@ -53,7 +53,7 @@ export default {
};
},
created() {
this.$emit('updateBread', [ { breadName: '福利中心' }, { breadPath: '/gic-card/list' }, { breadName: '应用配置' } ]);
this.$emit('updateBread', [ { breadName: '卡券列表', breadPath: '/gic-card/list' }, { breadName: '应用配置' } ]);
},
mounted() {
this.getDetail();
......
src/views/card/gic-card/card-form.js
......@@ -312,8 +312,8 @@ export default {
remarkName: { required: true, message: '请输入备注名称', trigger: 'blur' },
// subTitle: { required: true, message: '请输入卡券副标题', trigger: 'blur' },
denomination: { required: true, validator: validDenomination, trigger: 'blur' },
goodsDiscountCheckLower: { required: true, validator: validDiscount, type: 'min', trigger: 'blur' },
goodsDiscountCheck: { required: true, validator: validDiscount, type: 'max', trigger: 'blur' },
goodsDiscountCheckLower: { validator: validDiscount, type: 'min', trigger: 'blur' },
goodsDiscountCheck: { validator: validDiscount, type: 'max', trigger: 'blur' },
couponStock: [
{ required: true, trigger: 'blur', message: '请输入库存' },
{ validator: validMin0, trigger: 'change', message: '库存必须大于0' }
......@@ -384,7 +384,7 @@ export default {
},
created() {
const breadName = this.isAdd || this.isCopy ? '新建卡券' : '编辑卡券';
this.$emit('updateBread', [ { breadName: '福利中心' }, { breadName: 'GIC卡券' }, { breadName: '卡券库', breadPath: '/gic-card/list' }, { breadName } ]);
this.$emit('updateBread', [ { breadName: '卡券列表', breadPath: '/gic-card/list' }, { breadName } ]);
},
mounted() {
if (this.currentAreaId) {
......@@ -699,6 +699,7 @@ export default {
// }
// }
});
this.ruleForm1.giveRule = this.ruleForm1.giveRule || '1.卡券新老用户同享。\n2.用户使用卡券下单，订单取消后，卡券将自动失效';
}).catch(() => {
this.loading = false;
});
......
src/views/card/gic-card/card-form.vue
<template>
<div class="cardForm" v-loading="loading">
<dm-steps :active="active - 1" style="margin: 20px auto 46px;">
<dm-steps :active="active - 1" style="margin: 20px 40px 46px;">
<dm-step title="编辑基本信息"></dm-step>
<dm-step title="编辑适用信息"></dm-step>
</dm-steps>
......@@ -24,10 +24,10 @@
</el-radio-group>
</el-form-item> -->
<el-form-item prop="cardName" label="卡券名称">
<dm-input class="w260" v-model="ruleForm1.cardName" :byte-type="1" :maxlength="9" />
<dm-input class="w260" v-model="ruleForm1.cardName" placeholder="如：双十一优惠券" :byte-type="1" :maxlength="9" />
</el-form-item>
<el-form-item prop="remarkName" label="备注名">
<dm-input class="w260" v-model="ruleForm1.remarkName" :byte-type="1" :maxlength="10" />
<dm-input class="w260" v-model="ruleForm1.remarkName" placeholder="仅内部可见" :byte-type="1" :maxlength="10" />
</el-form-item>
<!-- 20210303 ui不要副标题 -->
<!-- <el-form-item prop="subTitle" label="副标题">
......@@ -43,8 +43,8 @@
<!-- 抵金券 -->
<el-form-item prop="denomination" label="优惠金额" v-if="ruleForm1.cardType === 0">
<dm-input-amount style="width:140px;" v-model="ruleForm1.denomination" :max="10000000" placeholder="请输入大于0的整数" :precison="2" :min="0" ></dm-input-amount>
<span class="tips">请输入大于0的数字</span>
<dm-input-amount style="width:140px;" v-model="ruleForm1.denomination" :max="10000000" placeholder="金额需大于0" :precison="2" :min="0" ></dm-input-amount>
<!-- <span class="tips">请输入大于0的数字</span> -->
</el-form-item>
<!-- 折扣券 -->
<el-form-item prop="denomination" label="优惠折扣" v-if="ruleForm1.cardType === 1">
......@@ -57,10 +57,10 @@
</el-form-item>
<!-- 抵金券、兑换券 -->
<el-form-item prop="costPrice" label="成本费用" v-if="ruleForm1.cardType !== 1">
<dm-input-amount style="width:140px;" v-model="ruleForm1.costPrice" :precision="2" :min="0" ></dm-input-amount>
<span class="tips">请输入大于0的数字（限制两位小数）</span>
<dm-input-amount style="width:140px;" v-model="ruleForm1.costPrice" placeholder="金额需大于0" :precision="2" :min="0" ></dm-input-amount>
<!-- <span class="tips">请输入大于0的数字（限制两位小数）</span> -->
</el-form-item>
<el-form-item label="最低适用商品件数" prop="goodsDiscountCheckLower" class="is-required">
<el-form-item label="最低适用商品件数" prop="goodsDiscountCheckLower">
<el-radio v-model="useConditionLimit.goodsDiscountCheckLower" :label="0">不限</el-radio>
<span class="ml15">
<el-radio v-model="useConditionLimit.goodsDiscountCheckLower" :label="1">
......@@ -68,7 +68,7 @@
</el-radio>
</span>
</el-form-item>
<el-form-item label="最高适用商品件数" prop="goodsDiscountCheck" class="is-required">
<el-form-item label="最高适用商品件数" prop="goodsDiscountCheck">
<el-radio v-model="useConditionLimit.goodsDiscountCheck" :label="0">不限</el-radio>
<span class="ml15">
<el-radio v-model="useConditionLimit.goodsDiscountCheck" :label="1">
......@@ -76,7 +76,7 @@
</el-radio>
</span>
</el-form-item>
<el-form-item label="code类型" class="is-required">
<el-form-item label="code类型">
<el-radio v-model="ruleForm1.customCodeFlag" :label="0">
<el-tooltip open-delay="200" content="仅随机生成支持卡券转赠" placement="top">
<span class="tooltip-icon">随机生成</span>
......@@ -108,9 +108,9 @@
<div class="inline-block" v-show="ruleForm1.customCodeFlag == 2">
<input style="position:absolute;top:3px;opacity:0;height:0px;width:0px;" type="file" name="file" accept=".csv" ref="file" @change="uploadCode">
<el-button :disabled="fileList.length >= 10" :loading="uploadFileloading" class="dashed" @click="$refs.file.click()"><i class="iconfont-components4 icon-cp-shangc mr5"></i>上传</el-button>
<el-button type="text" class="ml20" @click="downloadCouponCSV">点击下载文件模板</el-button>
<el-button type="text" class="ml20" @click="downloadCouponCSV">下载文件模板</el-button>
<el-popover placement="bottom" width="350" trigger="hover" open-delay="200">
<ul>
<ul style="line-height:20px;font-size:12px;color:#303133">
<li>1. 券码格式可由 6~20 位的数字或字母组成，若券码为纯数字组成，为避免发生意外错误，请将其格式设置为 ‘文本’ 格式；</li>
<li>2. 请勿导入重复的内容，导入的内容在原来基础上增加库存；</li>
<li>3. 导入的券码在当前模版上进行数据的填充；</li>
......@@ -128,17 +128,18 @@
<dm-input-unit style="width:115px;" :min="1" :max="10000000" v-model="ruleForm1.couponStock">
<span slot="append">张</span>
</dm-input-unit>
<span class="tips ml5">优惠券创建数量，如不填，则默认为100,000张</span>
<!-- <span class="tips ml5">优惠券创建数量，如不填，则默认为100,000张</span> -->
</el-form-item>
<el-form-item label="库存数量" class="is-required" key="customCodeNum" v-else>
<el-input-number style="width:115px;" controls-position="right" :min="0" :max="1000000" disabled :value="customCodeNum" />
</el-form-item>
<div class="common-title mb25 mt60">领取和使用限制</div>
<el-form-item label="领券限制" required>
<el-input-number style="width:115px;" class="mr10" controls-position="right" :min="1" v-model="ruleForm1.getLimit" />张/人<span class="tips ml5">每个用户领券上限，默认为 1</span>
<el-input-number style="width:115px;" class="mr10" controls-position="right" :min="1" v-model="ruleForm1.getLimit" />张/人
<!-- <span class="tips ml5">每个用户领券上限，默认为 1</span> -->
</el-form-item>
<!-- 有效期 -->
<el-form-item class="is-required" label="有效期类型">
<el-form-item label="有效期类型">
<div class="mb15">
<el-radio v-model="ruleForm1.cardEffectiveMode" :label="0">固定日期</el-radio>
</div>
......@@ -182,7 +183,7 @@
</el-form-item>
<!-- !!!需要通过$el找到，避免开关来来回回初始化，所以用v-show -->
<el-form-item label="转赠对话框文字" prop="giveContent" class="is-required" v-show="ruleForm1.giveFlag === 1">
<dm-input class="w260" type="textarea" ref="ruleTextarea" :row="4" :autosize="{ minRows: 4, maxRows: 8 }" v-model="ruleForm1.giveContent" wrap="soft" :byte-type="1" :maxlength="24" />
<dm-input class="w260" ref="ruleTextarea" v-model="ruleForm1.giveContent" wrap="soft" :byte-type="1" :maxlength="24" />
</el-form-item>
<template v-if="ruleForm1.giveFlag === 1">
<el-form-item label="转赠对话框图片" prop="giveImage">
......@@ -226,7 +227,7 @@
<dm-acc-group-select :etype.sync="ruleForm1.operAuthType" :group-ids.sync="ruleForm1.operAuth" />
</el-form-item>
<el-form-item prop="useExplain" label="使用说明">
<dm-input type="textarea" :autosize="{ minRows: 4, maxRows: 6 }" class="w260 autosize" :byte-type="1" :rows="4" v-model="ruleForm1.useExplain" :maxlength="500" placeholder="请输入使用说明" show-word-limit />
<dm-input type="textarea" :autosize="{ minRows: 4, maxRows: 6 }" class="w260 autosize" :byte-type="1" :rows="4" v-model="ruleForm1.useExplain" :maxlength="500" placeholder="建议填写卡券的具体使用信息" show-word-limit />
</el-form-item>
<el-form-item label="适用商品说明">
<dm-input type="textarea" class="w260" :byte-type="1" :rows="4" v-model="ruleForm1.adaptGoodsExplain" :maxlength="50" placeholder="选填" show-word-limit />
......@@ -308,8 +309,8 @@
<el-button type="primary" @click="changeStep(2, 'ruleForm1')">下一步</el-button>
</template>
<template v-if="active == 2">
<el-button type="primary" @click="changeStep(3, 'ruleForm2')">确认新建</el-button>
<el-button @click="changeStep(1)">上一步</el-button>
<el-button type="primary" @click="changeStep(3, 'ruleForm2')">确认新建</el-button>
</template>
</div>
......@@ -386,4 +387,4 @@ export default cardFormAdd;
.content {
margin-bottom: 30px;
}
</style>
\ No newline at end of file
</style>
src/views/card/gic-card/card-info.js
......@@ -80,7 +80,7 @@ export default {
};
},
created() {
this.$emit('updateBread', [ { breadName: '福利中心' }, { breadName: 'GIC卡券' }, { breadName: '卡券库', breadPath: '/gic-card/list' }, { breadName: this.isInfo ? '卡券详情' : '编辑卡券' } ]);
this.$emit('updateBread', [ { breadName: '卡券列表', breadPath: '/gic-card/list' }, { breadName: this.isInfo ? '卡券详情' : '编辑卡券' } ]);
},
mounted() {
if (this.currentAreaId) {
......@@ -249,4 +249,4 @@ export default {
return false;
}
},
};
\ No newline at end of file
};
src/views/card/gic-card/card-info.vue
......@@ -108,7 +108,7 @@
<div v-if="isInfo" class="word-break">{{ ruleForm.adaptStoreExplain || '--' }}</div>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submitForm" v-if="!isInfo">保存</el-button>
<el-button type="primary" @click="submitForm" v-if="!isInfo">确认保存</el-button>
</el-form-item>
</el-col>
</el-row>
......@@ -213,4 +213,4 @@ export default cardInfo;
}
}
}
</style>
\ No newline at end of file
</style>
src/views/card/gic-card/card-list.vue
......@@ -405,7 +405,7 @@ export default {
}
.card {
padding-left: 70px;
min-height: 70px;
min-height: 60px;
position: relative;
img {
position: absolute;
......
src/views/card/gic-card/destory-list.vue
......@@ -6,7 +6,7 @@
<el-option v-for="(item, index) in destoryType" :key="index" :label="item.label" :value="item.value"></el-option>
</el-select> -->
<el-input v-model="listParams.search" class="w260 mrAuto" placeholder="请输入卡券名称" clearable @change="refresh"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<dm-perm-button class="specter" :disabled="$itemPerm($itemCode.gicCardDestory)" type="danger" @click="showDialog('add', {})">卡券销毁</dm-perm-button>
<dm-perm-button class="specter" :disabled="$itemPerm($itemCode.gicCardDestory)" type="danger" @click="showDialog('add', {})">销毁卡券</dm-perm-button>
</div>
<el-table tooltip-effect="dark" :data="tableList" style="width:100%">
<el-table-column v-for="(v, i) in tableHeader" :fixed="v.fixed" :show-overflow-tooltip="v.tooltip" :width="v.width" :min-width="v.minWidth" :align="v.align" :key="i" :prop="v.prop" :label="v.label" :formatter="v.formatter" :sortable="v.sortable">
......@@ -127,7 +127,7 @@ export default {
};
},
created() {
this.$emit('updateBread', [ { breadName: '福利中心' }, { breadName: 'GIC卡券销毁列表' } ]);
this.$emit('updateBread', [ { breadName: '卡券销毁列表' } ]);
},
mounted() {
if(this.currentAreaId) {
......
src/views/card/gic-card/module/destory-dialog.vue
<template>
<el-dialog title="卡券销毁" :visible.sync="show" width="700px" :before-close="close">
<el-dialog title="销毁卡券" :visible.sync="show" width="700px" :before-close="close">
<div v-loading="loading">
<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">
......
src/views/card/gic-card/module/send-preview.vue
......@@ -21,7 +21,7 @@
</div>
<div class="page" v-if="active==='page'">
<div class="page-card">
<img :src="data.bannerImage" draggable="false" width="100%" height="100px" />
<img :src="data.giveBannerImage" draggable="false" width="100%" height="100px" />
<p class="title">你的好友xx，赠送给你一张卡券</p>
<div class="card-content">
<div class="dl" :style="`background:linear-gradient(137deg,rgba(${colorRGB2Hex(data.color)},0.8) 0%,rgba(${colorRGB2Hex(data.color)},1) 100%);`">
......@@ -399,4 +399,4 @@ export default {
transform: translateX(10px);
opacity: 0;
}
</style>
\ No newline at end of file
</style>
src/views/card/gic-card/send-list.vue
......@@ -18,7 +18,7 @@
<!-- <dm-perm-button :disabled="$itemPerm($itemCode.gicCardGiveLogExport)" type="primary" icon="iconfont-market4 icon-icon_yunxiazai mr5" @click="showExport">数据导出</dm-perm-button> -->
</div>
<div v-show="isOpen" class="table-search-head p20">
转赠时间：<el-date-picker class="w250 mr10" v-model="dateTime" type="daterange" range-separator="~" start-placeholder="开始日期" end-placeholder="结束日期" @change="refresh"></el-date-picker>
转赠时间：<el-date-picker class="w250" style="margin-right:60px" v-model="dateTime" type="daterange" range-separator="~" start-placeholder="开始日期" end-placeholder="结束日期" @change="refresh"></el-date-picker>
领取时间：<el-date-picker class="w250" v-model="dateTime2" type="daterange" range-separator="~" start-placeholder="开始日期" end-placeholder="结束日期" @change="refresh"></el-date-picker>
</div>
<el-table class="mt20" tooltip-effect="dark" :data="tableList" :max-height="mainHeight(54 + 50)" style="width:100%" :default-sort="{prop: 'giveTime', order: ''}" @sort-change="sortChange">
......@@ -107,7 +107,7 @@ export default {
};
},
created() {
this.$emit('updateBread', [ { breadName: '福利中心' }, { breadName: 'GIC卡券' }, { breadName: '转赠记录' } ]);
this.$emit('updateBread', [ { breadName: '转赠记录' } ]);
},
mounted() {
this.getTableList();
......
src/views/card/gic-card/stock-list.vue
......@@ -10,7 +10,7 @@ export default {
stockList
},
created() {
this.$emit('updateBread', [ { breadName: '福利中心' }, { breadName: 'GIC卡券', breadPath: '/gic-card/list' }, { breadName: '库存记录' } ]);
this.$emit('updateBread', [ { breadName: '卡券列表', breadPath: '/gic-card/list' }, { breadName: '库存记录' } ]);
}
};
</script>
src/views/card/gic-card/stock-upload-list.vue
......@@ -10,7 +10,7 @@ export default {
stockRecord
},
created() {
this.$emit('updateBread', [ { breadName: '福利中心' }, { breadName: 'GIC卡券', breadPath: '/gic-card/list' }, { breadName: '库存上传记录' } ]);
this.$emit('updateBread', [ { breadName: '库存上传记录' } ]);
},
computed: {
queryParams() {
......
src/views/card/setting/custom.vue
<template>
<div class="p20" v-loading="loading">
<div class="p20 pt30" v-loading="loading">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="150px" style="min-height:400px;">
<el-form-item label="转赠扣库存" prop="transferReduceFlag">
<el-switch :active-value="1" :inactive-value="0" v-model="ruleForm.transferReduceFlag"></el-switch>
<div class="gray03 fz12">开启表示赠送领取成功后，该卡券库存将会从福利中心的可占用库存扣除数量，若福利中心卡券可占用库存为 0，该卡券不可被赠送。</div>
<div class="gray03 fz12" style="line-height:1.4;margin-top:10px">开启表示赠送领取成功后，该卡券库存将会从福利中心的可占用库存扣除数量，若福利中心卡券可占用库存为 0，该卡券不可被赠送。</div>
</el-form-item>
<el-form-item>
<el-form-item style="margin-top:50px">
<el-button type="primary" @click="submitForm">保存</el-button>
<span class="ml10 gray03 fz12" v-if="ruleForm.updateTime">最近修改：{{formatDateTimeByType(ruleForm.updateTime, 'yyyy-MM-dd HH:mm:ss')}}</span>
</el-form-item>
......@@ -34,7 +34,7 @@ export default {
};
},
created() {
this.$emit('updateBread', [ { breadName: '福利中心' }, { breadName: '通用设置' } ]);
this.$emit('updateBread', [ { breadName: '通用设置' } ]);
},
mounted() {
this.getDetail();
......
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