From dad428d90c85381df5c9c0d6f914fdfae7d8d350 Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Thu, 28 Jan 2021 15:14:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom/SysCustomerController.java         |  104 +-
 .../com/stdiet/custom/domain/SysOrder.java    |   10 +
 .../mapper/custom/SysCustomerMapper.xml       |    1 +
 .../mapper/custom/SysOrderMapper.xml          |    9 +-
 .../custom/customer/createOrderDialog.vue     |  607 +++++++
 stdiet-ui/src/views/custom/customer/index.vue | 1116 +++++-------
 .../src/views/custom/customer/orderDrawer.vue |  155 ++
 stdiet-ui/src/views/custom/dishes/index.vue   |   26 +-
 stdiet-ui/src/views/custom/order/index.vue    | 1548 ++++++++++-------
 .../custom/recipesPlan/bodySignDialog.vue     |  126 ++
 .../src/views/custom/recipesPlan/index.vue    |  267 +--
 .../views/custom/recipesPlan/orderDialog.vue  |  110 ++
 12 files changed, 2557 insertions(+), 1522 deletions(-)
 create mode 100644 stdiet-ui/src/views/custom/customer/createOrderDialog.vue
 create mode 100644 stdiet-ui/src/views/custom/customer/orderDrawer.vue
 create mode 100644 stdiet-ui/src/views/custom/recipesPlan/bodySignDialog.vue
 create mode 100644 stdiet-ui/src/views/custom/recipesPlan/orderDialog.vue

diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysCustomerController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysCustomerController.java
index 83a989f04..b9e78d464 100644
--- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysCustomerController.java
+++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysCustomerController.java
@@ -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);
         }
diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrder.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrder.java
index b8305ad9d..e81fa571a 100644
--- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrder.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrder.java
@@ -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;
diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysCustomerMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysCustomerMapper.xml
index 78d64845e..36bf00620 100644
--- a/stdiet-custom/src/main/resources/mapper/custom/SysCustomerMapper.xml
+++ b/stdiet-custom/src/main/resources/mapper/custom/SysCustomerMapper.xml
@@ -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">
diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml
index 2e91119e7..319a66670 100644
--- a/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml
+++ b/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml
@@ -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"/>
diff --git a/stdiet-ui/src/views/custom/customer/createOrderDialog.vue b/stdiet-ui/src/views/custom/customer/createOrderDialog.vue
new file mode 100644
index 000000000..6647e615f
--- /dev/null
+++ b/stdiet-ui/src/views/custom/customer/createOrderDialog.vue
@@ -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>
diff --git a/stdiet-ui/src/views/custom/customer/index.vue b/stdiet-ui/src/views/custom/customer/index.vue
index d8330d6c7..ada121fca 100644
--- a/stdiet-ui/src/views/custom/customer/index.vue
+++ b/stdiet-ui/src/views/custom/customer/index.vue
@@ -1,6 +1,12 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      :inline="true"
+      v-show="showSearch"
+      label-width="86px"
+    >
       <el-form-item label="名字" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -19,10 +25,53 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-
+      <el-form-item label="主营养师" prop="mainDietitian">
+        <el-input
+          v-model="queryParams.mainDietitian"
+          placeholder="请输入主营养师"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="营养师助理" prop="assistantDietitian">
+        <el-input
+          v-model="queryParams.assistantDietitian"
+          placeholder="请输入营养师助理"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="售后营养师" prop="afterDietitian">
+        <el-input
+          v-model="queryParams.afterDietitian"
+          placeholder="请输入售后营养师"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="销售人员" prop="salesman">
+        <el-input
+          v-model="queryParams.salesman"
+          placeholder="请输入销售人员"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <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-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-form>
 
@@ -33,28 +82,9 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['custom:customer:add']"
-        >新增</el-button>
-      </el-col>
-      <!--<el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['custom:customer:edit']"
-        >修改</el-button>
-      </el-col>-->
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['custom:customer:remove']"
-        >删除</el-button>
+          v-hasPermi="['custom:customerCenter:add']"
+          >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -62,684 +92,468 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['custom:customer:export']"
-        >导出</el-button>
+          v-hasPermi="['custom:customerCenter:export']"
+          >导出
+        </el-button>
       </el-col>
-      <el-col :span="1.5" title="营养体征调查链接">
-        <el-button
-          type="primary"
-          size="mini"
-        ><a href="http://sign.shengtangdiet.com/question" target='_blank'>营养体征调查</a></el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="customerList" stripe @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <!--<el-table-column label="序号" align="center" prop="id" />-->
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180" fixed="left">
+    <el-table
+      v-loading="loading"
+      :data="customerCenterList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        width="160"
+      />
+      <el-table-column label="名字" align="center" prop="name" />
+      <el-table-column label="手机号" align="center" prop="phone" />
+      <el-table-column
+        label="主营养师"
+        align="center"
+        prop="mainDietitian"
+        :formatter="nutritionistIdFormat"
+      />
+      <el-table-column
+        label="营养师助理"
+        align="center"
+        prop="assistantDietitian"
+        :formatter="nutriAssisIdFormat"
+      />
+      <el-table-column
+        label="售后营养师"
+        align="center"
+        prop="afterDietitian"
+        :formatter="afterSaleIdFormat"
+      />
+      <el-table-column
+        label="销售人员"
+        align="center"
+        prop="salesman"
+        :formatter="preSaleIdFormat"
+      />
+      <el-table-column label="订单" align="center">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleOnOrderClick(scope.row)"
+            >详情
+          </el-button>
         </template>
       </el-table-column>
-      <el-table-column label="姓名" align="center" prop="name" width="120" fixed="left"/>
-      <el-table-column label="手机号" align="center" prop="phone" width="120" fixed="left"/>
-      <el-table-column label="性别" align="center" prop="sex" width="100">
+      <el-table-column label="合同" align="center">
         <template slot-scope="scope">
-          {{scope.row.sex == 0 ? `男` : '女'}}
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleOnContractClick(scope.row)"
+            >详情
+          </el-button>
         </template>
       </el-table-column>
-      <el-table-column label="年龄(岁)" align="center" prop="age" width="100"/>
-      <el-table-column label="身高(厘米)" align="center" prop="tall" width="100"/>
-      <el-table-column label="体重(斤)" align="center" prop="weight" width="100"/>
-      <el-table-column label="北方、南方" align="center" prop="position" width="100">
+      <el-table-column label="体征" align="center">
         <template slot-scope="scope">
-          {{scope.row.position == 0 ? `南方` : '北方'}}
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleOnBodySignClick(scope.row)"
+            >详情
+          </el-button>
         </template>
       </el-table-column>
-      <el-table-column label="病史" align="center" prop="signList" width="120">
+      <el-table-column label="健康评估" align="center">
         <template slot-scope="scope">
-          <el-button v-show="getSignString(scope.row.signList).length > 10" type="text" @click="openFormDialog('病史', getSignString(scope.row.signList))">点击查看</el-button>
-          <span v-show="getSignString(scope.row.signList).length <= 10">{{getSignString(scope.row.signList)}}</span>
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleOnHealthSignClick(scope.row)"
+            >详情
+          </el-button>
         </template>
       </el-table-column>
-      <el-table-column label="忌口或过敏源" align="center" prop="dishesIngredientId" width="120">
+      <el-table-column label="食谱计划" align="center">
         <template slot-scope="scope">
-          <el-button v-show="scope.row.dishesIngredientId.length > 10" type="text" @click="openFormDialog('忌口或过敏源', scope.row.dishesIngredientId)">点击查看</el-button>
-          <span v-show="scope.row.dishesIngredientId.length <= 10">{{scope.row.dishesIngredientId}}</span>
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleOnMenuClick(scope.row)"
+            >详情
+          </el-button>
         </template>
       </el-table-column>
