Skip to content

W
welfare
Commit 1fa22f9b by 黑潮
Options

Merge branch 'feature/福利中心-礼品管理' into dev

parents 22d8d1d5 b0d11370
Showing with 41 additions and 20 deletions
dist/css/chunk-05b52201.427b36c1.css deleted 100644 → 0
.empty_block[data-v-5c83d712]:after{content:"\6682\65E0\7269\6D41\4FE1\606F"}.logistics-info[data-v-5c83d712]{display:-webkit-box;display:-ms-flexbox;display:flex}.logistics-info>div[data-v-5c83d712]{-webkit-box-flex:1;-ms-flex:1;flex:1}.logistics-info span[data-v-5c83d712]{display:inline-block}.logistics-info span+span[data-v-5c83d712]{margin-left:10px}.logistics-step[data-v-5c83d712]{margin-top:24px;background:#fafafa;padding:15px 0}.logistics-step h3[data-v-5c83d712]{color:#303133;font-size:16px;border-bottom:1px solid #dcdfe6;padding:0 20px 15px 20px}.logistics-step .logistics-list[data-v-5c83d712]{height:328px;overflow-y:auto;padding:20px}.logistics-step .logistics-item[data-v-5c83d712]{position:relative;padding-bottom:10px}.logistics-step .logistics-line-step[data-v-5c83d712]{display:-webkit-box;display:-ms-flexbox;display:flex;font-size:12px}.logistics-step .logistics-line-step .time[data-v-5c83d712]{margin-right:20px;width:160px;line-height:22px;font-weight:500;color:#303133}.logistics-step .logistics-line-step .content[data-v-5c83d712]{color:#303133;-webkit-box-flex:1;-ms-flex:1;flex:1;line-height:22px}
\ No newline at end of file
dist/css/chunk-ee0f2ebe.f0bd96d3.css → dist/css/chunk-1757828d.d5c62f81.css
[data-v-25f84e59] .el-divider--horizontal{margin:16px 0;margin-top:20px}.upload[data-v-25f84e59] .el-button{border-style:dashed}.el-icon-warning[data-v-3af8fe50]{color:#faad14;font-size:21px}.empty_block[data-v-c46fc112]:after{content:"\6682\65E0\7269\6D41\4FE1\606F"}.logistics-info[data-v-c46fc112]{display:-webkit-box;display:-ms-flexbox;display:flex}.logistics-info>div[data-v-c46fc112]{-webkit-box-flex:1;-ms-flex:1;flex:1}.logistics-info span[data-v-c46fc112]{display:inline-block}.logistics-info span+span[data-v-c46fc112]{margin-left:10px}.logistics-step[data-v-c46fc112]{margin-top:24px;background:#fafafa;padding:15px 0}.logistics-step h3[data-v-c46fc112]{color:#303133;font-size:16px;border-bottom:1px solid #dcdfe6;padding:0 20px 15px 20px}.logistics-step .logistics-list[data-v-c46fc112]{height:328px;overflow-y:auto;padding:20px}.logistics-step .logistics-item[data-v-c46fc112]{position:relative;padding-bottom:10px}.logistics-step .logistics-line-step[data-v-c46fc112]{display:-webkit-box;display:-ms-flexbox;display:flex;font-size:12px}.logistics-step .logistics-line-step .time[data-v-c46fc112]{margin-right:20px;width:160px;line-height:22px;font-weight:500;color:#303133}.logistics-step .logistics-line-step .content[data-v-c46fc112]{color:#303133;-webkit-box-flex:1;-ms-flex:1;flex:1;line-height:22px}.write-off[data-v-5539a2cd]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;font-size:14px;color:#303133}.write-off .code[data-v-5539a2cd]{margin-top:20px;color:#f5222d;font-size:20px}.goods-info[data-v-b7f9a690]{height:100%;display:-webkit-box;display:-ms-flexbox;display:flex}.goods-info img[data-v-b7f9a690]{width:62px;height:62px;border:1px solid #f1f3f7;border-radius:5px}.goods-info .goods-text[data-v-b7f9a690]{margin-left:18px;font-size:13px;color:#303133;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.goods-info .goods-text-info[data-v-b7f9a690]{color:#909399;font-size:12px}.goods-info .goods-text-name[data-v-b7f9a690]{margin-bottom:5px;line-height:16px}
\ No newline at end of file
[data-v-25f84e59] .el-divider--horizontal{margin:16px 0;margin-top:20px}.upload[data-v-25f84e59] .el-button{border-style:dashed}.el-icon-warning[data-v-3af8fe50]{color:#faad14;font-size:21px}.empty_block[data-v-c46fc112]:after{content:"\6682\65E0\7269\6D41\4FE1\606F"}.logistics-info[data-v-c46fc112]{display:-webkit-box;display:-ms-flexbox;display:flex}.logistics-info>div[data-v-c46fc112]{-webkit-box-flex:1;-ms-flex:1;flex:1}.logistics-info span[data-v-c46fc112]{display:inline-block}.logistics-info span+span[data-v-c46fc112]{margin-left:10px}.logistics-step[data-v-c46fc112]{margin-top:24px;background:#fafafa;padding:15px 0}.logistics-step h3[data-v-c46fc112]{color:#303133;font-size:16px;border-bottom:1px solid #dcdfe6;padding:0 20px 15px 20px}.logistics-step .logistics-list[data-v-c46fc112]{height:328px;overflow-y:auto;padding:20px}.logistics-step .logistics-item[data-v-c46fc112]{position:relative;padding-bottom:10px}.logistics-step .logistics-line-step[data-v-c46fc112]{display:-webkit-box;display:-ms-flexbox;display:flex;font-size:12px}.logistics-step .logistics-line-step .time[data-v-c46fc112]{margin-right:20px;width:160px;line-height:22px;font-weight:500;color:#303133}.logistics-step .logistics-line-step .content[data-v-c46fc112]{color:#303133;-webkit-box-flex:1;-ms-flex:1;flex:1;line-height:22px}.write-off[data-v-5539a2cd]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;font-size:14px;color:#303133}.write-off .code[data-v-5539a2cd]{margin-top:20px;color:#f5222d;font-size:20px}.goods-info[data-v-9b45ca54]{height:100%;display:-webkit-box;display:-ms-flexbox;display:flex}.goods-info img[data-v-9b45ca54]{width:62px;height:62px;border:1px solid #f1f3f7;border-radius:5px}.goods-info .goods-text[data-v-9b45ca54]{margin-left:18px;font-size:13px;color:#303133;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.goods-info .goods-text-info[data-v-9b45ca54]{color:#909399;font-size:12px}.goods-info .goods-text-name[data-v-9b45ca54]{margin-bottom:5px;line-height:16px}
\ No newline at end of file
dist/css/chunk-459815f5.2cde6ef6.css 0 → 100644
.empty_block[data-v-dfb952a4]:after{content:"\6682\65E0\7269\6D41\4FE1\606F"}.logistics-info[data-v-dfb952a4]{display:-webkit-box;display:-ms-flexbox;display:flex}.logistics-info>div[data-v-dfb952a4]{-webkit-box-flex:1;-ms-flex:1;flex:1}.logistics-info span[data-v-dfb952a4]{display:inline-block}.logistics-info span+span[data-v-dfb952a4]{margin-left:10px}.logistics-step[data-v-dfb952a4]{margin-top:24px;background:#fafafa;padding:15px 0}.logistics-step h3[data-v-dfb952a4]{color:#303133;font-size:16px;border-bottom:1px solid #dcdfe6;padding:0 20px 15px 20px}.logistics-step .logistics-list[data-v-dfb952a4]{height:328px;overflow-y:auto;padding:20px}.logistics-step .logistics-item[data-v-dfb952a4]{position:relative;padding-bottom:10px}.logistics-step .logistics-line-step[data-v-dfb952a4]{display:-webkit-box;display:-ms-flexbox;display:flex;font-size:12px}.logistics-step .logistics-line-step .time[data-v-dfb952a4]{margin-right:20px;width:160px;line-height:22px;font-weight:500;color:#303133}.logistics-step .logistics-line-step .content[data-v-dfb952a4]{color:#303133;-webkit-box-flex:1;-ms-flex:1;flex:1;line-height:22px}
\ No newline at end of file
src/views/performance-manage/delivery-list.vue
......@@ -9,7 +9,7 @@
<el-option label="门店自提" :value="2"></el-option>
</el-select>
<el-input class="w360 ml10" placeholder="请输入关键词进行搜索" v-model="searchValue" clearable @keyup.enter.native="handleSearch" @change="handleSearch">
<el-select v-model="searchType" slot="prepend" style="width:140px;">
<el-select v-model="searchType" slot="prepend" style="width:140px;" @change="handleSearchTypeChange">
<el-option label="商品名称" value="giftName"></el-option>
<el-option label="礼品编码" value="giftCode"></el-option>
<el-option label="sku编码" value="giftSkuCode"></el-option>
......@@ -225,8 +225,8 @@ export default {
sort = 'asc';
} else {
let now = Date.now();
this.query.endTime = this.$options.filters['formatDate'](now);
this.query.startTime = this.$options.filters['formatDate'](now - 30 * 24 * 60 * 60 * 1000);
this.query.endTime = this.$options.filters['formatDate'](now) + ' 23:59:59';
this.query.startTime = this.$options.filters['formatDate'](now - 30 * 24 * 60 * 60 * 1000) + ' 00:00:00';
}
this.getList(sort);
},
......@@ -292,6 +292,10 @@ export default {
this.$refs.exportData.applyReport();
});
},
handleSearchTypeChange() {
this.searchValue = '';
this.handleSearch();
},
},
filters: {
formatDate(ms, type = 'date') {
......
src/views/performance-manage/record.vue
......@@ -15,7 +15,7 @@
<el-option label="已关闭" :value="2"></el-option>
</el-select>
<el-input class="w360 ml10" placeholder="请输入关键词搜索" v-model="searchValue" clearable @keyup.enter.native="handleSearch" @change="handleSearch">
<el-select v-model="searchType" slot="prepend" style="width:160px;">
<el-select v-model="searchType" slot="prepend" style="width:160px;" @change="handleSearchTypeChange">
<el-option label="礼品名称" value="giftName"></el-option>
<el-option label="礼品编码" value="giftNo"></el-option>
<el-option label="sku编码" value="giftSkuCode"></el-option>
......@@ -68,10 +68,22 @@
<div>
应用单号：{{row.businessId}}
</div>
<div class="mt10">
<div v-if="row.orderFlag == 1 && row.giftType == 1" class="mt10">
<span>发货单号：</span>
<el-button type="text" @click="linkToDetail(row.deliveryOrderId)">{{row.deliveryOrderId}}</el-button>
</div>
<div v-if="row.orderFlag == 1 && row.giftType == 2" class="mt10">
{{row.deliveryInfo}}
</div>
<div v-else-if="row.orderFlag == 0" class="mt10">
<span style="display:flex">
<span style="flex-shrink:0">备注：</span>
<span>{{row.waitReason}}</span>
</span>
</div>
<div v-else-if="row.orderFlag == 2" class="mt10">
<span>关闭时间： {{row.updateTime | formatDate('dateTime')}}</span>
</div>
</el-popover>
</template>
</el-table-column>
......@@ -178,6 +190,9 @@ export default {
breadName: '履约记录'
},
]);
let now = Date.now();
this.query.endTime = this.$options.filters['formatDate'](now) + ' 23:59:59';
this.query.startTime = this.$options.filters['formatDate'](now - 30 * 24 * 60 * 60 * 1000) + ' 00:00:00';
this.getApplicationList();
this.getList();
},
......@@ -233,6 +248,10 @@ export default {
// this.$router.push({ path: '/performance/delivery-detail', query: { deliveryId } });
window.open(`/performance/delivery-detail?deliveryId=${deliveryId}`);
},
handleSearchTypeChange() {
this.searchValue = '';
this.handleSearch();
},
},
filters: {
formatDate(ms, type = 'date') {
......
src/views/performance-manage/refund.vue
......@@ -12,13 +12,13 @@
<el-option label="已关闭" :value="3"></el-option> -->
</el-select>
<el-input class="w360 ml10" placeholder="请输入关键词搜索" v-model="searchValue" clearable @keyup.enter.native="handleSearch" @change="handleSearch">
<el-select class="w160" v-model="searchType" slot="prepend">
<el-select class="w160" v-model="searchType" slot="prepend" @change="handleSearchTypeChange">
<el-option label="退货单号" value="refundId"></el-option>
<el-option label="商品名称" value="giftName"></el-option>
<el-option label="礼品编码" value="giftCode"></el-option>
<el-option label="sku编码" value="giftSkuCode"></el-option>
<el-option label="发货单号" value="deliveryId"></el-option>
<el-option label="会员手机号" value="consigneePhone"></el-option>
<el-option label="会员手机号" value="memberPhone"></el-option>
<el-option label="会员姓名" value="memberName"></el-option>
<el-option label="会员卡号" value="memberCardNo"></el-option>
<el-option label="履约单号" value="orderId"></el-option>
......@@ -295,6 +295,9 @@ export default {
breadName: '退货单'
},
]);
let now = Date.now();
this.query.endTime = this.$options.filters['formatDate'](now) + ' 23:59:59';
this.query.startTime = this.$options.filters['formatDate'](now - 30 * 24 * 60 * 60 * 1000) + ' 00:00:00';
this.getApplicationList();
this.handleChangeRefundFlag();
},
......@@ -387,16 +390,7 @@ export default {
let sort;
if(this.query.refundFlag === 0) {
sort = 'asc';
this.query.endTime = '';
this.query.startTime = '';
} else if(this.query.refundFlag) {
sort = 'desc';
let now = Date.now();
this.query.endTime = this.$options.filters['formatDate'](now);
this.query.startTime = this.$options.filters['formatDate'](now - 30 * 24 * 60 * 60 * 1000);
} else {
this.query.endTime = '';
this.query.startTime = '';
sort = 'desc';
}
this.pager.currentPage = 1;
......@@ -408,6 +402,10 @@ export default {
onError(e) {
this.$message.error('复制失败');
},
handleSearchTypeChange() {
this.searchValue = '';
this.handleSearch();
},
},
filters: {
formatDate(ms, type = 'date') {
......
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