From e1d9d96244f20905d9605a1fc54277f0a3063659 Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Thu, 28 Jan 2021 19:38:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/filters/dev/application.yml      |   2 +-
 .../src/main/filters/local/application.yml    |   2 +-
 .../src/main/filters/prod/application.yml     |   2 +-
 .../com/stdiet/custom/domain/SysCustomer.java |  13 +
 .../mapper/custom/SysCustomerMapper.xml       |   6 +-
 .../BodySignDetail/index.vue}                 |   0
 .../src/components/OrderDetail/index.vue      | 138 +++
 .../OrderDrawer/index.vue}                    |  54 +-
 .../OrderEdit/index.vue}                      |   9 +-
 stdiet-ui/src/views/custom/customer/index.vue | 131 ++-
 stdiet-ui/src/views/custom/order/index.vue    | 927 ++----------------
 .../src/views/custom/recipesPlan/index.vue    |   8 +-
 .../views/custom/recipesPlan/orderDialog.vue  | 110 ---
 13 files changed, 404 insertions(+), 998 deletions(-)
 rename stdiet-ui/src/{views/custom/recipesPlan/bodySignDialog.vue => components/BodySignDetail/index.vue} (100%)
 create mode 100644 stdiet-ui/src/components/OrderDetail/index.vue
 rename stdiet-ui/src/{views/custom/customer/orderDrawer.vue => components/OrderDrawer/index.vue} (71%)
 rename stdiet-ui/src/{views/custom/customer/createOrderDialog.vue => components/OrderEdit/index.vue} (99%)
 delete mode 100644 stdiet-ui/src/views/custom/recipesPlan/orderDialog.vue

diff --git a/stdiet-admin/src/main/filters/dev/application.yml b/stdiet-admin/src/main/filters/dev/application.yml
index f9c1e913b..6536928b3 100644
--- a/stdiet-admin/src/main/filters/dev/application.yml
+++ b/stdiet-admin/src/main/filters/dev/application.yml
@@ -138,7 +138,7 @@ token:
     # 令牌密钥
     secret: shengtangdiet
     # 令牌有效期（默认30分钟）
-    expireTime: 30
+    expireTime: 120
   
 # MyBatis配置
 mybatis:
diff --git a/stdiet-admin/src/main/filters/local/application.yml b/stdiet-admin/src/main/filters/local/application.yml
index f0ca8faf5..057dee4c1 100644
--- a/stdiet-admin/src/main/filters/local/application.yml
+++ b/stdiet-admin/src/main/filters/local/application.yml
@@ -138,7 +138,7 @@ token:
   # 令牌密钥
   secret: shengtangdiet
   # 令牌有效期（默认30分钟）
-  expireTime: 30
+  expireTime: 120
 
 # MyBatis配置
 mybatis:
diff --git a/stdiet-admin/src/main/filters/prod/application.yml b/stdiet-admin/src/main/filters/prod/application.yml
index f1095933f..4044c157a 100644
--- a/stdiet-admin/src/main/filters/prod/application.yml
+++ b/stdiet-admin/src/main/filters/prod/application.yml
@@ -138,7 +138,7 @@ token:
   # 令牌密钥
   secret: shengtangdiet
   # 令牌有效期（默认30分钟）
-  expireTime: 30
+  expireTime: 120
 
 # MyBatis配置
 mybatis:
diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCustomer.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCustomer.java
index aacaaa1cc..e57f75aba 100644
--- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCustomer.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCustomer.java
@@ -29,6 +29,11 @@ public class SysCustomer extends BaseEntity
     @Excel(name = "手机号")
     private String phone;
 
+    /** 进粉日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "进粉日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fansTime;
+
     /** 邮箱 */
     @Excel(name = "邮箱")
     private String email;
@@ -237,6 +242,14 @@ public class SysCustomer extends BaseEntity
         this.delFlag = delFlag;
     }
 
