From b32971b510810d697481bc677249d100de007059 Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期四, 17 八月 2023 09:19:54 +0800
Subject: [PATCH] 小程序初始

---
 web_standard/src/views/ext/salaryStatistic.vue |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/web_standard/src/views/ext/salaryStatistic.vue b/web_standard/src/views/ext/salaryStatistic.vue
index e58ab8d..edf46b2 100644
--- a/web_standard/src/views/ext/salaryStatistic.vue
+++ b/web_standard/src/views/ext/salaryStatistic.vue
@@ -12,7 +12,7 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="鐗╂枡缂栫爜" prop="mmodelCode">
+      <!-- <el-form-item label="鐗╂枡缂栫爜" prop="mmodelCode">
         <el-input v-model="searchForm.mmodelCode" placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�" @keypress.enter.native="search"></el-input>
       </el-form-item>
       <el-form-item label="宸ュ簭" prop="procedureId">
@@ -24,7 +24,7 @@
             :value="item.id">
           </el-option>
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="鎶ュ伐鏃堕棿">
         <el-date-picker
           v-model="planDate"
@@ -131,7 +131,13 @@
       'field.main': 'name',
       sorts: [{ direction: 'DESC', property: 'CREATE_TIME' }]
     })
-    
+    let tempDate = new Date()
+    let year = tempDate.getFullYear()
+    let month = tempDate.getMonth() + 1
+    let day = tempDate.getDate()
+    this.searchForm.startDate = `${year}-${month}-01`
+    this.searchForm.endDate = `${year}-${month}-${day}`
+    this.planDate = [this.searchForm.startDate, this.searchForm.endDate]
     this.search()
   },
   activated() {
@@ -142,7 +148,7 @@
       .catch(err => {
         console.log(err)
       })
-    companyUserExtAllUser({ departmentId: this.$store.state.userInfo.curComDepartment.id })
+    companyUserExtAllUser({ companyId: this.$store.state.userInfo.company.id })
       .then(res => {
         this.proUsers = res
       })

--
Gitblit v1.9.3