Commit eb0093c9 by chenxin

fix: build

parent 5912302c
......@@ -6,10 +6,11 @@
</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>
</div>
<el-table tooltip-effect="dark" v-loading="loading" :data="tableList" style="width:100%">
<el-table max-height="500" tooltip-effect="dark" v-loading="loading" :data="tableList" style="width:100%">
<el-table-column prop="appName" label="活动应用名称" min-width="120"> </el-table-column>
<el-table-column prop="activityName" label="活动名称" min-width="120"> </el-table-column>
<el-table-column prop="activityName" label="活动名称" min-width="180"> </el-table-column>
<el-table-column prop="remainedStock" label="可用库存" min-width="120"> </el-table-column>
<el-table-column prop="preStock" v-if="type == 1 || type == 2" label="待履约库存" min-width="120"> </el-table-column>
<el-table-column prop="outStock" label="历史履约库存" min-width="120"> </el-table-column>
</el-table>
<!-- <div class="clearfix">
......@@ -35,6 +36,10 @@ export default {
welfareId: {
type: String,
required: true
},
type: {
type: [ Number, String ], // 1实物礼品 2虚拟礼品 3卡券 4卡券包
required: true
}
},
data() {
......@@ -77,7 +82,7 @@ export default {
...this.listParams
}).then(res => {
this.loading = false;
this.tableList = res.total || [];
this.tableList = res.result.page.result || [];
}).catch(() => {
this.loading = false;
});
......
<template>
<div class="p20" v-loading="loading">
<div class="pb20 clearfix flex-center">
<welfare-item :welfare-id="$route.query.id" :type="type"></welfare-item>
<welfare-item :welfare-id="$route.query.id" :type="type" @updateSkulist="(list) => { skuList = list; }"></welfare-item>
</div>
<div style="height:20px;width:calc(100% + 40px);position:relative;left:-20px;" class="bg-color mb20"></div>
<div>
<p class="fz16 mb15">操作记录<span class="fz12 ml10 gray03">主要对手动调整库存,应用占用库存,应用释放库存的场景下对福利“可占库存”引起变更进行记录</span></p>
<div class="table-search-head">
<el-select class="mr10 w140" v-if="type == 1" clearable v-model="listParams.name" placeholder="全部SKU" @change="refresh">
<el-option v-for="(item, idx) in skuList" :key="idx" :label="item.giftSkuName" :value="item.giftSkuId"></el-option>
</el-select>
<el-select class="mr10 w140" 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="w250 mr10" multiple placeholder="全部来源" clearable @change="changeAppCode">
<el-select v-model="appCodes" class="w140 mr10" multiple placeholder="全部来源" 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 w300" v-model="listParams.activityName" clearable placeholder="请输入活动名称搜索" @change="refresh"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
......@@ -21,6 +24,7 @@
<el-table-column prop="modifyTime" label="操作时间" min-width="120" fixed="left">
<span slot-scope="scope" v-html="listTime(scope.row.modifyTime)"></span>
</el-table-column>
<el-table-column v-if="type == 1 || type == 2" prop="name" label="调整对象" min-width="120"> </el-table-column>
<el-table-column label="调整类型" min-width="120">
<span slot-scope="scope">{{ scope.row.modifyType | fType }}</span>
</el-table-column>
......@@ -80,7 +84,8 @@ export default {
total: 0,
tableList: [],
appList: [],
appCodes: []
appCodes: [],
skuList: []
};
},
mounted() {
......@@ -91,14 +96,6 @@ export default {
},
methods: {
listTime,
// formatSendStatus(row) {
// const st = sendType[row.status];
// if(st) {
// return `<span class="state-point ${st.cl}">${st.label || '--'}</span>`;
// } else {
// return '<span class="state-point state-point-default">未知状态</span>';
// }
// },
formatCardType(row) {
return cardType[row.cardType].label;
},
......
......@@ -69,7 +69,7 @@ export default {
return {
info: {},
dialogVisible: false,
skuList: Array(5).fill({ num: 50 })
skuList: []
};
},
methods: {
......@@ -91,7 +91,10 @@ export default {
remainedStock, // 可占用库存
totalStock, // 总库存
};
this.skuList = res.skuList || [];
if(this.type == 1) {
this.skuList = res.result.skuList || [];
this.$emit('updateSkulist', this.skuList);
}
});
}
if(this.type == 3 || this.type == 4) {
......
<template>
<div class="p20" v-loading="loading">
<div class="pb20 clearfix flex-center">
<el-select v-model="listParams.appCode" class="w250 mr10" placeholder="全部来源" clearable @change="refresh">
<el-select v-model="listParams.appCode" class="w140 mr10" placeholder="全部来源" clearable @change="refresh">
<el-option v-for="item in appList" :key="item.appCode" :label="item.appName" :value="item.appCode"></el-option>
</el-select>
<el-input placeholder="请输入关键字搜索" class="w400 mr10" v-model="listParams.search" clearable @change="refresh">
......
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