+    public Date getFansTime() {
+        return fansTime;
+    }
+
+    public void setFansTime(Date fansTime) {
+        this.fansTime = fansTime;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysCustomerMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysCustomerMapper.xml
index 36bf00620..2b3904328 100644
--- a/stdiet-custom/src/main/resources/mapper/custom/SysCustomerMapper.xml
+++ b/stdiet-custom/src/main/resources/mapper/custom/SysCustomerMapper.xml
@@ -12,6 +12,7 @@
         <result property="address"    column="address"    />
         <result property="payDate"    column="pay_date"    />
         <result property="startDate"    column="start_date"    />
+        <result property="fansTime" column="fans_time" />
         <result property="purchaseNum"    column="purchase_num"    />
         <result property="payTotal"    column="pay_total"    />
         <result property="mainDietitian"    column="main_dietitian"    />
@@ -27,7 +28,7 @@
     </resultMap>
 
     <sql id="selectSysCustomerVo">
-        select id, name, phone, email, address, pay_date, start_date, purchase_num, pay_total, main_dietitian, assistant_dietitian, after_dietitian, salesman, charge_person, follow_status, create_time, create_by, update_time, update_by from sys_customer
+        select id, name, phone, email, fans_time, address, pay_date, start_date, purchase_num, pay_total, main_dietitian, assistant_dietitian, after_dietitian, salesman, charge_person, follow_status, create_time, create_by, update_time, update_by from sys_customer
     </sql>
 
     <select id="selectSysCustomerList" parameterType="SysCustomer" resultMap="SysCustomerResult">
@@ -48,6 +49,7 @@
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="name != null">name,</if>
             <if test="phone != null">phone,</if>
+            <if test="fansTime != null">fans_time,</if>
             <if test="email != null">email,</if>
             <if test="address != null">address,</if>
             <if test="payDate != null">pay_date,</if>
@@ -68,6 +70,7 @@
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="name != null">#{name},</if>
             <if test="phone != null">#{phone},</if>
+            <if test="fansTime != null">#{fansTime},</if>
             <if test="email != null">#{email},</if>
             <if test="address != null">#{address},</if>
             <if test="payDate != null">#{payDate},</if>
@@ -92,6 +95,7 @@
         <trim prefix="SET" suffixOverrides=",">
             <if test="name != null">name = #{name},</if>
             <if test="phone != null">phone = #{phone},</if>
+            <if test="fansTime != null">fans_time = #{fansTime},</if>
             <if test="email != null">email = #{email},</if>
             <if test="address != null">address = #{address},</if>
             <if test="payDate != null">pay_date = #{payDate},</if>
diff --git a/stdiet-ui/src/views/custom/recipesPlan/bodySignDialog.vue b/stdiet-ui/src/components/BodySignDetail/index.vue
similarity index 100%
rename from stdiet-ui/src/views/custom/recipesPlan/bodySignDialog.vue
rename to stdiet-ui/src/components/BodySignDetail/index.vue
diff --git a/stdiet-ui/src/components/OrderDetail/index.vue b/stdiet-ui/src/components/OrderDetail/index.vue
new file mode 100644
index 000000000..5caa2ade2
--- /dev/null
+++ b/stdiet-ui/src/components/OrderDetail/index.vue
@@ -0,0 +1,138 @@
+<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_one === 'yes' ? 'success' : 'danger'"
+          >
+            {{ scope.row.value_one === "yes" ? "已审核" : "未审核" }}
+          </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">
+          <auto-hide-message
+            :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: [
+        ["reviewStatus", "orderTime", "conditioningProject"],
+        ["customer", "phone", "amount"],
+        ["payType", "account", "serveTime"],
+        ["giveServeDay", "preSale", "afterSale"],
+        ["nutritionist", "nutriAssis", "planner"],
+        ["plannerAssis", "operator", "operatorAssis"],
+        ["startTime", "serverEndTime", "remark"],
+      ],
+    };
+  },
+  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>
diff --git a/stdiet-ui/src/views/custom/customer/orderDrawer.vue b/stdiet-ui/src/components/OrderDrawer/index.vue
similarity index 71%
rename from stdiet-ui/src/views/custom/customer/orderDrawer.vue
rename to stdiet-ui/src/components/OrderDrawer/index.vue
index f8e1d1aa7..51f1f39a0 100644
--- a/stdiet-ui/src/views/custom/customer/orderDrawer.vue
+++ b/stdiet-ui/src/components/OrderDrawer/index.vue
@@ -65,9 +65,23 @@
                 v-if="scope.row.orderType === 'main'"
                 size="mini"
                 type="text"
