Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

导粉记录，订单条件筛选，食谱计划生成优化

Browse Source
This commit is contained in:
xiezhijun
2021-06-07 19:11:44 +08:00
parent 06d62ea4a0
commit 669bbfbf23
14 changed files with 190 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
stdiet-ui/src/components/ImportFanRecord/ImportFan/index.vue
View File

@ -4,7 +4,7 @@
<el-dialog :title="title" :visible.sync="open" width="1050px" :close-on-click-modal="false" append-to-body @closed="cancel">
<!--<div style="margin-bottom: 20px;color:red">1、添加导粉记录时会根据进粉渠道、当前时间来自动确定所属直播间，当前时间段没有直播，则取上一次直播，若账号从未直播过，则为空</div>-->
<el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
<!--<el-form-item label="账号渠道" prop="channel">
<el-form-item label="账号渠道" prop="channel">
<el-select
v-model="queryParams.channel"
placeholder="请选择账号渠道"
@ -19,7 +19,7 @@
:value="parseInt(dict.dictValue)"
/>
</el-select>
</el-form-item>-->
</el-form-item>
<el-form-item label="销售" prop="saleId" label-width="50px">
<el-select
v-model="queryParams.saleId"
@ -89,20 +89,15 @@
</el-table-column>-->
<el-table-column label="导粉时间" align="center" prop="fanTime" width="240">
<template slot-scope="scope">
<el-date-picker
v-model="scope.row.fanTime"
type="datetime"
placeholder="选择导粉时间"
format="yyyy-MM-dd HH:mm"
<el-time-picker
value-format="yyyy-MM-dd HH:mm"
:picker-options="fanPickerOptions"
v-model="scope.row.fanTime"
placeholder="选择导粉时间"
@change="autoSelectLive(scope.row)"
>
</el-date-picker>
</el-time-picker>
</template>
</el-table-column>
<el-table-column label="导粉数量" align="center" prop="fanNum" width="180">
<template slot-scope="scope">
<el-input-number v-model="scope.row.fanNum" :min="1" :max="10000" label="导粉数量" style="width:160px"></el-input-number>
@ -227,9 +222,9 @@ export default {
response.data.wxSaleAccountList.forEach((item,index) => {
item.fanNum = 1;
//item.importFanNum = this.getTotalFanNum(response.data.fanNumList, item.id);
item.importFanChannel = null;
item.importFanChannel = item.channel ? item.channel : null;
item.importFanLive = null;
item.fanTime = null;
item.fanTime = null;
});
this.wxAccountList = response.data.wxSaleAccountList;
//this.fanNumList = response.data.fanNumList;
@ -297,14 +292,16 @@ export default {
'importFanChannel': row.importFanChannel,
'importFanLive': row.importFanLive,
'wxAccountId': row.id,
'fanNum': row.fanNum
'fanNum': row.fanNum,
"importTime": row.fanTime
}
addImportFanRecord(param).then((response) => {
if(response.code == 200){
this.msgSuccess("保存成功");
row.importFanChannel = null;
//row.importFanChannel = null;
row.importFanLive = null;
row.importFanNum += row.fanNum;
row.fanTime = null;
row.fanNum = 1;
this.importFanFlag = true;
}
@ -321,17 +318,19 @@ export default {
}
let param = {
'importFanDate': this.data.importFanDate,
'importFanChannels': null,
'importFanLives': null,
'wxAccountIds': null,
'fanNums': null
'importFanChannels': "",
'importFanLives': "",
'wxAccountIds': "",
'fanNums': "",
"importTimes": ""
}
this.wxAccountList.forEach((item,index) => {
if(item.importFanChannel != undefined && item.importFanChannel != null && item.importFanChannel != ""){
param.importFanChannels += param.importFanChannels != null ? (","+this.nullToString(item.importFanChannel)) : item.importFanChannel;
param.importFanLives += param.importFanLives != null ? (","+this.nullToString(item.importFanLive)) : item.importFanLive;
param.wxAccountIds += param.wxAccountIds != null ? (","+this.nullToString(item.id)) : item.id;
param.fanNums += param.fanNums != null ? (","+this.nullToString(item.fanNum)) : item.fanNum;
if(item.fanTime != undefined && item.fanTime != null && item.fanTime != ""){
param.importFanChannels += index != 0 ? (","+this.nullToString(item.importFanChannel)) : item.importFanChannel;
param.importFanLives += index != 0 ? (","+this.nullToString(item.importFanLive)) : item.importFanLive;
param.wxAccountIds += index != 0 ? (","+this.nullToString(item.id)) : item.id;
param.fanNums += index != 0 ? (","+this.nullToString(item.fanNum)) : item.fanNum;
param.importTimes += index != 0 ? (","+this.nullToString(item.fanTime)) : item.fanTime;
}
if(index == this.wxAccountList.length -1){
if(param.importFanChannels == null){
@ -347,9 +346,10 @@ export default {
this.importFanFlag = true;
for(let i=0; i < this.wxAccountList.length; i++){
this.wxAccountList[i].importFanLive = null;
this.wxAccountList[i].importFanChannel = null;
//this.wxAccountList[i].importFanChannel = null;
this.wxAccountList[i].importFanNum += this.wxAccountList[i].fanNum;
this.wxAccountList[i].fanNum = 1;
this.wxAccountList[i].fanTime = null;
//this.$set('wxAccountList', index, item);
}
}
@ -366,6 +366,8 @@ export default {
row.importFanLive = null;
return;
}
row.fanTime = this.data.importFanDate + " " + row.fanTime.substring(row.fanTime.length - 5);
//console.log(row.fanTime);
getLiveSchedulByTime({'fanChannel':row.importFanChannel,'liveStartTimeString':encodeURIComponent(row.fanTime)}).then((response) => {
if (response.code === 200) {
let live = response.data;

15
stdiet-ui/src/views/custom/importFanRecord/index.vue
View File

@ -92,10 +92,15 @@
<span>{{ parseTime(scope.row.importFanDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="进粉账号渠道" align="center" prop="importFanChannelName" />
<el-table-column label="账号渠道" align="center" prop="importFanChannelName" />
<el-table-column label="所属直播间" align="center" prop="liveRoomName" >
<template slot-scope="scope">
{{(scope.row.liveRoomName != null || scope.row.liveNutritionistName != null) ? (scope.row.liveRoomName + "—" + scope.row.liveNutritionistName) : ""}}
{{(scope.row.liveRoomName != null ? scope.row.liveRoomName : "无")}}
</template>
</el-table-column>
<el-table-column label="直播营养师" align="center" prop="liveNutritionistName" >
<template slot-scope="scope">
{{scope.row.liveNutritionistName != null ? scope.row.liveNutritionistName : "无"}}
</template>
</el-table-column>
<el-table-column label="导粉总数" align="center" prop="wxAccountList" :formatter="getTotalFanNum">
@ -104,9 +109,9 @@
<template slot-scope="scope">
<el-popover
placement="left"
width="520"
width="700"
trigger="click">
<el-table :data="scope.row.wxAccountList" style="width:450;height: 400px;overflow: auto;">
<el-table :data="scope.row.wxAccountList" style="width:700;height: 400px;overflow: auto;">
<el-table-column width="80" property="saleName" label="销售" align="center"></el-table-column>
<el-table-column width="160" property="wxAccount" label="微信号" align="center"></el-table-column>
<el-table-column width="120" property="importFanNum" label="导粉数量" align="center">
@ -119,6 +124,8 @@
</div>
</template>
</el-table-column>
<el-table-column width="160" property="importTime" label="导粉时间" align="center">
</el-table-column>
<el-table-column width="120" label="操作" align="center">
<template slot-scope="scope">
<el-button

53
stdiet-ui/src/views/custom/order/index.vue
View File

@ -88,6 +88,24 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6" v-if="!isPartner">
<el-form-item label="售中" prop="onSaleId">
<el-select
v-model="queryParams.onSaleId"
placeholder="请选择售中"
clearable
filterable
size="small"
>
<el-option
v-for="dict in onSaleIdOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="parseInt(dict.dictValue)"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6" v-if="!isPartner">
<el-form-item label="售后" prop="afterSaleId">
<el-select
@ -248,7 +266,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="订单类型" prop="searchOrderTypeArray">
<el-cascader
placeholder="请选择订单类型"
@ -257,13 +275,13 @@
:props="orderTypeProps"
collapse-tags
clearable
style="width: 300px"
></el-cascader> </el-form-item
><!-- -->
</el-col>
<el-col :span="12">
<el-col :span="20">
<el-form-item label="成交日期" prop="orderTime">
<el-date-picker
style="width:300px"
v-model="daterange"
type="daterange"
size="small"
@ -276,10 +294,7 @@
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col>
<el-form-item>
<el-form-item style="margin-left:50px">
<el-button
type="cyan"
icon="el-icon-search"
@ -292,6 +307,20 @@
</el-button>
</el-form-item>
</el-col>
<!--<el-col>
<el-form-item>
<el-button
type="cyan"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索
</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">
重置
</el-button>
</el-form-item>
</el-col>-->
</el-form>
</el-row>
@ -337,9 +366,11 @@
width="100"
>
<template slot-scope="scope">
<div v-if="scope.row.orderTime != undefined && scope.row.orderTime != null">
<div v-for="time in scope.row.orderTime.split(' ')" :key="time">
{{ time }}
</div>
</div>
</template>
</el-table-column>
<el-table-column
@ -362,7 +393,11 @@
width="90"
/>
<el-table-column label="服务时长" align="center" prop="serveTime" />
<el-table-column label="销售" align="center" prop="preSale" />
<el-table-column label="销售/售中" align="center" prop="preSale" >
<template slot-scope="scope">
{{ scope.row.preSaleId ? scope.row.preSale : scope.row.onSale }}
</template>
</el-table-column>
<el-table-column
v-if="!isMobile"
label="售后"
@ -561,6 +596,7 @@ export default {
phone: null,
payTypeId: null,
preSaleId: null,
onSaleId: null,
afterSaleId: null,
nutritionistId: null,
nutriAssisId: null,
@ -592,6 +628,7 @@ export default {
...mapGetters([
// 售前字典
"preSaleIdOptions",
"onSaleIdOptions",
// 售后字典
"afterSaleIdOptions",
// 主营养师字典