From d18622be3bf4c48e9cf17bc4d3254245438ed272 Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期四, 18 一月 2024 10:49:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/src/views/main/bs/orderScheduling/index.vue | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/jcdm-ui/src/views/main/bs/orderScheduling/index.vue b/jcdm-ui/src/views/main/bs/orderScheduling/index.vue
index d154a16..6afe612 100644
--- a/jcdm-ui/src/views/main/bs/orderScheduling/index.vue
+++ b/jcdm-ui/src/views/main/bs/orderScheduling/index.vue
@@ -86,7 +86,7 @@
</el-form-item>
<el-form-item label="鎿嶄綔鏃堕棿" prop="operateTime">
<el-date-picker
- v-model="queryParams.operateTime"
+ v-model="queryParams.dateConditions"
type="datetimerange"
:picker-options="pickerOptions"
value-format="yyyy-MM-dd HH:mm:ss"
@@ -411,7 +411,7 @@
combinedBoxTime: null,
finalAssemblyTime: null,
operator: null,
- operateTime: '',
+ operateTime: null,
status: null,
spareField1: null,
spareField2: null,
@@ -419,7 +419,8 @@
spareField4: null,
createUser: null,
updateUser: null,
- remarks: null
+ remarks: null,
+ dateConditions: [],
},
// 琛ㄥ崟鍙傛暟
form: {},
@@ -472,6 +473,7 @@
/** 鏌ヨ璁㈠崟鎺掍骇鍒楄〃 */
getList() {
this.loading = true;
+ console.log(this.queryParams)
listOrderScheduling(this.queryParams).then(response => {
this.orderSchedulingList = response.rows;
this.total = response.total;
@@ -518,8 +520,8 @@
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
- // this.queryParams.pageNum = 1;
- // this.getList();
+ this.queryParams.pageNum = 1;
+ this.getList();
this.$modal.msgSuccess(this.queryParams.operateTime);
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
--
Gitblit v1.9.3