From 38e6f27a8082e1173e3c02a33da5da39b6c6872c Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期三, 31 七月 2024 13:33:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/components/do/b3-work-time-management/work-time-management.vue |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 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 eb464ac..add61f4 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
@@ -63,7 +63,7 @@
       </el-radio-group>
       <div style="display: flex;align-items: center;">
         <p style="font-size: 14px;margin-right: 30px;">
-          鎬诲伐鏃舵眹鎬伙細<span style="font-size: 16px;color: #3A7BFA;" v-if="totalInfo">{{ (totalInfo['浜ч噺宸ユ椂姹囨��']+totalInfo['杈呭姪宸ユ椂姹囨��'])? (totalInfo['浜ч噺宸ユ椂姹囨��']+totalInfo['杈呭姪宸ユ椂姹囨��']):0 }}</span>&nbsp;&nbsp;&nbsp;&nbsp;浜ч噺宸ユ椂姹囨�伙細<span style="font-size: 16px;color: #3A7BFA;" v-if="totalInfo">{{totalInfo['浜ч噺宸ユ椂姹囨��']?totalInfo['浜ч噺宸ユ椂姹囨��']:0}}</span>&nbsp;&nbsp;&nbsp;&nbsp;杈呭姪宸ユ椂姹囨�伙細<span style="font-size: 16px;color: #3A7BFA;" v-if="totalInfo">{{totalInfo['杈呭姪宸ユ椂姹囨��']?totalInfo['杈呭姪宸ユ椂姹囨��']:0}}</span>
+          鎬诲伐鏃舵眹鎬伙細<span style="font-size: 16px;color: #3A7BFA;" v-if="totalInfo">{{ (totalInfo['浜ч噺宸ユ椂姹囨��']+totalInfo['杈呭姪宸ユ椂姹囨��'])? Number((totalInfo['浜ч噺宸ユ椂姹囨��']+totalInfo['杈呭姪宸ユ椂姹囨��'])).tofixed(4):0 }}</span>&nbsp;&nbsp;&nbsp;&nbsp;浜ч噺宸ユ椂姹囨�伙細<span style="font-size: 16px;color: #3A7BFA;" v-if="totalInfo">{{totalInfo['浜ч噺宸ユ椂姹囨��']?Number(totalInfo['浜ч噺宸ユ椂姹囨��']).tofixed(4):0}}</span>&nbsp;&nbsp;&nbsp;&nbsp;杈呭姪宸ユ椂姹囨�伙細<span style="font-size: 16px;color: #3A7BFA;" v-if="totalInfo">{{totalInfo['杈呭姪宸ユ椂姹囨��']?Number(totalInfo['杈呭姪宸ユ椂姹囨��']).tofixed(4):0}}</span>
         </p>
         <el-button size="small" type="primary" @click="openAdd" v-show="currentTable == 'ValueTable0'&&add">褰曞叆鏁版嵁</el-button>
         <el-button size="small" type="primary"
@@ -161,7 +161,7 @@
               </el-select>
             </el-form-item>
             <el-form-item label="濮撳悕:">
-              <el-input v-model="formData0.nameUser" size="small" disabled></el-input>
+              <el-input v-model="formData0.name" size="small" disabled></el-input>
             </el-form-item>
             <el-form-item label="鐝:">
               <el-select v-model="formData0.shift" placeholder="璇烽�夋嫨" size="small" :disabled="title=='鎵瑰噯'">
@@ -332,7 +332,8 @@
           }
         },
         requiredAdd: [],
-        requiredUp: []
+        requiredUp: [],
+        needSort: ['createTime', 'name']
 			},
       entityCopy: {},
 			upIndex: 0,
@@ -399,7 +400,8 @@
         reviewerNonproductiveTime:'',
         auxiliaryProject:'',
         reviewerRemark:'',
-        nameUser: ''
+        nameUser: '',
+        name: ''
       },
       checkVisible:false,
       checkLoadN:false,
@@ -574,7 +576,9 @@
       if(this.currentTable=='ValueTable0'){
         entity.state = this.entity.state
         this.componentData.entity = {...this.componentData.entity,...entity}
-        this.$refs['ValueTable0'].selectList(e)
+        this.$nextTick(() => {
+          this.$refs['ValueTable0'].selectList(e)
+        })
       }else{
         this.componentData1.entity = {...this.componentData1.entity,...entity}
         this.$refs['ValueTable1'].selectList(e)
@@ -676,11 +680,13 @@
       this.title = '瀹℃牳'
       this.formData0 = row;
       this.checkVisible = true
+      this.formData0.reviewerNumber = this.formData0.amount
     },
     handleRatify(row){
       this.title = '鎵瑰噯'
       this.formData0 = row;
       this.checkVisible = true
+      this.formData0.reviewerNumber = this.formData0.amount
     },
     handleChangeTask (row) {
       this.ValueTable0Selected = JSON.parse(JSON.stringify(row))
@@ -921,7 +927,4 @@
 		height: calc(100% - 60px - 80px - 10px - 40px - 25px);
 		padding: 20px;
 	}
->>>.el-dialog__wrapper {
-  z-index: 9999 !important; /* 鏍规嵁闇�瑕佽皟鏁村眰绾� */
-}
 </style>

--
Gitblit v1.9.3