From 7647ae9a3db4712b4154adc6317584b66429212b Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 18 九月 2023 15:05:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue b/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue
index ebdb09a..4294b66 100644
--- a/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue
+++ b/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue
@@ -26,7 +26,8 @@
<el-option label="鏁版嵁鏌ヨ" value="queryData"></el-option>
</el-select>
</el-form-item>
-<!-- 闆嗘垚浠诲姟 鏄惁鎺ㄩ�佹垚鍔� 闆嗘垚鏁版嵁 鏄惁鍒嗚В浠诲姟-->
+<!-- 闆嗘垚浠诲姟 鏄惁鎺ㄩ�佹垚鍔�
+闆嗘垚鏁版嵁 鏄惁鍒嗚В浠诲姟-->
<el-form-item v-if="((status.type == 'task' || status.type == 'data')&& status.stateTaskDataFlag)" size="small">
<el-select v-model="formInline.stateTask" placeholder="璇烽�夋嫨鐘舵��">
<el-option label="鏄�" value="true"></el-option>
@@ -60,7 +61,7 @@
<!-- 鍏敤妯″潡-->
<!-- 杈撳叆鍐呭-->
<el-form-item size="small" v-if="shouldShowInput">
- <el-input v-model="formInline.text" placeholder="璇疯緭鍏ュ唴瀹�" @keyup.enter.native="SaveHandler"></el-input>
+ <el-input v-model="formInline.text" placeholder="鎸変笅鍥炶溅閿繘琛屾煡璇紒" @keyup.enter.native="SaveHandler"></el-input>
</el-form-item>
<!-- 鏌ヨ鎸夐挳-->
<el-form-item size="small" v-if="shouldShowButton">
@@ -118,7 +119,12 @@
SaveHandler(){
let name = this.SearchObject.searchData[this.formInline.type].prop;
getList(this.page.currentPage, this.page.pageSize, { [`conditionMap[${name}_like]`]: this.formInline.text}).then(res => {
- console.log(res);
+ if(!res.data.data.records){
+ this.$message.error('鏆傛湭鏌ュ埌鏁版嵁锛�')
+ }else {
+ let Data=res.data.data;
+ this.$emit('getList',Data);
+ }
});
},
handleSearch() {
@@ -154,8 +160,12 @@
}
// 璇锋眰
getList(currentPage, pageSize, requestParams).then(res => {
- let Data=res.data.data.records;
- this.$emit('getList',Data)
+ if(!res.data.data.records){
+ this.$message.error('鏆傛湭鏌ュ埌鏁版嵁锛�')
+ }else {
+ let Data=res.data.data;
+ this.$emit('getList',Data);
+ }
});
}
}
--
Gitblit v1.10.0