From df1b3f0a1c940af780ead43e5e7150034825851c Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Thu, 16 Dec 2021 18:17:48 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E9=A1=B9=E7=9B=AE=E3=80=81=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E7=BB=84=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A4=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=B9=B4=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mineProject/MineProject.vue | 51 ++++++++++++++++++++-------
 src/views/workTeam/WorkTeam.vue       | 24 ++++++++++++-
 2 files changed, 62 insertions(+), 13 deletions(-)

diff --git a/src/views/mineProject/MineProject.vue b/src/views/mineProject/MineProject.vue
index 7f9ab3d..fa9ccb6 100644
--- a/src/views/mineProject/MineProject.vue
+++ b/src/views/mineProject/MineProject.vue
@@ -10,19 +10,23 @@
                 <a-input placeholder="请输入项目名称" v-model="queryParam.chargeProject" :maxLength="50"></a-input>
               </a-form-item>
             </a-col>
+            <!--            <a-col :xl="6" :lg="8" :md="8" :sm="24">-->
+            <!--              <a-form-item label="需要发票">-->
+            <!--                <j-dict-select-tag dict-code="invoice_type" placeholder="请选择是否需要发票"-->
+            <!--                                   v-model="queryParam.needInvoice"></j-dict-select-tag>-->
+            <!--              </a-form-item>-->
+            <!--            </a-col>-->
+            <!--            <a-col :xl="6" :lg="8" :md="8" :sm="24">-->
+            <!--              <a-form-item label="打包项目">-->
+            <!--                <j-dict-select-tag dict-code="yn" placeholder="请选择是否打包"-->
+            <!--                                   v-model="queryParam.pack"></j-dict-select-tag>-->
+            <!--              </a-form-item>-->
+            <!--            </a-col>-->
             <a-col :xl="6" :lg="8" :md="8" :sm="24">
-              <a-form-item label="需要发票">
-                <j-dict-select-tag dict-code="invoice_type" placeholder="请选择是否需要发票"
-                                   v-model="queryParam.needInvoice"></j-dict-select-tag>
+              <a-form-item label="运行年份">
+                <j-year-date style="width:100%" placeholder="请选择运行年份" v-model="queryParam.year"></j-year-date>
               </a-form-item>
             </a-col>
-            <a-col :xl="6" :lg="8" :md="8" :sm="24">
-              <a-form-item label="打包项目">
-                <j-dict-select-tag dict-code="yn" placeholder="请选择是否打包"
-                                   v-model="queryParam.pack"></j-dict-select-tag>
-              </a-form-item>
-            </a-col>
-
             <a-col :xl="6" :lg="8" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
@@ -75,10 +79,11 @@
 import { JeroListMixin } from '@/mixins/JeroListMixin'
 import ProjectDetailModal from '@views/MessagePage/ProjectDetailModal'
 import MineContractModule from '@views/mineContract/modules/MineContractModule'
+import JYearDate from '@comp/jero/JYearDate'
 
 export default {
   name: 'MineProject',
-  components: { ProjectDetailModal, MineContractModule },
+  components: { ProjectDetailModal, MineContractModule, JYearDate },
   mixins: [JeroListMixin],
   data() {
     return {
@@ -129,9 +134,19 @@ export default {
         list: '/project/payCommonProject/queryCompanyPageList'
       },
       contractId: null,
-      contractModuleVisible: false
+      contractModuleVisible: false,
+      disableMixinCreated: true
     }
   },
+  created() {
+    this.queryParam = {
+      year: this.getCurrentYear()
+    }
+    this.lastQueryParam = {
+      year: this.getCurrentYear()
+    }
+    this.loadData()
+  },
   methods: {
     /**
      * 打开收入合同详情
@@ -154,6 +169,18 @@ export default {
           projectType: 1
         }
       })
+    },
+    searchReset() {
+      this.queryParam = {
+        year: this.getCurrentYear()
+      }
+      this.lastQueryParam = {
+        year: this.getCurrentYear()
+      }
+      this.loadData(1)
+    },
+    getCurrentYear() {
+      return new Date().getFullYear().toString()
     }
   }
 }
diff --git a/src/views/workTeam/WorkTeam.vue b/src/views/workTeam/WorkTeam.vue
index f19902b..8de5416 100644
--- a/src/views/workTeam/WorkTeam.vue
+++ b/src/views/workTeam/WorkTeam.vue
@@ -153,9 +153,19 @@ export default {
       contractModuleVisible: false,
       url: {
         list: '/project/payWorkingGroupSubitem/queryCompanyPageList'
-      }
+      },
+      disableMixinCreated: true
     }
   },
+  created() {
+    this.queryParam = {
+      year: this.getCurrentYear()
+    }
+    this.lastQueryParam = {
+      year: this.getCurrentYear()
+    }
+    this.loadData()
+  },
   methods: {
     toMeeting() {
       this.$router.push({
@@ -200,6 +210,18 @@ export default {
           workingGroupId: record.workingGroupId
         }
       })
+    },
+    searchReset() {
+      this.queryParam = {
+        year: this.getCurrentYear()
+      }
+      this.lastQueryParam = {
+        year: this.getCurrentYear()
+      }
+      this.loadData(1)
+    },
+    getCurrentYear() {
+      return new Date().getFullYear().toString()
     }
   }
 }