浏览代码

'恢复代码覆盖'

songxy 1 年之前
父节点
当前提交
128ffeb191

+ 4 - 2
client/src/views/OaSystem/attendanceCenter/dep.vue

@@ -129,7 +129,7 @@
         >
           <template #header>
             <span>{{ item.text }}</span>
-            <span class="c-#989FA8 font-size-14px m-t-8px">{{ item.unit }}</span>
+            <span class="m-t-8px font-size-14px c-#989FA8">{{ item.unit }}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -376,7 +376,9 @@ const getExcelTable = (attendanceData) => {
       if (!isworkday) return ''
       // 判断有没有数据
       if (!arr.swAttendanceStatus) return ''
-      return `${attendanceTypeObj[arr.swAttendanceStatus] ?? ''} / ${attendanceTypeObj[arr.xwAttendanceStatus] ?? ''}`
+      return `${attendanceTypeObj[arr.swAttendanceStatus] ?? ''} / ${
+        attendanceTypeObj[arr.xwAttendanceStatus] ?? ''
+      }`
     })
     return [
       item.deptName,

+ 3 - 7
client_h5/src/App.vue

@@ -4,14 +4,14 @@ import reqest from "@/utils/request";
 
 const initUserInfoHandler = async () => {
     const code: string = await getDDAuthCode() as string
-    console.log("code--------")
-    console.log(code)
-    return;
     const userIdResult = await getUserIdByDD({
         code
     })
     console.log("userIdResult--------")
     console.log(userIdResult)
+    if (userIdResult && userIdResult?.data) {
+        getUserInfoById(userIdResult?.data.userId)
+    }
 }
 initUserInfoHandler()
 function getDDAuthCode() {
@@ -20,15 +20,11 @@ function getDDAuthCode() {
             corpId: 'ding65143abf9aeea2ec',
             success: (res: any) => {
                 const { code } = res;
-                console.log("authCode---------------")
-                console.log(res)
                 if (code) {
                     resolve(code);
                 }
             },
             fail: (ex: any) => {
-                console.log("ex---------------")
-                console.log(ex)
                 reject(ex);
             },
             complete: () => {},

+ 1 - 1
zjugis-business/src/main/java/com/zjugis/business/controller/ProjectMilestoneController.java

@@ -73,7 +73,7 @@ public class ProjectMilestoneController {
 
     @PostMapping("/project-milestone/finish")
     public CommonResult finish(@Valid  @RequestBody ProjectMilestoneRequest projectMilestone) {
-        return CommonResult.success(projectMilestoneService.e/project-milestone(projectMilestone));
+        return CommonResult.success(projectMilestoneService.finish(projectMilestone));
     }
 
     /**