From e37f04c97ef893edce5f3f748398424fa17ffc2a Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 18 九月 2024 10:04:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue b/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue
index 5a018d8..4216767 100644
--- a/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue
+++ b/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue
@@ -24,6 +24,9 @@
<el-option label="鍒嗙被鏌ヨ" value="queryClassify"></el-option>
<el-option label="鍚紪鐮佽鍒欑殑鍒嗙被鏌ヨ" value="queryClassifyRule"></el-option>
<el-option label="鏁版嵁鏌ヨ" value="queryData"></el-option>
+ <el-option label="鏍囧噯鐢宠" value="applyCodeForBZ"></el-option>
+ <el-option label="閮ㄩ棬鐢宠" value="syncDataForOrg"></el-option>
+ <el-option label="浜哄憳鐢宠" value="syncDataForPerson"></el-option>
</el-select>
</el-form-item>
<!-- 闆嗘垚浠诲姟 鏄惁鎺ㄩ�佹垚鍔�
@@ -121,7 +124,7 @@
SaveHandler(){
let name = this.SearchObject.searchData[this.formInline.type].prop;
const requestApi = (api) => {
- api(this.page.currentPage, this.page.pageSize, { [`conditionMap[${name}_like]`]: this.formInline.text}).then(res => {
+ api(this.page.currentPage, this.page.pageSize,'createTime','desc',{[`conditionMap[${name}_like]`]: this.formInline.text}).then(res => {
if(!res.data.data.records){
this.$message.error('鏆傛湭鏌ュ埌鏁版嵁锛�')
}else {
@@ -130,12 +133,15 @@
}
});
}
- if(this.status.type=='logo'){
+ //鏃ュ織
+ if(this.status.type=='loge'){
requestApi(getLogoList);
}
+ //鏁版嵁
if(this.status.type=='data'){
requestApi(getDataList);
}
+ //浠诲姟
if(this.status.type=='task'){
requestApi(getTaskList);
}
@@ -146,7 +152,7 @@
const { cut, state, stateTask, Date, lastDate, taskCut } = this.formInline;
const requestParams = {};
const requestApi = (api) => {
- api(currentPage, pageSize, requestParams).then(res => {
+ api(currentPage, pageSize,'createTime','desc',requestParams).then(res => {
if(!res.data.data.records){
this.$message.error('鏆傛湭鏌ュ埌鏁版嵁锛�');
} else {
@@ -182,7 +188,7 @@
requestParams['conditionMap[sendType_like]'] = taskCut;
}
- if (type == 'logo') {
+ if (type == 'loge') {
requestApi(getLogoList);
}
if (type == 'data') {
--
Gitblit v1.9.3