From dcbfc14fa674d929c53e19b3a4cf1a13d3fd12ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Mon, 1 Jul 2024 14:27:44 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=89=8D=E7=AB=AFpc=E3=80=91pad?=
 =?UTF-8?q?=E5=BA=93=E7=A7=BB=E9=A1=B5=E9=9D=A2=E9=9C=80=E6=B1=82=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/mixins/padListPageMixins.js         |   3 +-
 .../components/padListPage/index.vue          |   5 +-
 .../padManage/isPadForTransferLibJob.vue      | 107 ++++++++++++++----
 3 files changed, 88 insertions(+), 27 deletions(-)

diff --git a/fe/PC/src/mixins/padListPageMixins.js b/fe/PC/src/mixins/padListPageMixins.js
index 3e40fdb29..44f01243f 100644
--- a/fe/PC/src/mixins/padListPageMixins.js
+++ b/fe/PC/src/mixins/padListPageMixins.js
@@ -58,8 +58,9 @@ export const padListPageMixins = {
       }
     },
     // 获取列表
-    getPadList(page=1){
+    getPadList(page=1,beforeCallback){
       if(this.padListLoading)return
+      if(beforeCallback)beforeCallback()
       console.log('请求页数',page)
       if(page != 1 && (Number(page) > Number(this.padListPager.totalPage)))return
       this.padListLoading = true
diff --git a/fe/PC/src/views/padManage/components/padListPage/index.vue b/fe/PC/src/views/padManage/components/padListPage/index.vue
index 3dea30d29..8fb72b8a8 100644
--- a/fe/PC/src/views/padManage/components/padListPage/index.vue
+++ b/fe/PC/src/views/padManage/components/padListPage/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="padListPage">
+  <div class="padListPage" v-loading="padListLoading">
     <!-- 搜索头部 -->
     <div class="padListHeader">
       <div class="leftSearchHeader" v-if="searchForm && searchForm.length > 0">
@@ -41,6 +41,7 @@
               :type="btnItem.type" 
               v-show="typeof btnItem.hide == 'function' ? !btnItem.hide() : !btnItem.hide"
               @click="headerButtonClick(btnItem,btnIndex)"
+              :class="btnItem.class || null"
             >{{ btnItem.label }}</el-button>
           </el-form-item>
         </el-form>
@@ -111,7 +112,7 @@
       </div>
     </div>
     <!-- 无数据且正在加载 -->
-    <div class="padListCard" v-if="(!padListData || padListData.length <= 0) && padListLoading" v-loading="padListLoading"></div>
+    <!-- <div class="padListCard" v-if="(!padListData || padListData.length <= 0) && padListLoading" v-loading="padListLoading"></div> -->
     <!-- 无数据且加载完成 -->
     <el-empty v-if="(!padListData || padListData.length <= 0) && !padListLoading" description="暂无数据"></el-empty>
     <!-- 页脚 -->
diff --git a/fe/PC/src/views/padManage/isPadForTransferLibJob.vue b/fe/PC/src/views/padManage/isPadForTransferLibJob.vue
index f26723ae2..5e08bcefd 100644
--- a/fe/PC/src/views/padManage/isPadForTransferLibJob.vue
+++ b/fe/PC/src/views/padManage/isPadForTransferLibJob.vue
@@ -119,10 +119,16 @@ export default {
   ],
   components: { padListPage,currenForm,currenDescriptions },
   computed: {
-    // 头部按钮显隐控制
-    hideButton: function () {
+    // 头部按钮显隐控制(查看待执行)
+    hideButton_canHandle: function () {
       return function (val) {
-        return this.showFilterSta == val
+        return this.showFilterSta_canHandle == val
+      }
+    },
+    // 头部按钮显隐控制(查看已完成)
+    hideButton_compelete: function () {
+      return function (val) {
+        return this.showFilterSta_compelete == val
       }
     },
     // 单独行按钮显隐控制
@@ -146,22 +152,36 @@ export default {
         requestNumber:"",
       },
       searchForm:[
-        {label:'传入申请单号',prop:'callRequestNumber',type:'input',width:'140px',action:'Like'},
-        {label:'传入任务单号',prop:'callJobNumber',type:'input',width:'140px',action:'Like'},
+        {label:'传入申请单号',prop:'callRequestNumber',type:'input',width:'130px',action:'Like'},
+        {label:'传入任务单号',prop:'callJobNumber',type:'input',width:'130px',action:'Like'},
       ],
-      showFilterSta:false,
+      showFilterSta_canHandle:false,//查看待执行
+      showFilterSta_compelete:false,//查看已完成
       headerButton:[
         {
           type: 'warning',
           label: '查看待执行数据',
           name: "showCanHandle",
-          hide: () => { return this.hideButton(true) },
+          hide: () => { return this.hideButton_canHandle(true) },
         },
         {
           type: 'danger',
           label: '重置[待执行]数据',
           name: "showAllData",
-          hide: () => { return this.hideButton(false) },
+          hide: () => { return this.hideButton_canHandle(false) },
+        },
+        {
+          type: 'success',
+          label: '查看已完成数据',
+          name: "showCompelete",
+          class:"showCompeleteBtn",
+          hide: () => { return this.hideButton_compelete(true) },
+        },
+        {
+          type: 'danger',
+          label: '重置[已完成]数据',
+          name: "showAllData2",
+          hide: () => { return this.hideButton_compelete(false) },
         },
       ],
       padMainColumn:[
@@ -353,28 +373,49 @@ export default {
     // 头部其他按钮点击事件
     headerButtonClick(item,index){
       if(item.name == 'showCanHandle'){
-        this.showCanHandleFunc()
+        this.showFilterSta_canHandle = true
+        this.showFilterSta_compelete = false
+        this.showFasterFunc(1)
+      }
+      if(item.name == 'showCompelete'){
+        this.showFilterSta_compelete = true
+        this.showFilterSta_canHandle = false
+        this.showFasterFunc(2)
       }
-      else if(item.name == 'showAllData'){
-        this.showFilterSta = false
+      else if(item.name == 'showAllData' || item.name == 'showAllData2'){
+        if(item.name == 'showAllData')this.showFilterSta_canHandle = false
+        if(item.name == 'showAllData2')this.showFilterSta_compelete = false
         document.getElementById("padListCard").scrollTop = 0
         this.clearSearchHandle(true)
-        this.getPadList();
+        this.getPadList(1,()=>{this.padListParams.sorting = null});
       }
     },
-    // 筛选可执行功能
-    showCanHandleFunc(){
-      this.showFilterSta = true
-      let _filters = [{
+    // 快捷按钮筛选功能type=1:查看待执行   type=2：查看已完成
+    showFasterFunc(type){
+      let _obj = {
         logic:"And",
         column:"jobStatus",
         action:"In",
         value: JSON.stringify([1,2,4,30])
-      }]
+      }
+      if(type == '2'){
+        _obj = {
+          logic:"And",
+          column:"jobStatus",
+          action:"==",
+          value: "3"
+        }
+      }
+      let _filters = []
+      _filters.push(_obj)
       this.padListParams.condition.filters = _filters
       document.getElementById("padListCard").scrollTop = 0
       this.clearSearchHandle()
-      this.getPadList();
+      if(type == '2'){
+        this.getPadList(1,()=>{this.padListParams.sorting = 'CompleteTime DESC'})
+      }else{
+        this.getPadList(1,()=>{this.padListParams.sorting = null})
+      }
     },
     // 当前行按钮点击事件
     listRowButtonClick(row,item){
@@ -406,11 +447,13 @@ export default {
       }
     },
     headerSearchHandle(){
-      this.showFilterSta = false
+      this.showFilterSta_canHandle = false
+      this.showFilterSta_compelete = false
     },
     resetSearchHandle(){
       this.clearSearchHandle(true)
-      this.showFilterSta = false
+      this.showFilterSta_canHandle = false
+      this.showFilterSta_compelete = false
     },
     // 完成库移-关闭
     compeletHandleClose(){
@@ -449,11 +492,14 @@ export default {
             transferLibJobHandel(this.currentRowData.id, _data).then(res => {
               this.compeletLoading = false
               this.$successMsg("完成库移成功！")
-              if(this.showFilterSta){
-                this.showCanHandleFunc()
+              if(this.showFilterSta_canHandle){
+                this.showFasterFunc(1)
+              }
+              if(this.showFilterSta_compelete){
+                this.showFasterFunc(2)
               }
               else{
-                this.getPadList()
+                this.getPadList(1,()=>{this.padListParams.sorting = null})
               }
               this.compeletHandleClose()
             }).catch(err => {
@@ -514,7 +560,20 @@ export default {
     height:28px;
     overflow:hidden
   }
-  
+  ::v-deep .padListHeader{
+    .el-button--mini{
+      padding: 7px 10px;
+    }
+    .showCompeleteBtn{
+      background:#31bb99;
+      border-color:#31bb99;
+
+      &:hover{
+        background:#4cc9aa;
+        border-color:#4cc9aa;
+      }
+    }
+  }
   .compeletHandlePop{
     ::v-deep .el-dialog{
       margin-bottom:0 !important