导出

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

@@ -94,6 +94,13 @@
                     </el-select>
 
                 </el-form-item>
+                <el-form-item prop="exportContent" label="导出内容" v-if="permissions.countCost && permissions.countHours && (radio == $t('other.project') || radio == $t('projectclassification'))">
+                    <el-select v-model="exportParam.exportContent" style="width:350px;" filterable="true" popper-class="projectSelectPopperClass">
+                        <el-option label="工时和成本" value="hoursAndCost"></el-option>
+                        <el-option label="仅工时" value="hours"></el-option>
+                        <el-option label="仅成本" value="cost"></el-option>
+                    </el-select>
+                </el-form-item>
 
                 <el-form-item :label="$t('departmentchoice')" v-if="radio == $t('other.project')">
                     <el-cascader v-if="user.userNameNeedTranslate != 1" v-model="exportParam.deptId" :options="departmentList" :placeholder="$t('defaultText.pleaseChoose')"
@@ -298,6 +305,9 @@
                 if (this.radio == this.$t('other.project')) {
                     this.exportParam.deptId = []
                 }
+                if(this.permissions.countCost && this.permissions.countHours && (this.radio == this.$t('other.project') || this.radio == this.$t('projectclassification'))){
+                    this.$set(this.exportParam, 'exportContent', 'hoursAndCost')
+                }
             },
             //获取我的项目列表
             getMyProjectList() {
@@ -382,6 +392,9 @@
                         param.deptId = this.exportParam.deptId[this.exportParam.deptId.length - 1]
                     }
                 }
+                if(this.permissions.countCost && this.permissions.countHours && (this.radio == this.$t('other.project') || this.radio == this.$t('projectclassification'))){
+                    param.exportContent = this.exportParam.exportContent
+                }
                 this.http.post(url, param,
                     res => {
                         this.listLoading = false;

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

@@ -444,7 +444,7 @@
                             </el-select>
                             </template>
                             
-                            <el-link v-if="index >= 1&&domain.canEdit" type="primary" :underline="false" @click="delDomain(index)" style="float:right;margin-right:10px;"
+                            <el-link v-if="index >= 1&&domain.canEdit" type="primary" :underline="false" @click="delDomain(index)" style="float:right;margin-right:15%;"
                                 :disabled="workForm.domains.length==0?true:(workForm.domains[index].state>=2?false:true)">
                                 <i class="fa fa-trash" style="color: red;;font-size:18px;"></i>
                             </el-link>
@@ -558,7 +558,7 @@
                         </el-form-item>
                         <el-form-item :label="user.companyId==781? $t('other.specificContentAndResults') : $t('other.workMatters') " :prop="'domains.' + index + '.content'" 
                         :rules="user.timeType.workContentState == 1 ? { required: true, message: user.companyId==781? $t('other.tianspecificContentAndResults'):$t('other.tianworkMatters'), trigger: 'blur' } : null">
-                            <el-input v-model="domain.content" type="textarea" :rows="4" :placeholder="$t('defaultText.pleaseFillOut')" clearable
+                            <el-input v-model="domain.content" type="textarea" :rows="4" :placeholder="$t('defaultText.pleaseFillOut')" clearable style="width:75%;margin-right:7%"
                             :disabled="workForm.domains.length==0?true:(workForm.domains[index].state>=2?false:true)"></el-input>
                         </el-form-item>
                         </div>