-      <el-table-column label="是否便秘" align="center" prop="constipation" width="100">
-        <template slot-scope="scope">
-          {{scope.row.constipation == 0 ? `是` : '否'}}
-        </template>
-      </el-table-column>
-      <el-table-column label="是否熬夜失眠" align="center" prop="staylate" width="100">
-        <template slot-scope="scope">
-          {{scope.row.staylate == 0 ? `是` : '否'}}
-        </template>
-      </el-table-column>
-      <el-table-column label="是否经常运动" align="center" prop="motion" width="100">
-        <template slot-scope="scope">
-          {{scope.row.motion == 0 ? `是` : '否'}}
-        </template>
-      </el-table-column>
-      <el-table-column label="饮食方式" align="center" prop="makeFoodType" width="100">
-        <template slot-scope="scope">
-          {{scope.row.makeFoodType == 0 ? `自己做` : '外面吃'}}
-        </template>
-      </el-table-column>
-      <el-table-column label="饮食备注" align="center" prop="remarks" width="100">
-        <template slot-scope="scope">
-          <el-button v-show="scope.row.remarks != null && scope.row.remarks.length > 10" type="text" @click="openFormDialog('饮食备注', scope.row.remarks)">点击查看</el-button>
-          <span v-show="scope.row.remarks == null && scope.row.remarks.length <= 10">{{scope.row.remarks}}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="饮食特点" align="center" prop="makeFoodTaste" width="100">
-        <template slot-scope="scope">
-          {{scope.row.makeFoodTaste == 0 ? `清淡` : '重口味'}}
-        </template>
-      </el-table-column>
-      <el-table-column label="工作职业" align="center" prop="vocation" width="100">
-        <template slot-scope="scope">
-          {{scope.row.vocation}}
-        </template>
-      </el-table-column>
-      <el-table-column label="是否上夜班" align="center" prop="night" width="100">
-        <template slot-scope="scope">
-          {{scope.row.night == 0 ? `是` : '否'}}
-        </template>
-      </el-table-column>
-      <el-table-column label="久坐多还是运动多" align="center" prop="walk" width="100">
-        <template slot-scope="scope">
-          {{scope.row.walk == 0 ? `久坐多` : '走动多'}}
-        </template>
-      </el-table-column>
-      <el-table-column label="是否浑身乏力" align="center" prop="weakness" width="100">
-        <template slot-scope="scope">
-          {{scope.row.weakness == 0 ? `是` : '否'}}
-        </template>
-      </el-table-column>
-      <el-table-column label="是否减脂反弹" align="center" prop="rebound" width="100">
-        <template slot-scope="scope">
-          {{scope.row.rebound == 0 ? `是` : '否'}}
-        </template>
-      </el-table-column>
-      <el-table-column label="意识到生活习惯是减脂关键" align="center" prop="crux" width="100">
-        <template slot-scope="scope">
-          {{scope.row.crux == 0 ? `是` : '否'}}
-        </template>
-      </el-table-column>
-      <el-table-column label="睡觉时间" align="center" prop="sleepTime" width="100">
-        <template slot-scope="scope">
-          {{scope.row.sleepTime}}点
-        </template>
-      </el-table-column>
-      <el-table-column label="起床时间" align="center" prop="getupTime" width="100">
-        <template slot-scope="scope">
-          {{scope.row.getupTime}}点
-        </template>
-      </el-table-column>
-      <el-table-column label="方便沟通时间" align="center" prop="connectTime" width="100">
-        <template slot-scope="scope">
-          {{scope.row.connectTime}}点
-        </template>
-      </el-table-column>
-      <el-table-column label="湿气数据" align="center" prop="bloodData" width="100">
-        <template slot-scope="scope">
-          {{scope.row.bloodData}}
-        </template>
-      </el-table-column>
-      <el-table-column label="气血数据" align="center" prop="moistureDate" width="120">
-        <template slot-scope="scope">
-          {{scope.row.moistureDate}}
-        </template>
-      </el-table-column>
-      <el-table-column label="减脂经历" align="center" prop="experience" width="100">
-        <template slot-scope="scope">
-          <el-button v-show="scope.row.experience != null && scope.row.experience.length > 10" type="text" @click="openFormDialog('减脂经历', scope.row.experience)">点击查看</el-button>
-          <span v-show="scope.row.experience == null || scope.row.experience.length <= 10">{{scope.row.experience}}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="减脂遇到的困难" align="center" prop="difficulty" width="100">
-        <template slot-scope="scope">
-          <el-button v-show="scope.row.difficulty != null && scope.row.difficulty.length > 10" type="text" @click="openFormDialog('减脂遇到的困难', scope.row.difficulty)">点击查看</el-button>
-          <span v-show="scope.row.difficulty == null || scope.row.difficulty.length <= 10">{{scope.row.difficulty}}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="comments" width="100">
-        <template slot-scope="scope">
-          <el-button v-show="scope.row.comments != null && scope.row.comments.length > 10" type="text" @click="openFormDialog('备注', scope.row.comments)">点击查看</el-button>
-          <span v-show="scope.row.comments == null || scope.row.comments.length <= 10">{{scope.row.comments}}</span>
-        </template>
-      </el-table-column>
-      <!--<el-table-column label="主营养师" align="center" prop="mainDietitian" />
-      <el-table-column label="营养师助理" align="center" prop="assistantDietitian" />
-      <el-table-column label="售后营养师" align="center" prop="afterDietitian" />
-      <el-table-column label="销售人员" align="center" prop="salesman" />
-      <el-table-column label="负责人" align="center" prop="chargePerson" />-->
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120" fixed="right">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['custom:customer:edit']"
-          >修改</el-button>
+            v-hasPermi="['custom:customerCenter:edit']"
+            >修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['custom:customer:remove']"
-          >删除</el-button>
+            v-hasPermi="['custom:customerCenter:remove']"
+            >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
 
-    <el-dialog :title="formDialog.title" :visible.sync="formDialog.show" width="30%" append-to-body center>
-      <span>{{formDialog.content}}</span>
-      <span slot="footer" class="dialog-footer">
-      <el-button @click="formDialog.show = false">取 消</el-button>
-      <!--<el-button type="primary" @click="experience_dialog = false">确 定</el-button>-->
-      </span>
-    </el-dialog>
-
-    <!-- 添加或修改客户信息对话框 -->
-    <el-dialog :title="title" v-if="open" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-          <!--<p>现在要先为您建立更加详细的档案，以便为您定制专属的减脂计划</p>-->
-          <el-form-item label="真实姓名" prop="name">
-            <el-input v-model="form.name" placeholder="请输入真实姓名" />
-          </el-form-item>
-          <el-form-item label="手机号" prop="phone">
-            <el-input v-model="form.phone" placeholder="请输入手机号" />
-          </el-form-item>
-          <!--<el-form-item label="邮箱" prop="email">
-            <el-input v-model="form.email" placeholder="请输入邮箱" />
-          </el-form-item>-->
-          <!--<el-form-item label="您的居住地址" prop="address">
-            <el-input v-model="form.address" placeholder="请输入地址" />
-          </el-form-item>-->
-          <el-form-item label="性别" prop="sex">
-            <el-select v-model="form.sex" placeholder="请选择性别">
-              <el-option label="男" :value="parseInt('0')" />
-              <el-option label="女" :value="parseInt('1')" />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="年龄(岁)" prop="age">
-            <el-input v-model="form.age" placeholder="请输入年龄" />
-          </el-form-item>
-          <el-form-item label="身高(厘米)" prop="tall" >
-            <el-input v-model="form.tall" placeholder="请输入身高" />
-          </el-form-item>
-          <el-form-item label="体重(斤)" prop="weight">
-            <el-input v-model="form.weight" placeholder="请输入体重" />
-          </el-form-item>
-          <el-form-item label="南方人还是北方人" prop="position">
-            <el-select v-model="form.position" placeholder="请选择">
-              <el-option label="南方" :value="parseInt('0')" />
-              <el-option label="北方" :value="parseInt('1')" />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="病史(多选)" prop="physicalSignsId">
-            <el-select v-model="form.physicalSignsId" multiple placeholder="请选择">
-              <el-option
-                v-for="physicalSign in physicalSignsList"
-                :key="physicalSign.id" :label="physicalSign.name" :value="physicalSign.id">
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="忌口或过敏源" prop="dishesIngredientId">
-            <el-input v-model="form.dishesIngredientId" placeholder="请输入名称" />
-          </el-form-item>
-          <!--<el-form-item label="您的照片" prop="photo">
-            <el-input v-model="form.photo" placeholder="请输入客户照片" />
-          </el-form-item>-->
-          <el-form-item label="是否便秘" prop="constipation">
-            <el-select v-model="form.constipation" placeholder="请选择">
-              <el-option label="是" :value="parseInt('0')" />
-              <el-option label="否" :value="parseInt('1')" />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="是否熬夜、失眠" prop="staylate">
-            <el-select v-model="form.staylate" placeholder="请选择">
-              <el-option label="是" :value="parseInt('0')" />
-              <el-option label="否" :value="parseInt('1')" />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="是否经常运动" prop="motion">
-            <el-select v-model="form.motion" placeholder="请选择">
-              <el-option label="是" :value="parseInt('0')" />
-              <el-option label="否" :value="parseInt('1')" />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="饮食方式" prop="makeFoodType">
-            <el-select v-model="form.makeFoodType" placeholder="请选择">
-              <el-option label="自己做" :value="parseInt('0')" />
-              <el-option label="外面吃" :value="parseInt('1')" />
-            </el-select>
-          </el-form-item>
-        <el-form-item label="饮食备注" prop="remarks">
-          <el-input type="textarea" placeholder="请输入内容" v-model="form.remarks" maxlength="200" show-word-limit rows="5"></el-input>
-          <!--<el-input v-model="form.remarks" placeholder="请输入备注信息" />-->
-        </el-form-item>
-          <el-form-item label="饮食特点" prop="makeFoodTaste">
-            <el-select v-model="form.makeFoodTaste" placeholder="请选择">
-              <el-option label="清淡" :value="parseInt('0')" />
-              <el-option label="重口味" :value="parseInt('1')" />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="工作职业" prop="vocation">
-            <el-input v-model="form.vocation" placeholder="请输入工作职业" />
-          </el-form-item>
-          <el-form-item label="是否上夜班" prop="night">
-            <el-select v-model="form.night" placeholder="请选择">
-              <el-option label="是" :value="parseInt('0')" />
-              <el-option label="否" :value="parseInt('1')" />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="平时久坐多还是走动多" prop="walk">
-            <el-select v-model="form.walk" placeholder="请选择">
-              <el-option label="久坐多" :value="parseInt('0')" />
-              <el-option label="走动多" :value="parseInt('1')" />
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="是否浑身乏力" prop="weakness">
-            <el-select v-model="form.weakness" placeholder="请选择">
-              <el-option label="是" :value="parseInt('0')" />
-              <el-option label="否" :value="parseInt('1')" />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="是否减脂反弹" prop="rebound">
-            <el-select v-model="form.rebound" placeholder="请选择">
-              <el-option label="是" :value="parseInt('0')" />
-              <el-option label="否" :value="parseInt('1')" />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="是否意识到生活习惯是减脂关键" prop="crux">
-            <el-select v-model="form.crux" placeholder="请选择">
-              <el-option label="是" :value="parseInt('0')" />
-              <el-option label="否" :value="parseInt('1')" />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="睡觉时间" prop="sleepTime">
-            <el-time-select v-model="form.sleepTime" :picker-options="{start: '00:00',step: '01:00',end: '24:00'}" placeholder="请选择时间" :editable=false />
-          </el-form-item>
-          <el-form-item label="起床时间" prop="getupTime">
-            <el-time-select v-model="form.getupTime" :picker-options="{start: '00:00',step: '01:00',end: '24:00'}" placeholder="请选择时间" :editable=false />
-          </el-form-item>
-          <el-form-item label="方便沟通时间" prop="connectTime">
-            <el-time-select v-model="form.connectTime" :picker-options="{start: '00:00',step: '01:00',end: '24:00'}" placeholder="请选择时间" :editable=false />
-          </el-form-item>
-          <!--<el-form-item label="备注信息" prop="remarks">
-            <el-input v-model="form.remarks" placeholder="请输入备注信息" />
-          </el-form-item>-->
-          <!--<p>好的，我现在给您测一下湿气和气血，有以下出现情况的请直接选择</p>-->
-          <el-form-item label="湿气(多选)" prop="bloodData">
-            <el-checkbox-group v-model="form.bloodData">
-              <el-checkbox v-for="bloodItem in bloodDataList" :label="bloodItem.dictValue"  :key="bloodItem.dictValue">{{bloodItem.dictLabel}}</el-checkbox>
-            </el-checkbox-group>
-          </el-form-item>
-          <el-form-item label="气血(多选)" prop="moistureDate">
-            <el-checkbox-group v-model="form.moistureDate">
-              <el-checkbox v-for="moistureItem in moistureDataList" :label="moistureItem.dictValue" :key="moistureItem.dictValue">{{moistureItem.dictLabel}}</el-checkbox>
-            </el-checkbox-group>
-          </el-form-item>
-
-          <el-form-item label="减脂经历（重点详细填写）" prop="experience">
-            <el-input type="textarea" placeholder="请输入内容" v-model="form.experience" maxlength="200" show-word-limit rows="5"></el-input>
-          </el-form-item>
-          <el-form-item label="减脂遇到的困难" prop="difficulty">
-            <el-input type="textarea" placeholder="请输入内容" v-model="form.difficulty" maxlength="200" show-word-limit rows="5"></el-input>
-          </el-form-item>
-          <el-form-item label="备注" prop="comments">
-          <el-input type="textarea" placeholder="请输入其他需要反馈的内容" v-model="form.comments" maxlength="200" show-word-limit rows="5"></el-input>
-          </el-form-item>
-      </el-form>
+    <!-- 添加或修改客户档案对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="520px" append-to-body>
+      <el-row :gutter="15">
+        <el-form ref="form" :model="form" :rules="rules" label-width="90px">
+          <el-col :span="12">
+            <el-form-item label="名字" prop="name">
+              <el-input v-model="form.name" placeholder="请输入名字" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="手机号" prop="phone">
+              <el-input v-model="form.phone" placeholder="请输入手机号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="主营养师" prop="mainDietitian">
+              <el-select v-model="form.mainDietitian" 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="12">
+            <el-form-item label="营养师助理" prop="assistantDietitian">
+              <el-select v-model="form.assistantDietitian" 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="12">
+            <el-form-item label="售后" prop="afterDietitian">
+              <el-select v-model="form.afterDietitian" 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="12">
+            <el-form-item label="售前" prop="salesman">
+              <el-select v-model="form.salesman" 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-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>
+
+    <order-drawer ref="cusOrderDrawerRef" />
   </div>
 </template>
 
 <script>
