Browse Source

出差在钉钉同步的模式下不显示申请时间。 填写日报增加项目描述的显示。

seyason 3 years ago
parent
commit
b371169a04

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/awayOffice/awayOffice.vue

@@ -205,7 +205,7 @@
                     <el-table-column label="行程" width="120" align="center" v-if="!isDingding">
                         <template slot-scope="scope">{{scope.row.cityFrom + '-' + scope.row.cityTo}}</template>
                     </el-table-column>
-                    <el-table-column prop="indate" label="申请时间" width="150" align="center"></el-table-column>
+                    <el-table-column prop="indate" label="申请时间" width="150" align="center" v-if="!isDingding"></el-table-column>
                     <el-table-column label="出差天数" width="120" align="center">
                         <template slot-scope="scope">
                             <div>{{scope.row.dayCount}}天</div>

+ 3 - 0
fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -336,6 +336,9 @@
                         <el-link type="primary" v-if="workForm.domains[index].state == 0 || workForm.domains[index].state == 2"
                             :underline="false" style="margin-left:10px;" @click="copyProject(index)">复制</el-link>
                     </el-form-item>
+                    <el-form-item label="项目描述" v-if="domain.projectId">
+                        <span>{{projectList.filter(p=>p.id == domain.projectId)[0].projectDesc}}</span>
+                    </el-form-item>
 
                     <el-form-item label="任务分组" v-if="user.company.packageProject == 1">
                         <!-- 任务分组 -->