From 226ba0f4e64ba0eacb780909a3bc120a36b3b720 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 17 七月 2024 22:05:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/do/b3-work-time-management/work-time-management.vue | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 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 6b25f2a..f70ad63 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
@@ -170,6 +170,9 @@
</el-option>
</el-select>
</el-form-item>
+ <el-form-item label="澶嶆牳璇存槑:">
+ <el-input v-model="formData0.reviewerRemark" type="textarea" :rows="3" size="small" :disabled="title=='鎵瑰噯'"></el-input>
+ </el-form-item>
</el-form>
</el-col>
<el-col :span="12">
@@ -178,6 +181,9 @@
<el-input v-model="formData0.number" size="small" :disabled="title=='鎵瑰噯'"></el-input>
</el-form-item>
<el-form-item label="鏁伴噺:" required>
+ <el-input v-model="formData0.amount" size="small" :disabled="title=='鎵瑰噯'"></el-input>
+ </el-form-item>
+ <el-form-item label="澶嶆牳鏁伴噺:" required>
<el-input v-model="formData0.reviewerNumber" size="small" :disabled="title=='鎵瑰噯'"></el-input>
</el-form-item>
<el-form-item label="鏍稿噯宸ユ椂:">
@@ -192,12 +198,6 @@
</el-form>
</el-col>
</el-row>
- <el-form :model="formData0" label-width="90px">
- <el-form-item label="澶嶆牳璇存槑:">
- <el-input v-model="formData0.reviewerRemark" type="textarea"
- :rows="3" size="small" :disabled="title=='鎵瑰噯'"></el-input>
- </el-form-item>
- </el-form>
<span slot="footer" class="dialog-footer">
<el-row>
<el-button @click="submitCheck(0)" :loading="checkLoadN">{{title=='瀹℃牳'?'涓嶉�氳繃':'涓嶆壒鍑�'}}</el-button>
@@ -341,7 +341,7 @@
entity: {
week: null,
weekDay: null,
- dateTime: null,
+ dateTime: [],
name:null,
orderBy: {
field: 'id',
@@ -400,6 +400,7 @@
reviewerNonproductiveTime:'',
auxiliaryProject:'',
reviewerRemark:'',
+ nameUser: ''
},
checkVisible:false,
checkLoadN:false,
@@ -505,6 +506,8 @@
let formattedDate2 = `${year}-${month}-${day} 23:59:59`;
this.entity.dateTime.push(formattedDate1);
this.entity.dateTime.push(formattedDate2);
+ this.componentData1.entity.dateTime.push(formattedDate1);
+ this.componentData1.entity.dateTime.push(formattedDate2);
this.refreshTable()
},
getPower(){
--
Gitblit v1.9.3