|
|
@@ -3182,6 +3182,11 @@ const handleConfirm = async () => {
|
|
|
const StatusEditdata = await StatusEdit({workOrder:workOrder,status:statusCode});
|
|
|
if (StatusEditdata.code === 0) {
|
|
|
ElMessage({type: 'success',message: '更新成功'})
|
|
|
+ if(searchInfo.value === ''){
|
|
|
+ _WorkList_page();
|
|
|
+ }else{
|
|
|
+ _cha_WorkList();
|
|
|
+ }
|
|
|
} else {
|
|
|
ElMessage({type: 'error',message: '更新失败'})
|
|
|
}
|
|
|
@@ -3537,13 +3542,12 @@ const _cha_WorkList = async (node) => {
|
|
|
ElMessage({type: 'warning',message: '请输入搜索的信息'})
|
|
|
return false;
|
|
|
}
|
|
|
- const search = searchInfo.value;
|
|
|
var regex = /^[a-zA-Z0-9]+$/;
|
|
|
try {
|
|
|
- if (regex.test(search)) {
|
|
|
+ if (regex.test(searchInfo.value)) {
|
|
|
// 符合条件,执行搜索操作
|
|
|
console.log('搜索内容为纯数字加字母');
|
|
|
- const WorkListdata = await WorkList({search:search,limit:100,page:1});//接口调用函数
|
|
|
+ const WorkListdata = await WorkList({search:searchInfo.value,limit:100,page:1});//接口调用函数
|
|
|
if(WorkListdata.data.total === 0){
|
|
|
ElMessage({type: 'warning',message: '未搜索具体查询条件'})
|
|
|
}
|
|
|
@@ -3552,7 +3556,7 @@ const _cha_WorkList = async (node) => {
|
|
|
} else {
|
|
|
// 不符合条件,给出提示
|
|
|
console.log('搜索内容包含非字母和数字的字符');
|
|
|
- const WorkListdata = await WorkList({Gd_khdh:'',search:search,limit:100,page:1});//接口调用函数
|
|
|
+ const WorkListdata = await WorkList({Gd_khdh:'',search:searchInfo.value,limit:100,page:1});//接口调用函数
|
|
|
if(WorkListdata.data.total === 0){
|
|
|
ElMessage({type: 'warning',message: '未搜索具体查询条件'})
|
|
|
}
|