up

src/views/order/parkorder.vue

@@ -7,7 +7,18 @@
           <div slot="content"></div>
           <slot>
             <div>
-              <Input style="width: 200px; margin-right: 10px" v-model="searchFields.name" placeholder="关键字搜索" />
+              <el-input style="width: 200px;" v-model="searchFields.keyword" placeholder="关键字搜索" />
+
+              <el-date-picker v-model="searchFields.date" value-format="yyyy-MM-dd" type="date" placeholder="预约日期"
+                style="margin-left: 10px;">
+              </el-date-picker>
+
+              <el-select style="margin-left: 10px;" v-model="searchFields.type" placeholder="请选择类型">
+                <el-option value="">
+                </el-option>
+                <el-option v-for="item in parameters.parkType" :key="item.id" :label="item.value" :value="item.id">
+                </el-option>
+              </el-select>
               <Button type="primary" @click="load" style="margin-left: 10px">查询</Button>
             </div>
           </slot>
@@ -28,7 +39,23 @@
                 <div v-if="scope.row[column.field]==2">大车位</div>
                 <div v-if="scope.row[column.field]==3">残疾人车位</div>
               </div>
-              <div v-else>{{scope.row[column.field]}}</div>
+
+              <div v-else-if="column.type=='format'">
+                <div v-if="column.field=='orderType'">
+                  {{scope.row["visit_order"]?"参观预约":"活动预约"}}
+                </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>
+
+
+              <div v-else>
+                {{scope.row[column.field]}}
+              </div>
             </template>
           </el-table-column>
         </el-table>
