Merge branch 'master' of https://gitee.com/vansfa/rt_adminUI

src/views/qw/qwAccounts/index.vue

@@ -11,9 +11,9 @@
                 />
           </el-select>
         </el-form-item>          
-      <el-form-item label="企微账号" prop="userName">
+      <el-form-item label="企微账号" prop="account">
         <el-input
-          v-model="queryParams.userName"
+          v-model="queryParams.account"
           placeholder="请输入企微账号"
           clearable
           size="small"
@@ -150,7 +150,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        userName: null,
+        account: null,
         passWord: null,
         phone: null,
         email: null,
@@ -209,7 +209,7 @@ export default {
     reset() {
       this.form = {
         id: null,
-        userName: null,
+        account: null,
         passWord: null,
         phone: null,
         email: null,

src/views/store/storeOrder/index.vue

@@ -898,6 +898,12 @@ export default {
       else{
         this.queryParams.deliveryImportTimeRange=null;
       }
+      if(this.deliverySendTimeRange!=null&&this.deliverySendTimeRange.length==2){
+        this.queryParams.deliverySendTimeRange=this.deliverySendTimeRange[0]+"--"+this.deliverySendTimeRange[1]
+      }
+      else{
+        this.queryParams.deliverySendTimeRange=null;
+      }
       const queryParams = this.addDateRange(this.queryParams, this.dateRange);
       this.$confirm('是否确认导出所有订单数据项?', "警告", {
           confirmButtonText: "确定",
@@ -931,6 +937,12 @@ export default {
       else{
         this.queryParams.deliveryImportTimeRange=null;
       }
+      if(this.deliverySendTimeRange!=null&&this.deliverySendTimeRange.length==2){
+        this.queryParams.deliverySendTimeRange=this.deliverySendTimeRange[0]+"--"+this.deliverySendTimeRange[1]
+      }
+      else{
+        this.queryParams.deliverySendTimeRange=null;
+      }
       const queryParams = this.addDateRange(this.queryParams, this.dateRange);
       this.$confirm('是否确认导出所有订单明细数据项?', "警告", {
           confirmButtonText: "确定",