From d6f94d02fd033c1c0a68fe2d4e987eb233d2afb1 Mon Sep 17 00:00:00 2001
From: 田源 <tianyuan@vci-tech.com>
Date: 星期三, 05 三月 2025 18:05:03 +0800
Subject: [PATCH] 整合代码

---
 Source/UBCS-WEB/src/views/docking/task.vue |   25 ++++++++++++++++---------
 1 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/docking/task.vue b/Source/UBCS-WEB/src/views/docking/task.vue
index fd99ef0..916feda 100644
--- a/Source/UBCS-WEB/src/views/docking/task.vue
+++ b/Source/UBCS-WEB/src/views/docking/task.vue
@@ -20,10 +20,11 @@
                      size="small"
                      plain
                      icon="el-icon-refresh-right"
-                     @click="handleSend">鎵嬪姩鎺ㄩ��
+                       v-if="permissionList.sendPush"
+                     @click="handleSend" >鎵嬪姩鎺ㄩ��
           </el-button>
         <div style="float: right;margin-left: 10px">
-          <vci-docking-search :formInline="formInline" :SearchObject="SearchObject" :page="page" :status="status"></vci-docking-search>
+          <vci-docking-search :formInline="formInline" :SearchObject="SearchObject" :page="page" :status="status" @getList="dockingGetList"></vci-docking-search>
         </div>
       </template>
     </avue-crud>
@@ -31,7 +32,7 @@
 </template>
 
 <script>
-import {getList,sendData} from "@/api/docking/task";
+import {getTaskList,sendData} from "@/api/docking/task";
 import {validatenull} from "@/util/validate";
 import {mapGetters} from "vuex";
 import {remove} from "@/api/code/codeSynonym";
@@ -120,9 +121,12 @@
       option: {
         height:'auto',
         calcHeight: 0,
+        columnBtn:false,
         tip: false,
+        addBtn:false,
         searchShow: false,
-        searchMenuSpan: 6,
+        searchShowBtn:false,
+        // searchMenuSpan: 6,
         border: true,
         index: true,
         viewBtn: true,
@@ -227,10 +231,7 @@
     ...mapGetters([ "permission"]),
     permissionList() {
       return {
-        addBtn: false,
-        viewBtn: false,
-        delBtn: false,
-        editBtn: false
+        sendPush: this.vaildData(this.permission.task.task_sendPush, false),
       };
     },
     oids() {
@@ -242,6 +243,12 @@
     }
   },
   methods: {
+    dockingGetList(val){
+      this.data=val.records;
+      this.page.pageSize=val.size;
+      this.page.currentPage=val.current;
+      this.page.total=val.total;
+    },
     async cellDbClick(row, column, cell, event) {
       for (const key in row) {
         if (key === column.property) {
@@ -289,7 +296,7 @@
           query['conditionMap["' + key + '"]'] = this.query[key];
         }
       }
-      getList(page.currentPage, page.pageSize, Object.assign(params, this.params, query, this.query)).then(res => {
+      getTaskList(page.currentPage, page.pageSize, Object.assign(params, this.params, query, this.query)).then(res => {
         const data = res.data.data;
         this.page.total = data.total;
         this.data = data.records;

--
Gitblit v1.9.3