-                @click="handleOnMenuClick(scope.row)"
+                @click="handleOnDetailClick(scope.row)"
                 >详情</el-button
               >
+              <el-button
+                v-if="scope.row.orderType === 'main'"
+                size="mini"
+                type="text"
+                @click="handleOnEditClick(scope.row)"
+                >修改</el-button
+              >
+              <el-button
+                v-if="scope.row.orderType === 'main'"
+                size="mini"
+                type="text"
+                @click="handleOnDeleteClick(scope.row)"
+                >删除</el-button
+              >
             </template>
           </el-table-column>
         </el-table>
@@ -75,16 +89,20 @@
     </el-drawer>
 
     <create-order-dialog ref="cusCreateOrderDialogRef" />
+
+    <order-detail ref="orderDetailRef" />
   </div>
 </template>
 <script>
-import { listOrder } from "@/api/custom/order";
-import CreateOrderDialog from "./createOrderDialog";
+import { listOrder, delOrder } from "@/api/custom/order";
+import OrderEdit from "@/components/OrderEdit";
+import OrderDetail from "@/components/OrderDetail";
 
 export default {
   name: "CustomerOrderDrawer",
   components: {
-    "create-order-dialog": CreateOrderDialog,
+    "create-order-dialog": OrderEdit,
+    "order-detail": OrderDetail,
   },
   data() {
     return {
@@ -145,6 +163,34 @@ export default {
     handleOnClosed() {
       this.data = undefined;
     },
+    handleOnDetailClick(data) {
+      this.$refs.orderDetailRef.showDialog(data.orderId);
+    },
+    handleOnEditClick(data) {
+      this.$refs.cusCreateOrderDialogRef.showDialog(data, () => {
+        this.fetchOrderList(this.data.id);
+      });
+    },
+    handleOnDeleteClick(data) {
+      const orderIds = data.orderId || this.ids;
+      this.$confirm(
+        '是否确认删除销售订单编号为"' + orderIds + '"的数据项?',
+        "警告",
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }
+      )
+        .then(function () {
+          return delOrder(orderIds);
+        })
+        .then(() => {
+          this.fetchOrderList(this.data.id);
+          this.msgSuccess("删除成功");
+        })
+        .catch(function () {});
+    },
   },
 };
 </script>
diff --git a/stdiet-ui/src/views/custom/customer/createOrderDialog.vue b/stdiet-ui/src/components/OrderEdit/index.vue
similarity index 99%
rename from stdiet-ui/src/views/custom/customer/createOrderDialog.vue
rename to stdiet-ui/src/components/OrderEdit/index.vue
index 6647e615f..c43cac79f 100644
--- a/stdiet-ui/src/views/custom/customer/createOrderDialog.vue
+++ b/stdiet-ui/src/components/OrderEdit/index.vue
@@ -239,7 +239,7 @@ import { addOrder, getOptions, updateOrder } from "@/api/custom/order";
 import dayjs from "dayjs";
 
 export default {
-  name: "OrderDialog",
+  name: "OrderEdit",
   props: {
     id: {
       type: String,
@@ -437,11 +437,13 @@ export default {
   },
   methods: {
     showDialog(data, callback) {
-      this.data = data;
+      // this.data = data;
       this.callback = callback;
       this.reset(data);
 
-      this.title = `创建「${data.customer}」客户订单`;
+      this.title = `${data.orderId ? "修改" : "创建"}「${
+        data.customer
+      }」客户订单`;
       this.visible = true;
     },
     /** 提交按钮 */
@@ -457,7 +459,6 @@ export default {
               }
             });
           } else {
-            this.form.status = "0";
             addOrder(this.form).then((response) => {
               if (response.code === 200) {
                 this.msgSuccess("新增成功");
diff --git a/stdiet-ui/src/views/custom/customer/index.vue b/stdiet-ui/src/views/custom/customer/index.vue
index ada121fca..c7cf5c9ab 100644
--- a/stdiet-ui/src/views/custom/customer/index.vue
+++ b/stdiet-ui/src/views/custom/customer/index.vue
@@ -113,7 +113,17 @@
         prop="createTime"
         width="160"
       />
-      <el-table-column label="名字" align="center" prop="name" />
+      <el-table-column
+        label="进粉时间"
+        align="center"
+        prop="fansTime"
+        width="120"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.fansTime, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="客户姓名" align="center" prop="name" />
       <el-table-column label="手机号" align="center" prop="phone" />
       <el-table-column
         label="主营养师"
@@ -159,16 +169,6 @@
           </el-button>
         </template>
       </el-table-column>
-      <el-table-column label="体征" align="center">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            @click="handleOnBodySignClick(scope.row)"
-            >详情
-          </el-button>
-        </template>
-      </el-table-column>
       <el-table-column label="健康评估" align="center">
         <template slot-scope="scope">
           <el-button
@@ -226,9 +226,9 @@
     <!-- 添加或修改客户档案对话框 -->
     <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-form ref="form" :model="form" :rules="rules" label-width="100px">
           <el-col :span="12">
-            <el-form-item label="名字" prop="name">
+            <el-form-item label="客户名字" prop="customer">
               <el-input v-model="form.name" placeholder="请输入名字" />
             </el-form-item>
           </el-col>
@@ -237,6 +237,30 @@
               <el-input v-model="form.phone" placeholder="请输入手机号" />
             </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-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="mainDietitian">
               <el-select v-model="form.mainDietitian" placeholder="请选择">
@@ -262,27 +286,16 @@
             </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 label="进粉时间" prop="fansTime">
+              <el-date-picker
+                v-model="form.fansTime"
+                type="date"
+                placeholder="选择进粉时间"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+                :picker-options="fanPickerOptions"
+              >
+              </el-date-picker>
             </el-form-item>
           </el-col>
         </el-form>
@@ -293,7 +306,11 @@
       </div>
     </el-dialog>
 
+    <!-- 订单抽屉 -->
     <order-drawer ref="cusOrderDrawerRef" />
+    <!-- 合同抽屉 -->
+    <!-- 健康评估弹窗 -->
+    <!-- 食谱计划抽屉 -->
   </div>
 </template>
 
@@ -306,10 +323,11 @@ import {
   listCustomer,
   updateCustomer,
 } from "@/api/custom/customer";
+import store from "@/store";
 
 import { getOptions } from "@/api/custom/order";
 
-import OrderDrawer from "./orderDrawer";
+import OrderDrawer from "@/components/OrderDrawer";
 
 export default {
   name: "Customer",
@@ -317,7 +335,9 @@ export default {
     "order-drawer": OrderDrawer,
   },
   data() {
+    const userId = store.getters && store.getters.userId;
     return {
+      userId,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -358,7 +378,40 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        customer: [
+          { required: true, message: "客户姓名不能为空", trigger: "blur" },
+        ],
+        phone: [
+          { required: true, message: "手机号不能为空", trigger: "blur" },
+          {
+            required: true,
+            trigger: "blur",
+            pattern: /^[0-9]{5,11}$/,
+            message: "手机号格式不正确",
+          },
+        ],
+        salesman: [
+          { required: true, message: "售前不能为空", trigger: "blur" },
+        ],
+        afterDietitian: [
+          { required: true, message: "售后不能为空", trigger: "blur" },
+        ],
+        mainDietitian: [
+          { required: true, message: "主营养师不能为空", trigger: "blur" },
+        ],
+        assistantDietitian: [
+          { required: true, message: "营养师助理不能为空", trigger: "blur" },
+        ],
+        fansTime: [
+          { required: true, message: "进粉时间不能为空", trigger: "blur" },
+        ],
+      },
+      fanPickerOptions: {
+        disabledDate(time) {
+          return time.getTime() > Date.now();
+        },
+      },
     };
   },
   created() {
@@ -482,6 +535,12 @@ export default {
       this.reset();
       this.open = true;
       this.title = "添加客户档案";
+
+      // 选择默认销售
+      const tarSale = this.preSaleIdOptions.find(
+        (obj) => parseInt(obj.dictValue) === this.userId
+      );
+      this.form.salesman = tarSale ? tarSale.dictValue : null;
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
diff --git a/stdiet-ui/src/views/custom/order/index.vue b/stdiet-ui/src/views/custom/order/index.vue
index 6a848ba13..398d8fdff 100644
--- a/stdiet-ui/src/views/custom/order/index.vue
+++ b/stdiet-ui/src/views/custom/order/index.vue
@@ -8,17 +8,6 @@
         v-show="showSearch"
         label-width="70px"
       >
-        <!--<el-col :span="6">
-          <el-form-item label="手机号" prop="phone">
-            <el-input
-              v-model="queryParams.phone"
-              placeholder="请输入手机号"
-              clearable
-              size="small"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-        </el-col>-->
         <el-col :span="6">
           <el-form-item label="客户信息" prop="customer">
             <el-input
@@ -48,7 +37,41 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="售前" prop="preSaleId">
+          <el-form-item label="收款账号" prop="accountId">
+            <el-select
+              v-model="queryParams.accountId"
+              placeholder="请选择账号"
+              clearable
+              size="small"
+            >
+              <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="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>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="销售" prop="preSaleId">
             <el-select
               v-model="queryParams.preSaleId"
               placeholder="请选择售前"
@@ -100,13 +123,13 @@
         </el-col>
         <el-col :span="6">
           <el-form-item
-            label="助理营养师"
+            label="营养师助理"
             prop="nutriAssisId"
             label-width="90px"
           >
             <el-select
               v-model="queryParams.nutriAssisId"
-              placeholder="请选择助理营养师"
+              placeholder="请选择营养师助理"
               clearable
               style="width: 170px"
               size="small"
@@ -120,23 +143,6 @@
             </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-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="6">
           <el-form-item label="策划" prop="plannerId">
             <el-select
@@ -205,23 +211,6 @@
             </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>
-          </el-form-item>
-        </el-col>
         <el-col :span="6">
           <el-form-item label="服务时长" prop="serveTimeId">
             <el-select
@@ -285,7 +274,7 @@
     </el-row>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="primary"
           icon="el-icon-plus"
@@ -294,7 +283,7 @@
           v-hasPermi="['custom:order:add']"
           >新增
         </el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -311,46 +300,8 @@
       ></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"
-      >
-        <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"
-                ? "进行中"
-                : "已暂停"
-            }}
-          </el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="审核状态"
-        align="center"
-        prop="reviewStatus"
-        width="80"
-        fixed="left"
-      >
+    <el-table v-loading="loading" :data="orderList">
+      <el-table-column label="审核状态" align="center" prop="reviewStatus">
         <template slot-scope="scope">
           <el-tag
             :type="scope.row.reviewStatus === 'yes' ? 'success' : 'danger'"
@@ -364,8 +315,7 @@
         label="成交时间"
         align="center"
         prop="orderTime"
-        width="180"
-        fixed="left"
+        width="160"
       >
         <template slot-scope="scope">
           <span>{{
@@ -373,152 +323,45 @@
           }}</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" />
+      <el-table-column label="手机号" align="center" prop="phone" width="100" />
+      <el-table-column label="成交金额" align="center" prop="amount">
         <template slot-scope="scope">
           {{ toThousands(scope.row.amount) }}
         </template>
       </el-table-column>
-      <el-table-column label="体重" align="center" prop="weight" width="80">
+      <el-table-column label="收款账号" align="center" prop="account" width="90" />
+      <el-table-column label="服务时长" align="center" prop="serveTime" />
+      <el-table-column label="销售" align="center" prop="preSale" />
+      <el-table-column label="售后" align="center" prop="afterSale" />
+      <el-table-column label="主营养师" align="center" prop="nutritionist" />
+      <el-table-column label="营养师助理" align="center" prop="nutriAssis" />
+      <el-table-column label="策划" align="center" prop="planner" />
+      <el-table-column label="策划助理" align="center" prop="plannerAssis" />
+      <el-table-column label="运营" align="center" prop="operator" />
+      <el-table-column label="运营助理" align="center" prop="operatorAssis" />
+      <el-table-column label="备注" align="center" prop="remark">
         <template slot-scope="scope">
-          {{ scope.row.weight ? `${scope.row.weight}斤` : "" }}
+          <auto-hide-message
+            :data="scope.row.remark == null ? '' : scope.row.remark + ''"
+            :maxLength="20"
+          />
         </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"
-      >
-        <template slot-scope="scope">
-          {{ 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"
-      >
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.becomeFanTime, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="开始时间"
-        align="center"
-        prop="startTime"
-        width="120"
-      >
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.startTime, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="结束时间"
-        align="center"
-        prop="serverEndTime"
-        width="120"
-      >
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.serverEndTime, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="服务天数"
-        align="center"
-        prop="serverDay"
-        width="80"
-      >
-        <template slot-scope="scope">
-          {{ 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"
+        width="160px"
       >
         <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-tickets"
+            @click="handleDetail(scope.row)"
+            >详情</el-button
+          >
           <el-button
             size="mini"
             type="text"
@@ -527,14 +370,14 @@
             v-hasPermi="['custom:order:edit']"
             >修改
           </el-button>
-          <el-button
+          <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-s-data"
             @click="orderPauseManage(scope.row)"
             v-hasPermi="['orderPause:pause:query']"
             >暂停记录管理
-          </el-button>
+          </el-button> -->
           <el-button
             size="mini"
             type="text"
@@ -576,334 +419,45 @@
       <orderPause v-bind:orderPauseId="orderPauseId"></orderPause>
     </el-dialog>
 
-    <!-- 添加或修改销售订单对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="720px" append-to-body>
-      <el-row :gutter="15">
-        <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-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-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="电话" prop="phone">
-              <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-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="8" v-hasPermi="['custom:order:review']">
-            <el-form-item label="审核状态" prop="reviewStatus">
-              <el-select
-                v-model="form.reviewStatus"
-                placeholder="请选择审核状态"
-                @change="handleOnRviewChange"
-              >
-                <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="12">
-            <el-form-item label="进粉时间" prop="becomeFanTime">
-              <el-date-picker
-                style="width: 182.5px"
-                v-model="form.becomeFanTime"
-                type="date"
-                placeholder="选择进粉时间"
-                format="yyyy-MM-dd"
-                value-format="yyyy-MM-dd"
-                :picker-options="fanPickerOptions"
-              >
-              </el-date-picker>
-            </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">
-              <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>
-            <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>
+    <!-- 订单详情 -->
+    <order-detail ref="orderDetailRef" />
+    <!-- 订单修改 -->
+    <order-edit ref="orderEditRef" />
   </div>
 </template>
 
 <script>
 import {
-  addOrder,
   delOrder,
   exportOrder,
   getOptions,
-  getOrder,
   listOrder,
-  updateOrder,
 } from "@/api/custom/order";
 import dayjs from "dayjs";
 import orderPause from "./orderPause";
 
+import OrderDetail from "@/components/OrderDetail";
+import OrderEdit from "@/components/OrderEdit";
+import AutoHideMessage from "@/components/AutoHideMessage";
+
 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",
+  components: {
+    orderPause,
+    "auto-hide-message": AutoHideMessage,
+    "order-detail": OrderDetail,
+    "order-edit": OrderEdit,
+  },
   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();
-    };
     return {
       // 遮罩层
       loading: true,
       // 选中数组
       ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
       // 显示搜索条件
       showSearch: false,
       // 总条数
@@ -912,8 +466,6 @@ export default {
       orderList: [],
       // 弹出层标题
       title: "",
-      // 是否显示弹出层
-      open: false,
       // 是否显示暂停记录弹窗
       openPause: false,
       pauseTitle: "暂停记录",
@@ -921,8 +473,6 @@ export default {
       //
       totalAmount: 0,
       //
-      review: "no",
-      //
       daterange: [beginTime, endTime],
       // 收款方式字典
       payTypeIdOptions: [],
@@ -940,8 +490,6 @@ export default {
       accountIdOptions: [],
       // 服务时长
       serveTimeIdOption: [],
-      // 赠送时长
-      giveTimeIdOption: [],
       //调理项目
       conditioningProjectIdOption: [],
       // 审核状态
@@ -952,8 +500,6 @@ export default {
       operatorIdOptions: [],
       //
       operatorAssisIdOptions: [],
-      //下拉列表对应关系(用于选择收款账号自动选择策划、策划助理、运营、运营助理)
-      orderDropdownCorrespondingOptions: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -975,109 +521,16 @@ export default {
         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: "最近一周",
-            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();
-        },
-      },
     };
   },
-  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 },
+            // { dictValue: 0, dictLabel: "无", remark: null },
           ];
         }
         opts[cur.postCode].push({
@@ -1100,28 +553,17 @@ export default {
       this.payTypeIdOptions = response.data;
     });
     this.getDicts("cus_account").then((response) => {
-      response.data.splice(0, 0, {
-        dictValue: 0,
-        dictLabel: "无",
-        remark: null,
-      });
       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: {
     /** 查询销售订单列表 */
@@ -1184,103 +626,8 @@ export default {
         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,
-        accountId: defaultAccount ? parseInt(defaultAccount.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"),
-      };
-      this.resetForm("form");
+    handleDetail(data) {
+      this.$refs.orderDetailRef.showDialog(data.orderId);
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -1293,57 +640,15 @@ export default {
       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;
-      this.form.accountId = "no";
-      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 = "修改销售订单";
-      });
-    },
-    /** 提交按钮 */
-    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.$refs.orderEditRef.showDialog(row, () => {
+        this.getList();
       });
     },
     /** 删除按钮操作 */
@@ -1383,9 +688,6 @@ export default {
         })
         .catch(function () {});
     },
-    handleOnRviewChange(val) {
-      this.review = val;
-    },
     handleStatusClick(data) {
       console.log(data);
     },
@@ -1396,55 +698,8 @@ export default {
       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
-        );
-        if (planningAndOperationValue) {
-          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;
-        } else {
-          this.form.plannerId = 0;
-          this.form.plannerAssisId = 0;
-          this.form.operatorId = 0;
-          this.form.operatorAssisId = 0;
-        }
-      }
-    },
-  },
-  watch: {
-    // 监听收款账号的变化
-    "form.accountId": function (newVal, oldVal) {
-      if (oldVal != "no" && newVal != "no") {
-        this.initPlanningAndOperation();
-      }
-    },
   },
+  watch: {},
 };
 </script>
 
diff --git a/stdiet-ui/src/views/custom/recipesPlan/index.vue b/stdiet-ui/src/views/custom/recipesPlan/index.vue
index 77eea16d0..39505df61 100644
--- a/stdiet-ui/src/views/custom/recipesPlan/index.vue
+++ b/stdiet-ui/src/views/custom/recipesPlan/index.vue
@@ -227,8 +227,8 @@
 <script>
   import {exportRecipesPlan, getRecipesPlan, listRecipesPlan, updateRecipesPlan} from "@/api/custom/recipesPlan";
   import {getOptions} from "@/api/custom/order";
-  import OrderDialog from './orderDialog';
-  import BodySignDialog from './bodySignDialog';
+  import OrderDetail from '@/components/OrderDetail';
+  import BodySignDetail from '@/components/BodySignDetail';
   import dayjs from 'dayjs';
   import store from "@/store";
 
@@ -295,8 +295,8 @@
 
     },
     components: {
-      "order-dialog": OrderDialog,
-      "body_sign_dialog": BodySignDialog
+      "order-dialog": OrderDetail,
+      "body_sign_dialog": BodySignDetail
     },
     created() {
       getOptions().then(response => {
diff --git a/stdiet-ui/src/views/custom/recipesPlan/orderDialog.vue b/stdiet-ui/src/views/custom/recipesPlan/orderDialog.vue
deleted file mode 100644
index c7eae4e71..000000000
--- a/stdiet-ui/src/views/custom/recipesPlan/orderDialog.vue
+++ /dev/null
@@ -1,110 +0,0 @@
-<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>