From 8381325223bee254168855b1b697db31fc591b9e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 19 九月 2023 09:28:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue |   88 +++++++++++++++++++++++++++++++++++++++----
 1 files changed, 79 insertions(+), 9 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue b/Source/UBCS-WEB/src/components/dockingSearch/VciDockingSearch.vue
index 652907c..c56b682 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">
@@ -71,7 +72,9 @@
 </template>
 
 <script>
-import {getList} from "@/api/docking/loge";
+import {getLogoList} from "@/api/docking/loge";
+import {getDataList} from "@/api/docking/data";
+import {getTaskList} from "@/api/docking/task";
 export default {
   name: "VciDockingSearch",
   props:['SearchObject','page','formInline','status'],
@@ -117,13 +120,80 @@
     },
     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);
-      });
+      const requestApi = (api) => {
+        api(this.page.currentPage, this.page.pageSize, { [`conditionMap[${name}_like]`]: this.formInline.text}).then(res => {
+          if(!res.data.data.records){
+            this.$message.error('鏆傛湭鏌ュ埌鏁版嵁锛�')
+          }else {
+            let Data=res.data.data;
+            this.$emit('getList',Data);
+          }
+        });
+      }
+      //鏃ュ織
+      if(this.status.type=='loge'){
+        requestApi(getLogoList);
+      }
+      //鏁版嵁
+      if(this.status.type=='data'){
+        requestApi(getDataList);
+      }
+      //浠诲姟
+      if(this.status.type=='task'){
+        requestApi(getTaskList);
+      }
     },
-    handleSearch(){
-      let formattedDate = this.$moment(this.formInline.Date).format('YYYY-M-D');
-      console.log('formattedDate',formattedDate);
+    handleSearch() {
+      const { type, typeFlag, stateFlag, stateTaskDataFlag, dateFlag, lastDateFlag ,sendTypeFlga } = this.status;
+      const { currentPage, pageSize } = this.page;
+      const { cut, state, stateTask, Date, lastDate, taskCut } = this.formInline;
+      const requestParams = {};
+      const requestApi = (api) => {
+        api(currentPage, pageSize, requestParams).then(res => {
+          if(!res.data.data.records){
+            this.$message.error('鏆傛湭鏌ュ埌鏁版嵁锛�');
+          } else {
+            let Data=res.data.data;
+            this.$emit('getList',Data);
+          }
+        });
+      }
+      // 闆嗘垚鏃ュ織绫诲瀷
+      if (type === 'loge' && typeFlag) {
+        requestParams['conditionMap[type_like]'] = cut;
+      }
+      // 闆嗘垚鏃ュ織鏄惁鎴愬姛
+      if (type === 'loge' && stateFlag) {
+        requestParams['conditionMap[interfaceStatus_like]'] = state;
+      }
+      // 闆嗘垚浠诲姟 鏄惁鎺ㄩ�佹垚鍔�  闆嗘垚鏁版嵁  鏄惁鍒嗚В浠诲姟
+      if ((type === 'task' || type === 'data') && stateTaskDataFlag) {
+        requestParams['conditionMap[sendFlag_like]'] = stateTask;
+      }
+      // 闆嗘垚浠诲姟 鍒涘缓鏃ユ湡 鍜� 闆嗘垚鏃ュ織 璁板綍鏃堕棿
+      if ((type === 'loge' || type === 'task') && dateFlag) {
+        const formattedDate = this.$moment(Date).format('YYYY-M-D');
+        requestParams['conditionMap[createTime_like]'] = formattedDate;
+      }
+      // 闆嗘垚浠诲姟 鏈�鍚庢帹閫佹椂闂�
+      if (type === 'task' && lastDateFlag) {
+        const formattedDate = this.$moment(lastDate).format('YYYY-M-D');
+        requestParams['conditionMap[lastModifyTime_like]'] = formattedDate;
+      }
+      // 闆嗘垚浠诲姟 闆嗘垚鏁版嵁 鎺ㄩ�佺被鍨�
+      if ((type === 'task' || type === 'data') && sendTypeFlga) {
+        requestParams['conditionMap[sendType_like]'] = taskCut;
+      }
+
+      if (type == 'loge') {
+        requestApi(getLogoList);
+      }
+      if (type == 'data') {
+        requestApi(getDataList);
+      }
+      if (type == 'task') {
+        requestApi(getTaskList);
+      }
     }
   }
 }

--
Gitblit v1.9.3