修复导入日报的相关问题

fhKeeper/formulahousekeeper/timesheet/src/views/project/finance.vue

@@ -1335,9 +1335,12 @@ import { error } from 'dingtalk-jsapi';
                     return;
                 }
                 if (index === 1){
-                    sums[index] = ''
+                    sums[index] = '';
                     return
                 }
+                if (index === 2 && this.user.timeType.financeJobnumEnabled == 1) {
+                    sums[index] = '';
+                }
                 const values = data.map(item => Number(item[column.property]));
                 if (!values.every(value => isNaN(value))) {
                     sums[index] = values.reduce((prev, curr) => {

fhKeeper/formulahousekeeper/timesheet/src/views/project/projectInside.vue

@@ -726,7 +726,7 @@
                     <span>{{ $t('wenjian1guanli') }}</span>
                     <div>
                         <span>{{ $t('xuanzwenjian') }}</span>
-                        <el-select v-model="addFileId">
+                        <el-select v-model="addFileId" filterable >
                             <el-option
                                 v-for="item in projectFileList"
                                 :key="item.id"
@@ -1689,7 +1689,7 @@
             },
             // 列表的删除按钮
             taskFileDelete(eid){
-                this.$confirm(this.$t('quxiaoguanlan'), this.$t('other.prompts'), {
+                this.$confirm('是否移除此文件？', this.$t('other.prompts'), {
                     confirmButtonText: this.$t('btn.determine'),
                     cancelButtonText: this.$t('btn.cancel'),
                     type: 'warning'
@@ -2435,6 +2435,7 @@
             backToParentTask() {
                 // this.getTaskDetail(this.addForm.parentTid);
                 this.getTaskDetail(this.timelabel ? this.relationPar.id : this.addForm.parentTid);
+                this.isEditFile = true;
                 if(this.timelabel){
                     this.isRelationItem = false
                     // this.relationPar = {name: ''}
@@ -2449,6 +2450,8 @@
                 this.addForm = {parentTname: this.addForm.name,parentTid: this.addForm.id,projectId: this.addForm.projectId, groupId: this.addForm.groupId,  taskLevel:0, planHours: 8, taskType: 0};
                 this.addForm.executorListFront = [{executorId:null, planHours:8}];
                 this.addLoading = false;
+                //创建子任务，非编辑状态
+                this.isEditFile = false;
             },
             //认领任务
             addAsMyTask(task) {

fhKeeper/formulahousekeeper/timesheet/src/views/task/list.vue

@@ -1772,7 +1772,6 @@ import { error } from 'dingtalk-jsapi';
                 })
             },
             submitInsert() {
-                this.addLoading = true
                 if (this.textContent !== true) return  this.$message({
                     showClose: true,
                     message: this.$t('pictureistoolargepleaseuploaditagain'),
@@ -1796,13 +1795,14 @@ import { error } from 'dingtalk-jsapi';
                         });
                     }
                 }
-
+                
                 this.$refs.form1.validate(valid => {
                     if (valid) {
                         delete this.addForm.subTaskList;
                         delete this.addForm.progress;
                         delete this.addForm.refTaskList;
                         this.addForm.executorListStr = JSON.stringify(this.addForm.executorListFront);
+                        this.addLoading = true;
                         this.http.post('/task/save',this.addForm,
                             res => {
                                 this.addLoading = false

fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue

@@ -325,8 +325,8 @@
                     <selectCat :size="'medium'" :widthStr="'360'" v-if="user.userNameNeedTranslate == '1'" :subject="users" :subjectId="depForm.otherManagerIds" :distinction="'4'" @selectCal="selectCal"></selectCat>
                 </el-form-item>
                 <!-- 直属领导 -->
-                <el-form-item :label="$t('leadership')" prop="reportAuditUserid" v-if="user.timeType.needDeptAudit && user.userNameNeedTranslate != '1'">
-                    <el-select v-model="depForm.reportAuditUserid" filterable  clearable  :placeholder="$t('defaultText.pleaseChoose')" style="width: 100%">
+                <el-form-item :label="$t('leadership')" prop="reportAuditUserid" v-if="user.timeType.needDeptAudit">
+                    <el-select v-model="depForm.reportAuditUserid" v-if="user.userNameNeedTranslate != '1'" filterable  clearable  :placeholder="$t('defaultText.pleaseChoose')" style="width: 100%">
                         <el-option v-for="item in users" :key="item.id" :label="item.name" :value="item.id"></el-option>
                     </el-select>
                     <selectCat :size="'medium'" :widthStr="'360'" v-if="user.userNameNeedTranslate == '1'" :subject="users" :subjectId="depForm.reportAuditUserid" :distinction="'5'" @selectCal="selectCal"></selectCat>

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

@@ -1631,12 +1631,11 @@
         </el-dialog>
         <!--基于企业微信考勤数据的工时导入 -->
         <el-dialog :title="$t('title.Workhoursimportresult')" v-if="showImportResult" :visible.sync="showImportResult" customClass="customWidth" width="500px">
-            <div>
-                <span>{{importResultMsg}}</span>
-                
+            <div style="padding-bottom:10px;">
+                <p>{{importResultMsg}}</p>
             </div>
             <!-- <span slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="showImportResult=false">{{$t('btn.submit')}}</el-button>
+                <el-button type="primary" @click="showImportResult=false">关闭</el-button>
             </span> -->
         </el-dialog>
         
@@ -2366,7 +2365,7 @@
                         this.importingData = false;
                         if (res.code == "ok") {
                             //换成弹出框，以免有人等了半天回来啥也没看到
-                            this.importResultMsg = this.$t('other.successful') + ':' + this.$t('other.importSuccess') +res.data+this.$t('other.workHourData')+(res.msg?res.msg:"");
+                            this.importResultMsg = '成功导入' +res.data+this.$t('other.workHourData')+(res.msg?res.msg:"");
                             this.getReportList();
                             this.importWxDialog = false;
                         } else {
@@ -2404,7 +2403,7 @@
                         this.showImportResult = true;
                         if (res.code == "ok") {
                             //换成弹出框，以免有人等了半天回来啥也没看到
-                            this.importResultMsg = this.$t('other.importSuccess')+res.data+this.$t('other.workHourData')+(res.msg?res.msg:"");;
+                            this.importResultMsg = "成功导入"+res.data+this.$t('other.workHourData')+(res.msg?res.msg:"");;
                             this.getReportList();
                             this.importWXDialog = false;
                         } else {