@@ -109,6 +136,9 @@
           }, {
             id: 2,
             value: "大车位"
+          }, {
+            id: 3,
+            value: "残疾人车位"
           }],
           carType: [{
             id: 1,
@@ -122,7 +152,9 @@
         clientHeight: 0,
         //查询条件字段
         searchFields: {
-          name: ""
+          keyword: "",
+          date: "",
+          type: ""
         },
         tableData: [],
         paginations: {
@@ -158,11 +190,27 @@
             title: "联系方式",
             type: "string",
           },
+          {
+            field: "orderType",
+            title: "关联类型",
+            type: "format",
+          },
+          {
+            field: "teamType",
+            title: "类型",
+            type: "format",
+          },
+          {
+            field: "teamunit",
+            title: "团队名称",
+            type: "format",
+          },
           {
             field: "操作",
             title: "操作",
             width: 220,
             type: "opt",
+            fixed: "right"
           }
         ]
 
@@ -192,7 +240,8 @@
         listparkorder({
           page: this.paginations.page,
           page_size: this.paginations.page_size,
-          car_park_id: carId
+          car_park_id: carId,
+          ...this.searchFields
         }).then(res => {
           this.tableData = res.data;
           this.paginations.total = res.total
@@ -200,9 +249,6 @@
 
         })
 
-
-
-
       },
       show(obj) {
         this.clientHeight = document.documentElement.clientHeight - 84 - 110;

src/views/order/visitor.vue

@@ -7,27 +7,21 @@
           <div slot="content"></div>
           <slot>
             <div>
-              <el-date-picker
+              <el-date-picker class="vm10" v-model="visitRange" value-format="yyyy-MM-dd" type="daterange"
-              class="vm10"
+                range-separator="至" start-placeholder="参观开始时间" end-placeholder="参观结束时间">
-                    v-model="visitRange"
-                    value-format="yyyy-MM-dd"
-                    type="daterange"
-                    range-separator="至"
-                    start-placeholder="参观开始时间"
-                    end-placeholder="参观结束时间">
               </el-date-picker>
-              <el-date-picker
+              <el-select style="margin-left: 10px;margin-right: 10px;" v-model="searchFields.time" placeholder="预约时段">
-                    class="vm10"
+                <el-option value="">
-                    v-model="orderRange"
+                </el-option>
-                    value-format="yyyy-MM-dd"
+                <el-option v-for="item in parameters.visittime" :key="item.id" :label="item.value" :value="item.value">
-                    type="daterange"
+                </el-option>
-                    range-separator="至"
+
-                    start-placeholder="订单开始时间"
+              </el-select>
-                    end-placeholder="订单结束时间">
+              <el-date-picker class="vm10" v-model="orderRange" value-format="yyyy-MM-dd" type="daterange"
+                range-separator="至" start-placeholder="订单开始时间" end-placeholder="订单结束时间">
               </el-date-picker>
               <el-select class="vm10 vm15" v-model="searchFields.type" placeholder="请选择类型">
-                <el-option v-for="item in parameters.type_list" :key="item.id" :label="item.value"
+                <el-option v-for="item in parameters.type_list" :key="item.id" :label="item.value" :value="item.id">
-                  :value="item.id">
                 </el-option>
               </el-select>
               <Input class="inputwrap" v-model="searchFields.keyword" placeholder="请输入关键词" />
@@ -87,6 +81,31 @@
     data() {
       return {
         parameters: {
+          visittime: [{
+            value: "09:00-10:00",
+            id: "1"
+          }, {
+            value: "10:00-11:00",
+            id: "2"
+          }, {
+            value: "11:00-12:00",
+            id: "3"
+          }, {
+            value: "12:00-13:00",
+            id: "4"
+          }, {
+            value: "13:00-14:00",
+            id: "41"
+          }, {
+            value: "14:00-15:00",
+            id: "51"
+          }, {
+            value: "15:00-16:00",
+            id: "61"
+          }, {
+            value: "16:00-17:00",
+            id: "71"
+          }],
           type_list: [{
             value: '团体',
             id: "1"
@@ -123,7 +142,8 @@
           order_end_date: "",
           is_export: 0,
           type: "",
-          unit:""
+          unit: "",
+          time: ""
         },
         tableData: [],
         paginations: {
@@ -220,32 +240,38 @@
         var topHeight = 50; //页面 头部
         let tableHeight = clientHeight - lxHeader_height - topHeight - paginationHeight - 20;
         that.tableHeight = tableHeight;
-        that.tokens = getToken()
+        that.baseurl = location.host; //process.env.VUE_APP_BASE_API
-        that.baseurl = process.env.VUE_APP_BASE_API
         console.log("aa", process.env)
       },
-      load() {
+      load(is_export) {
+        console.log(is_export)
         var that = this;
         listvisitor({
           page: this.paginations.page,
           page_size: this.paginations.page_size,
           keyword: this.searchFields.keyword,
           start_date: this.searchFields.start_date,
-          is_export:this.searchFields.is_export,
+          //is_export: this.searchFields.is_export,
           end_date: this.searchFields.end_date,
           order_start_date: this.searchFields.order_start_date,
           order_end_date: this.searchFields.order_end_date,
           type: this.searchFields.type,
-          unit:this.searchFields.unit
+          unit: this.searchFields.unit,
+          time: this.searchFields.time
         }).then(res => {
-          if(that.searchFields.is_export==1){
+          let tokens = getToken();
-            var url = "api/admin/visit/order-detail-index?token="+that.tokens
+          console.log(is_export)
+          console.log(tokens)
+          console.log(that.searchFields.is_export)
+          if (is_export) {
+            var url = "/api/admin/visit/order-detail-index?token=" + tokens
+            console.log(url)
             for (var m in that.searchFields) {
               url += "&" + m + "=" + that.searchFields[m]
             }
             url = that.baseurl + url
             console.log(url)
-            window.open(url, '_blank')
+            window.open("http://" + url, '_blank')
             that.searchFields.is_export = 0
             return;
           }
@@ -304,9 +330,8 @@
         this.load()
       },
       exportExcel() {
-        this.searchFields.is_export = 1
+        this.searchFields.is_export = 1;
-        this.load()
+        this.load(true);
-
       },
       handleCurrentChange(page) {
         this.paginations.page = page;
@@ -322,19 +347,23 @@
     margin: 10px;
     margin-left: 0;
   }
+
   .inputwrap input {
     height: 40px;
 
   }
+
   .inputwrap .ivu-input-suffix {
     line-height: 40px !important;
   }
+
   .vm10 {
     vertical-align: middle;
     margin: 10px;
     margin-left: 0;
     width: 360px !important;
   }
+
   .vm15 {
     width: 150px !important;
   }

src/views/order/visitorder.vue

@@ -7,7 +7,24 @@
           <div slot="content"></div>
           <slot>
             <div>
-              <Input style="width: 200px; margin-right: 10px" v-model="searchFields.name" placeholder="关键字搜索" />
+              <el-input style="width: 200px;" v-model="searchFields.keyword" placeholder="关键字搜索" />
+
+              <el-date-picker v-model="searchFields.date" value-format="yyyy-MM-dd" type="date" placeholder="预约日期"
+                style="margin-left: 10px;">
+              </el-date-picker>
+              <el-select style="margin-left: 10px;" v-model="searchFields.time" placeholder="预约时段">
+                <el-option value="">
+                </el-option>
+                <el-option v-for="item in parameters.visittime" :key="item.id" :label="item.value" :value="item.value">
+                </el-option>
+
+              </el-select>
+              <el-select style="margin-left: 10px;" v-model="searchFields.type" placeholder="请选择类型">
+                <el-option value="">
+                </el-option>
+                <el-option v-for="item in parameters.visitType" :key="item.id" :label="item.value" :value="item.id">
+                </el-option>
+              </el-select>
               <Button type="primary" @click="load" style="margin-left: 10px">查询</Button>
             </div>
           </slot>
@@ -173,6 +190,31 @@
             id: 2,
             value: "个人"
           }],
+          visittime: [{
+            value: "09:00-10:00",
+            id: "1"
+          }, {
+            value: "10:00-11:00",
+            id: "2"
+          }, {
+            value: "11:00-12:00",
+            id: "3"
+          }, {
+            value: "12:00-13:00",
+            id: "4"
+          }, {
+            value: "13:00-14:00",
+            id: "41"
+          }, {
+            value: "14:00-15:00",
+            id: "51"
+          }, {
+            value: "15:00-16:00",
+            id: "61"
+          }, {
+            value: "16:00-17:00",
+            id: "71"
+          }],
           cardType: [{
             id: 1,
             value: "身份证"
@@ -198,7 +240,10 @@
         clientHeight: 0,
         //查询条件字段
         searchFields: {
-          name: ""
+          keyword: "",
+          date: "",
+          type: "",
+          time: ""
         },
         tableData: [],
         paginations: {
@@ -296,7 +341,11 @@
         listvisitorder({
           page: this.paginations.page,
           page_size: this.paginations.page_size,
-          name:this.searchFields.name
+          name: this.searchFields.name,
+          date: this.searchFields.date,
+          type: this.searchFields.type,
+          keyword: this.searchFields.keyword,
+          time: this.searchFields.time
         }).then(res => {
           this.tableData = res.data;
           this.paginations.total = res.total

vue.config.js

@@ -47,6 +47,7 @@ module.exports = {
     proxy: {
       [process.env.VUE_APP_BASE_API]: {
         target: 'https://dangxingjiaoyujidi.langye.net/',
+        //target: 'http://leyitest.ali251.langye.net/',
         changeOrigin: true, //配置跨域
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''