订单

src/views/cookbook.vue

@@ -65,13 +65,16 @@
               prop="stock"
               align="center"
               label="库存数量">
+              <template slot-scope="scope">
+                <span>{{scope.row.stock != 'null' ? scope.row.stock : ''}}</span>
+              </template>
             </el-table-column>
             <el-table-column
               prop="amount"
               align="center"
               label="单价">
               <template slot-scope="scope">
-                <span>{{scope.row.amount ? scope.row.amount : ''}}</span>
+                <span>{{scope.row.amount != 'null' ? scope.row.amount : ''}}</span>
               </template>
             </el-table-column>
             <el-table-column

src/views/orderList/OrderDetail.vue

@@ -5,7 +5,7 @@
         <el-breadcrumb-item>您当前的位置为：</el-breadcrumb-item>
         <el-breadcrumb-item>菜单管理</el-breadcrumb-item>
         <el-breadcrumb-item>订单管理</el-breadcrumb-item>
-        <el-breadcrumb-item :to="{ path: '/tab/orderDetail' }">{{renderType}}订单信息</el-breadcrumb-item>
+        <el-breadcrumb-item>订单信息</el-breadcrumb-item>
       </el-breadcrumb>
     </div>
     <el-card class="box-card no-margin-card">
@@ -20,23 +20,61 @@
             <el-col :span="3" class="align-right padding-right10">下单时间：</el-col>
             <el-col :span="5">{{orderObg.createDate}}</el-col>
           </el-row>
-          <el-row>
+          <el-row v-if="orderObg.type == 'CSSM'">
+            <el-col :span="3" class="align-right padding-right10">预约厨师：</el-col>
+            <el-col :span="5">{{orderObg.cook.name}}</el-col>
+            <el-col :span="3" class="align-right padding-right10">厨师电话：</el-col>
+            <el-col :span="5">{{orderObg.cook.phone}}</el-col>
+          </el-row>
+          <el-row v-if="orderObg.type != 'WM' && orderObg.type != 'CS'">
+            <el-col :span="3" class="align-right padding-right10">联系人：</el-col>
+            <el-col :span="5">{{orderObg.contactsName}}</el-col>
+            <el-col :span="3" class="align-right padding-right10">联系电话：</el-col>
+            <el-col :span="5">{{orderObg.contactsPhone}}</el-col>
+          </el-row>
+          <el-row v-if="orderObg.type == 'CSSM'">
+            <el-col :span="3" class="align-right padding-right10">拿手菜：</el-col>
+            <el-col :span="5">{{orderObg.cook.food}}</el-col>
+            <el-col :span="3" class="align-right padding-right10">服务类型：</el-col>
+            <el-col :span="5">{{orderObg.cook.eatType}}</el-col>
+          </el-row>
+          <el-row v-if="orderObg.type == 'CSSM'">
+            <el-col :span="3" class="align-right padding-right10">用餐人数：</el-col>
+            <el-col :span="5">{{orderObg.cook.num}}</el-col>
+            <el-col :span="3" class="align-right padding-right10">状态：</el-col>
+            <el-col :span="5">{{renderStatus(orderObg.status)}}</el-col>
+          </el-row>
+          <el-row v-if="orderObg.type == 'CSSM'">
+            <el-col :span="3" class="align-right padding-right10">预约时间：</el-col>
+            <el-col :span="5">{{orderObg.cook.goDate}}</el-col>
+            <el-col :span="3" class="align-right padding-right10">服务地址：</el-col>
+            <el-col :span="5">{{orderObg.cook.address}}</el-col>
+          </el-row>
+          <el-row v-if="orderObg.type == 'CSSM'">
+            <el-col :span="3" class="align-right padding-right10">备注：</el-col>
+            <el-col :span="5">{{orderObg.cook.message}}</el-col>
+          </el-row>
+          <el-row v-if="orderObg.type == 'WX' || orderObg.type == 'BJ'">
+            <el-col :span="5" class="align-right">{{orderObg.type == 'WX' ? '维修事项' : '保洁内容'}}(简要描述): </el-col>
+            <el-col :span="15" :offset="1">{{orderObg.message}}</el-col>
+          </el-row>
+          <el-row v-if="orderObg.type == 'WM'">
             <el-col :span="3" class="align-right padding-right10">工号：</el-col>
             <el-col :span="5">{{orderObg.userNo}}</el-col>
             <el-col :span="3" class="align-right padding-right10">姓名：</el-col>
             <el-col :span="5">{{orderObg.userName}}</el-col>
           </el-row>
