diff --git a/src/api/equipmentManagement/repairRecords/index.ts b/src/api/equipmentManagement/repairRecords/index.ts
index 9af5fdf..2ba56d7 100644
--- a/src/api/equipmentManagement/repairRecords/index.ts
+++ b/src/api/equipmentManagement/repairRecords/index.ts
@@ -89,8 +89,9 @@ function getRepairList(data) {
"repairPart": data.repairPart,
"repairReason": data.repairReason,
"repairPerson": data.repairPerson,
- "repairBeginTime": data.repairBeginTime,
- "repairEndTime": data.repairEndTime,
+ "repairBeginTime":data.Date?data.Date[0]:'',
+ "repairEndTime": data.Date?data.Date[1]:'',
+ "searchValue":data.searchValue,
"pageNum": data.pageNum,
"pageSize": data.pageSize
}
diff --git a/src/views/equipmentManagement/repairRecords/index.vue b/src/views/equipmentManagement/repairRecords/index.vue
index 9bbf38c..8b9b5e1 100644
--- a/src/views/equipmentManagement/repairRecords/index.vue
+++ b/src/views/equipmentManagement/repairRecords/index.vue
@@ -9,7 +9,14 @@
-
+
高级筛选
@@ -17,13 +24,13 @@
-
-
+
@@ -35,34 +42,18 @@
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
+
查询
重置
@@ -161,7 +152,6 @@
![]()
-
@@ -192,11 +182,11 @@
-
+
-
![]()
+
@@ -209,7 +199,6 @@
-
@@ -382,8 +371,7 @@ var advanceSearch = reactive({
'repairPart': '',
'repairReason': '',
'repairPerson': '',
- 'repairBeginTime': '',
- 'repairEndTime': '',
+ Date: [],
pageNum: 1,
pageSize: 10
});
@@ -447,8 +435,7 @@ function Reset() {
'repairPart': '',
'repairReason': '',
'repairPerson': '',
- 'repairBeginTime': '',
- 'repairEndTime': ''
+ 'Date': []
};
selectedRow.value.deviceName = '';
let keys = Object.keys(defVal);
@@ -469,7 +456,7 @@ function txtSearch() {
// 等待 500ms 无输入后执行查询
searchIntval = setTimeout(() => {
Search();
- }, 200);
+ }, 500);
}
//获取列表数据
@@ -655,27 +642,22 @@ function ResetFormData() {
cEdit.isEdit = false;
cEdit.imageIds = [];
-
selectedRow.value = { deviceName: '', deviceId: '' };
clearUploadFiles();
}
var dropImg = (type, file, index) => {
-
-
let runDrop = () => {
-
if (type == 'after') {
afterFiles.value.splice(index, 1);
}
if (type == 'before') {
- beforeFiles.value.splice(index, 1);
+ beforeFiles.value.splice(index, 1);
}
- if(file.id){
+ if (file.id) {
cEdit.imageIds.push(file.id);
}
-
};
confirm('您确认删除此记录吗?', runDrop, hideConfirm, '提示');
};
@@ -707,11 +689,10 @@ function SaveFormData() {
if (beforeFile.value.length > 0) {
for (let i = 0; i < beforeFile.value.length; i++) {
let file = beforeFile.value[i];
- if(file && !file.id){
+ if (file && !file.id) {
formData.append('beforeFile', file);
- }
+ }
}
-
}
if (afterFile.value.length > 0) {
@@ -719,10 +700,9 @@ function SaveFormData() {
for (let i = 0; i < afterFile.value.length; i++) {
let file = afterFile.value[i];
- if(file && !file.id){
+ if (file && !file.id) {
formData.append('afterFile', file);
}
-
}
}