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

暂存

Browse Source
This commit is contained in:
huangdeliang
2021-01-28 15:14:38 +08:00
parent 4b2de6accd
commit dad428d90c
12 changed files with 2557 additions and 1522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysCustomerController.java
View File

@ -1,29 +1,21 @@
package com.stdiet.web.controller.custom;
import java.util.ArrayList;
import java.util.List;
import com.stdiet.common.utils.StringUtils;
import com.stdiet.custom.domain.SysCustomerPhysicalSigns;
import com.stdiet.custom.domain.SysPhysicalSigns;
import com.stdiet.common.utils.bean.ObjectUtils;
import com.stdiet.custom.domain.SysRecipesPlan;
import com.stdiet.custom.dto.request.CustomerInvestigateRequest;
import com.stdiet.custom.dto.response.CustomerListResponse;
import com.stdiet.custom.service.ISysCustomerPhysicalSignsService;
import org.omg.PortableInterceptor.SYSTEM_EXCEPTION;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.stdiet.common.annotation.Log;
import com.stdiet.common.core.controller.BaseController;
import com.stdiet.common.core.domain.AjaxResult;
import com.stdiet.common.enums.BusinessType;
import com.stdiet.custom.domain.SysCustomer;
import com.stdiet.custom.service.ISysCustomerService;
import com.stdiet.common.utils.poi.ExcelUtil;
import com.stdiet.common.core.page.TableDataInfo;
import com.stdiet.common.enums.BusinessType;
import com.stdiet.common.utils.StringUtils;
import com.stdiet.common.utils.poi.ExcelUtil;
import com.stdiet.custom.domain.SysCustomer;
import com.stdiet.custom.domain.SysCustomerPhysicalSigns;
import com.stdiet.custom.service.ISysCustomerPhysicalSignsService;
import com.stdiet.custom.service.ISysCustomerService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 客户体征信息Controller
@ -33,8 +25,7 @@ import com.stdiet.common.core.page.TableDataInfo;
*/
@RestController
@RequestMapping("/custom/customer")
public class SysCustomerController extends BaseController
{
public class SysCustomerController extends BaseController {
@Autowired
private ISysCustomerService sysCustomerService;
@ -46,13 +37,12 @@ public class SysCustomerController extends BaseController
*/
@PreAuthorize("@ss.hasPermi('custom:customer:list')")
@GetMapping("/list")
public TableDataInfo list(SysCustomerPhysicalSigns sysCustomerPhysicalSigns)
{
public TableDataInfo list(SysCustomer sysCustomer) {
startPage();
List<SysCustomerPhysicalSigns> list = sysCustomerPhysicalSignsService.selectSysCustomerAndSignList(sysCustomerPhysicalSigns);
if(list != null && list.size() > 0){
for(SysCustomerPhysicalSigns sysCus : list){
if(StringUtils.isNotEmpty(sysCus.getPhone())){
List<SysCustomer> list = sysCustomerService.selectSysCustomerList(sysCustomer);
if (list != null && list.size() > 0) {
for (SysCustomer sysCus : list) {
if (StringUtils.isNotEmpty(sysCus.getPhone())) {
sysCus.setPhone(StringUtils.hiddenPhoneNumber(sysCus.getPhone()));
}
}
@ -64,32 +54,12 @@ public class SysCustomerController extends BaseController
* 导出客户信息列表
*/
@PreAuthorize("@ss.hasPermi('custom:customer:export')")
@Log(title = "客户体征", businessType = BusinessType.EXPORT)
@Log(title = "客户档案", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(SysCustomerPhysicalSigns sysCustomerPhysicalSigns) throws Exception
{
List<SysCustomerPhysicalSigns> list = sysCustomerPhysicalSignsService.selectSysCustomerAndSignList(sysCustomerPhysicalSigns);
List<CustomerListResponse> responsesList = new ArrayList<>();
CustomerListResponse customerListResponse = null;
for(SysCustomerPhysicalSigns sysCus : list){
customerListResponse = ObjectUtils.getObjectByObject(sysCus, CustomerListResponse.class);
customerListResponse.setCreateTime(sysCus.getCreateTime());
if(StringUtils.isNotEmpty(sysCus.getPhone())){
customerListResponse.setPhone(StringUtils.hiddenPhoneNumber(sysCus.getPhone()));
}
StringBuilder signStr = new StringBuilder();
if(sysCus.getSignList() != null && sysCus.getSignList().size() > 0){
int i = 0;
for (SysPhysicalSigns s : sysCus.getSignList()) {
signStr.append((i != 0 ? "，" : "") + s.getName());
i++;
}
}
customerListResponse.setPhysicalSignsId(signStr.toString());
responsesList.add(customerListResponse);
}
ExcelUtil<CustomerListResponse> util = new ExcelUtil<CustomerListResponse>(CustomerListResponse.class);
return util.exportExcel(responsesList, "客户体征数据");
public AjaxResult export(SysCustomer sysCustomer) throws Exception {
List<SysCustomer> list = sysCustomerService.selectSysCustomerList(sysCustomer);
ExcelUtil<SysCustomer> util = new ExcelUtil<SysCustomer>(SysCustomer.class);
return util.exportExcel(list, "customerCenter");
}
/**
@ -97,42 +67,38 @@ public class SysCustomerController extends BaseController
*/
@PreAuthorize("@ss.hasPermi('custom:customer:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return AjaxResult.success(sysCustomerPhysicalSignsService.selectSysCustomerPhysicalSignsById(id));
public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(sysCustomerService.selectSysCustomerById(id));
}
/**
* 新增客户信息
*/
@PreAuthorize("@ss.hasPermi('custom:customer:add')")
@Log(title = "客户体征", businessType = BusinessType.INSERT)
@Log(title = "客户档案", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody CustomerInvestigateRequest customerInvestigateRequest) throws Exception
{
return sysCustomerPhysicalSignsService.addOrupdateCustomerAndSign(customerInvestigateRequest);
public AjaxResult add(@RequestBody SysCustomer sysCustomer) throws Exception {
return toAjax(sysCustomerService.insertSysCustomer(sysCustomer));
}
/**
* 修改客户信息
*/
@PreAuthorize("@ss.hasPermi('custom:customer:edit')")
@Log(title = "客户体征", businessType = BusinessType.UPDATE)
@Log(title = "客户档案", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody CustomerInvestigateRequest customerInvestigateRequest) throws Exception
{
return sysCustomerPhysicalSignsService.addOrupdateCustomerAndSign(customerInvestigateRequest);
public AjaxResult edit(@RequestBody SysCustomer sysCustomer) throws Exception {
return toAjax(sysCustomerService.updateSysCustomer(sysCustomer));
}
/**
* 删除客户信息
*/
@PreAuthorize("@ss.hasPermi('custom:customer:remove')")
@Log(title = "客户体征", businessType = BusinessType.DELETE)
@Log(title = "客户档案", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(sysCustomerPhysicalSignsService.deleteSysCustomerPhysicalSignsByIds(ids));
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(sysCustomerService.deleteSysCustomerByIds(ids));
}
/**
@ -142,7 +108,7 @@ public class SysCustomerController extends BaseController
@PreAuthorize("@ss.hasPermi('custom:customer:query')")
public AjaxResult getCustomerAndSignByPhone(@RequestParam("phone")String phone)
{
SysCustomerPhysicalSigns sysCustomer = null;
SysCustomerPhysicalSigns sysCustomer = null;
if(StringUtils.isNotEmpty(phone)){
sysCustomer = sysCustomerPhysicalSignsService.selectSysCustomerAndSignByPhone(phone);
}

10
stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrder.java
View File

@ -25,6 +25,8 @@ public class SysOrder extends BaseEntity {
@Excel(name = "编号")
private Long orderId;
private Long cusId;
/**
* 客户姓名
*/
@ -224,6 +226,14 @@ public class SysOrder extends BaseEntity {
* */
private List<SysOrderPause> orderPauseList;
public Long getCusId() {
return cusId;
}
public void setCusId(Long cusId) {
this.cusId = cusId;
}
@JsonFormat(pattern = "yyyy-MM-dd")
public Date getStartTime() {
return startTime;

1
stdiet-custom/src/main/resources/mapper/custom/SysCustomerMapper.xml
View File

@ -35,6 +35,7 @@
where del_flag = 0
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
<if test="phone != null and phone != ''"> and phone like concat('%', #{phone}, '%')</if>
order by create_time desc
</select>
<select id="selectSysCustomerById" parameterType="Long" resultMap="SysCustomerResult">

9
stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml
View File

@ -7,6 +7,7 @@
<resultMap type="SysOrder" id="SysOrderResult">
<result property="orderId" column="order_id"/>
<result property="customer" column="customer"/>
<result property="cusId" column="cus_id"/>
<result property="phone" column="phone"/>
<result property="amount" column="amount"/>
<result property="weight" column="weight"/>
@ -46,7 +47,7 @@
</resultMap>
<sql id="selectSysOrderVo">
select o.order_id, o.review_status, o.customer, o.phone, o.amount, o.start_time, o.pause_time, o.status, o.weight, ser.dict_label as serve_time,
select o.order_id, o.review_status, o.cus_id, o.customer, o.phone, o.amount, o.start_time, o.pause_time, o.status, o.weight, ser.dict_label as serve_time,
o.serve_time_id, o.pay_type_id, pay.dict_label as pay_type, o.pre_sale_id, o.create_by, o.create_time, o.after_sale_id, o.update_by, o.update_time,
o.nutritionist_id, o.remark, o.nutri_assis_id, o.account_id, acc.dict_label as account, o.planner_id, o.planner_assis_id, o.operator_id, o.operator_assis_id,
o.recommender, o.order_time,o.give_serve_day,o.conditioning_project_id,cp.dict_label as conditioning_project,o.server_end_time,o.become_fan_time from sys_order o
@ -61,6 +62,7 @@
<where>
<if test="orderId != null and orderId != ''">and order_id = #{orderId}</if>
<if test="customer != null and customer != ''">and customer = #{customer}</if>
<if test="cusId != null and cusId != ''">and cus_id = #{cusId}</if>
<if test="phone != null and phone != ''">and phone = #{phone}</if>
<if test="status != null ">and status = #{status}</if>
<if test="payTypeId != null ">and pay_type_id = #{payTypeId}</if>
@ -87,6 +89,7 @@
<where>
<if test="orderId != null and orderId != ''">and order_id = #{orderId}</if>
<if test="customer != null and customer != ''">and customer = #{customer}</if>
<if test="cusId != null and cusId != ''">and cus_id = #{cusId}</if>
<if test="phone != null and phone != ''">and phone = #{phone}</if>
<if test="status != null ">and status = #{status}</if>
<if test="payTypeId != null ">and pay_type_id = #{payTypeId}</if>
@ -118,6 +121,7 @@
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="orderId != null and orderId != ''">order_id,</if>
<if test="customer != null and customer != ''">customer,</if>
<if test="cusId != null">cus_id,</if>
<if test="phone != null">phone,</if>
<if test="amount != null">amount,</if>
<if test="status != null">status,</if>
@ -151,6 +155,7 @@
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="orderId != null and orderId != ''">#{orderId},</if>
<if test="customer != null and customer != ''">#{customer},</if>
<if test="cusId != null">#{cusId},</if>
<if test="phone != null">#{phone},</if>
<if test="amount != null">#{amount},</if>
<if test="status != null">#{status},</if>
@ -187,6 +192,7 @@
update sys_order
<trim prefix="SET" suffixOverrides=",">
<if test="customer != null and customer != ''">customer = #{customer},</if>
<if test="cusId != null">cus_id = #{cusId},</if>
<if test="phone != null">phone = #{phone},</if>
<if test="amount != null">amount = #{amount},</if>
<if test="weight != null">weight = #{weight},</if>
@ -234,6 +240,7 @@
<resultMap type="SysOrder" id="SysOrderResultExtended">
<result property="orderId" column="order_id"/>
<result property="customer" column="customer"/>
<result property="cusId" column="cus_id"/>
<result property="phone" column="phone"/>
<result property="amount" column="amount"/>
<result property="weight" column="weight"/>

607
stdiet-ui/src/views/custom/customer/createOrderDialog.vue Normal file
View File

@ -0,0 +1,607 @@
<template>
<el-dialog
:title="title"
:visible.sync="visible"
width="720px"
append-to-body
:close-on-click-modal="false"
@closed="handleOnClosed"
>
<el-row :gutter="15">
<el-form ref="form" :model="form" :rules="rules" label-width="90px">
<el-col :span="8">
<el-form-item label="成交金额" prop="amount">
<el-input v-model="form.amount" placeholder="请输入金额" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="收款方式" prop="payTypeId">
<el-select v-model="form.payTypeId" placeholder="请选择">
<el-option
v-for="dict in payTypeIdOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="parseInt(dict.dictValue)"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="收款账号" prop="accountId">
<el-select v-model="form.accountId" placeholder="请选择">
<el-option
v-for="dict in accountIdOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="parseInt(dict.dictValue)"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="服务时长" prop="serveTime">
<el-select v-model="form.serveTimeId" placeholder="请选服">
<el-option
v-for="dict in serveTimeIdOption"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="parseInt(dict.dictValue)"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="赠送时长" prop="serveTime">
<el-select v-model="form.giveServeDay" placeholder="请选择">
<el-option
v-for="dict in giveTimeIdOption"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="parseInt(dict.dictValue)"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="调理项目" prop="conditioningProjectId">
<el-select
v-model="form.conditioningProjectId"
placeholder="请选择"
>
<el-option
v-for="dict in conditioningProjectIdOption"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="parseInt(dict.dictValue)"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="售前" prop="preSaleId">
<el-select v-model="form.preSaleId" placeholder="请选择">
<el-option
v-for="dict in preSaleIdOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="parseInt(dict.dictValue)"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="售后" prop="afterSaleId">
<el-select v-model="form.afterSaleId" placeholder="请选择">
<el-option
v-for="dict in afterSaleIdOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="parseInt(dict.dictValue)"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="主营养师" prop="nutritionistId">
<el-select v-model="form.nutritionistId" placeholder="请选择">
<el-option
v-for="dict in nutritionistIdOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="parseInt(dict.dictValue)"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="助理营养师" prop="nutriAssisId">
<el-select v-model="form.nutriAssisId" placeholder="请选择">
<el-option
v-for="dict in nutriAssisIdOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="parseInt(dict.dictValue)"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="策划" prop="plannerId">
<el-select v-model="form.plannerId" placeholder="请选择">
<el-option
v-for="dict in plannerIdOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="parseInt(dict.dictValue)"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="策划助理" prop="plannerAssisId">
<el-select v-model="form.plannerAssisId" placeholder="请选择">
<el-option
v-for="dict in plannerAssisIdOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="parseInt(dict.dictValue)"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="运营" prop="operatorId">
<el-select v-model="form.operatorId" placeholder="请选择">
<el-option
v-for="dict in operatorIdOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="parseInt(dict.dictValue)"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="运营助理" prop="operatorAssisId">
<el-select v-model="form.operatorAssisId" placeholder="请选择">
<el-option
v-for="dict in operatorAssisIdOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="parseInt(dict.dictValue)"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="推荐人" prop="recommender">
<el-input v-model="form.recommender" placeholder="请输入推荐人" />
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="成交时间" prop="orderTime">
<el-date-picker
style="width: 182.5px"
v-model="form.orderTime"
type="datetime"
placeholder="选择成交时间"
format="yyyy-MM-dd HH:mm"
value-format="yyyy-MM-dd HH:mm:ss"
:picker-options="orderPickerOptions"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="服务开始时间" prop="startTime" label-width="120">
<el-date-picker
style="width: 182.5px"
v-model="form.startTime"
type="date"
placeholder="选择开始日期"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col v-hasPermi="['custom:order:review']">
<el-form-item label="审核状态" prop="reviewStatus">
<el-select v-model="form.reviewStatus" placeholder="请选择审核状态">
<el-option
v-for="dict in reviewStatusOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
</el-col>
<el-col>
<el-form-item label="备注" prop="remark">
<el-input
v-model="form.remark"
type="textarea"
placeholder="请输入内容"
/>
</el-form-item>
</el-col>
</el-form>
</el-row>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</template>
<script>
import { addOrder, getOptions, updateOrder } from "@/api/custom/order";
import dayjs from "dayjs";
export default {
name: "OrderDialog",
props: {
id: {
type: String,
},
},
data() {
const checkStartTime = (rule, value, callback) => {
if (!value) {
return callback(new Error("开始时间不能为空"));
}
if (!this.form.orderTime) {
return callback(new Error("请先选择成交时间"));
}
if (
dayjs(this.form.startTime).diff(dayjs(this.form.orderTime), "day") < 0
) {
return callback(new Error("开始时间不能先于成交时间"));
}
callback();
};
const checkOrderTime = (rule, value, callback) => {
if (!value) {
return callback(new Error("成交时间不能为空"));
}
callback();
};
return {
title: "",
data: undefined,
callback: undefined,
form: {},
visible: false,
// 表单校验
rules: {
customer: [
{ required: true, message: "客户姓名不能为空", trigger: "blur" },
],
amount: [{ required: true, message: "金额不能为空", trigger: "blur" }],
phone: [
{ required: true, message: "手机号不能为空", trigger: "blur" },
{
required: true,
trigger: "blur",
pattern: /^[0-9]{5,11}$/,
message: "手机号格式不正确",
},
],
orderTime: [
{ required: true, message: "成交时间不能为空", trigger: "blur" },
{ required: true, trigger: "blur", validator: checkOrderTime },
],
startTime: [
{ required: true, message: "开始时间不能为空", trigger: "blur" },
{ required: true, trigger: "blur", validator: checkStartTime },
],
// payTypeId: [
// {required: true, message: "收款方式不能为空", trigger: "blur"}
// ],
// accountId: [
// {required: true, message: "账号不能为空", trigger: "blur"}
// ],
// serveTimeId: [
// {required: true, message: "服务时长不能为空", trigger: "blur"}
// ],
},
pickerOptions: {
shortcuts: [
{
text: "最近一周",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
picker.$emit("pick", [start, end]);
},
},
{
text: "最近一个月",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
picker.$emit("pick", [start, end]);
},
},
{
text: "最近三个月",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
picker.$emit("pick", [start, end]);
},
},
],
},
orderPickerOptions: {
disabledDate(time) {
return time.getTime() > Date.now();
},
},
fanPickerOptions: {
disabledDate(time) {
return time.getTime() > Date.now();
},
},
startPickerOptions: {
disabledDate(time) {
return time.getTime() < Date.now();
},
},
// 收款方式字典
payTypeIdOptions: [],
// 售前字典
preSaleIdOptions: [],
// 售后字典
afterSaleIdOptions: [],
// 主营养师字典
nutritionistIdOptions: [],
// 助理营养师字典
nutriAssisIdOptions: [],
// 策划字典
plannerIdOptions: [],
// 账号
accountIdOptions: [],
// 服务时长
serveTimeIdOption: [],
// 赠送时长
giveTimeIdOption: [],
//调理项目
conditioningProjectIdOption: [],
// 策划助理字典
plannerAssisIdOptions: [],
// 运营字典
operatorIdOptions: [],
// 审核状态
reviewStatusOptions: [],
//
operatorAssisIdOptions: [],
//下拉列表对应关系(用于选择收款账号自动选择策划、策划助理、运营、运营助理)
orderDropdownCorrespondingOptions: [],
};
},
created() {
getOptions().then((res) => {
const options = res.data.reduce((opts, cur) => {
if (!opts[cur.postCode]) {
opts[cur.postCode] = [
{ dictValue: 0, dictLabel: "无", remark: null },
];
}
opts[cur.postCode].push({
dictValue: cur.userId,
dictLabel: cur.userName,
remark: cur.remark,
});
return opts;
}, {});
this.preSaleIdOptions = options["pre_sale"] || [];
this.afterSaleIdOptions = options["after_sale"] || [];
this.nutritionistIdOptions = options["nutri"] || [];
this.nutriAssisIdOptions = options["nutri_assis"] || [];
this.plannerIdOptions = options["planner"] || [];
this.plannerAssisIdOptions = options["planner_assis"] || [];
this.operatorIdOptions = options["operator"] || [];
this.operatorAssisIdOptions = options["operator_assis"] || [];
});
this.getDicts("cus_pay_type").then((response) => {
this.payTypeIdOptions = response.data;
});
this.getDicts("cus_account").then((response) => {
this.accountIdOptions = response.data;
console.log(response.data);
this.accountIdOptions.splice(0, 0, {
dictLabel: "无",
dictValue: "0",
});
});
this.getDicts("cus_serve_time").then((response) => {
this.serveTimeIdOption = response.data;
});
this.getDicts("give_serve_daye_type").then((response) => {
this.giveTimeIdOption = response.data;
});
this.getDicts("conditioning_project").then((response) => {
this.conditioningProjectIdOption = response.data;
});
this.getDicts("cus_review_status").then((response) => {
this.reviewStatusOptions = response.data;
});
this.getDicts("order_dropdown_corresponding").then((response) => {
this.orderDropdownCorrespondingOptions = response.data;
});
},
methods: {
showDialog(data, callback) {
this.data = data;
this.callback = callback;
this.reset(data);
this.title = `创建「${data.customer}」客户订单`;
this.visible = true;
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.form.orderId != null) {
updateOrder(this.form).then((response) => {
if (response.code === 200) {
this.msgSuccess("修改成功");
this.visible = false;
this.callback && this.callback();
}
});
} else {
this.form.status = "0";
addOrder(this.form).then((response) => {
if (response.code === 200) {
this.msgSuccess("新增成功");
this.visible = false;
this.callback && this.callback();
}
});
}
}
});
},
reset(obj = {}) {
const defaultPayType = this.payTypeIdOptions.find(
(opt) => opt.remark === "default"
);
const defaultServeTime = this.serveTimeIdOption.find(
(opt) => opt.remark === "default"
);
const defaultGiveServeTime = this.giveTimeIdOption.find(
(opt) => opt.remark === "default"
);
const defaultConditioningProjectIdOption = this.conditioningProjectIdOption.find(
(opt) => opt.remark === "default"
);
const defaultAccount = this.accountIdOptions.find(
(opt) => opt.remark === "default"
);
const defaultPresale = this.preSaleIdOptions.find(
(opt) => opt.remark === "default"
);
const defaultAftersale = this.afterSaleIdOptions.find(
(opt) => opt.remark === "default"
);
const defaultNutritionist = this.nutritionistIdOptions.find(
(opt) => opt.remark === "default"
);
const defaultNutriAssis = this.nutriAssisIdOptions.find(
(opt) => opt.remark === "default"
);
const accountId = defaultAccount ? parseInt(defaultAccount.dictValue) : 0;
const planningAndOperationValue = this.orderDropdownCorrespondingOptions.find(
(opt) => parseInt(opt.dictValue) === accountId
);
const [
plannerId,
plannerAssisId,
operatorId,
operatorAssisId,
] = planningAndOperationValue
? planningAndOperationValue.dictLabel
.split("|")
.map((str) => parseInt(str))
: [0, 0, 0, 0];
this.form = {
orderId: null,
customer: null,
phone: null,
amount: null,
weight: null,
plannerId,
plannerAssisId,
operatorId,
operatorAssisId,
startTime: dayjs().add(3, "day").format("YYYY-MM-DD"),
pauseTime: null,
payTypeId: defaultPayType ? parseInt(defaultPayType.dictValue) : null,
preSaleId: defaultPresale ? parseInt(defaultPresale.dictValue) : null,
createBy: null,
createTime: null,
afterSaleId: defaultAftersale
? parseInt(defaultAftersale.dictValue)
: null,
updateBy: null,
updateTime: null,
nutritionistId: defaultNutritionist
? parseInt(defaultNutritionist.dictValue)
: null,
remark: null,
nutriAssisId: defaultNutriAssis
? parseInt(defaultNutriAssis.dictValue)
: null,
recommender: null,
orderTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
serveTimeId: defaultServeTime
? parseInt(defaultServeTime.dictValue)
: null,
reviewStatus: "no",
giveServeDay: defaultGiveServeTime
? parseInt(defaultGiveServeTime.dictValue)
: null,
conditioningProjectId: defaultConditioningProjectIdOption
? parseInt(defaultConditioningProjectIdOption.dictValue)
: null,
accountId,
...obj,
};
console.log(this.form);
this.resetForm("form");
},
handleOnClosed() {
this.reset();
},
// 取消按钮
cancel() {
this.visible = false;
// this.reset();
},
//根据收款账号ID初始化策划、策划助理、运营、运营助理
initPlanningAndOperation() {
if (this.form.accountId != null && this.form.accountId != undefined) {
const planningAndOperationValue = this.orderDropdownCorrespondingOptions.find(
(opt) => parseInt(opt.dictValue) === this.form.accountId
);
const [
plannerId,
plannerAssisId,
operatorId,
operatorAssisId,
] = planningAndOperationValue
? planningAndOperationValue.dictLabel
.split("|")
.map((str) => parseInt(str))
: [0, 0, 0, 0];
this.form = {
...this.form,
plannerId,
plannerAssisId,
operatorId,
operatorAssisId,
};
}
},
},
watch: {
// 监听收款账号的变化
"form.accountId": function (newVal, oldVal) {
console.log("updte");
this.initPlanningAndOperation();
},
},
};
</script>

1116
stdiet-ui/src/views/custom/customer/index.vue
View File

File diff suppressed because it is too large Load Diff

155
stdiet-ui/src/views/custom/customer/orderDrawer.vue Normal file
View File

@ -0,0 +1,155 @@
<template>
<div>
<el-drawer
:title="title"
:close-on-press-escape="false"
:visible.sync="visible"
@closed="handleOnClosed"
size="40%"
>
<div class="app-container">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
icon="el-icon-plus"
size="mini"
@click="handleAdd"
>创建订单
</el-button>
</el-col>
</el-row>
<el-table
:data="orderList"
row-key="orderId"
default-expand-all
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
>
<el-table-column
label="审核状态"
prop="reviewStatus"
align="center"
width="120"
>
<template slot-scope="scope">
<el-tag
v-if="scope.row.orderType === 'main'"
:type="scope.row.reviewStatus === 'yes' ? 'success' : 'danger'"
disable-transitions
>
{{ scope.row.reviewStatus === "yes" ? "已审核" : "未审核" }}
</el-tag>
<el-tag
v-if="scope.row.orderType === 'virtual'"
disable-transitions
>
分单
</el-tag>
</template>
</el-table-column>
<el-table-column
label="成交时间"
prop="orderTime"
align="center"
></el-table-column>
<el-table-column
label="成交金额"
prop="amount"
align="center"
></el-table-column>
<el-table-column label="服务时长" prop="serveTime" align="center" />
<el-table-column label="操作" align="center" width="120px">
<template slot-scope="scope">
<el-button
v-if="scope.row.orderType === 'main'"
size="mini"
type="text"
@click="handleOnMenuClick(scope.row)"
>详情</el-button
>
</template>
</el-table-column>
</el-table>
</div>
</el-drawer>
<create-order-dialog ref="cusCreateOrderDialogRef" />
</div>
</template>
<script>
import { listOrder } from "@/api/custom/order";
import CreateOrderDialog from "./createOrderDialog";
export default {
name: "CustomerOrderDrawer",
components: {
"create-order-dialog": CreateOrderDialog,
},
data() {
return {
visible: false,
title: "",
data: undefined,
orderList: [],
};
},
methods: {
showDrawer(data) {
// console.log(data);
this.data = data;
if (!this.data) {
return;
}
this.title = `「${this.data.name}」订单列表`;
this.fetchOrderList(data.id);
},
fetchOrderList(cusId) {
listOrder({ cusId }).then((res) => {
this.orderList = res.rows.reduce((arr, cur) => {
const tarOrder = arr.find((ord) => ord.startTime === cur.startTime);
if (tarOrder) {
const firstObj = JSON.parse(JSON.stringify(tarOrder));
tarOrder.children = [
{ ...firstObj, orderType: "main" },
{ ...cur, orderType: "main" },
];
tarOrder.amount += cur.amount;
tarOrder.orderId += cur.orderId;
tarOrder.orderType = "virtual";
} else {
cur.orderType = "main";
arr.push(cur);
}
return arr;
}, []);
this.visible = true;
});
},
handleAdd() {
this.$refs.cusCreateOrderDialogRef.showDialog(
{
customer: this.data.name,
cusId: this.data.id,
preSaleId: this.data.salesman,
afterSaleId: this.data.afterDietitian,
nutritionistId: this.data.mainDietitian,
nutriAssisId: this.data.assistantDietitian,
},
() => {
this.fetchOrderList(this.data.id);
}
);
},
handleOnClosed() {
this.data = undefined;
},
},
};
</script>
<style lang="scss" scoped>
/deep/ :focus {
outline: 0;
}
</style>

26
stdiet-ui/src/views/custom/dishes/index.vue
View File

@ -51,11 +51,11 @@
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
>搜索
</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
>重置
</el-button>
</el-form-item>
</el-form>
@ -159,7 +159,13 @@
/>
<!-- 添加或修改菜品对话框 -->
<el-drawer :title="title" :visible.sync="open" size="50%">
<el-drawer
:title="title"
:visible.sync="open"
size="50%"
:close-on-press-escape="false"
:close-on-click-modal="false"
>
<div class="drawer_content">
<el-row class="content_detail">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
@ -241,7 +247,7 @@
:summary-method="getSummaries"
style="width: 100%"
>
<el-table-column prop="name" label="食材"> </el-table-column>
<el-table-column prop="name" label="食材"></el-table-column>
<el-table-column label="通俗计量">
<template slot-scope="scope">
<span class="cus-unit">
@ -503,7 +509,7 @@ export default {
updateBy: null,
updateTime: null,
igdList: [],
isMain: 0
isMain: 0,
};
this.selIngIds = [];
this.selIngList = [];
@ -734,7 +740,11 @@ export default {
};
</script>
<style>
<style lang="scss" scoped>
/deep/ :focus {
outline: 0;
}
.el-transfer-panel__filter {
margin: 2px;
}

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

File diff suppressed because it is too large Load Diff

126
stdiet-ui/src/views/custom/recipesPlan/bodySignDialog.vue Normal file
View File

@ -0,0 +1,126 @@
<template>
<el-dialog title="客户体征" :visible.sync="visible" width="1000px" append-to-body @closed="onClosed">
<el-table :show-header="false" :data="customerSignList" border :cell-style="columnStyle" style="width: 100%;">
<el-table-column width="140" prop="attr_name_one">
</el-table-column>
<el-table-column prop="value_one">
<template slot-scope="scope">
<auto-hide-message :data="scope.row.value_one == null ? '' : (scope.row.value_one+'')" :maxLength="20"/>
</template>
</el-table-column>
<el-table-column width="140" prop="attr_name_two"></el-table-column>
<el-table-column prop="value_two">
<template slot-scope="scope">
<auto-hide-message :data="scope.row.value_two == null ? '' : (scope.row.value_two+'')" :maxLength="20"/>
</template>
</el-table-column>
<el-table-column width="140" prop="attr_name_three"></el-table-column>
<el-table-column prop="value_three">
<template slot-scope="scope">
<auto-hide-message :data="scope.row.value_three == null ? '' : (scope.row.value_three+'')" :maxLength="20"/>
</template>
</el-table-column>
</el-table>
</el-dialog>
</template>
<script>
import {getCustomerAndSignByPhone} from "@/api/custom/customer";
import AutoHideMessage from "@/components/AutoHideMessage";
export default {
name: 'BodySignDialog',
components: {
"auto-hide-message": AutoHideMessage
},
data() {
return {
visible: false,
//用户体征数据
customerSignList: [],
message: "未找到该客户，请检查订单手机号与客户体征手机号是否一致",
signTitleData: [["姓名", "手机号", "性别"],
["年龄(岁)", "身高(厘米)", "体重(斤)"],
["南、北方", "病史", "忌口或过敏源"],
["是否便秘", "是否熬夜失眠", "是否经常运动"],
["饮食方式", "饮食备注", "饮食特点"],
["工作职业", "是否上夜班", "久坐多还是运动多"],
["是否浑身乏力", "是否减脂反弹", "意识到生活习惯是减脂的关键"],
["睡觉时间", "起床时间", "方便沟通时间"],
["湿气数据", "气血数据", "减脂经历"],
["减脂遇到的困难", "备注", "创建时间"]],
signValueData: [["name", "phone", "sex"],
["age", "tall", "weight"],
["position", "signString", "dishesIngredientId"],
["constipation", "staylate", "motion"],
["makeFoodType", "remarks", "makeFoodTaste"],
["vocation", "night", "walk"],
["weakness", "rebound", "crux"],
["sleepTime", "getupTime", "connectTime"],
["bloodData", "moistureDate", "experience"],
["difficulty", "comments", "createTime"]]
}
},
methods: {
showDialog(phone) {
if (!phone) {
this.alert(this.message);
return;
}
getCustomerAndSignByPhone({phone}).then(response => {
if (response.data == null) {
this.alert(this.message);
return;
}
let sign = response.data;
// sign.name = response.data.name;
// sign.phone = response.data.phone;
// sign.createTime = response.data.createTime;
sign.sex = sign.sex === 0 ? `男` : '女';
sign.position = sign.position === 0 ? `南方` : '北方';
sign.signString = sign.signList.join('，');
sign.constipation = sign.constipation === 0 ? "是" : "否";
sign.staylate = sign.staylate === 0 ? "是" : "否";
sign.motion = sign.motion === 0 ? "是" : "否";
sign.makeFoodType = sign.makeFoodType === 0 ? `自己做` : '外面吃';
sign.makeFoodTaste = sign.makeFoodTaste === 0 ? "清淡" : '重口味';
sign.night = sign.night === 0 ? `是` : '否';
sign.walk = sign.walk === 0 ? `久坐多` : '走动多';
sign.weakness = sign.weakness === 0 ? `是` : '否';
sign.rebound = sign.rebound === 0 ? `是` : '否';
sign.crux = sign.crux === 0 ? `是` : '否';
sign.sleepTime = sign.sleepTime + "点";
sign.getupTime = sign.getupTime + "点";
sign.connectTime = sign.connectTime + "点";
for (let i = 0; i < this.signTitleData.length; i++) {
this.customerSignList.push({
"attr_name_one": this.signTitleData[i][0],
"value_one": sign[this.signValueData[i][0]],
"attr_name_two": this.signTitleData[i][1],
"value_two": sign[this.signValueData[i][1]],
"attr_name_three": this.signTitleData[i][2],
"value_three": sign[this.signValueData[i][2]]
});
}
this.visible = true;
});
},
alert(value) {
this.$alert(value, '提示', {confirmButtonText: '关闭'});
},
// 自定义列背景色
columnStyle({row, column, rowIndex, columnIndex}) {
if (columnIndex == 0 || columnIndex == 2 || columnIndex == 4 || columnIndex == 6) {
//第三第四列的背景色就改变了2和3都是列数的下标
return "background:#f3f6fc;font-weight:bold";
} else {
return "background:#ffffff;";
}
},
onClosed() {
this.customerSignList = [];
}
},
}
</script>

267
stdiet-ui/src/views/custom/recipesPlan/index.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" >
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
<el-form-item label="客户信息" prop="customer">
<el-input
v-model="queryParams.customer"
@ -55,7 +55,8 @@
:disabled="single"
@click="handleUpdate"
v-hasPermi="['recipes:recipesPlan:edit']"
>修改</el-button>
>修改
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
@ -64,18 +65,19 @@
size="mini"
@click="handleExport"
v-hasPermi="['recipes:recipesPlan:export']"
>导出</el-button>
>导出
</el-button>
</el-col>
<!--<div><span style="margin-left:10px;font-size:16px;color:#E6A23C;font-family:PingFang SC">备注：2021年1月开始的订单才会自动生成食谱计划</span></div>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="recipesPlanList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="客户姓名" align="center" prop="customer" />
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="客户姓名" align="center" prop="customer"/>
<el-table-column label="客户手机号" align="center" prop="hidePhone" width="180"/>
<el-table-column label="食谱日期范围" align="center" prop="scopeDate" width="200"/>
<el-table-column label="营养师" align="center" prop="nutritionist" />
<el-table-column label="营养师" align="center" prop="nutritionist"/>
<el-table-column label="营养师助理" align="center" prop="nutritionistAssis" width="180"/>
<el-table-column label="是否发送" align="center" prop="sendFlag">
<!--<template slot-scope="scope">
@ -103,27 +105,31 @@
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['recipes:recipesPlan:edit']"
>修改</el-button>
>修改
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="allRecipesPlanQueryParam.orderId = scope.row.orderId; getAllPlanByOrderId()"
>查看完整计划</el-button>
>查看完整计划
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="getOrderDetail(scope.row)"
v-hasPermi="['custom:order:query']"
>查看订单</el-button>
>查看订单
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="getCustomerSign(scope.row)"
v-hasPermi="['custom:customer:query']"
>查看体征</el-button>
>查看体征
</el-button>
<!--<el-button
size="mini"
type="text"
@ -148,8 +154,8 @@
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="食谱是否已发送" prop="sendFlag" label-width="120px">
<el-select v-model="form.sendFlag" placeholder="请选择">
<el-option label="否" :value="parseInt('0')" />
<el-option label="是" :value="parseInt('1')" />
<el-option label="否" :value="parseInt('0')"/>
<el-option label="是" :value="parseInt('1')"/>
</el-select>
</el-form-item>
</el-form>
@ -164,9 +170,9 @@
<el-form :model="allRecipesPlanQueryParam" ref="allPlanQueryFrom" :inline="true">
<el-form-item label="发送状态" prop="sendFlag">
<el-select v-model="allRecipesPlanQueryParam.sendFlag" placeholder="请选择">
<el-option label="全部" :value="null" />
<el-option label="未发送" :value="parseInt('0')" />
<el-option label="已发送" :value="parseInt('1')" />
<el-option label="全部" :value="null"/>
<el-option label="未发送" :value="parseInt('0')"/>
<el-option label="已发送" :value="parseInt('1')"/>
</el-select>
</el-form-item>
<el-form-item>
@ -175,7 +181,7 @@
</el-form>
<el-table v-loading="loading" :data="allRecipesPlanList" width="700px">
<el-table-column label="客户姓名" align="center" prop="customer" />
<el-table-column label="客户姓名" align="center" prop="customer"/>
<!--<el-table-column label="营养师名称" align="center" prop="nutritionist" />
<el-table-column label="营养师助理名称" align="center" prop="nutritionistAssis" />-->
@ -211,71 +217,21 @@
</div>-->
</el-dialog>
<!-- 查看体征 -->
<el-dialog title="客户体征" v-if="customerOpen" :visible.sync="customerOpen" width="1000px" append-to-body>
<el-table :show-header="false" :data="customerSignList" border :cell-style="columnStyle" style="width: 100%;">
<el-table-column width="140" prop="attr_name_one">
</el-table-column>
<el-table-column prop="value_one">
<template slot-scope="scope">
<AutoHideMessage :data="scope.row.value_one == null ? '' : (scope.row.value_one+'')" :maxLength="20"/>
</template>
</el-table-column>
<el-table-column width="140" prop="attr_name_two"></el-table-column>
<el-table-column prop="value_two">
<template slot-scope="scope">
<AutoHideMessage :data="scope.row.value_two == null ? '' : (scope.row.value_two+'')" :maxLength="20"/>
</template>
</el-table-column>
<el-table-column width="140" prop="attr_name_three"></el-table-column>
<el-table-column prop="value_three">
<template slot-scope="scope">
<AutoHideMessage :data="scope.row.value_three == null ? '' : (scope.row.value_three+'')" :maxLength="20"/>
</template>
</el-table-column>
</el-table>
</el-dialog>
<!-- 查看订单 -->
<el-dialog title="订单详情" v-if="orderDetailOpen" :visible.sync="orderDetailOpen" width="1000px" append-to-body>
<el-table :show-header="false" :data="orderDetailList" border :cell-style="columnStyle" style="width: 100%;">
<el-table-column width="120" prop="attr_name_one">
</el-table-column>
<el-table-column prop="value_one">
<template slot-scope="scope" >
<el-tag v-if="scope.row.attr_name_one === '订单状态'" :type="scope.row.value_two === '2' ? 'success' : scope.row.value_one === '0'? '': 'danger'" disable-transitions>
{{scope.row.value_two === '2' ? '已完成': scope.row.value_one ==='0'? '进行中': '已暂停'}}
</el-tag>
<AutoHideMessage v-else :data="scope.row.value_one == null ? '' : (scope.row.value_one+'')" :maxLength="20"/>
</template>
</el-table-column>
<el-table-column width="120" prop="attr_name_two"></el-table-column>
<el-table-column prop="value_two">
<template slot-scope="scope" >
<el-tag v-if="scope.row.attr_name_two === '审核状态'" :type="scope.row.value_two === 'yes' ? 'success' : 'danger'">
{{scope.row.value_two === 'yes' ? '已审核' : '未审核'}}
</el-tag>
<AutoHideMessage v-else :data="scope.row.value_two == null ? '' : (scope.row.value_two+'')" :maxLength="20"/>
</template>
</el-table-column>
<el-table-column width="120" prop="attr_name_three"></el-table-column>
<el-table-column prop="value_three">
<template slot-scope="scope" >
<AutoHideMessage :data="scope.row.value_three == null ? '' : (scope.row.value_three+'')" :maxLength="20"/>
</template>
</el-table-column>
</el-table>
</el-dialog>
<order-dialog ref="orderDialog"/>
<!-- 查看体征 -->
<body_sign_dialog ref="bodySignDialog"/>
</div>
</template>
<script>
import { listRecipesPlan, getRecipesPlan, updateRecipesPlan,exportRecipesPlan } from "@/api/custom/recipesPlan";
import { getCustomerAndSignByPhone } from "@/api/custom/customer";
import {getInfoDetail,getOptions} from "@/api/custom/order";
import AutoHideMessage from "@/components/AutoHideMessage";
import {exportRecipesPlan, getRecipesPlan, listRecipesPlan, updateRecipesPlan} from "@/api/custom/recipesPlan";
import {getOptions} from "@/api/custom/order";
import OrderDialog from './orderDialog';
import BodySignDialog from './bodySignDialog';
import dayjs from 'dayjs';
import store from "@/store";
const nextDate = dayjs().add(1, 'day').format("YYYY-MM-DD");
const weekDate = dayjs().add(6, 'day').format("YYYY-MM-DD");
const userId = store.getters && store.getters.userId;
@ -301,6 +257,7 @@
title: "",
// 是否显示弹出层
open: false,
orderDialog: undefined,
// 查询参数
queryParams: {
pageNum: 1,
@ -314,16 +271,11 @@
// 表单参数
form: {},
// 表单校验
rules: {
},
rules: {},
//食谱开始时间范围
planStartDateScope:[nextDate, nextDate],
//用户体征数据
customerSignList: [],
//用户体征弹窗状态
customerOpen: false,
planStartDateScope: [nextDate, nextDate],
//订单对于所有计划安排数据
allRecipesPlanList:[],
allRecipesPlanList: [],
//订单弹窗状态
allRecipesPlanOpen: false,
//订单弹窗中查询参数
@ -335,30 +287,16 @@
},
//订单弹窗中列表数据的总条数
allRecipesPlanTotal: 0,
//订单详情数据
orderDetailList:[],
//订单详情弹窗
orderDetailOpen:false,
//营养师
nutritionistIdOptions:[],
nutritionistIdOptions: [],
//营养师助理
nutriAssisIdOptions:[],
//订单详情的标题，按竖显示
orderTitleData:[["订单状态","审核状态","成交时间"],["姓名","金额","体重"],["手机号","服务时长","赠送时长"],["调理项目","收款方式","售前"],
["售后","营养师","助理营养师"],["账号","策划","策划助理"],["运营","运营助理","进粉时间"],["开始时间","结束时间","备注"]],
//订单详情的属性名称，与标题对应，按竖显示
orderValueData:[["status","reviewStatus","orderTime"],["customer","amount","weight"],["phone","serveTime","giveServeDay"],["conditioningProject","payType","preSale"],
["afterSale","nutritionist","nutriAssis"],["account","planner","plannerAssis"],["operator","operatorAssis","becomeFanTime"],["startTime","serverEndTime","serverEndTime"]],
signTitleData:[["姓名","手机号","性别"],["年龄(岁)","身高(厘米)","体重(斤)"],["南、北方","病史","忌口或过敏源"],["是否便秘","是否熬夜失眠","是否经常运动"],
["饮食方式","饮食备注","饮食特点"],["工作职业","是否上夜班","久坐多还是运动多"],["是否浑身乏力","是否减脂反弹","意识到生活习惯是减脂的关键"],
["睡觉时间","起床时间","方便沟通时间"],["湿气数据","气血数据","减脂经历"],["减脂遇到的困难","备注","创建时间"]],
signValueData:[["name","phone","sex"],["age","tall","weight"],["position","signString","dishesIngredientId"],["constipation","staylate","motion"],
["makeFoodType","remarks","makeFoodTaste"],["vocation","night","walk"],["weakness","rebound","crux"],["sleepTime","getupTime","connectTime"],["bloodData","moistureDate","experience"],["difficulty","comments","createTime"]]
nutriAssisIdOptions: [],
};
},
components: {
AutoHideMessage
"order-dialog": OrderDialog,
"body_sign_dialog": BodySignDialog
},
created() {
getOptions().then(response => {
@ -373,10 +311,10 @@
this.nutriAssisIdOptions = options['nutri_assis'] || [];
const defaultNutritionist = this.nutritionistIdOptions.find(opt => opt.dictValue == userId);
const defaultNutriAssisId = this.nutriAssisIdOptions.find(opt => opt.dictValue == userId);
if(defaultNutritionist){
this.queryParams.nutritionistId = userId;
if (defaultNutritionist) {
this.queryParams.nutritionistId = userId;
}
if(defaultNutriAssisId){
if (defaultNutriAssisId) {
this.queryParams.nutritionistAssisId = userId;
}
this.getList();
@ -386,17 +324,17 @@
/** 查询食谱计划列表 */
getList() {
this.loading = true;
if(this.planStartDateScope != null && this.planStartDateScope.length > 0){
if (this.planStartDateScope != null && this.planStartDateScope.length > 0) {
this.queryParams.startDate = dayjs(this.planStartDateScope[0]).format('YYYY-MM-DD');
this.queryParams.endDate = dayjs(this.planStartDateScope[1]).format('YYYY-MM-DD');
}else{
this.queryParams.endDate = dayjs(this.planStartDateScope[1]).format('YYYY-MM-DD');
} else {
this.queryParams.startDate = null;
this.queryParams.endDate = null;
}
listRecipesPlan(this.queryParams).then(response => {
this.recipesPlanList = response.rows;
this.recipesPlanList.forEach(function(item, index){
item.scopeDate = dayjs(item.startDate).format("YYYY-MM-DD")+" 到 "+dayjs(item.endDate).format("YYYY-MM-DD")
this.recipesPlanList.forEach(function (item, index) {
item.scopeDate = dayjs(item.startDate).format("YYYY-MM-DD") + " 到 " + dayjs(item.endDate).format("YYYY-MM-DD")
});
this.total = response.total;
this.loading = false;
@ -404,79 +342,23 @@
},
/** 查询客户体征 */
getCustomerSign(row) {
this.customerSignList = [];
let message = "未找到该客户，请检查订单手机号与客户体征手机号是否一致";
if(row.phone == null || row.phone == ""){
this.alert(message);
return;
}
getCustomerAndSignByPhone({"phone": row.phone}).then(response => {
if(response.data == null){
this.alert(message);
return;
}
let sign = response.data.sign;
sign.name = response.data.name;
sign.phone = response.data.phone;
sign.createTime = response.data.createTime;
sign.sex = sign.sex == 0 ? `男` : '女';
sign.position = sign.position == 0 ? `南方` : '北方';
sign.signString = this.getSignString(sign.signList);
sign.constipation = sign.constipation == 0 ? "是" : "否";
sign.staylate = sign.staylate == 0 ? "是" : "否";
sign.motion = sign.motion == 0 ? "是" : "否";
sign.makeFoodType = sign.makeFoodType == 0 ? `自己做` : '外面吃';
sign.makeFoodTaste = sign.makeFoodTaste == 0 ? "清淡" : '重口味';
sign.night = sign.night == 0 ? `是` : '否';
sign.walk = sign.walk == 0 ? `久坐多` : '走动多';
sign.weakness = sign.weakness == 0 ? `是` : '否';
sign.rebound = sign.rebound == 0 ? `是` : '否';
sign.crux = sign.crux == 0 ? `是` : '否';
sign.sleepTime = sign.sleepTime+"点";
sign.getupTime = sign.getupTime + "点";
sign.connectTime = sign.connectTime +"点";
for(let i = 0; i < this.signTitleData.length; i++){
this.customerSignList.push({"attr_name_one": this.signTitleData[i][0],"value_one": sign[this.signValueData[i][0]],"attr_name_two": this.signTitleData[i][1],"value_two": sign[this.signValueData[i][1]],"attr_name_three": this.signTitleData[i][2],"value_three": sign[this.signValueData[i][2]]});
}
this.customerOpen = true;
});
this.$refs.bodySignDialog.showDialog(row.phone);
},
getAllPlanByOrderId(){
if(this.allRecipesPlanQueryParam.sendFlag === ""){
getAllPlanByOrderId() {
if (this.allRecipesPlanQueryParam.sendFlag === "") {
this.allRecipesPlanQueryParam.sendFlag = null;
}
listRecipesPlan(this.allRecipesPlanQueryParam).then(response => {
this.allRecipesPlanList = response.rows;
this.allRecipesPlanList.forEach(function(item, index){
item.scopeDate = dayjs(item.startDate).format("YYYY-MM-DD")+" 到 "+dayjs(item.endDate).format("YYYY-MM-DD")
});
this.allRecipesPlanOpen = true;
this.allRecipesPlanTotal = response.total;
this.allRecipesPlanList = response.rows;
this.allRecipesPlanList.forEach(function (item, index) {
item.scopeDate = dayjs(item.startDate).format("YYYY-MM-DD") + " 到 " + dayjs(item.endDate).format("YYYY-MM-DD")
});
this.allRecipesPlanOpen = true;
this.allRecipesPlanTotal = response.total;
});
},
getOrderDetail(row){
this.orderDetailList = [];
getInfoDetail({'orderId': row.orderId}).then(response => {
response.data.weight = response.data.weight != null ? (response.data.weight +"斤") : "";
response.data.giveServeDay = response.data.giveServeDay != null ? (response.data.giveServeDay +"天") : "";
for(let i = 0; i < this.orderTitleData.length; i++){
this.orderDetailList.push({"attr_name_one": this.orderTitleData[i][0],"value_one": response.data[this.orderValueData[i][0]],"attr_name_two": this.orderTitleData[i][1],"value_two": response.data[this.orderValueData[i][1]],"attr_name_three": this.orderTitleData[i][2],"value_three": response.data[this.orderValueData[i][2]]});
}
this.orderDetailOpen = true;
});
},
alert(value){
this.$alert(value, '提示', {confirmButtonText: '关闭'});
},
getSignString(signList){
if(signList == null){
return "";
}
let signStr = "";
for(let i in signList){
signStr += "，"+signList[i].name;
}
return signList.length > 0 ? signStr.substring(1) : signStr;
getOrderDetail(row) {
this.$refs.orderDialog.showDialog(row.orderId);
},
// 取消按钮
cancel() {
@ -509,13 +391,13 @@
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.planStartDateScope = [nextDate,nextDate];
this.planStartDateScope = [nextDate, nextDate];
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 修改按钮操作 */
@ -527,7 +409,7 @@
this.form.sendFlag = response.data.sendFlag;
this.open = true;
this.title = "修改食谱计划";
});
});
},
/** 提交按钮 */
submitForm() {
@ -536,10 +418,10 @@
if (this.form.id != null) {
updateRecipesPlan(this.form).then(response => {
if (response.code === 200) {
this.msgSuccess("修改成功");
this.open = false;
this.getList();
}
this.msgSuccess("修改成功");
this.open = false;
this.getList();
}
});
}
}
@ -552,33 +434,34 @@
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function() {
}).then(function () {
return exportRecipesPlan(queryParams);
}).then(response => {
this.download(response.msg);
}).catch(function() {});
}).catch(function () {
});
},
getTagType(row){
if(row.sendFlag == 1) {
return "success";
}
return "danger";
getTagType(row) {
if (row.sendFlag == 1) {
return "success";
}
return "danger";
/* if(dayjs(row.startDate+"").diff(dayjs(),'day') <= 1){
return "danger";
}
return '';*/
},
// 自定义列背景色
columnStyle({ row, column, rowIndex, columnIndex }) {
columnStyle({row, column, rowIndex, columnIndex}) {
if (columnIndex == 0 || columnIndex == 2 || columnIndex == 4 || columnIndex == 6) {
//第三第四列的背景色就改变了2和3都是列数的下标
return "background:#f3f6fc;font-weight:bold";
}else{
} else {
return "background:#ffffff;";
}
},
// 和并列
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
objectSpanMethod({row, column, rowIndex, columnIndex}) {
if (columnIndex === 0) {
if (rowIndex % 4 === 0) {
return {

110
stdiet-ui/src/views/custom/recipesPlan/orderDialog.vue Normal file
View File

@ -0,0 +1,110 @@
<template>
<el-dialog title="订单详情" :visible.sync="visible" width="1000px" append-to-body @closed="onClosed">
<el-table :show-header="false" :data="orderDetailList" border :cell-style="columnStyle" style="width: 100%;">
<el-table-column width="120" prop="attr_name_one">
</el-table-column>
<el-table-column prop="value_one">
<template slot-scope="scope">
<el-tag v-if="scope.row.attr_name_one === '订单状态'"
:type="scope.row.value_two === '2' ? 'success' : scope.row.value_one === '0'? '': 'danger'"
disable-transitions>
{{scope.row.value_two === '2' ? '已完成': scope.row.value_one ==='0'? '进行中': '已暂停'}}
</el-tag>
<auto-hide-message v-else :data="scope.row.value_one == null ? '' : (scope.row.value_one+'')"
:maxLength="20"/>
</template>
</el-table-column>
<el-table-column width="120" prop="attr_name_two"></el-table-column>
<el-table-column prop="value_two">
<template slot-scope="scope">
<el-tag v-if="scope.row.attr_name_two === '审核状态'"
:type="scope.row.value_two === 'yes' ? 'success' : 'danger'">
{{scope.row.value_two === 'yes' ? '已审核' : '未审核'}}
</el-tag>
<auto-hide-message v-else :data="scope.row.value_two == null ? '' : (scope.row.value_two+'')"
:maxLength="20"/>
</template>
</el-table-column>
<el-table-column width="120" prop="attr_name_three"></el-table-column>
<el-table-column prop="value_three">
<template slot-scope="scope">
<auto-hide-message :data="scope.row.value_three == null ? '' : (scope.row.value_three+'')" :maxLength="20"/>
</template>
</el-table-column>
</el-table>
</el-dialog>
</template>
<script>
import AutoHideMessage from "@/components/AutoHideMessage";
import {getInfoDetail} from "@/api/custom/order";
export default {
name: 'OrderDialog',
components: {
"auto-hide-message": AutoHideMessage
},
props: {},
data() {
return {
orderDetailList: [],
visible: false,
//订单详情的标题，按竖显示
orderTitleData: [["订单状态", "审核状态", "成交时间"],
["姓名", "金额", "体重"],
["手机号", "服务时长", "赠送时长"],
["调理项目", "收款方式", "售前"],
["售后", "营养师", "助理营养师"],
["账号", "策划", "策划助理"],
["运营", "运营助理", "进粉时间"],
["开始时间", "结束时间", "备注"]],
//订单详情的属性名称，与标题对应，按竖显示
orderValueData: [["status", "reviewStatus", "orderTime"],
["customer", "amount", "weight"],
["phone", "serveTime", "giveServeDay"],
["conditioningProject", "payType", "preSale"],
["afterSale", "nutritionist", "nutriAssis"],
["account", "planner", "plannerAssis"],
["operator", "operatorAssis", "becomeFanTime"],
["startTime", "serverEndTime", "serverEndTime"]],
}
},
created() {
},
methods: {
// 自定义列背景色
columnStyle({row, column, rowIndex, columnIndex}) {
if (columnIndex == 0 || columnIndex == 2 || columnIndex == 4 || columnIndex == 6) {
//第三第四列的背景色就改变了2和3都是列数的下标
return "background:#f3f6fc;font-weight:bold";
} else {
return "background:#ffffff;";
}
},
showDialog(orderId) {
getInfoDetail({orderId}).then(response => {
response.data.weight = response.data.weight != null ? (response.data.weight + "斤") : "";
response.data.giveServeDay = response.data.giveServeDay != null ? (response.data.giveServeDay + "天") : "";
for (let i = 0; i < this.orderTitleData.length; i++) {
this.orderDetailList.push({
"attr_name_one": this.orderTitleData[i][0],
"value_one": response.data[this.orderValueData[i][0]],
"attr_name_two": this.orderTitleData[i][1],
"value_two": response.data[this.orderValueData[i][1]],
"attr_name_three": this.orderTitleData[i][2],
"value_three": response.data[this.orderValueData[i][2]]
});
}
this.visible = true;
});
},
onClosed() {
this.orderDetailList = [];
}
},
watch: {
// visible: function (val, oldVal) {
// console.log({val, oldVal})
// }
}
}
</script>