From fdc020d2f1f15b495a67d641afb06428f888a908 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 17 七月 2024 16:20:28 +0800
Subject: [PATCH] 工时汇总加传参

---
 src/components/do/b3-work-time-management/work-time-management.vue |   54 ++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/src/components/do/b3-work-time-management/work-time-management.vue b/src/components/do/b3-work-time-management/work-time-management.vue
index f5d3a51..1a2efab 100644
--- a/src/components/do/b3-work-time-management/work-time-management.vue
+++ b/src/components/do/b3-work-time-management/work-time-management.vue
@@ -1,16 +1,16 @@
 <template>
   <div class="work-time-management">
     <div class="search">
-<!--      <div class="search_thing">-->
-<!--				<div class="search_label">鍛ㄦ锛�</div>-->
-<!--				<div class="search_input" style="display: flex;align-items: center;">-->
-<!--          <el-input size="small" placeholder="寮�濮嬪懆娆�" clearable-->
-<!--						v-model="entity.week1"></el-input>-->
-<!--            <span>&nbsp;-&nbsp;</span>-->
-<!--          <el-input size="small" placeholder="缁撴潫鍛ㄦ" clearable-->
-<!--						v-model="entity.week2"></el-input>-->
-<!--        </div>-->
-<!--			</div>-->
+      <!-- <div class="search_thing">
+				<div class="search_label">鍛ㄦ锛�</div>
+				<div class="search_input" style="display: flex;align-items: center;">
+          <el-input size="small" placeholder="寮�濮嬪懆娆�" clearable
+						v-model="entity.week1"></el-input>
+            <span>&nbsp;-&nbsp;</span>
+          <el-input size="small" placeholder="缁撴潫鍛ㄦ" clearable
+						v-model="entity.week2"></el-input>
+        </div>
+			</div> -->
 			<div class="search_thing" style="width: 200px;">
 				<div class="search_label">鏄熸湡锛�</div>
 				<el-select v-model="entity.weekDay" placeholder="鍏ㄩ儴" size="small" @change="refreshTable()" clearable>
@@ -18,7 +18,7 @@
 					</el-option>
 				</el-select>
 			</div>
-			<div class="search_thing">
+			<div class="search_thing" style="width: 390px;">
 				<div class="search_label" style="width: 90px;">鏃堕棿鑼冨洿锛�</div>
 				<div class="search_input">
           <el-date-picker
@@ -551,6 +551,7 @@
         this.componentData1.entity = {...this.componentData1.entity,...entity}
         this.$refs['ValueTable1'].selectList()
       }
+      this.collectWorkingHours()
     },
     refresh(){
       this.entity = {}
@@ -610,7 +611,13 @@
             this.addLoad = false
             if (res.code == 201) return
             this.$message.success('宸叉彁浜�')
-            this.addVisible = false
+            this.formData.number = ''
+            this.formData.amount = ''
+            this.formData.remarks = ''
+            this.formData.approvedWorkingHour = ''
+            this.formData.nonproductiveTime = ''
+            this.formData.auxiliaryProject = ''
+            // this.addVisible = false
             this.refreshTable()
             this.collectWorkingHours()
           })
@@ -625,7 +632,13 @@
             this.addLoad = false
             if (res.code == 201) return
             this.$message.success('鎿嶄綔鎴愬姛')
-            this.addVisible = false
+            this.formData.number = ''
+            this.formData.amount = ''
+            this.formData.remarks = ''
+            this.formData.approvedWorkingHour = ''
+            this.formData.nonproductiveTime = ''
+            this.formData.auxiliaryProject = ''
+            // this.addVisible = false
             this.refreshTable()
             this.collectWorkingHours()
           })
@@ -743,9 +756,15 @@
       return String(d)
     },
     collectWorkingHours(){
-      this.$axios.post(this.$api.auxiliaryOutputWorkingHours.collectWorkingHours).then(res => {
-        this.totalInfo = res.data
-      })
+      this.$axios.post(this.$api.auxiliaryOutputWorkingHours.collectWorkingHours,{
+    entity:this.componentData.entity
+   }, {
+  headers: {
+ 'Content-Type': 'application/json'
+ }
+ }).then(res => {
+ this.totalInfo = res.data
+ })
     },
     selectshiftByUser(){
       this.$axios.post(this.$api.auxiliaryWorkingHoursDay.selectshiftByUser).then(res => {
@@ -822,4 +841,7 @@
 		height: calc(100% - 60px - 80px - 10px - 40px - 25px);
 		padding: 20px;
 	}
+>>>.el-dialog__wrapper {
+  z-index: 9999 !important; /* 鏍规嵁闇�瑕佽皟鏁村眰绾� */
+}
 </style>

--
Gitblit v1.9.3