From 822201dc84ee71bc47a3a4cb76a4aa1f5d9e77f2 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期一, 22 一月 2024 18:39:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/src/views/main/kb/prepareOnline/index.vue | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/jcdm-ui/src/views/main/kb/prepareOnline/index.vue b/jcdm-ui/src/views/main/kb/prepareOnline/index.vue
index f259571..3a4c8ac 100644
--- a/jcdm-ui/src/views/main/kb/prepareOnline/index.vue
+++ b/jcdm-ui/src/views/main/kb/prepareOnline/index.vue
@@ -15,14 +15,14 @@
</el-form-item>
<el-form-item style="margin-left: 360px">
<el-checkbox-group v-model="queryParams.isRepairFlag">
- <el-checkbox name="type"></el-checkbox>
+ <el-checkbox @change="cleanFlag" name="type"></el-checkbox>
</el-checkbox-group>
</el-form-item>
- <el-form-item label-width="120" label="杩斾慨鍙戝姩鏈哄彿:" prop="engineNo" style="margin-left: 5px">
+ <el-form-item label-width="120" label="杩斾慨鍙戝姩鏈哄彿:" prop="repairEngineNo" style="margin-left: 5px">
<el-input
:disabled="!queryParams.isRepairFlag"
- v-model="queryParams.engineNo"
+ v-model="queryParams.repairEngineNo"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -92,7 +92,7 @@
</template>
<script>
-import {listOrderScheduling} from "@/api/main/bs/orderScheduling/orderScheduling";
+import {listOrderScheduling2} from "@/api/main/bs/orderScheduling/orderScheduling";
import VueQr from 'vue-qr'
export default {
name: "index",
@@ -107,7 +107,7 @@
queryParams: {
orderNo: '',
isRepairFlag: '',
- engineNo: ''
+ repairEngineNo: ''
},
dataList: []
}
@@ -118,7 +118,7 @@
this.getList();
},
getList(){
- listOrderScheduling(this.queryParams).then(response => {
+ listOrderScheduling2(this.queryParams).then(response => {
console.log("--------------------"+response.rows)
this.dataList = response.rows
if (this.queryParams.orderNo === '' || this.queryParams.orderNo === null){
@@ -137,6 +137,11 @@
filterTag(value, row) {
return row.tag === value;
},
+ cleanFlag(){
+ if (this.queryParams.isRepairFlag === false){
+ this.queryParams.repairEngineNo = ''
+ }
+ },
filterHandler(value, row, column) {
const property = column['property'];
return row[property] === value;
--
Gitblit v1.9.3