查询条件修改

src/utils/query.ts

@@ -9,15 +9,26 @@ export function queryParamsFilter(params: Recordable, field?: string[]) {
   const exclude = ['currentPage', 'pageSize', 'total', 'column', 'order', 'createTime'].concat(field || [])
   const p = Object.assign({}, params)
 
-  for (const key in params) {
-    if (key === 'createTime' && p[key]?.length) {
-      p['createTime_begin'] = p[key][0]
-      p['createTime_end'] = p[key][1]
-      delete p[key]
-    } else if (!exclude.includes(key)) {
-      p[key] = `*${p[key]}*`
-    }
+  if(p.createTime!=null&&p.createTime!="") {
+    p.createTime_begin = p.createTime[0]
+    p.createTime_end = p.createTime[1]
+    p.createTime = null
+  } else {
+    p.createTime = null
   }
+  // alert(JSON.stringify(p))
+
+ 
+
+  // for (const key in params) {
+  //   if (key === 'createTime' && p[key]?.length) {
+  //     p['createTime_begin'] = p[key][0]
+  //     p['createTime_end'] = p[key][1]
+  //     delete p[key]
+  //   } else if (!exclude.includes(key)) {
+  //     p[key] = `*${p[key]}*`
+  //   }
+  // }
 
   return p
 }

src/views/order/orderChange/OrderChange.vue

@@ -17,6 +17,7 @@
           v-model="queryParams.createTime"
           type="daterange"
           value-format="YYYY-MM-DD"
+          unlink-panels
           placeholder="选择创建时间"
         ></el-date-picker>
       </el-form-item>
@@ -547,6 +548,9 @@ const onCopy = () => {
 }
 
 const onPaste = () => {
+
+    console.log(copyInfo)
+
   // 将复制的配置信息，一条一条设置
   copyInfo.forEach((item: any) => {
     item.templateFileId = currentRow.templateFileId
@@ -564,6 +568,13 @@ const onReset = () => {
 const onQuery = async () => {
   loading.value = true
   try {
+    if(queryParams.createTime!=null&&queryParams.createTime!="") {
+      queryParams.createTime_begin = queryParams.createTime[0]
+      queryParams.createTime_end = queryParams.createTime[1]
+      queryParams.createTime = null
+    } else {
+      queryParams.createTime = null
+    }
     const { data } = await getExcelFileOrderPage(queryParams)
     tableData.value = data.result.records
     queryParams.total = +data.result.total

src/views/order/orderList/OrderList.vue

@@ -16,7 +16,7 @@
         </el-input>
       </el-form-item>
       <el-form-item label="创建时间">
-        <el-date-picker v-model="formState.createTime" type='daterange' value-format="YYYY-MM-DD" placeholder=""></el-date-picker>
+        <el-date-picker unlink-panels v-model="formState.createTime" type='daterange' value-format="YYYY-MM-DD" placeholder=""></el-date-picker>
       </el-form-item>
 
       <el-form-item>