Bladeren bron

2022.6.22 移动端新增项目bug,部门填报状态调整

ggooalice 3 jaren geleden
bovenliggende
commit
932e9ac294

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

@@ -35,8 +35,8 @@
                 </div>
                 <div style="display:flex;">
                 <div v-if="permissions.reportsCompany || user.manageDeptId != 0 || permissions.reportsDept" :style="'overflow-x:hidden;overflow-y:auto;height:' + tableHeight + 'px;'">
-                    <div style="width:205px;">
-                        <el-select v-model="selectState" size="small" @change="stateChange" >
+                    <div style="width:240px;">
+                        <el-select v-model="selectState" size="small" @change="stateChange" style="width:215px">
                         <el-option value="-1" label="全部状态" >全部状态</el-option>
                         <el-option value="-2" label="未填报">未填报</el-option>
                         <el-option value="1" label="已通过">已通过</el-option>
@@ -46,7 +46,7 @@
                         </el-select></div>
                     <div>
                         <el-tree :data="data"  @node-click="handleNodeClick" node-key="id" :default-expanded-keys="expandDate">
-                            <span class="custom-tree-node" slot-scope="{ node, data}" style="width:50px">
+                            <span class="custom-tree-node" slot-scope="{ node, data}" style="width:90px">
                                 <span>{{ node.label }}</span>
                                 <span v-if="data.membCount != null && data.isUser == null">({{data.membCount}})</span>
                                 <div style="width:0%;float:right;">

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet_h5/src/views/project/index.vue

@@ -398,7 +398,7 @@
                         formData.append("associateDegreeNames", null);
                     }
 
-                    if(this.form.associateDegrees.length > 0) {
+                    if(this.form.associateDegrees != null && this.form.associateDegrees.length != 0) {
                         var sss = this.form.associateDegrees.toString()
                         formData.append("associateDegrees", sss);
                     } else {