From 498df4ec49c9469d535c494039586ff30c3b23a6 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 30 八月 2025 21:17:13 +0800
Subject: [PATCH] 机床搜索回车生效
---
src/views/flow/donelist.vue | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/views/flow/donelist.vue b/src/views/flow/donelist.vue
index 2cb3a15..efc3265 100644
--- a/src/views/flow/donelist.vue
+++ b/src/views/flow/donelist.vue
@@ -11,7 +11,7 @@
@size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad" >
<template #menu="scope">
<el-button type="primary" text size="default" @click.stop="handleView(scope.row, scope.index)">鏌ョ湅</el-button>
- <el-button type="primary" :disabled="scope.row.processIsFinished=='false'" v-if="permission.withdraw_button" text size="default" @click.stop="handleWithdraw(scope.row, scope.index)">鎾ゅ洖</el-button>
+ <el-button type="primary" :disabled="scope.row.processIsFinished==='true' || scope.row.flag.toLowerCase().indexOf('program')>-1" v-if="permission.withdraw_button" text size="default" @click.stop="handleWithdraw(scope.row, scope.index)">鎾ゅ洖</el-button>
</template>
</avue-crud>
@@ -71,7 +71,7 @@
}
},
{
- label: '宸ヨ壓鐗堟',
+ label: '鎵规鍙�',
prop: 'variables.craftEdition',
render: ({ row }) => {
return h('p',{'class': 'margin0'}, row?.variables?.craftEdition || '');
@@ -292,6 +292,7 @@
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
+ sortable:true,
search: false,
searchRange: true,
searchSpan: 8,
@@ -349,15 +350,17 @@
return;
}
this.$message.success('鎿嶄綔鎴愬姛');
+
+ this.refreshChange();
}).catch(err => {
console.error(err);
- done()
+ //done()
});
}).catch(() => {
console.log('>>>>>>')
// this.$message.info('宸插彇娑堟搷浣�');
- done();
+ //done();
});
},
currentChange(currentPage) {
@@ -370,7 +373,7 @@
console.log('searchChange', params);
params.createTimeBegin = params?.processCreateTime?.[0] || '';
params.createTimeEnd = params?.processCreateTime?.[1] || '';
- console.log(params);
+ //console.log(params);
// data = {
// createTimeBegin: dayjs(params.createTimeBegin).isValid() ? dayjs(params.createTimeBegin).format('YYYY-MM-DD') : '',
// createTimeEnd: dayjs(params.createTimeEnd).isValid() ? dayjs(params.createTimeEnd).format('YYYY-MM-DD') : '',
@@ -383,7 +386,7 @@
}
this.query = data
this.onLoad(this.page, data);
- done();
+ //done();
},
searchReset () {
this.loading = true;
@@ -392,7 +395,7 @@
},
sizeChange() {
this.loading = true;
- this.getList();
+ this.getList();
},
refreshChange() {
this.onLoad(this.page, this.query);
--
Gitblit v1.9.3