up

src/views/order/parkorder.vue

@@ -18,13 +18,13 @@
                 </el-option>
                 <el-option v-for="item in parameters.parkType" :key="item.id" :label="item.value" :value="item.id">
                 </el-option>
-              </el-select>
+              </el-select>
 
               <el-select style="margin-right: 10px;width: 120px;" v-model="searchFields.status" placeholder="请选择状态">
                 <el-option value="">
-                </el-option>
+                </el-option>
 
-                <el-option v-for="(item,key) in parameters.status_list" :key="key" :label="item" :value="key">
+                <el-option v-for="(item,key) in parameters.status_list" :key="key" :label="item" :value="key">
                   {{item}}
                 </el-option>
               </el-select>
@@ -45,24 +45,18 @@
               </div>
               <div v-else-if="column.type=='type'">
                 <div v-if="scope.row[column.field]==1">小车位</div>
-                <div v-if="scope.row[column.field]==2">大车位</div>
+                <div v-if="scope.row[column.field]==2">大车位(09:00-12:00)</div>
                 <div v-if="scope.row[column.field]==3">残疾人车位</div>
+                <div v-if="scope.row[column.field]==4">大车位(13:00-16:00)</div>
               </div>
 
               <div v-else-if="column.type=='format'">
-                <div v-if="column.field=='orderType'">
+
-                  {{scope.row["visit_order"]?"参观预约":"活动预约"}}
+                <div v-if="column.field=='status'">
-                </div>
-                <div v-if="column.field=='teamType'">
-                  {{scope.row["visit_order"].type=="1"?"团队":"个人"}}
-                </div>
-                <div v-if="column.field=='teamunit'">
-                  {{scope.row["visit_order"].unit?scope.row["visit_order"].unit:"无"}}
-                </div>
-                <div v-else-if="column.field=='status'">
                   <el-tag
                     :type="(scope.row[column.field]=='2'?'success':(scope.row[column.field]=='1'?'warning':'info'))">
-                    {{parameters.status_list[scope.row[column.field]]}}</el-tag>
+                    {{parameters.status_list[scope.row[column.field]]}}
+                  </el-tag>
                 </div>
               </div>
               <div v-else>
@@ -102,7 +96,10 @@
                 小车位
               </div>
               <div v-if="form.type==2">
-                大车位
+                大车位(09:00-12:00)
+              </div>
+              <div v-if="form.type==4">
+                大车位(13:00-16:00)
               </div>
               <div v-if="form.type==3">
                 残疾人车位
@@ -147,11 +144,14 @@
             value: "小车位"
           }, {
             id: 2,
-            value: "大车位"
+            value: "大车位(09:00-12:00)"
           }, {
             id: 3,
             value: "残疾人车位"
-          }],
+          }, {
+            id: 4,
+            value: "大车位(13:00-16:00)"
+          }, ],
           carType: [{
             id: 1,
             value: "普通车"
@@ -192,7 +192,7 @@
             field: "time",
             title: "预约时间",
             type: "string",
-            width: 220,
+            width: 220,
 
           },
           {
@@ -205,7 +205,7 @@
             field: "type",
             title: "车位类型",
             type: "type",
-            width: 120,
+            width: 200,
           },
           {
             field: "mobile",
@@ -216,12 +216,12 @@
           {
             field: "orderType",
             title: "关联类型",
-            type: "format",
+            width: 80,
           },
           {
             field: "teamType",
             title: "类型",
-            type: "format",
+            width: 80,
           },
           {
             field: "in_date",
@@ -238,12 +238,13 @@
           {
             field: "teamunit",
             title: "团队名称",
-            type: "format",
           },
           {
             field: "status",
             title: "状态",
             type: "format",
+            width: 120,
+            fixed: "right"
           },
           {
             field: "操作",
@@ -283,6 +284,16 @@
           car_park_id: carId,
           ...this.searchFields
         }).then(res => {
+          for (var m of res.data) {
+            m.orderType = m.visit_order ? "参观预约" : "活动预约";
+            if (m.visit_order) {
+              m.teamunit = m.visit_order.unit ? m.visit_order.unit : "无";
+              m.teamType = m.visit_order.type == 1 ? "团队" : "个人";
+            } else {
+              m.teamunit = m.activity_order.unit ? m.activity_order.unit : "无";
+              m.teamType = m.activity_order.type == 1 ? "团队" : "个人";
+            }
+          }
           this.tableData = res.data;
           this.paginations.total = res.total
         }).catch(error => {