-          <el-row>
+          <el-row v-if="orderObg.type == 'WM'">
             <el-col :span="3" class="align-right padding-right10">取餐时间：</el-col>
-            <el-col :span="5">{{orderObg.takeDate}}</el-col>
+            <el-col :span="5">次日16:50 ~ 17:30(周末除外)</el-col>
             <el-col :span="3" class="align-right padding-right10">支付方式：</el-col>
             <el-col :span="5">{{orderObg.payType}}</el-col>
           </el-row>
-          <el-row>
+          <el-row v-if="orderObg.type == 'WM'">
             <el-col :span="3" class="align-right padding-right10">状态：</el-col>
             <el-col :span="5">{{renderStatus(orderObg.status)}}</el-col>
           </el-row>
-          <el-row>
+          <el-row v-if="orderObg.type == 'WM'">
             <el-col :span="3" class="align-right padding-right10"><span>餐品及数量：</span></el-col>
             <el-col :span="10">
               <el-table
@@ -90,31 +128,6 @@ export default {
     }
   },
   created () {
-//     amount: "90"
-// contactsName: null
-// contactsPhone: null
-// cook: null
-// createDate: "2019-07-02 11:46:59"
-
-// amount: "30"
-// foodName: "酱鸡腿"
-// imgUrl: "f21467425ac64f45a97375809d5275cf.png"
-// num: "1"
-// tradeId: "20190702114659"
-
-// detail: [{tradeId: "20190702114659", foodName: "酱鸡腿", num: "1", amount: "30",…}]
-// id: 166
-// message: null
-// num: "3"
-// operatorName: null
-// payType: "线下"
-// status: "DQR"
-// takeDate: null
-// tradeNo: "20190702114659"
-// type: "WM"
-// updateDate: null
-// userName: ""
-// userNo: ""
     this.getDetail()
   },
   methods: {

src/views/orderList/OrderList.vue

@@ -130,12 +130,12 @@
     <el-dialog
     title="订单统计"
     :visible.sync="dialogVisible"
-    width="50%">
+    width="60%">
       <el-row>
         <div class="order-list">
           <el-card class="box-card no-margin-card margin-bottom20">
             <el-form :inline="true" :model="formInline" class="demo-form-inline">
-              <el-col :sm="10">
+              <el-col :sm="12" style="margin-bottom: 10px;">
                 <el-form-item label="下单时间">
                   <el-col :sm="11">
                     <el-form-item prop="date1">
@@ -156,13 +156,15 @@
                 <el-form-item label="类型" style="margin-left: 30px">
                   <el-select v-model="formInline.type">
                     <el-option label="全部" value="全部"></el-option>
-                    <el-option label="外卖" value="外卖"></el-option>
+                    <el-option label="外卖" value="WM"></el-option>
+                    <el-option label="家政" value=""></el-option>
+                    <el-option label="超市" value="CS"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :sm="2">
                 <el-form-item>
-                  <el-button type="primary" @click="searchList" size="small">搜索</el-button>
+                  <el-button class="searchButton" type="primary" @click="searchList" size="small">搜索</el-button>
                 </el-form-item>
               </el-col>
             </el-form>
@@ -182,19 +184,19 @@
                   type="index"
                   label="序号"
                   align="center"
-                  width="180">
+                  >
                 </el-table-column>
                 <el-table-column
                   prop="tradeNo"
                   label="名称"
                   align="center"
-                  width="180">
+                  >
                 </el-table-column>
                 <el-table-column
                   prop="userNo"
                   label="数量"
                   align="center"
-                  width="240">
+                  >
                 </el-table-column>
               </el-table>
             </div>