From 43f4fd08bb99f587c387391aad727fb82b34b7c1 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 11 八月 2023 13:27:47 +0800
Subject: [PATCH] 1.存货类型页面优化

---
 src/views/reportManager/groupSalaryList.vue |   23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/views/reportManager/groupSalaryList.vue b/src/views/reportManager/groupSalaryList.vue
index 59757e9..edab877 100644
--- a/src/views/reportManager/groupSalaryList.vue
+++ b/src/views/reportManager/groupSalaryList.vue
@@ -486,8 +486,6 @@
       width="800px"
       :close-on-click-modal="false"
       top="15vh"
-      @closed="handleClose"
-      @close="handleClose"
     >
       <div style="height: 300px;width: 100%;background-color: aliceblue;padding:20px">
         <el-tag
@@ -560,7 +558,8 @@
         groupcode: '', // 鐢熶骇鐝粍
         username: '', // 鎿嶄綔浜哄憳
         wkshopcode: this.$store.state.settings.orgType === 'W' ? getCookie('stu_torgcode') : '', // 鎵�灞炶溅闂�
-        operdate: '', // 鎿嶄綔鏃堕棿
+        operdate: [new Date().getFullYear() + '-' + (new Date().getMonth() + 1).toString().padStart(
+          2, '0') + '-01', new Date().toISOString().slice(0, 10)], // 鎿嶄綔鏃堕棿
         rejectstepcode: [], // 鍓旈櫎宸ュ簭(鍥哄畾钖祫宸ュ簭涓嶅弬涓庤绠�
         compute: 'last', // 璁′欢鏂瑰紡  閫愰亾宸ュ簭锛歝ontin   鏈亾宸ュ簭锛歭ast
         prop: 'lm_date', // 鎺掑簭瀛楁
@@ -775,7 +774,8 @@
       this.form.stepname = ''
       this.form.groupcode = ''
       this.form.username = ''
-      this.form.operdate = ''
+      this.form.operdate = [new Date().getFullYear() + '-' + (new Date().getMonth() + 1).toString().padStart(
+        2, '0') + '-01', new Date().toISOString().slice(0, 10)]
       this.form.wkshopcode = this.$store.state.settings.orgType === 'W' ? getCookie('stu_torgcode') : '' // 鎵�灞炶溅闂�
       this.getGroupSalaryReportSearch()
     },
@@ -790,7 +790,22 @@
     },
     tableRowClassName({ row, rowIndex }) {
       return 'custom-row'
+    },
+    // 淇敼鎸夐挳
+    async edit(operation, row) {
+      this.operation = operation
+      this.dialogVisible = true
+
+      const res = await GroupSalaryReportSearchUser({ id: row.id })
+      this.tagArr = res.data.map(r => r.username)
+      // this.tagArr = ['妤兼潕淇�', '寮犱笁', '鏉庡洓']
+      // this.$nextTick(() => {
+      //   this.dialogForm.OrgCode = row.org_code
+      //   this.dialogForm.OrgName = row.org_name
+      //   this.dialogForm.SupUnit = row.parent_id
+      // })
     }
+
   }
 }
 </script>

--
Gitblit v1.9.3