Merge branch 'hotfix-0623' into 'release'

Hotfix 0623

See merge request com.pica.cloud.education.frontend/pica.cloud.web-education-admin!268

src/views/goods/order-manage.vue

@@ -15,20 +15,25 @@
             <el-form-item label="买家名称">
               <el-input v-model="searchForm.receiver" size="small" placeholder="请输入买家名称"></el-input>
             </el-form-item>
-            <el-form-item label="下单时间">
-              <el-date-picker
-                  v-model="searchForm.orderDate"
-                  type="datetime"
-                  size="small"
-                  format="yyyy-MM-dd HH:mm:ss"
-                  value-format="timestamp"
-                  placeholder="请选择下单时间">
-              </el-date-picker>
+            <el-form-item label="创建人">
+              <el-input v-model="searchForm.prescriberName" size="small" placeholder="请输入创建人名称"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="30" type="flex" style="margin-top: 10px">
           <el-col :span="18">
+            <el-form-item label="下单时间" class="t-b">
+              <el-date-picker
+                v-model="createRangeTime"
+                type="daterange"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                style="width: 90%;"
+                :picker-options="pickerOptions1">
+              </el-date-picker>
+            </el-form-item>
             <el-form-item label="招募人">
               <el-select
                 v-model="searchForm.ownerId"
@@ -301,6 +306,7 @@
     },
     data(){
       return{
+        createRangeTime: '',
         curmbFirst: '云鹊店铺',
         curmbSecond: '订单管理',
         activeName: 'all',
@@ -310,7 +316,10 @@
           goodsName: '',
           orderNo: '',
           receiver: '',
-          orderDate: '',
+          prescriberName: '',
+          orderTime:'',
+          orderBeginTime:'',
+          orderEndTime: '',
           brokerId:'',
           ownerId:'',
           pageNo: 1,
@@ -380,7 +389,13 @@
         ownerId:'',
         brokerList:[],
         brokerOwnerList:[],
-
+        pickerOptions1: {
+          disabledDate: time => {
+            return (
+              time.getTime() > new Date().getTime()
+            ); //减去一天的时间代表可以选择同一天;
+          }
+        },
       }
     },
     created() {
@@ -392,6 +407,8 @@
     },
     methods: {
       searchList(){
+        this.searchForm.orderBeginTime = this.createRangeTime[0];
+        this.searchForm.orderEndTime = this.createRangeTime[1];
         console.log("searchList搜索开始")
         openLoading(this);
         queryOrderList(this.searchForm).then(res => {
@@ -410,6 +427,7 @@
           showStatus: -1,
           storeId: this.$route.query.storeId,
           goodsName: '',
+          prescriberName: '',
           orderNo: '',
           receiver: '',
           orderDate: '',