参观活动订单

src/views/active/activity.vue

@@ -456,6 +456,8 @@
           let result = Object.assign(that.form, res);
           that.form = result;
           that.form.end_time = result.end_time.substring(11,result.end_time.length);
+          result.cover_upload.coverType = "cover";
+          that.coverlist.push(result.cover_upload);
           let _files = [];
           for (var mod of result.banners) {
             let m = Object.assign({}, mod);
@@ -464,8 +466,6 @@
             m.coverType = "poster";
             _files.push(m);
           }
-          result.cover_upload.coverType = "cover";
-          that.coverlist.push(result.cover_upload);
           that.bannersList = _files;
           this.$refs.tiny.setContent(result.content);
         }).catch(error => {

src/views/order/activeorder.vue

@@ -27,6 +27,13 @@
                 <div v-if="item.id==scope.row[column.field]">
                   {{item.value}}
                 </div>
+              </div>
+              <div v-else-if="column.type=='status'" v-for="item in parameters.status_list">
+                <div v-if="item.id==scope.row[column.field]">
+                  <el-tag v-if="scope.row[column.field]==1" type="warning">{{item.value}}</el-tag>
+                  <el-tag v-if="scope.row[column.field]==2" type="success">{{item.value}}</el-tag>
+                  <el-tag v-if="scope.row[column.field]==0" type="info">{{item.value}}</el-tag>
+                </div>
               </div>
               <div v-else>{{scope.row[column.field]}}</div>
             </template>
@@ -56,13 +63,12 @@
                  {{form.mobile}}
                </div>
              </el-form-item>
-             <div v-if="form.type==1">
-                <el-form-item label="单位名称" prop="unit">
+                <el-form-item v-if="form.type==1" label="单位名称" prop="unit">
                   <div>
                     {{form.unit}}
                   </div>
                 </el-form-item>
-                <el-form-item label="领队人" prop="leader">
+                <el-form-item label="联系人" prop="leader">
                   <div>
                     {{form.leader}}
                   </div>
@@ -80,7 +86,7 @@
                     {{form.idcard}}
                   </div>
                 </el-form-item>
-                <el-form-item label="总人数" prop="total">
+                <el-form-item label="参与人数" prop="total">
                   <div>
                     {{form.total}}
                   </div>
@@ -120,8 +126,6 @@
                     </el-table-column>
                   </el-table>
                 </div>
-
-             </div>
            </el-form>
          </el-scrollbar>
        </div>
@@ -160,8 +164,19 @@
           },{
             id:2,
             value:"护照"
+          }],
+          status_list:[{
+          	value: '待参加',
+          	id: "1"
+          }, {
+          	value: '已参加',
+          	id: "2"
+          }, {
+          	value: '取消预约',
+          	id: "0"
           }]
         },
+
         tableHeight: 0,
         clientHeight:0,
         //查询条件字段
@@ -187,15 +202,34 @@
           details_list: []
         },
         columns: [
+          {
+            field: "leader",
+            title: "联系人",
+            type: "string",
+            align:"center"
+          },
+          {
+            field: "mobile",
+            title: "联系电话",
+            type: "string",
+            align:"center"
+          },
           {
             field: "type",
             title: "类型",
             type: "type",
+            align:"center"
+          },
+          {
+            field: "status",
+            title: "订单状态",
+            type: "status",
+            align:"center"
           },
           {
             field: "操作",
             title: "操作",
-            width: 220,
+            width: 120,
             type: "opt",
           }
         ]
@@ -250,7 +284,7 @@
         get(obj.id).then(res => {
           let result = Object.assign(that.form, res);
           that.form = result;
-          that.for.details_list = result.details;
+          that.form.details_list = result.details;
         }).catch(error => {
           //reject(error)
         })

src/views/order/visitorder.vue

@@ -30,6 +30,13 @@
                 <div v-if="item.id==scope.row[column.field]">
                   {{item.value}}
                 </div>
+              </div>
+              <div v-else-if="column.type=='status'" v-for="item in parameters.status_list">
+                <div v-if="item.id==scope.row[column.field]">
+                  <el-tag v-if="scope.row[column.field]==1" type="warning">{{item.value}}</el-tag>
+                  <el-tag v-if="scope.row[column.field]==2" type="success">{{item.value}}</el-tag>
+                  <el-tag v-if="scope.row[column.field]==0" type="info">{{item.value}}</el-tag>
+                </div>
               </div>
               <div v-else>{{scope.row[column.field]}}</div>
             </template>
@@ -64,8 +71,7 @@
                  {{form.mobile}}
                </div>
              </el-form-item>
-             <div v-if="form.type==1">
-                <el-form-item label="单位名称" prop="unit">
+                <el-form-item v-if="form.type==1" label="单位名称" prop="unit">
                   <div>
                     {{form.unit}}
                   </div>
@@ -88,7 +94,7 @@
                     {{form.idcard}}
                   </div>
                 </el-form-item>
-                <el-form-item label="总人数" prop="total">
+                <el-form-item label="参观人数" prop="total">
                   <div>
                     {{form.total}}
                   </div>
@@ -128,8 +134,6 @@
                     </el-table-column>
                   </el-table>
                 </div>
-
-             </div>
            </el-form>
          </el-scrollbar>
        </div>
@@ -168,6 +172,16 @@
           },{
             id:2,
             value:"护照"
+          }],
+          status_list:[{
+          	value: '待参观',
+          	id: "1"
+          }, {
+          	value: '已参观',
+          	id: "2"
+          }, {
+          	value: '取消预约',
+          	id: "0"
           }]
         },
         tableHeight: 0,
@@ -199,16 +213,35 @@
             title: "预约日期",
             type: "date",
           },
+          {
+            field: "leader",
+            title: "联系人",
+            type: "string",
+            align:"center"
+          },
+          {
+            field: "mobile",
+            title: "联系电话",
+            type: "string",
+            align:"center"
+          },
           {
             field: "type",
             title: "类型",
             type: "type",
-          },
-          {
-            field: "操作",
-            title: "操作",
-            width: 220,
-            type: "opt",
+            align:"center"
+          },
+          {
+            field: "status",
+            title: "订单状态",
+            type: "status",
+            align:"center"
+          },
+          {
+            field: "操作",
+            title: "操作",
+            width: 120,
+            type: "opt",
           }
         ]
 
@@ -252,7 +285,7 @@
         get(obj.id).then(res => {
           let result = Object.assign(that.form, res);
           that.form = result;
-          that.for.details_list = result.details;
+          that.form.details_list = result.details;
         }).catch(error => {
           //reject(error)
         })