Merge remote-tracking branch 'origin/master'

src/views/pms/iotopeationfill/index.vue

@@ -430,18 +430,7 @@ const handleExport = async () => {
 
 /** 初始化 **/
 onMounted(async () => {
-  if(deptId != null){
-    queryParams.deptId = deptId;
-  }
-  if(orderStatus === 4){
-    queryParams.orderStatus = null
-  }
-  if(orderStatus != null && orderStatus != 4){
-    queryParams.orderStatus = orderStatus;
-  }
-  if(createTime){
-    queryParams.createTime = createTime;
-  }
+
   // 计算近一周时间
   const end = new Date();
   const start = new Date();
@@ -459,6 +448,31 @@ onMounted(async () => {
   };
 
   queryParams.createTime = [formatDate(start), formatDate(end)];
+
+  if(deptId != null){
+    queryParams.deptId = deptId;
+  }
+  if(orderStatus === 4){
+    queryParams.orderStatus = null
+  }
+  if(orderStatus != null && orderStatus != 4){
+    queryParams.orderStatus = orderStatus;
+  }
+  if(createTime){
+    const timeArr = createTime.split(',');
+    if (timeArr.length === 2) {
+      queryParams.createTime = timeArr;
+    } else {
+      // 处理格式不正确的情况，可以给个默认值或提示
+      console.warn('createTime参数格式不正确');
+    }
+    //queryParams.createTime = createTime;
+  }
+
+
+
+
+
   getList()
 })
 </script>