Merge remote-tracking branch 'origin/master'

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,37 +46,25 @@
                         </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}">
-                            <span>{{ node.label }}</span>
-                            <span v-if="data.membCount != null && data.isUser == null">({{data.membCount}})</span>
-                            <div style="width:0%;float:right;">
-                            <span v-if="data.isUser == 1 && data.state == null" style="color:red;">
-                            未填报
-                            </span>
-                            <span v-if="data.isUser == 1 && data.state == 0" style="color:orange;">
-                                <el-tooltip v-if="data.workingTime" content="待审核" placement="top" effect="light">
-                                    <span>{{data.workingTime.toFixed(1) + 'h'}}</span>
-                                </el-tooltip>
-                                <span v-else>待审核</span>
-                            </span>
-                            <span v-if="data.isUser == 1 && data.state == 1" style="color:#32cd32;">
-                                <el-tooltip v-if="data.workingTime" content="已通过" placement="top" effect="light">
-                                    <span>{{data.workingTime.toFixed(1) + 'h'}}</span>
-                                </el-tooltip>
-                                <span v-else>已通过</span>
-                            </span>
-                            <span v-if="data.isUser == 1 && data.state == 2" style="color:red;">
-                                <el-tooltip v-if="data.workingTime" content="未通过" placement="top" effect="light">
-                                    <span>{{data.workingTime.toFixed(1) + 'h'}}</span>
-                                </el-tooltip>
-                                <span v-else>未通过</span>
-                            </span>
-                            <span v-if="data.isUser == 1 && data.state == 3" style="color:#409eff;">
-                                <el-tooltip v-if="data.workingTime" content="待提交" placement="top" effect="light">
-                                    <span>{{data.workingTime.toFixed(1) + 'h'}}</span>
-                                </el-tooltip>
-                                <span v-else>待提交</span>
-                            </span>
+                            <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;">
+                                <span v-if="data.isUser == 1 && data.state == null" style="color:red;font-size:13px">
+                                未填报
+                                </span>
+                                <span v-if="data.isUser == 1 && data.state == 0" style="color:orange;font-size:13px">
+                                待审核({{data.workingTime.toFixed(1) + 'h'}})
+                                </span>
+                                <span v-if="data.isUser == 1 && data.state == 1" style="color:#32cd32;font-size:13px">
+                                已通过({{data.workingTime.toFixed(1) + 'h'}})
+                                </span>
+                                <span v-if="data.isUser == 1 && data.state == 2" style="color:red;font-size:13px">
+                                未通过({{data.workingTime.toFixed(1) + 'h'}})
+                                </span>
+                                <span v-if="data.isUser == 1 && data.state == 3" style="color:#409eff;font-size:13px">
+                                待提交({{data.workingTime.toFixed(1) + 'h'}})
+                                </span>
                             </div>
                         </span>
                         </el-tree>

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 {