Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper into master

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ReportController.java

@@ -1455,7 +1455,7 @@ public class ReportController {
         return reportService.getProcessErrorData();
     }
 
-    //todo 获取人员成本数据 上传到 第三方
+    //todo 获取人员成本数据 上传到 第三方（威派格）
     @RequestMapping("/uploadThirdReportData")
     public HttpRespMsg uploadThirdReportData(String yearMonth){
         return reportService.uploadThirdReportData(yearMonth,request);

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -5163,20 +5163,11 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             object.put("month",rl.get("month"));
             array.add(object);
         });
-        String username = "WPG_GS";
-        String password = "Sap_GS@12345";
-        String authorization =username + ":" + password;
         JSONObject header=new JSONObject();
-        String s = "Basic "+Base64.getEncoder().encodeToString(authorization.getBytes());
-        header.put("Authorization",s);
         param.put("IT_TAB",array);
         JSONObject item=new JSONObject();
         item.put("headers",header);
         item.put("body",param);
-        //在请求头信息中携带Basic认证信息(这里才是实际Basic认证传递用户名密码的方式)
-        headers.set("app_id","3bf356d5-bdba-48d4-b1f5-e91468beefa3");
-        headers.set("app_key","f2960f3bf3c5ca58ee0c6970c1242e87-1655272886142-371814");
-        headers.set("Authorization",s);
         headers.setContentType(MediaType.APPLICATION_JSON);
         HttpEntity<String> requestEntity = new HttpEntity<String>(item.toJSONString(), headers);
         //过滤掉账号认证失败的时候抛出的401异常

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/task/TimingTask.java

@@ -240,20 +240,12 @@ public class TimingTask {
                 object.put("month",rl.get("month"));
                 array.add(object);
             });
-            String username = "WPG_GS";
-            String password = "Sap_GS@12345";
-            String authorization =username + ":" + password;
             JSONObject header=new JSONObject();
-            String s = "Basic "+Base64.getEncoder().encodeToString(authorization.getBytes());
-            header.put("Authorization",s);
             param.put("IT_TAB",array);
             JSONObject item=new JSONObject();
             item.put("headers",header);
             item.put("body",param);
             //在请求头信息中携带Basic认证信息(这里才是实际Basic认证传递用户名密码的方式)
-            headers.set("app_id","3bf356d5-bdba-48d4-b1f5-e91468beefa3");
-            headers.set("app_key","f2960f3bf3c5ca58ee0c6970c1242e87-1655272886142-371814");
-            headers.set("Authorization",s);
             headers.setContentType(MediaType.APPLICATION_JSON);
             HttpEntity<String> requestEntity = new HttpEntity<String>(item.toJSONString(), headers);
             //过滤掉账号认证失败的时候抛出的401异常

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

@@ -299,7 +299,8 @@
                 </el-table-column>
                 <el-table-column :label="$t('operation')" min-width="180" fixed="right" v-if="!isAuditList && !isSyncData">
                     <template slot-scope="scope">
-                      <div v-if="(scope.row.status != 0 && scope.row.ownerId == user.id) || permissions.leaveAll">
+                      <!-- <div v-if="(scope.row.status != 0 && scope.row.ownerId == user.id) || permissions.leaveAll"> -->
+                      <div v-if="(scope.row.status != 0 || permissions.leaveAll) && scope.row.ownerId == user.id">
                         <el-button size="mini" v-if="scope.row.status == 3 ||scope.row.status == 2" @click.stop.native="deletes(scope.row)" >删除</el-button>
                         <el-button size="mini" v-if="scope.row.status == 1" @click.stop.native="cancel(scope.row)">撤回</el-button>
                         <el-button size="mini" v-if="scope.row.status == 3 ||scope.row.status == 2 " type="primary" @click.stop.native="editor(scope.row)">重新提交</el-button>
@@ -1924,6 +1925,7 @@ export default {
           res => {
               if (res.code == "ok") {
                   this.addForm.timeDays = res.data
+                  this.timeChoose = res.data
               } else {
                   this.$message({
                     message: res.msg,

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

@@ -3460,7 +3460,7 @@ a {
                     inchagerId: this.inchagerId,
                     participation: this.participationId,
                 }
-                if(this.createDate.length > 0) {
+                if(this.createDate) {
                     parameter.startDate = this.createDate[0]
                     parameter.endDate = this.createDate[1]
                 }

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

@@ -105,7 +105,9 @@
                     <el-table-column prop="taskLevel" label="优先级" sortable width="180">
                         <template slot-scope="scope">
                             <div>
-                                {{scope.row.taskLevel == 0 ? '一般' : scope.row.taskLevel == 1 ? '重要' : '紧急'}}
+                                <span v-if="scope.row.taskLevel == 0">一般</span>
+                                <span v-if="scope.row.taskLevel == 1" style="color: #E6A23C">重要</span>
+                                <span v-if="scope.row.taskLevel == 2" style="color: #F56C6C">紧急</span>
                             </div>
                         </template>
                     </el-table-column>