Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

# Conflicts:
#	fhKeeper/formulahousekeeper/management-platform/src/main/resources/upload/项目导入模板.xlsx

fhKeeper/formulahousekeeper/timesheet/src/components/taskComponent.vue

@@ -55,7 +55,7 @@
                 <span style="margin-left:30px;margin-right:10px;" v-if="timelabel && mileageCup">{{ $t('wan-cheng-shi-jian') }}</span>
                 <el-date-picker style="width:40%;" v-if="timelabel && mileageCup" v-model="addForm.finishDate" type="date" value-format="yyyy-MM-dd"  
                 :placeholder="$t('pleaseselectadate')" :disabled="(this.addForm.id != null && user.id != this.addForm.createrId && currentProject.inchargerId != user.id) && !permissions.projectManagement && !(groupResponsibleId == user.id)" @change="DateChange()"></el-date-picker>
-                </el-form-item>
+            </el-form-item>
             <div style="border: 1px solid #ddd;margin:5px 0;padding:5px 0;">
             <el-form-item :label="$t('zhi-hang-ren') + (index+1)" v-for="(executorItem, index) in addForm.executorListFront" :key="index">
                 <el-select v-if="user.userNameNeedTranslate != 1" v-model="executorItem.executorId" :disabled="(addForm.id != null && user.id != addForm.createrId && currentProject.inchargerId != user.id) && !permissions.projectManagement && !(groupResponsibleId == user.id)" size="small" filterable clearable :placeholder="$t('pleaseselectanexecutor')" style="width:40%;" @change="$forceUpdate()">
@@ -1055,6 +1055,9 @@ export default {
                 console.log(this.gstimday, this.gstimhour)
                 // //删除中间传值的变量数组
                 delete this.addForm.executorList;
+                
+                // 触发类型切换事件
+                this.selchg()
             } else {
                 this.$message({
                     message: res.msg,

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

@@ -938,13 +938,19 @@
                   </template>
                 </el-table-column>
                 <el-table-column  prop="happenDate" :label="$t('forthedate')" ></el-table-column>
-                <el-table-column prop="invoiceType" :label="$t('costtype')"    >
+                <!-- <el-table-column prop="invoiceType" :label="$t('costtype')"    >
                   <template slot-scope="scope">
                         {{feeType[scope.row.invoiceType]}}
                     </template>
                 </el-table-column>
                 <el-table-column prop="expenseType" :label="$t('ppertype')"  >
                   
+                </el-table-column> -->
+                <el-table-column prop="expenseType" :label="$t('costtype')"></el-table-column>
+                <el-table-column prop="invoiceType" :label="$t('ppertype')">
+                  <template slot-scope="scope">
+                    {{scope.row.invoiceType == 0 ? '增值税专用发票' : '增值税普通发票'}}
+                  </template>
                 </el-table-column>
                 <el-table-column prop="amount" :label="$t('amountof')+'('+ $t('tax') +')'"   align="right">
                   <template slot-scope="scope">

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

@@ -3461,7 +3461,7 @@ a {
                 if (row == null) {
                     this.addForm = {alarmType: 0}
                 } else {
-                    this.addForm = row;
+                    this.addForm = JSON.parse(JSON.stringify(row));
                 }
             },
             //获取客户列表