-  import { listCustomer, getCustomer, delCustomer, addCustomer, updateCustomer, exportCustomer } from "@/api/custom/customer";
-  import { listPhysicalSigns } from "@/api/custom/physicalSigns";
-  import dayjs from 'dayjs';
-  export default {
-    name: "Customer",
-    data() {
-      return {
-        // 遮罩层
-        loading: true,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        // 总条数
-        total: 0,
-        // 客户信息表格数据
-        customerList: [],
-        // 弹出层标题
-        title: "",
-        // 是否显示弹出层
-        open: false,
-        // 查询参数
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-          name: null,
-          phone: null
-        },
-        // 表单参数
-        form: {},
-        //气血数据
-        bloodDataList:[],
-        //湿气数据
-        moistureDataList:[],
-        //体征数据
-        physicalSignsList:[],
-        // 表单校验
-        rules: {
-          name: [
-            { required: true, trigger: "blur", message: "请填写姓名" },
-            { min: 1, max: 20, trigger: "blur", message: "姓名过长" }
-          ],
-          phone: [
-            { required: true, trigger: "blur", message: "请填写手机号" },
-            { required: true, trigger: "blur", message: "请填写正确的手机号" },
-            { required: true, trigger: "blur", pattern: /^[0-9]{5,11}$/ , message: '手机号格式不正确'}
-          ],
-          sex:[
-            { required: true, trigger: "blur", message: "请选择性别" }
-          ],
-          age:[
-            { required: true, trigger: "blur", message: "请填写年龄" },
-            {required: true, trigger: "blur", pattern: /^[1-9]\d*$/ , message: '年龄格式不正确'}
-          ],
-          tall:[
-            { required: true, trigger: "blur", message: "请填写身高" },
-            {required: true, trigger: "blur", pattern: /^[1-9]\d*$/ , message: '身高格式不正确'}
-          ],
-          weight:[
-            { required: true, trigger: "blur", message: "请填写体重" },
-            {required: true, trigger: "blur", pattern: /^[1-9]\d*$/ , message: '体重格式不正确'}
-          ],
-          constipation:[
-            { required: true, trigger: "blur", message: "请选择一个答案" }
-          ],
-          staylate:[
-            { required: true, trigger: "blur", message: "请选择一个答案" }
-          ],
-          motion:[
-            { required: true, trigger: "blur", message: "请选择一个答案" }
-          ],
-          makeFoodType:[
-            { required: true, trigger: "blur", message: "请选择一个答案" }
-          ],
-          makeFoodTaste:[
-            { required: true, trigger: "blur", message: "请选择一个答案" }
-          ],
-          walk:[
-            { required: true, trigger: "blur", message: "请选择一个答案" }
-          ],
-          weakness:[
-            { required: true, trigger: "blur", message: "请选择一个答案" }
-          ],
-          rebound:[
-            { required: true, trigger: "blur", message: "请选择一个答案" }
-          ],
-          crux:[
-            { required: true, trigger: "blur", message: "请选择一个答案" }
-          ],
-          position:[
-            { required: true, trigger: "blur", message: "请选择一个答案" }
-          ],
-          sleepTime:[
-            { required: true, trigger: "blur", message: "请选择一个答案" }
-          ],
-          getupTime:[
-            { required: true, trigger: "blur", message: "请选择一个答案" }
-          ],
-          connectTime:[
-            { required: true, trigger: "blur", message: "请选择一个答案" }
-          ],
-          night:[
-            { required: true, trigger: "blur", message: "请选择一个答案" }
-          ],
-          /*bloodData:[
-            { required: true, trigger: "blur", message: "请测试气血" }
-          ],
-          moistureDate:[
-            { required: true, trigger: "blur", message: "请测试湿气" }
-          ]*/
-        },
-        //查看表单内容
-        formDialog:{
-          title: "",
-          show: false,
-          content: ""
+import {
+  addCustomer,
+  delCustomer,
+  exportCustomer,
+  getCustomer,
+  listCustomer,
+  updateCustomer,
+} from "@/api/custom/customer";
+
+import { getOptions } from "@/api/custom/order";
+
+import OrderDrawer from "./orderDrawer";
+
+export default {
+  name: "Customer",
+  components: {
+    "order-drawer": OrderDrawer,
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 客户档案表格数据
+      customerCenterList: [],
+      // 售前字典
+      preSaleIdOptions: [],
+      // 售后字典
+      afterSaleIdOptions: [],
+      // 主营养师字典
+      nutritionistIdOptions: [],
+      // 助理营养师字典
+      nutriAssisIdOptions: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        phone: null,
+        mainDietitian: null,
+        assistantDietitian: null,
+        afterDietitian: null,
+        salesman: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+    };
+  },
+  created() {
+    this.getList();
+    getOptions().then((response) => {
+      const options = response.data.reduce((opts, cur) => {
+        if (!opts[cur.postCode]) {
+          opts[cur.postCode] = [
+            { dictValue: 0, dictLabel: "无", remark: null },
+          ];
         }
-      };
-    },
-    created() {
-      this.getList();
-      this.getPhysicalSign();
-      this.getDicts("sys_blood_data").then(response => {
-        this.bloodDataList = response.data;
-      });
-      this.getDicts("sys_moisture_data").then(response => {
-        this.moistureDataList = response.data;
-      });
-    },
-    methods: {
-      /** 查询客户信息列表 */
-      getList() {
-        this.loading = true;
-        listCustomer(this.queryParams).then(response => {
-          this.customerList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-      });
-      },
-      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;
-      },
-      /** 查询体征列表 */
-      getPhysicalSign() {
-        listPhysicalSigns().then(response => {
-          this.physicalSignsList = response.rows;
+        opts[cur.postCode].push({
+          dictValue: cur.userId,
+          dictLabel: cur.userName,
+          remark: cur.remark,
         });
-      },
-      // 取消按钮
-      cancel() {
-        this.open = false;
-        this.reset();
-      },
-      // 表单重置
-      reset() {
-        this.form = {
-          id: null,
-          customerId: null,
-          name: '',
-          phone: '',
-          address: "",
-          sex: 1,
-          age: null,
-          tall: null,
-          weight: null,
-          physicalSignsId: [],
-          dishesIngredientId: null,
-          photo: null,
-          constipation: 0,
-          staylate: 0,
-          motion: 1,
-          makeFoodType: 1,
-          makeFoodTaste: 1,
-          walk: 0,
-          difficulty: null,
-          weakness: 0,
-          rebound: 0,
-          crux: 0,
-          position: 1,
-          sleepTime: null,
-          getupTime: null,
-          connectTime: null,
-          remarks: null,
-          bloodData: [],
-          moistureDate: [],
-          night: 0,
-          vocation: null,
-          experience: null,
-          comments: null
-        };
-        this.resetForm("form");
-      },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.resetForm("queryForm");
-        this.handleQuery();
-      },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.id)
-        this.single = selection.length!==1
-        this.multiple = !selection.length
-      },
-      /** 新增按钮操作 */
-      handleAdd() {
-        this.reset();
-        this.open = true;
-        this.title = "添加客户体征";
-      },
-      /** 修改按钮操作 */
-      handleUpdate(row) {
-        this.reset();
-        const id = row.id || this.ids
-        getCustomer(id).then(response => {
-          let cusMessage = response.data;
-          cusMessage.bloodData = (cusMessage.bloodData != null && cusMessage.bloodData.trim() != "") ? cusMessage.bloodData.split(",") : [];
-          cusMessage.moistureDate = (cusMessage.moistureDate != null && cusMessage.moistureDate.trim() != "") ? cusMessage.moistureDate.split(",") : [];
-          cusMessage.physicalSignsId = (cusMessage.physicalSignsId != null && cusMessage.physicalSignsId.trim() != "") ? cusMessage.physicalSignsId.split(",") : [];
-          for(let i =0; i < cusMessage.physicalSignsId.length; i++) {
-            cusMessage.physicalSignsId[i] = parseInt(cusMessage.physicalSignsId[i]);
-            console.log(cusMessage.physicalSignsId[i]);
-          }
-          cusMessage.sleepTime = this.deltime(cusMessage.sleepTime);
-          cusMessage.getupTime = this.deltime(cusMessage.getupTime);
-          cusMessage.connectTime = this.deltime(cusMessage.connectTime);
-          this.form = cusMessage;
-          this.open = true;
-          this.title = "修改客户体征";
+        return opts;
+      }, {});
+      this.preSaleIdOptions = options["pre_sale"] || [];
+      this.afterSaleIdOptions = options["after_sale"] || [];
+      this.nutritionistIdOptions = options["nutri"] || [];
+      this.nutriAssisIdOptions = options["nutri_assis"] || [];
+    });
+  },
+  methods: {
+    /** 查询客户档案列表 */
+    getList() {
+      this.loading = true;
+      listCustomer(this.queryParams).then((response) => {
+        this.customerCenterList = response.rows;
+        this.total = response.total;
+        this.loading = false;
       });
-      },
-      /** 提交按钮 */
-      submitForm() {
-        this.$refs["form"].validate(valid => {
-          if (valid) {
-            if (this.form.id != null) {
-              updateCustomer(this.getDealSubmitData()).then(response => {
-                if (response.code === 200) {
-                  this.msgSuccess("修改成功");
-                  this.open = false;
-                  this.getList();
-                }
-              });
-            } else {
-              addCustomer(this.getDealSubmitData()).then(response => {
-                if (response.code === 200) {
-                  this.msgSuccess("新增成功");
-                  this.open = false;
-                  this.getList();
-                }
-              });
-            }
-          }else{
-            this.$message({
-              message: '数据未填写完整',
-              type: 'warning'
+    },
+    // 售前字典翻译
+    preSaleIdFormat(row, column) {
+      return this.selectDictLabel(this.preSaleIdOptions, row.salesman);
+    },
+    // 售后字典翻译
+    afterSaleIdFormat(row, column) {
+      return this.selectDictLabel(this.afterSaleIdOptions, row.afterDietitian);
+    },
+    // 主营养师字典翻译
+    nutritionistIdFormat(row, column) {
+      return this.selectDictLabel(
+        this.nutritionistIdOptions,
+        row.mainDietitian
+      );
+    },
+    // 助理营养师字典翻译
+    nutriAssisIdFormat(row, column) {
+      return this.selectDictLabel(
+        this.nutriAssisIdOptions,
+        row.assistantDietitian
+      );
+    },
+    handleOnOrderClick(row) {
+      this.$refs["cusOrderDrawerRef"].showDrawer(row);
+    },
+    handleOnContractClick(row) {
+      console.log(row);
+    },
+    handleOnBodySignClick(row) {
+      console.log(row);
+    },
+    handleOnHealthSignClick(row) {
+      console.log(row);
+    },
+    handleOnMenuClick(row) {
+      console.log(row);
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        name: null,
+        phone: null,
+        email: null,
+        address: null,
+        payDate: null,
+        startDate: null,
+        purchaseNum: null,
+        payTotal: null,
+        mainDietitian: null,
+        assistantDietitian: null,
+        afterDietitian: null,
+        salesman: null,
+        chargePerson: null,
+        followStatus: 0,
+        createTime: null,
+        createBy: null,
+        updateTime: null,
+        updateBy: null,
+        delFlag: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加客户档案";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getCustomer(id).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改客户档案";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateCustomer(this.form).then((response) => {
+              if (response.code === 200) {
+                this.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              }
+            });
+          } else {
+            addCustomer(this.form).then((response) => {
+              if (response.code === 200) {
+                this.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              }
             });
           }
-        });
-      },
-      /** 删除按钮操作 */
-      handleDelete(row) {
-        const ids = row.id || this.ids;
-        this.$confirm('是否确认删除客户信息编号为"' + ids + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delCustomer(ids);
-        }).then(() => {
-          this.getList();
-        this.msgSuccess("删除成功");
-      }).catch(function() {});
-      },
-      /** 导出按钮操作 */
-      handleExport() {
-        const queryParams = this.queryParams;
-        this.$confirm('是否确认导出当前列表中所有客户体征数据?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportCustomer(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-         }).catch(function() {});
-      },
-      getDealSubmitData(){
-        let cusMessage = Object.assign({}, this.form);
-        cusMessage.bloodData = cusMessage.bloodData != null ? cusMessage.bloodData.join(",") : null;
-        cusMessage.moistureDate = cusMessage.moistureDate != null ? cusMessage.moistureDate.join(",") : null;
-        cusMessage.physicalSignsId = cusMessage.physicalSignsId != null ? cusMessage.physicalSignsId.join(",") : null;
-        cusMessage.sleepTime = cusMessage.sleepTime.substring(0,2);
-        cusMessage.getupTime = cusMessage.getupTime.substring(0,2);
-        cusMessage.connectTime = cusMessage.connectTime.substring(0,2);
-        return cusMessage;
-      },
-      //睡觉、起床、沟通时间处理
-      deltime(time){
-        if(time != null){
-          return time > 9 ? (time + ":00") : ("0"+time+":00");
         }
-        return null;
-      },
-      openFormDialog(title, content){
-          this.formDialog.title = title;
-          this.formDialog.content = content;
-          this.formDialog.show = true;
-      }
-    }
-  };
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm(
+        '是否确认删除客户姓名为为"' + row.name + '"的数据项?',
+        "警告",
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }
+      )
+        .then(function () {
+          return delCustomer(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+        .catch(function () {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm("是否确认导出所有客户档案数据项?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(function () {
+          return exportCustomer(queryParams);
+        })
+        .then((response) => {
+          this.download(response.msg);
+        })
+        .catch(function () {});
+    },
+  },
+};
 </script>
diff --git a/stdiet-ui/src/views/custom/customer/orderDrawer.vue b/stdiet-ui/src/views/custom/customer/orderDrawer.vue
new file mode 100644
index 000000000..f8e1d1aa7
--- /dev/null
+++ b/stdiet-ui/src/views/custom/customer/orderDrawer.vue
@@ -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>
diff --git a/stdiet-ui/src/views/custom/dishes/index.vue b/stdiet-ui/src/views/custom/dishes/index.vue
index 6910435c0..e468076f3 100644
--- a/stdiet-ui/src/views/custom/dishes/index.vue
+++ b/stdiet-ui/src/views/custom/dishes/index.vue
@@ -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;
 }
diff --git a/stdiet-ui/src/views/custom/order/index.vue b/stdiet-ui/src/views/custom/order/index.vue
index cf8a9b1e2..00348cd67 100644
--- a/stdiet-ui/src/views/custom/order/index.vue
+++ b/stdiet-ui/src/views/custom/order/index.vue
@@ -1,7 +1,13 @@
 <template>
   <div class="app-container">
     <el-row>
-      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="70px">
+      <el-form
+        :model="queryParams"
+        ref="queryForm"
+        :inline="true"
+        v-show="showSearch"
+        label-width="70px"
+      >
         <el-col :span="6">
           <el-form-item label="手机号" prop="phone">
             <el-input
@@ -26,59 +32,102 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="收款方式" prop="payTypeId">
-            <el-select v-model="queryParams.payTypeId" placeholder="请选择收款方式" clearable size="small">
-              <el-option v-for="dict in payTypeIdOptions"
-                         :key="dict.dictValue"
-                         :label="dict.dictLabel"
-                         :value="parseInt(dict.dictValue)"/>
+            <el-select
+              v-model="queryParams.payTypeId"
+              placeholder="请选择收款方式"
+              clearable
+              size="small"
+            >
+              <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="6">
           <el-form-item label="售前" prop="preSaleId">
-            <el-select v-model="queryParams.preSaleId" placeholder="请选择售前" clearable size="small">
-              <el-option v-for="dict in preSaleIdOptions"
-                         :key="dict.dictValue"
-                         :label="dict.dictLabel"
-                         :value="parseInt(dict.dictValue)"/>
+            <el-select
+              v-model="queryParams.preSaleId"
+              placeholder="请选择售前"
+              clearable
+              size="small"
+            >
+              <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="6">
           <el-form-item label="售后" prop="afterSaleId">
-            <el-select v-model="queryParams.afterSaleId" placeholder="请选择售后" clearable size="small">
-              <el-option v-for="dict in afterSaleIdOptions"
-                         :key="dict.dictValue"
-                         :label="dict.dictLabel"
-                         :value="parseInt(dict.dictValue)"/>
+            <el-select
+              v-model="queryParams.afterSaleId"
+              placeholder="请选择售后"
+              clearable
+              size="small"
+            >
+              <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="6">
           <el-form-item label="主营养师" prop="nutritionistId">
-            <el-select v-model="queryParams.nutritionistId" placeholder="请选择主营养师" clearable size="small">
-              <el-option v-for="dict in nutritionistIdOptions"
-                         :key="dict.dictValue"
-                         :label="dict.dictLabel"
-                         :value="parseInt(dict.dictValue)"/>
+            <el-select
+              v-model="queryParams.nutritionistId"
+              placeholder="请选择主营养师"
+              clearable
+              size="small"
+            >
+              <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="6">
-          <el-form-item label="助理营养师" prop="nutriAssisId" label-width="90px">
-            <el-select v-model="queryParams.nutriAssisId" placeholder="请选择助理营养师" clearable style="width: 170px"
-                       size="small">
-              <el-option v-for="dict in nutriAssisIdOptions"
-                         :key="dict.dictValue"
-                         :label="dict.dictLabel"
-                         :value="parseInt(dict.dictValue)"/>
+          <el-form-item
+            label="助理营养师"
+            prop="nutriAssisId"
+            label-width="90px"
+          >
+            <el-select
+              v-model="queryParams.nutriAssisId"
+              placeholder="请选择助理营养师"
+              clearable
+              style="width: 170px"
+              size="small"
+            >
+              <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="6">
           <el-form-item label="账号" prop="accountId">
-            <el-select v-model="queryParams.accountId" placeholder="请选择账号" clearable
-                       size="small">
+            <el-select
+              v-model="queryParams.accountId"
+              placeholder="请选择账号"
+              clearable
+              size="small"
+            >
               <el-option
                 v-for="dict in accountIdOptions"
                 :key="dict.dictValue"
@@ -90,70 +139,103 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="策划" prop="plannerId">
-            <el-select v-model="queryParams.plannerId" placeholder="请选择策划" clearable
-                       size="small">
-              <el-option v-for="dict in plannerIdOptions"
-                         :key="dict.dictValue"
-                         :label="dict.dictLabel"
-                         :value="parseInt(dict.dictValue)"/>
+            <el-select
+              v-model="queryParams.plannerId"
+              placeholder="请选择策划"
+              clearable
+              size="small"
+            >
+              <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="6">
           <el-form-item label="策划助理" prop="plannerAssisId">
-            <el-select v-model="queryParams.plannerAssisId" placeholder="请选择策划助理"
-                       clearable size="small">
-              <el-option v-for="dict in plannerAssisIdOptions"
-                         :key="dict.dictValue"
-                         :label="dict.dictLabel"
-                         :value="parseInt(dict.dictValue)"/>
+            <el-select
+              v-model="queryParams.plannerAssisId"
+              placeholder="请选择策划助理"
+              clearable
+              size="small"
+            >
+              <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="6">
           <el-form-item label="运营" prop="operatorId">
-            <el-select v-model="queryParams.operatorId" placeholder="请选择运营"
-                       clearable size="small">
-              <el-option v-for="dict in operatorIdOptions"
-                         :key="dict.dictValue"
-                         :label="dict.dictLabel"
-                         :value="parseInt(dict.dictValue)"/>
+            <el-select
+              v-model="queryParams.operatorId"
+              placeholder="请选择运营"
+              clearable
+              size="small"
+            >
+              <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="6">
           <el-form-item label="运营助理" prop="operatorAssisId">
-            <el-select v-model="queryParams.operatorAssisId" placeholder="请选择运营助理"
-                       clearable size="small">
-              <el-option v-for="dict in operatorAssisIdOptions"
-                         :key="dict.dictValue"
-                         :label="dict.dictLabel"
-                         :value="parseInt(dict.dictValue)"/>
+            <el-select
+              v-model="queryParams.operatorAssisId"
+              placeholder="请选择运营助理"
+              clearable
+              size="small"
+            >
+              <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="6">
           <el-form-item label="审核状态" prop="reviewStatus">
-            <el-select v-model="queryParams.reviewStatus" placeholder="请选择审核状态"
-                       clearable size="small">
-              <el-option v-for="dict in reviewStatusOptions"
-                         :key="dict.dictValue"
-                         :label="dict.dictLabel"
-                         :value="dict.dictValue"/>
+            <el-select
+              v-model="queryParams.reviewStatus"
+              placeholder="请选择审核状态"
+              clearable
+              size="small"
+            >
+              <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 :span="6">
-        <el-form-item label="服务时长" prop="serveTimeId">
-          <el-select v-model="queryParams.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-form-item label="服务时长" prop="serveTimeId">
+            <el-select
+              v-model="queryParams.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="12">
           <el-form-item label="成交日期" prop="orderTime">
@@ -167,15 +249,20 @@
               start-placeholder="开始日期"
               end-placeholder="结束日期"
               value-format="yyyy-MM-dd"
-              :picker-options="pickerOptions">
+              :picker-options="pickerOptions"
+            >
             </el-date-picker>
           </el-form-item>
         </el-col>
 
         <el-col>
           <el-form-item>
-            <el-button type="cyan" icon="el-icon-search" size="mini"
-                       @click="handleQuery">搜索
+            <el-button
+              type="cyan"
+              icon="el-icon-search"
+              size="mini"
+              @click="handleQuery"
+              >搜索
             </el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">
               重置
@@ -193,7 +280,7 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['custom:order:add']"
-        >新增
+          >新增
         </el-button>
       </el-col>
       <el-col :span="1.5">
@@ -203,88 +290,222 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['custom:order:export']"
-        >导出
+          >导出
         </el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
-      <el-table-column label="订单状态" align="center" prop="orderId" width="80" fixed="left">
+    <el-table
+      v-loading="loading"
+      :data="orderList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column
+        label="订单状态"
+        align="center"
+        prop="orderId"
+        width="80"
+        fixed="left"
+      >
         <template slot-scope="scope">
           <el-tag
-            :type="scope.row.reviewStatus === '2' ? 'success' : scope.row.status ==='0'? '': 'danger'"
-            disable-transitions>
-            {{scope.row.reviewStatus === '2' ? '已完成': scope.row.status ==='0'? '进行中': '已暂停'}}
+            :type="
+              scope.row.reviewStatus === '2'
+                ? 'success'
+                : scope.row.status === '0'
+                ? ''
+                : 'danger'
+            "
+            disable-transitions
+          >
+            {{
+              scope.row.reviewStatus === "2"
+                ? "已完成"
+                : scope.row.status === "0"
+                ? "进行中"
+                : "已暂停"
+            }}
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="审核状态" align="center" prop="reviewStatus" width="80" fixed="left">
+      <el-table-column
+        label="审核状态"
+        align="center"
+        prop="reviewStatus"
+        width="80"
+        fixed="left"
+      >
         <template slot-scope="scope">
           <el-tag
             :type="scope.row.reviewStatus === 'yes' ? 'success' : 'danger'"
-            disable-transitions>
-            {{scope.row.reviewStatus === 'yes' ? '已审核':'未审核'}}
+            disable-transitions
+          >
+            {{ scope.row.reviewStatus === "yes" ? "已审核" : "未审核" }}
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="成交时间" align="center" prop="orderTime" width="180" fixed="left">
+      <el-table-column
+        label="成交时间"
+        align="center"
+        prop="orderTime"
+        width="180"
+        fixed="left"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.orderTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          <span>{{
+            parseTime(scope.row.orderTime, "{y}-{m}-{d} {h}:{i}:{s}")
+          }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="客户姓名" align="center" prop="customer" width="120" fixed="left"/>
-      <el-table-column label="金额" align="center" prop="amount" width="120" fixed="left">
+      <el-table-column
+        label="客户姓名"
+        align="center"
+        prop="customer"
+        width="120"
+        fixed="left"
+      />
+      <el-table-column
+        label="金额"
+        align="center"
+        prop="amount"
+        width="120"
+        fixed="left"
+      >
         <template slot-scope="scope">
-          {{toThousands(scope.row.amount)}}
+          {{ toThousands(scope.row.amount) }}
         </template>
       </el-table-column>
       <el-table-column label="体重" align="center" prop="weight" width="80">
         <template slot-scope="scope">
-          {{scope.row.weight ? `${scope.row.weight}斤` : ''}}
+          {{ scope.row.weight ? `${scope.row.weight}斤` : "" }}
         </template>
       </el-table-column>
-      <el-table-column label="手机号" align="center" prop="phone" width="120"/>
-      <el-table-column label="服务时长" align="center" prop="serveTime" width="80"/>
-      <el-table-column label="赠送时长" align="center" prop="giveServeDay" width="80">
+      <el-table-column label="手机号" align="center" prop="phone" width="120" />
+      <el-table-column
+        label="服务时长"
+        align="center"
+        prop="serveTime"
+        width="80"
+      />
+      <el-table-column
+        label="赠送时长"
+        align="center"
+        prop="giveServeDay"
+        width="80"
+      >
         <template slot-scope="scope">
-          {{scope.row.giveServeDay ? `${scope.row.giveServeDay}天` : '0天'}}
+          {{ scope.row.giveServeDay ? `${scope.row.giveServeDay}天` : "0天" }}
         </template>
       </el-table-column>
-      <el-table-column label="调理项目" align="center" prop="conditioningProject" width="120"/>
-      <el-table-column label="收款方式" align="center" prop="payType" width="120"/>
-      <el-table-column label="售前" align="center" prop="preSale" width="120"/>
-      <el-table-column label="售后" align="center" prop="afterSale" width="120"/>
-      <el-table-column label="主营养师" align="center" prop="nutritionist" width="120"/>
-      <el-table-column label="助理营养师" align="center" prop="nutriAssis" width="120"/>
-      <el-table-column label="账号" align="center" prop="account" width="120"/>
-      <el-table-column label="策划" align="center" prop="planner" width="120"/>
-      <el-table-column label="策划助理" align="center" prop="plannerAssis" width="120"/>
-      <el-table-column label="运营" align="center" prop="operator" width="120"/>
-      <el-table-column label="运营助理" align="center" prop="operatorAssis" width="120"/>
-      <el-table-column label="推荐人" align="center" prop="recommender" width="120"/>
-      <el-table-column label="进粉时间" align="center" prop="becomeFanTime" width="120">
+      <el-table-column
+        label="调理项目"
+        align="center"
+        prop="conditioningProject"
+        width="120"
+      />
+      <el-table-column
+        label="收款方式"
+        align="center"
+        prop="payType"
+        width="120"
+      />
+      <el-table-column label="售前" align="center" prop="preSale" width="120" />
+      <el-table-column
+        label="售后"
+        align="center"
+        prop="afterSale"
+        width="120"
+      />
+      <el-table-column
+        label="主营养师"
+        align="center"
+        prop="nutritionist"
+        width="120"
+      />
+      <el-table-column
+        label="助理营养师"
+        align="center"
+        prop="nutriAssis"
+        width="120"
+      />
+      <el-table-column label="账号" align="center" prop="account" width="120" />
+      <el-table-column label="策划" align="center" prop="planner" width="120" />
+      <el-table-column
+        label="策划助理"
+        align="center"
+        prop="plannerAssis"
+        width="120"
+      />
+      <el-table-column
+        label="运营"
+        align="center"
+        prop="operator"
+        width="120"
+      />
+      <el-table-column
+        label="运营助理"
+        align="center"
+        prop="operatorAssis"
+        width="120"
+      />
+      <el-table-column
+        label="推荐人"
+        align="center"
+        prop="recommender"
+        width="120"
+      />
+      <el-table-column
+        label="进粉时间"
+        align="center"
+        prop="becomeFanTime"
+        width="120"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.becomeFanTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.becomeFanTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="开始时间" align="center" prop="startTime" width="120">
+      <el-table-column
+        label="开始时间"
+        align="center"
+        prop="startTime"
+        width="120"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.startTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="结束时间" align="center" prop="serverEndTime" width="120">
+      <el-table-column
+        label="结束时间"
+        align="center"
+        prop="serverEndTime"
+        width="120"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.serverEndTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.serverEndTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="服务天数" align="center" prop="serverDay" width="80">
+      <el-table-column
+        label="服务天数"
+        align="center"
+        prop="serverDay"
+        width="80"
+      >
         <template slot-scope="scope">
-          {{scope.row.serverDay ? `${scope.row.serverDay}天` : '0天'}}
+          {{ scope.row.serverDay ? `${scope.row.serverDay}天` : "0天" }}
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" width="120"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="300" fixed="right">
+      <el-table-column label="备注" align="center" prop="remark" width="120" />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        width="300"
+        fixed="right"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -292,7 +513,7 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['custom:order:edit']"
-          >修改
+            >修改
           </el-button>
           <el-button
             size="mini"
@@ -300,7 +521,7 @@
             icon="el-icon-s-data"
             @click="orderPauseManage(scope.row)"
             v-hasPermi="['orderPause:pause:query']"
-          >暂停记录管理
+            >暂停记录管理
           </el-button>
           <el-button
             size="mini"
@@ -308,30 +529,39 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['custom:order:remove']"
-          >删除
+            >删除
           </el-button>
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
       layout="total, slot, sizes, prev, pager, next, jumper"
       @pagination="getList"
     >
-      <span style="margin-right: 12px;">总计：{{toThousands(this.totalAmount)}} 元</span>
+      <span style="margin-right: 12px"
+        >总计：{{ toThousands(this.totalAmount) }} 元</span
+      >
     </pagination>
 
     <!-- 暂停记录管理 -->
-    <el-dialog :title="pauseTitle" v-if="openPause" :visible.sync="openPause" width="900px" append-to-body>
-        <span style="color:#E6A23C;font-family:PingFang SC">
-          注意事项：
-          <br/>1、日期包含当天，如：2021-01-01到2021-01-07，总共暂停七天，2021-01-08继续服务
-          <br/>2、每条暂停记录的时间范围不能重叠</span>
-        <orderPause v-bind:orderPauseId="orderPauseId"></orderPause>
+    <el-dialog
+      :title="pauseTitle"
+      v-if="openPause"
+      :visible.sync="openPause"
+      width="900px"
+      append-to-body
+    >
+      <span style="color: #e6a23c; font-family: PingFang SC">
+        注意事项：
+        <br />1、日期包含当天，如：2021-01-01到2021-01-07，总共暂停七天，2021-01-08继续服务
+        <br />2、每条暂停记录的时间范围不能重叠</span
+      >
+      <orderPause v-bind:orderPauseId="orderPauseId"></orderPause>
     </el-dialog>
 
     <!-- 添加或修改销售订单对话框 -->
@@ -340,23 +570,27 @@
         <el-form ref="form" :model="form" :rules="rules" label-width="90px">
           <el-col :span="8">
             <el-form-item label="客户姓名" prop="customer">
-              <el-input v-model="form.customer" placeholder="请输入姓名"/>
+              <el-input v-model="form.customer" placeholder="请输入姓名" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="体重" prop="weight">
-                <el-input style="width: 100px" v-model="form.weight" placeholder="请输入体重"/>
-                斤
+              <el-input
+                style="width: 100px"
+                v-model="form.weight"
+                placeholder="请输入体重"
+              />
+              斤
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="电话" prop="phone">
-              <el-input v-model="form.phone" placeholder="请输入电话"/>
+              <el-input v-model="form.phone" placeholder="请输入电话" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="成交金额" prop="amount">
-              <el-input v-model="form.amount" placeholder="请输入金额"/>
+              <el-input v-model="form.amount" placeholder="请输入金额" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -409,7 +643,10 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="调理项目" prop="conditioningProjectId">
-              <el-select v-model="form.conditioningProjectId" placeholder="请选择">
+              <el-select
+                v-model="form.conditioningProjectId"
+                placeholder="请选择"
+              >
                 <el-option
                   v-for="dict in conditioningProjectIdOption"
                   :key="dict.dictValue"
@@ -517,12 +754,16 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="推荐人" prop="recommender">
-              <el-input v-model="form.recommender" placeholder="请输入推荐人"/>
+              <el-input v-model="form.recommender" placeholder="请输入推荐人" />
             </el-form-item>
           </el-col>
           <el-col :span="8" v-hasPermi="['custom:order:review']">
             <el-form-item label="审核状态" prop="reviewStatus">
-              <el-select v-model="form.reviewStatus" placeholder="请选择审核状态" @change="handleOnRviewChange">
+              <el-select
+                v-model="form.reviewStatus"
+                placeholder="请选择审核状态"
+                @change="handleOnRviewChange"
+              >
                 <el-option
                   v-for="dict in reviewStatusOptions"
                   :key="dict.dictValue"
@@ -556,7 +797,8 @@
                 placeholder="选择成交时间"
                 format="yyyy-MM-dd HH:mm"
                 value-format="yyyy-MM-dd HH:mm:ss"
-                :picker-options="orderPickerOptions">
+                :picker-options="orderPickerOptions"
+              >
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -575,7 +817,11 @@
           </el-col>
           <el-col>
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
+              <el-input
+                v-model="form.remark"
+                type="textarea"
+                placeholder="请输入内容"
+              />
             </el-form-item>
           </el-col>
         </el-form>
@@ -589,508 +835,608 @@
 </template>
 
 <script>
-  import {addOrder, delOrder, exportOrder, getOptions, getOrder, listOrder, updateOrder} from "@/api/custom/order";
-  import dayjs from 'dayjs';
-  import orderPause from "./orderPause";
+import {
+  addOrder,
+  delOrder,
+  exportOrder,
+  getOptions,
+  getOrder,
+  listOrder,
+  updateOrder,
+} from "@/api/custom/order";
+import dayjs from "dayjs";
+import orderPause from "./orderPause";
 
-  const beginTime = dayjs().startOf('month').format('YYYY-MM-DD');
-  const endTime = dayjs().format('YYYY-MM-DD');
-  // const beginTime = dayjs().format('YYYY-MM-DD');
-  // const endTime = dayjs().format('YYYY-MM-DD');
-  export default {
-    name: "Order",
-    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('成交时间不能为空'))
-        }
-        if (!this.form.becomeFanTime) {
-          return callback(new Error('请先填写进粉时间'))
-        }
-        if(dayjs(this.form.orderTime).diff(dayjs(this.form.becomeFanTime),'day') < 0){
-          return callback(new Error('成交时间不能小于进粉时间'))
-        }
-        callback();
+const beginTime = dayjs().startOf("month").format("YYYY-MM-DD");
+const endTime = dayjs().format("YYYY-MM-DD");
+// const beginTime = dayjs().format('YYYY-MM-DD');
+// const endTime = dayjs().format('YYYY-MM-DD');
+export default {
+  name: "Order",
+  data() {
+    const checkStartTime = (rule, value, callback) => {
+      if (!value) {
+        return callback(new Error("开始时间不能为空"));
       }
-      return {
-        // 遮罩层
-        loading: true,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: false,
-        // 总条数
-        total: 0,
-        // 销售订单表格数据
-        orderList: [],
-        // 弹出层标题
-        title: "",
-        // 是否显示弹出层
-        open: false,
-        // 是否显示暂停记录弹窗
-        openPause: false,
-        pauseTitle: "暂停记录",
-        orderPauseId: null,
-        //
-        totalAmount: 0,
-        //
-        review: 'no',
-        //
-        daterange: [beginTime, endTime],
-        // 收款方式字典
-        payTypeIdOptions: [],
-        // 售前字典
-        preSaleIdOptions: [],
-        // 售后字典
-        afterSaleIdOptions: [],
-        // 主营养师字典
-        nutritionistIdOptions: [],
-        // 助理营养师字典
-        nutriAssisIdOptions: [],
-        // 策划字典
-        plannerIdOptions: [],
-        // 账号
-        accountIdOptions: [],
-        // 服务时长
-        serveTimeIdOption: [],
-        // 赠送时长
-        giveTimeIdOption: [],
-        //调理项目
-        conditioningProjectIdOption:[],
-        // 审核状态
-        reviewStatusOptions: [],
-        // 策划助理字典
-        plannerAssisIdOptions: [],
-        // 运营字典
-        operatorIdOptions: [],
-        //
-        operatorAssisIdOptions: [],
-        //下拉列表对应关系(用于选择收款账号自动选择策划、策划助理、运营、运营助理)
-        orderDropdownCorrespondingOptions: [],
-        // 查询参数
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-          orderId: null,
-          customer: null,
-          phone: null,
-          payTypeId: null,
-          preSaleId: null,
-          afterSaleId: null,
-          nutritionistId: null,
-          nutriAssisId: null,
-          accountId: null,
-          plannerId: null,
-          plannerAssisId: null,
-          operatorId: null,
-          operatorAssisId: null,
-          recommender: null,
-          reviewStatus: null,
-          serveTimeId: null
-        },
-        // 表单参数
-        form: {},
-        // 表单校验
-        rules: {
-          customer: [
-            {required: true, message: "客户姓名不能为空", trigger: "blur"}
-          ],
-          weight: [
-            {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}
-          ],
-          becomeFanTime: [
-            {required: true, message: "进粉时间不能为空", trigger: "blur"}
-          ]
+      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("成交时间不能为空"));
+      }
+      if (!this.form.becomeFanTime) {
+        return callback(new Error("请先填写进粉时间"));
+      }
+      if (
+        dayjs(this.form.orderTime).diff(dayjs(this.form.becomeFanTime), "day") <
+        0
+      ) {
+        return callback(new Error("成交时间不能小于进粉时间"));
+      }
+      callback();
+    };
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // 销售订单表格数据
+      orderList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 是否显示暂停记录弹窗
+      openPause: false,
+      pauseTitle: "暂停记录",
+      orderPauseId: null,
+      //
+      totalAmount: 0,
+      //
+      review: "no",
+      //
+      daterange: [beginTime, endTime],
+      // 收款方式字典
+      payTypeIdOptions: [],
+      // 售前字典
+      preSaleIdOptions: [],
+      // 售后字典
+      afterSaleIdOptions: [],
+      // 主营养师字典
+      nutritionistIdOptions: [],
+      // 助理营养师字典
+      nutriAssisIdOptions: [],
+      // 策划字典
+      plannerIdOptions: [],
+      // 账号
+      accountIdOptions: [],
+      // 服务时长
+      serveTimeIdOption: [],
+      // 赠送时长
+      giveTimeIdOption: [],
+      //调理项目
+      conditioningProjectIdOption: [],
+      // 审核状态
+      reviewStatusOptions: [],
+      // 策划助理字典
+      plannerAssisIdOptions: [],
+      // 运营字典
+      operatorIdOptions: [],
+      //
+      operatorAssisIdOptions: [],
+      //下拉列表对应关系(用于选择收款账号自动选择策划、策划助理、运营、运营助理)
+      orderDropdownCorrespondingOptions: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        orderId: null,
+        customer: null,
+        phone: null,
+        payTypeId: null,
+        preSaleId: null,
+        afterSaleId: null,
+        nutritionistId: null,
+        nutriAssisId: null,
+        accountId: null,
+        plannerId: null,
+        plannerAssisId: null,
+        operatorId: null,
+        operatorAssisId: null,
+        recommender: null,
+        reviewStatus: null,
+        serveTimeId: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        customer: [
+          { required: true, message: "客户姓名不能为空", trigger: "blur" },
+        ],
+        weight: [
+          { 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 },
+        ],
+        becomeFanTime: [
+          { required: true, message: "进粉时间不能为空", trigger: "blur" },
+        ],
 
-
-          // payTypeId: [
-          //   {required: true, message: "收款方式不能为空", trigger: "blur"}
-          // ],
-          // accountId: [
-          //   {required: true, message: "账号不能为空", trigger: "blur"}
-          // ],
-          // serveTimeId: [
-          //   {required: true, message: "服务时长不能为空", trigger: "blur"}
-          // ],
-          // reviewStatus: [
-          //   {trigger: "change", validator: handleOnPreviewChange}
-          // ]
-        },
-        pickerOptions: {
-          shortcuts: [{
-            text: '最近一周',
+        // payTypeId: [
+        //   {required: true, message: "收款方式不能为空", trigger: "blur"}
+        // ],
+        // accountId: [
+        //   {required: true, message: "账号不能为空", trigger: "blur"}
+        // ],
+        // serveTimeId: [
+        //   {required: true, message: "服务时长不能为空", trigger: "blur"}
+        // ],
+        // reviewStatus: [
+        //   {trigger: "change", validator: handleOnPreviewChange}
+        // ]
+      },
+      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: '最近一个月',
+              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: '最近三个月',
+              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();
+              picker.$emit("pick", [start, end]);
+            },
           },
+        ],
+      },
+      orderPickerOptions: {
+        disabledDate(time) {
+          return time.getTime() > Date.now();
         },
-        fanPickerOptions: {
-          disabledDate(time) {
-            return time.getTime() > Date.now();
-          },
+      },
+      fanPickerOptions: {
+        disabledDate(time) {
+          return time.getTime() > Date.now();
         },
-        startPickerOptions: {
-          disabledDate(time) {
-            return time.getTime() < Date.now();
-          },
+      },
+      startPickerOptions: {
+        disabledDate(time) {
+          return time.getTime() < Date.now();
+        },
+      },
+    };
+  },
+  components: {
+    orderPause,
+  },
+  created() {
+    this.getList();
+    getOptions().then((response) => {
+      const options = response.data.reduce((opts, cur) => {
+        if (!opts[cur.postCode]) {
+          opts[cur.postCode] = [
+            { dictValue: 0, dictLabel: "无", remark: null },
+          ];
         }
-      };
-    },
-    components: {
-      orderPause
-    },
-    created() {
-      this.getList();
-      getOptions().then(response => {
-        const options = response.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;
-      });
-      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;
+        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_review_status").then(response => {
-        this.reviewStatusOptions = response.data;
-      });
-      this.getDicts("order_dropdown_corresponding").then(response => {
-        this.orderDropdownCorrespondingOptions = response.data;
-      });
-    },
-    methods: {
-      /** 查询销售订单列表 */
-      getList() {
-        this.loading = true;
-        listOrder(this.addDateRange(this.queryParams, this.daterange)).then(response => {
+    this.getDicts("cus_pay_type").then((response) => {
+      this.payTypeIdOptions = response.data;
+    });
+    this.getDicts("cus_account").then((response) => {
+      this.accountIdOptions = response.data;
+    });
+    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: {
+    /** 查询销售订单列表 */
+    getList() {
+      this.loading = true;
+      listOrder(this.addDateRange(this.queryParams, this.daterange)).then(
+        (response) => {
           this.orderList = response.rows;
           this.total = response.total;
           this.loading = false;
           this.totalAmount = response.totalAmount;
-        });
-      },// 收款方式字典翻译
-      payTypeIdFormat(row, column) {
-        return this.selectDictLabel(this.payTypeIdOptions, row.payTypeId);
-      },
-      // 售前字典翻译
-      preSaleIdFormat(row, column) {
-        return this.selectDictLabel(this.preSaleIdOptions, row.preSaleId);
-      },
-      // 售后字典翻译
-      afterSaleIdFormat(row, column) {
-        return this.selectDictLabel(this.afterSaleIdOptions, row.afterSaleId);
-      },
-      // 主营养师字典翻译
-      nutritionistIdFormat(row, column) {
-        return this.selectDictLabel(this.nutritionistIdOptions, row.nutritionistId);
-      },
-      // 助理营养师字典翻译
-      nutriAssisIdFormat(row, column) {
-        return this.selectDictLabel(this.nutriAssisIdOptions, row.nutriAssisId);
-      },
-      // 策划字典翻译
-      plannerIdFormat(row, column) {
-        return this.selectDictLabel(this.plannerIdOptions, row.plannerId);
-      },
-      // 账号字典翻译
-      accountIdFormat(row, column) {
-        return this.selectDictLabel(this.accountIdOptions, row.accountId);
-      },
-      // 策划助理字典翻译
-      plannerAssisIdFormat(row, column) {
-        return this.selectDictLabel(this.plannerAssisIdOptions, row.plannerAssisId);
-      },
-      // 运营字典翻译
-      operatorIdFormat(row, column) {
-        return this.selectDictLabel(this.operatorIdOptions, row.operatorId);
-      },
-      // 运营助理字典翻译
-      operatorAssisIdFormat(row, column) {
-        return this.selectDictLabel(this.operatorAssisIdOptions, row.operatorAssisId);
-      },
-      // 取消按钮
-      cancel() {
-        this.open = false;
-        this.review = 'no';
-        this.reset();
-      },
-      // 表单重置
-      reset() {
-        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 defaultOperator = this.operatorIdOptions.find(opt => opt.remark === 'default');
-        const defaultOperatorAssis = this.operatorAssisIdOptions.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 defaultPlanner = this.plannerIdOptions.find(opt => opt.remark === 'default');
-        const defaultPlannerAssis = this.plannerAssisIdOptions.find(opt => opt.remark === 'default');
-        this.form = {
-          orderId: null,
-          customer: null,
-          phone: null,
-          amount: null,
-          weight: null,
-          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,
-          plannerId: defaultPlanner ? parseInt(defaultPlanner.dictValue) : null,
-          plannerAssisId: defaultPlannerAssis ? parseInt(defaultPlannerAssis.dictValue) : null,
-          operatorId: defaultOperator ? parseInt(defaultOperator.dictValue) : null,
-          operatorAssisId: defaultOperatorAssis ? parseInt(defaultOperatorAssis.dictValue) : null,
-          recommender: null,
-          orderTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
-          serveTimeId: defaultServeTime ? parseInt(defaultServeTime.dictValue) : null,
-          reviewStatus: this.review,
-          giveServeDay: defaultGiveServeTime ? parseInt(defaultGiveServeTime.dictValue) : null,
-          conditioningProjectId: defaultConditioningProjectIdOption ? parseInt(defaultConditioningProjectIdOption.dictValue) : null,
-          becomeFanTime: dayjs().format("YYYY-MM-DD"),
-          //收款账号的初始化放最后，使得可以watch中监听到变化，保证策划、策划助理、运营、运营助理初始化
-          accountId: defaultAccount ? parseInt(defaultAccount.dictValue) : null
-        };
-        this.resetForm("form");
-      },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.daterange = [beginTime, endTime];
-        this.resetForm("queryForm");
-        this.handleQuery();
-      },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.orderId)
-        this.single = selection.length !== 1
-        this.multiple = !selection.length
-      },
-      /** 新增按钮操作 */
-      handleAdd() {
-        this.reset();
+        }
+      );
+    }, // 收款方式字典翻译
+    payTypeIdFormat(row, column) {
+      return this.selectDictLabel(this.payTypeIdOptions, row.payTypeId);
+    },
+    // 售前字典翻译
+    preSaleIdFormat(row, column) {
+      return this.selectDictLabel(this.preSaleIdOptions, row.preSaleId);
+    },
+    // 售后字典翻译
+    afterSaleIdFormat(row, column) {
+      return this.selectDictLabel(this.afterSaleIdOptions, row.afterSaleId);
+    },
+    // 主营养师字典翻译
+    nutritionistIdFormat(row, column) {
+      return this.selectDictLabel(
+        this.nutritionistIdOptions,
+        row.nutritionistId
+      );
+    },
+    // 助理营养师字典翻译
+    nutriAssisIdFormat(row, column) {
+      return this.selectDictLabel(this.nutriAssisIdOptions, row.nutriAssisId);
+    },
+    // 策划字典翻译
+    plannerIdFormat(row, column) {
+      return this.selectDictLabel(this.plannerIdOptions, row.plannerId);
+    },
+    // 账号字典翻译
+    accountIdFormat(row, column) {
+      return this.selectDictLabel(this.accountIdOptions, row.accountId);
+    },
+    // 策划助理字典翻译
+    plannerAssisIdFormat(row, column) {
+      return this.selectDictLabel(
+        this.plannerAssisIdOptions,
+        row.plannerAssisId
+      );
+    },
+    // 运营字典翻译
+    operatorIdFormat(row, column) {
+      return this.selectDictLabel(this.operatorIdOptions, row.operatorId);
+    },
+    // 运营助理字典翻译
+    operatorAssisIdFormat(row, column) {
+      return this.selectDictLabel(
+        this.operatorAssisIdOptions,
+        row.operatorAssisId
+      );
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.review = "no";
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      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 defaultOperator = this.operatorIdOptions.find(
+        (opt) => opt.remark === "default"
+      );
+      const defaultOperatorAssis = this.operatorAssisIdOptions.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 defaultPlanner = this.plannerIdOptions.find(
+        (opt) => opt.remark === "default"
+      );
+      const defaultPlannerAssis = this.plannerAssisIdOptions.find(
+        (opt) => opt.remark === "default"
+      );
+      this.form = {
+        orderId: null,
+        customer: null,
+        phone: null,
+        amount: null,
+        weight: null,
+        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,
+        plannerId: defaultPlanner ? parseInt(defaultPlanner.dictValue) : null,
+        plannerAssisId: defaultPlannerAssis
+          ? parseInt(defaultPlannerAssis.dictValue)
+          : null,
+        operatorId: defaultOperator
+          ? parseInt(defaultOperator.dictValue)
+          : null,
+        operatorAssisId: defaultOperatorAssis
+          ? parseInt(defaultOperatorAssis.dictValue)
+          : null,
+        recommender: null,
+        orderTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
+        serveTimeId: defaultServeTime
+          ? parseInt(defaultServeTime.dictValue)
+          : null,
+        reviewStatus: this.review,
+        giveServeDay: defaultGiveServeTime
+          ? parseInt(defaultGiveServeTime.dictValue)
+          : null,
+        conditioningProjectId: defaultConditioningProjectIdOption
+          ? parseInt(defaultConditioningProjectIdOption.dictValue)
+          : null,
+        becomeFanTime: dayjs().format("YYYY-MM-DD"),
+        //收款账号的初始化放最后，使得可以watch中监听到变化，保证策划、策划助理、运营、运营助理初始化
+        accountId: defaultAccount ? parseInt(defaultAccount.dictValue) : null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterange = [beginTime, endTime];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.orderId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加销售订单";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const orderId = row.orderId || this.ids;
+      getOrder(orderId).then((response) => {
+        this.form = response.data;
+        this.form.giveServeDay = parseInt(this.form.giveServeDay + "");
+        if (this.form.becomeFanTime == null) {
+          this.form.becomeFanTime = this.form.orderTime;
+        }
         this.open = true;
-        this.title = "添加销售订单";
-      },
-      /** 修改按钮操作 */
-      handleUpdate(row) {
-        this.reset();
-        const orderId = row.orderId || this.ids
-        getOrder(orderId).then(response => {
-          this.form = response.data;
-          this.form.giveServeDay = parseInt(this.form.giveServeDay+"");
-          if(this.form.becomeFanTime == null){
-            this.form.becomeFanTime = this.form.orderTime;
+        this.title = "修改销售订单";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.orderId != null) {
+            this.form.reviewStatus = this.review;
+            updateOrder(this.form).then((response) => {
+              if (response.code === 200) {
+                this.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              }
+            });
+          } else {
+            this.form.status = "0";
+            addOrder(this.form).then((response) => {
+              if (response.code === 200) {
+                this.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              }
+            });
           }
-          this.open = true;
-          this.title = "修改销售订单";
-        });
-      },
-      /** 提交按钮 */
-      submitForm() {
-        this.$refs["form"].validate(valid => {
-          if (valid) {
-            if (this.form.orderId != null) {
-              this.form.reviewStatus = this.review;
-              updateOrder(this.form).then(response => {
-                if (response.code === 200) {
-                  this.msgSuccess("修改成功");
-                  this.open = false;
-                  this.getList();
-                }
-              });
-            } else {
-              this.form.status = '0';
-              addOrder(this.form).then(response => {
-                if (response.code === 200) {
-                  this.msgSuccess("新增成功");
-                  this.open = false;
-                  this.getList();
-                }
-              });
-            }
-          }
-        });
-      },
-      /** 删除按钮操作 */
-      handleDelete(row) {
-        const orderIds = row.orderId || this.ids;
-        this.$confirm('是否确认删除销售订单编号为"' + orderIds + '"的数据项?', "警告", {
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const orderIds = row.orderId || this.ids;
+      this.$confirm(
+        '是否确认删除销售订单编号为"' + orderIds + '"的数据项?',
+        "警告",
+        {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
-          type: "warning"
-        }).then(function () {
+          type: "warning",
+        }
+      )
+        .then(function () {
           return delOrder(orderIds);
-        }).then(() => {
+        })
+        .then(() => {
           this.getList();
           this.msgSuccess("删除成功");
-        }).catch(function () {
-        });
-      },
-      /** 导出按钮操作 */
-      handleExport() {
-        const queryParams = this.queryParams;
-        this.$confirm('是否确认导出所有销售订单数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function () {
+        })
+        .catch(function () {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm("是否确认导出所有销售订单数据项?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(function () {
           return exportOrder(queryParams);
-        }).then(response => {
+        })
+        .then((response) => {
           this.download(response.msg);
-        }).catch(function () {
-        });
-      },
-      handleOnRviewChange(val) {
-        this.review = val;
-      },
-      handleStatusClick(data) {
-        console.log(data);
-      },
-      orderPauseManage(order) {
-        console.log(order.orderId);
-        this.pauseTitle = order.customer;
-        this.orderPauseId = order.orderId;
-        this.openPause = true;
-        //this.$router.push({ name: 'orderPause', params: { 'orderId': order.orderId }})
-      },
-      //根据收款账号ID初始化策划、策划助理、运营、运营助理
-      initPlanningAndOperation(){
-         if(this.form.accountId != null && this.form.accountId != undefined){
-           let planningAndOperationValue = this.orderDropdownCorrespondingOptions.find(opt => parseInt(opt.dictValue) === this.form.accountId);
-           let array = planningAndOperationValue.dictLabel.split("|");
-           let plannerIdOption = this.plannerIdOptions.find(opt => opt.dictValue == array[0]);
-           this.form.plannerId = plannerIdOption ? parseInt(plannerIdOption.dictValue) : 0;
-           let plannerAssisIdOption = this.plannerAssisIdOptions.find(opt => opt.dictValue == array[1]);
-           this.form.plannerAssisId = plannerAssisIdOption ? parseInt(plannerAssisIdOption.dictValue) : 0;
-           let operatorIdOption = this.operatorIdOptions.find(opt => opt.dictValue == array[2]);
-           this.form.operatorId = operatorIdOption ? parseInt(operatorIdOption.dictValue) : 0;
-           let operatorAssisIdOption = this.operatorAssisIdOptions.find(opt => opt.dictValue == array[3]);
-           this.form.operatorAssisId = operatorAssisIdOption ? parseInt(operatorAssisIdOption.dictValue) : 0;
-         }
+        })
+        .catch(function () {});
+    },
+    handleOnRviewChange(val) {
+      this.review = val;
+    },
+    handleStatusClick(data) {
+      console.log(data);
+    },
+    orderPauseManage(order) {
+      console.log(order.orderId);
+      this.pauseTitle = order.customer;
+      this.orderPauseId = order.orderId;
+      this.openPause = true;
+      //this.$router.push({ name: 'orderPause', params: { 'orderId': order.orderId }})
+    },
+    //根据收款账号ID初始化策划、策划助理、运营、运营助理
+    initPlanningAndOperation() {
+      if (this.form.accountId != null && this.form.accountId != undefined) {
+        let planningAndOperationValue = this.orderDropdownCorrespondingOptions.find(
+          (opt) => parseInt(opt.dictValue) === this.form.accountId
+        );
+        let array = planningAndOperationValue.dictLabel.split("|");
+        let plannerIdOption = this.plannerIdOptions.find(
+          (opt) => opt.dictValue == array[0]
+        );
+        this.form.plannerId = plannerIdOption
+          ? parseInt(plannerIdOption.dictValue)
+          : 0;
+        let plannerAssisIdOption = this.plannerAssisIdOptions.find(
+          (opt) => opt.dictValue == array[1]
+        );
+        this.form.plannerAssisId = plannerAssisIdOption
+          ? parseInt(plannerAssisIdOption.dictValue)
+          : 0;
+        let operatorIdOption = this.operatorIdOptions.find(
+          (opt) => opt.dictValue == array[2]
+        );
+        this.form.operatorId = operatorIdOption
+          ? parseInt(operatorIdOption.dictValue)
+          : 0;
+        let operatorAssisIdOption = this.operatorAssisIdOptions.find(
+          (opt) => opt.dictValue == array[3]
+        );
+        this.form.operatorAssisId = operatorAssisIdOption
+          ? parseInt(operatorAssisIdOption.dictValue)
+          : 0;
       }
     },
-    watch:{
-      // 监听收款账号的变化
-      "form.accountId": function(newVal, oldVal){
-        this.initPlanningAndOperation();
-      }
-    }
-  };
+  },
+  watch: {
+    // 监听收款账号的变化
+    "form.accountId": function (newVal, oldVal) {
+      this.initPlanningAndOperation();
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-  .s_success {
-    color: #1ab394;
-    font-size: 22px;
-  }
+.s_success {
+  color: #1ab394;
+  font-size: 22px;
+}
 
-  .s_pause {
-    color: #f56c6c;
-    font-size: 22px;
-    cursor: pointer;
-  }
-
-  .s_play {
-    color: #1c84c6;
-    font-size: 22px;
-    cursor: pointer;
-  }
+.s_pause {
+  color: #f56c6c;
+  font-size: 22px;
+  cursor: pointer;
+}
 
+.s_play {
+  color: #1c84c6;
+  font-size: 22px;
+  cursor: pointer;
+}
 </style>
diff --git a/stdiet-ui/src/views/custom/recipesPlan/bodySignDialog.vue b/stdiet-ui/src/views/custom/recipesPlan/bodySignDialog.vue
new file mode 100644
index 000000000..4eb6ee5fe
--- /dev/null
+++ b/stdiet-ui/src/views/custom/recipesPlan/bodySignDialog.vue
@@ -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>
diff --git a/stdiet-ui/src/views/custom/recipesPlan/index.vue b/stdiet-ui/src/views/custom/recipesPlan/index.vue
index 085854b80..77eea16d0 100644
--- a/stdiet-ui/src/views/custom/recipesPlan/index.vue
+++ b/stdiet-ui/src/views/custom/recipesPlan/index.vue
@@ -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 {
diff --git a/stdiet-ui/src/views/custom/recipesPlan/orderDialog.vue b/stdiet-ui/src/views/custom/recipesPlan/orderDialog.vue
new file mode 100644
index 000000000..c7eae4e71
--- /dev/null
+++ b/stdiet-ui/src/views/custom/recipesPlan/orderDialog.vue
@@ -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>