4

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -729,7 +729,7 @@
             </div>
             <span slot="footer" class="dialog-footer">
                 <el-button @click="cancel(workForm.domains,true)" v-if="canCancelInDialog" style="float:left;">{{$t('btn.withdraw')}}</el-button>
-                <span style="margin-right:20px">合计工时：{{totalReportHours}}小时</span>
+                <span style="margin-right:20px" @click="test()">合计工时：{{totalReportHours}}小时</span>
                 <el-button @click="deleteReport"  v-if="workForm.domains[0].id != null && canEdit && reportCanDelete">{{$t('btn.delete')}}</el-button>
                 <el-button @click="dialogVisible = false">{{$t('btn.cancel')}}</el-button>
                 <el-button v-if="!isSubstitude" @click="submitReport(1)" :loading="submitingReport" :disabled="workForm.domains.length==0?true:(canEdit?false:true)">{{$t('btn.temporaryStorage')}}</el-button>
@@ -1031,7 +1031,7 @@
                 
             </el-form>
             <div slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="exportUserTime" style="width:100%;" :loading="listLoading">{{$t('export.export')}}</el-button>
+                <el-button type="primary" @click="exportUserTime" style="width:100%;" >{{$t('export.export')}}</el-button>
             </div>
         </el-dialog>
         <!--人员列表 -->
@@ -1189,7 +1189,7 @@
               
               <!-- 222 -->
             </div>
-            <div v-if="user.userNameNeedTranslate != 1">
+            <div>
                 <el-input style="float:left;width:22%" v-model="searchKeyword" class="input-with-select" :placeholder="$t('defaultText.pleaseEnterNametoSearch')" clearable="true" size="small">
                     <el-button slot="append" @click="searchScreen(0)" icon="el-icon-search"></el-button>
                 </el-input>
@@ -1359,7 +1359,7 @@
               <el-button size="small" @click="getThisWeek()">{{$t('time.nextWeek')}}</el-button>
               
             </div>
-            <div v-if="user.userNameNeedTranslate != 1">
+            <div>
                 <el-input style="float:left;width:22%" v-model="searchKeyword" class="input-with-select" :placeholder="$t('defaultText.pleaseEnterNametoSearch')" clearable="true" size="small">
                     <el-button slot="append" @click="searchScreen(1)" icon="el-icon-search"></el-button>
                 </el-input>
@@ -1987,7 +1987,7 @@
         },
         methods: {
             test(){
-                // console.log('test',this.workForm.domains);
+                console.log('test',this.workForm.domains);
             },
             getHour(s1, s2) {
                 var reDate = /\d{4}-\d{1,2}-\d{1,2} /;
@@ -2607,7 +2607,9 @@
                 var newIndex = index+1;
                 var itemDomain = {
                         projectId: this.workForm.domains[index].projectId,
-                        workingTime: this.reportTimeType.type == 3?(leftProgress*this.reportTimeType.allday/100).toFixed(1):"",
+                        workingTime: this.reportTimeType.type == 3?(leftProgress*this.reportTimeType.allday/100).toFixed(1):(
+                            this.reportTimeType.type==2?"":(this.reportTimeType.allday).toFixed(1)
+                        ),
                         content: "",
                         progress:leftProgress,
                         state:2,//2-表示待提交
@@ -4412,7 +4414,7 @@
                                 domains: [{
                                     id: null,
                                     projectId: "",
-                                    workingTime: this.reportTimeType.type==3?(this.reportTimeType.allday).toFixed(1):"",
+                                    workingTime: this.reportTimeType.type==2?"":(this.reportTimeType.allday).toFixed(1),
                                     content: "",
                                     progress:100,
                                     state: 2,
@@ -4509,7 +4511,7 @@
                                 domains: [{
                                     id: null,
                                     projectId: "",
-                                    workingTime: this.reportTimeType.type==3?(this.reportTimeType.allday).toFixed(1):"",
+                                    workingTime: this.reportTimeType.type==2?"":(this.reportTimeType.allday).toFixed(1),
                                     content: "",
                                     progress:100,
                                     state: 2,
@@ -5497,7 +5499,9 @@
                 }
                 var addItem = {
                         projectId: "",
-                        workingTime: this.reportTimeType.type == 3?(leftProgress*this.reportTimeType.allday/100).toFixed(1):"",
+                        workingTime: this.reportTimeType.type == 3?(leftProgress*this.reportTimeType.allday/100).toFixed(1):(
+                            this.reportTimeType.type==2?"":(this.reportTimeType.allday).toFixed(1)
+                        ),
                         content: "",
                         progress:leftProgress,
                         state:2,//2-表示待提交