aexiaoliou 1 年間 前
コミット
4355a0c44f
共有100 個のファイルを変更した4466 個の追加2 個の削除を含む
  1. 5 0
      api/app/common/model/Project.php
  2. 1 0
      api/app/common/model/ProjectSchedule.php
  3. 4 2
      api/app/common/service/ProjectScheduleService.php
  4. 2 0
      build/test/assets/401.ad4cbf45.js
  5. 1 0
      build/test/assets/401.ad4cbf45.js.map
  6. 2 0
      build/test/assets/404.5bd49ab6.js
  7. 1 0
      build/test/assets/404.5bd49ab6.js.map
  8. 2 0
      build/test/assets/Good.4ce9a7c3.js
  9. 1 0
      build/test/assets/Good.4ce9a7c3.js.map
  10. 2 0
      build/test/assets/Repertory.27c9278a.js
  11. 1 0
      build/test/assets/Repertory.27c9278a.js.map
  12. 2 0
      build/test/assets/Setting.fe90a8d2.js
  13. 1 0
      build/test/assets/Setting.fe90a8d2.js.map
  14. 2 0
      build/test/assets/account.f93c5dff.js
  15. 1 0
      build/test/assets/account.f93c5dff.js.map
  16. 2 0
      build/test/assets/apiConfig.86921817.js
  17. 1 0
      build/test/assets/apiConfig.86921817.js.map
  18. 2 0
      build/test/assets/aside.b1d879a3.js
  19. 1 0
      build/test/assets/aside.b1d879a3.js.map
  20. 2 0
      build/test/assets/auth.f6d51e21.js
  21. 1 0
      build/test/assets/auth.f6d51e21.js.map
  22. 2 0
      build/test/assets/authAll.3e684ac4.js
  23. 1 0
      build/test/assets/authAll.3e684ac4.js.map
  24. 2 0
      build/test/assets/auths.f9a36c65.js
  25. 1 0
      build/test/assets/auths.f9a36c65.js.map
  26. 2 0
      build/test/assets/balance.00152d8d.js
  27. 1 0
      build/test/assets/balance.00152d8d.js.map
  28. 2 0
      build/test/assets/blackList.eab117c9.js
  29. 1 0
      build/test/assets/blackList.eab117c9.js.map
  30. 2 0
      build/test/assets/breadcrumb.a2d92f54.js
  31. 1 0
      build/test/assets/breadcrumb.a2d92f54.js.map
  32. 2 0
      build/test/assets/classic.12ae1cde.js
  33. 1 0
      build/test/assets/classic.12ae1cde.js.map
  34. 2 0
      build/test/assets/closeFull.3dd4128f.js
  35. 1 0
      build/test/assets/closeFull.3dd4128f.js.map
  36. 2 0
      build/test/assets/columns.dfda599c.js
  37. 1 0
      build/test/assets/columns.dfda599c.js.map
  38. 2 0
      build/test/assets/columnsAside.aaea8673.js
  39. 1 0
      build/test/assets/columnsAside.aaea8673.js.map
  40. 7 0
      build/test/assets/commonFunction.203a0abd.js
  41. 1 0
      build/test/assets/commonFunction.203a0abd.js.map
  42. 2 0
      build/test/assets/contextmenu.a2117d40.js
  43. 1 0
      build/test/assets/contextmenu.a2117d40.js.map
  44. 2 0
      build/test/assets/crkexport.5bd0dad1.js
  45. 1 0
      build/test/assets/crkexport.5bd0dad1.js.map
  46. 2 0
      build/test/assets/defaults.76fd34ca.js
  47. 1 0
      build/test/assets/defaults.76fd34ca.js.map
  48. 28 0
      build/test/assets/demo1.a0e3ce60.js
  49. 1 0
      build/test/assets/demo1.a0e3ce60.js.map
  50. 4283 0
      build/test/assets/demo2.21f4bab2.js
  51. 1 0
      build/test/assets/demo2.21f4bab2.js.map
  52. 2 0
      build/test/assets/departEdit.200c8dd8.js
  53. 1 0
      build/test/assets/departEdit.200c8dd8.js.map
  54. 2 0
      build/test/assets/department.e87e2503.js
  55. 1 0
      build/test/assets/department.e87e2503.js.map
  56. 2 0
      build/test/assets/detail.23a2a4d8.js
  57. 1 0
      build/test/assets/detail.23a2a4d8.js.map
  58. 2 0
      build/test/assets/dialog.44d85ce6.js
  59. 1 0
      build/test/assets/dialog.44d85ce6.js.map
  60. 2 0
      build/test/assets/dialog.8cba5033.js
  61. 1 0
      build/test/assets/dialog.8cba5033.js.map
  62. 2 0
      build/test/assets/edit.53e660d4.js
  63. 1 0
      build/test/assets/edit.53e660d4.js.map
  64. 2 0
      build/test/assets/export.a9fc091e.js
  65. 1 0
      build/test/assets/export.a9fc091e.js.map
  66. 2 0
      build/test/assets/export.ffc519c7.js
  67. 1 0
      build/test/assets/export.ffc519c7.js.map
  68. 2 0
      build/test/assets/getStyleSheets.81eb60fc.js
  69. 1 0
      build/test/assets/getStyleSheets.81eb60fc.js.map
  70. 2 0
      build/test/assets/good.46cd4eda.js
  71. 1 0
      build/test/assets/good.46cd4eda.js.map
  72. 2 0
      build/test/assets/head.e3e0b0be.js
  73. 1 0
      build/test/assets/head.e3e0b0be.js.map
  74. 2 0
      build/test/assets/header.cad12224.js
  75. 1 0
      build/test/assets/header.cad12224.js.map
  76. 2 0
      build/test/assets/horizontal.09e32d32.js
  77. 1 0
      build/test/assets/horizontal.09e32d32.js.map
  78. 2 0
      build/test/assets/import.951bb2f9.js
  79. 1 0
      build/test/assets/import.951bb2f9.js.map
  80. 2 0
      build/test/assets/import.9c7c9c35.js
  81. 1 0
      build/test/assets/import.9c7c9c35.js.map
  82. 2 0
      build/test/assets/import.faedaf9f.js
  83. 1 0
      build/test/assets/import.faedaf9f.js.map
  84. 2 0
      build/test/assets/index.00de5781.js
  85. 1 0
      build/test/assets/index.00de5781.js.map
  86. 2 0
      build/test/assets/index.0662cd38.js
  87. 1 0
      build/test/assets/index.0662cd38.js.map
  88. 2 0
      build/test/assets/index.08c2b548.js
  89. 1 0
      build/test/assets/index.08c2b548.js.map
  90. 2 0
      build/test/assets/index.14be1c4f.js
  91. 1 0
      build/test/assets/index.14be1c4f.js.map
  92. 2 0
      build/test/assets/index.1c427979.js
  93. 1 0
      build/test/assets/index.1c427979.js.map
  94. 2 0
      build/test/assets/index.2129ca47.js
  95. 1 0
      build/test/assets/index.2129ca47.js.map
  96. 2 0
      build/test/assets/index.2307aa4f.js
  97. 1 0
      build/test/assets/index.2307aa4f.js.map
  98. 2 0
      build/test/assets/index.24f23a29.js
  99. 1 0
      build/test/assets/index.24f23a29.js.map
  100. 0 0
      build/test/assets/index.29628b7a.js

+ 5 - 0
api/app/common/model/Project.php

@@ -8,6 +8,7 @@ use app\common\model\ProjectSchedule;
 
 /**
  * 
+ * @property string $status 状态值
  * @property array<number> $participants_id
  * @property number $responsibility_person_id
  * @property array<ProjectSchedule> $schedules
@@ -61,6 +62,10 @@ class Project extends Base
             ->join('admin a', 'a.id = s.updater_id', 'LEFT');
     }
 
+    public function getParticipantsIdAttr($value, $data) {
+        return array_map(fn($i) => (int) $i, json_decode($value) ?? []);
+    }
+
     public function getParticipantsAttr($value, $data) {
         return (new Admin)->where('id', 'in', $this->participants_id)->select()->map(fn($admin) => $admin->real_name);
     }

+ 1 - 0
api/app/common/model/ProjectSchedule.php

@@ -8,6 +8,7 @@ namespace app\common\model;
  * @property bool|int $is_update_project_status 是否更新项目状态
  * @property string $status 状态值
  * @property mixed $name
+ * @property Project $project 项目
  */
 class ProjectSchedule extends Base
 {

+ 4 - 2
api/app/common/service/ProjectScheduleService.php

@@ -37,8 +37,10 @@ class ProjectScheduleService extends Service
         }
 
         // 跳过、没有对应值、不更新项目状态值的projectNewStatus都是空,跳过
-        if (!$projectNewStatus) {
-            $schedule->project = $projectNewStatus;
+        if ($projectNewStatus) {
+            $project = $schedule->project;
+            $project->status = $projectNewStatus;
+            $project->save();
         }
 
         return ProjectSchedule::update($param);

File diff suppressed because it is too large
+ 2 - 0
build/test/assets/401.ad4cbf45.js


File diff suppressed because it is too large
+ 1 - 0
build/test/assets/401.ad4cbf45.js.map


File diff suppressed because it is too large
+ 2 - 0
build/test/assets/404.5bd49ab6.js


File diff suppressed because it is too large
+ 1 - 0
build/test/assets/404.5bd49ab6.js.map


File diff suppressed because it is too large
+ 2 - 0
build/test/assets/Good.4ce9a7c3.js


File diff suppressed because it is too large
+ 1 - 0
build/test/assets/Good.4ce9a7c3.js.map


File diff suppressed because it is too large
+ 2 - 0
build/test/assets/Repertory.27c9278a.js


File diff suppressed because it is too large
+ 1 - 0
build/test/assets/Repertory.27c9278a.js.map


File diff suppressed because it is too large
+ 2 - 0
build/test/assets/Setting.fe90a8d2.js


File diff suppressed because it is too large
+ 1 - 0
build/test/assets/Setting.fe90a8d2.js.map


File diff suppressed because it is too large
+ 2 - 0
build/test/assets/account.f93c5dff.js


File diff suppressed because it is too large
+ 1 - 0
build/test/assets/account.f93c5dff.js.map


File diff suppressed because it is too large
+ 2 - 0
build/test/assets/apiConfig.86921817.js


File diff suppressed because it is too large
+ 1 - 0
build/test/assets/apiConfig.86921817.js.map


File diff suppressed because it is too large
+ 2 - 0
build/test/assets/aside.b1d879a3.js


File diff suppressed because it is too large
+ 1 - 0
build/test/assets/aside.b1d879a3.js.map


+ 2 - 0
build/test/assets/auth.f6d51e21.js

@@ -0,0 +1,2 @@
+import{M as t,s as u,p,O as c,X as f}from"./vue.aade88c7.js";import{n as m}from"./index.72328493.js";const l=t({name:"auth"}),h=t({...l,props:{value:{type:String,default:()=>""}},setup(s){const o=s,r=m(),{userInfos:n}=u(r),a=p(()=>n.value.authBtnList.some(e=>e===o.value));return(e,d)=>a.value?c(e.$slots,"default",{key:0}):f("",!0)}});export{h as default};
+//# sourceMappingURL=auth.f6d51e21.js.map

File diff suppressed because it is too large
+ 1 - 0
build/test/assets/auth.f6d51e21.js.map


+ 2 - 0
build/test/assets/authAll.3e684ac4.js

@@ -0,0 +1,2 @@
+import{M as e,s as u,p,O as l,X as m}from"./vue.aade88c7.js";import{n as c,p as f}from"./index.72328493.js";const d=e({name:"authAll"}),v=e({...d,props:{value:{type:Array,default:()=>[]}},setup(t){const s=t,r=c(),{userInfos:o}=u(r),a=p(()=>f(s.value,o.value.authBtnList));return(n,_)=>a.value?l(n.$slots,"default",{key:0}):m("",!0)}});export{v as default};
+//# sourceMappingURL=authAll.3e684ac4.js.map

File diff suppressed because it is too large
+ 1 - 0
build/test/assets/authAll.3e684ac4.js.map


+ 2 - 0
build/test/assets/auths.f9a36c65.js

@@ -0,0 +1,2 @@
+import{M as s,s as p,p as l,O as m,X as c}from"./vue.aade88c7.js";import{n as d}from"./index.72328493.js";const i=s({name:"auths"}),v=s({...i,props:{value:{type:Array,default:()=>[]}},setup(a){const o=a,r=d(),{userInfos:n}=p(r),u=l(()=>{let e=!1;return n.value.authBtnList.map(t=>{o.value.map(f=>{t===f&&(e=!0)})}),e});return(e,t)=>u.value?m(e.$slots,"default",{key:0}):c("",!0)}});export{v as default};
+//# sourceMappingURL=auths.f9a36c65.js.map

File diff suppressed because it is too large
+ 1 - 0
build/test/assets/auths.f9a36c65.js.map


File diff suppressed because it is too large
+ 2 - 0
build/test/assets/balance.00152d8d.js


File diff suppressed because it is too large
+ 1 - 0
build/test/assets/balance.00152d8d.js.map


File diff suppressed because it is too large
+ 2 - 0
build/test/assets/blackList.eab117c9.js


File diff suppressed because it is too large
+ 1 - 0
build/test/assets/blackList.eab117c9.js.map


File diff suppressed because it is too large
+ 2 - 0
build/test/assets/breadcrumb.a2d92f54.js


File diff suppressed because it is too large
+ 1 - 0
build/test/assets/breadcrumb.a2d92f54.js.map


File diff suppressed because it is too large
+ 2 - 0
build/test/assets/classic.12ae1cde.js


File diff suppressed because it is too large
+ 1 - 0
build/test/assets/classic.12ae1cde.js.map


File diff suppressed because it is too large
+ 2 - 0
build/test/assets/closeFull.3dd4128f.js


File diff suppressed because it is too large
+ 1 - 0
build/test/assets/closeFull.3dd4128f.js.map


File diff suppressed because it is too large
+ 2 - 0
build/test/assets/columns.dfda599c.js


File diff suppressed because it is too large
+ 1 - 0
build/test/assets/columns.dfda599c.js.map


File diff suppressed because it is too large
+ 2 - 0
build/test/assets/columnsAside.aaea8673.js


File diff suppressed because it is too large
+ 1 - 0
build/test/assets/columnsAside.aaea8673.js.map


File diff suppressed because it is too large
+ 7 - 0
build/test/assets/commonFunction.203a0abd.js


File diff suppressed because it is too large
+ 1 - 0
build/test/assets/commonFunction.203a0abd.js.map


File diff suppressed because it is too large
+ 2 - 0
build/test/assets/contextmenu.a2117d40.js


File diff suppressed because it is too large
+ 1 - 0
build/test/assets/contextmenu.a2117d40.js.map


File diff suppressed because it is too large
+ 2 - 0
build/test/assets/crkexport.5bd0dad1.js


File diff suppressed because it is too large
+ 1 - 0
build/test/assets/crkexport.5bd0dad1.js.map


File diff suppressed because it is too large
+ 2 - 0
build/test/assets/defaults.76fd34ca.js


File diff suppressed because it is too large
+ 1 - 0
build/test/assets/defaults.76fd34ca.js.map


File diff suppressed because it is too large
+ 28 - 0
build/test/assets/demo1.a0e3ce60.js


File diff suppressed because it is too large
+ 1 - 0
build/test/assets/demo1.a0e3ce60.js.map


File diff suppressed because it is too large
+ 4283 - 0
build/test/assets/demo2.21f4bab2.js


File diff suppressed because it is too large
+ 1 - 0
build/test/assets/demo2.21f4bab2.js.map


File diff suppressed because it is too large
+ 2 - 0
build/test/assets/departEdit.200c8dd8.js


File diff suppressed because it is too large
+ 1 - 0
build/test/assets/departEdit.200c8dd8.js.map


File diff suppressed because it is too large
+ 2 - 0
build/test/assets/department.e87e2503.js


File diff suppressed because it is too large
+ 1 - 0
build/test/assets/department.e87e2503.js.map


File diff suppressed because it is too large
+ 2 - 0
build/test/assets/detail.23a2a4d8.js


File diff suppressed because it is too large
+ 1 - 0
build/test/assets/detail.23a2a4d8.js.map


File diff suppressed because it is too large
+ 2 - 0
build/test/assets/dialog.44d85ce6.js


File diff suppressed because it is too large
+ 1 - 0
build/test/assets/dialog.44d85ce6.js.map


File diff suppressed because it is too large
+ 2 - 0
build/test/assets/dialog.8cba5033.js


File diff suppressed because it is too large
+ 1 - 0
build/test/assets/dialog.8cba5033.js.map


File diff suppressed because it is too large
+ 2 - 0
build/test/assets/edit.53e660d4.js


File diff suppressed because it is too large
+ 1 - 0
build/test/assets/edit.53e660d4.js.map


File diff suppressed because it is too large
+ 2 - 0
build/test/assets/export.a9fc091e.js


File diff suppressed because it is too large
+ 1 - 0
build/test/assets/export.a9fc091e.js.map


File diff suppressed because it is too large
+ 2 - 0
build/test/assets/export.ffc519c7.js


File diff suppressed because it is too large
+ 1 - 0
build/test/assets/export.ffc519c7.js.map


File diff suppressed because it is too large
+ 2 - 0
build/test/assets/getStyleSheets.81eb60fc.js


File diff suppressed because it is too large
+ 1 - 0
build/test/assets/getStyleSheets.81eb60fc.js.map


File diff suppressed because it is too large
+ 2 - 0
build/test/assets/good.46cd4eda.js


File diff suppressed because it is too large
+ 1 - 0
build/test/assets/good.46cd4eda.js.map


File diff suppressed because it is too large
+ 2 - 0
build/test/assets/head.e3e0b0be.js


File diff suppressed because it is too large
+ 1 - 0
build/test/assets/head.e3e0b0be.js.map


File diff suppressed because it is too large
+ 2 - 0
build/test/assets/header.cad12224.js


File diff suppressed because it is too large
+ 1 - 0
build/test/assets/header.cad12224.js.map


File diff suppressed because it is too large
+ 2 - 0
build/test/assets/horizontal.09e32d32.js


File diff suppressed because it is too large
+ 1 - 0
build/test/assets/horizontal.09e32d32.js.map


File diff suppressed because it is too large
+ 2 - 0
build/test/assets/import.951bb2f9.js


File diff suppressed because it is too large
+ 1 - 0
build/test/assets/import.951bb2f9.js.map


File diff suppressed because it is too large
+ 2 - 0
build/test/assets/import.9c7c9c35.js


File diff suppressed because it is too large
+ 1 - 0
build/test/assets/import.9c7c9c35.js.map


File diff suppressed because it is too large
+ 2 - 0
build/test/assets/import.faedaf9f.js


File diff suppressed because it is too large
+ 1 - 0
build/test/assets/import.faedaf9f.js.map


File diff suppressed because it is too large
+ 2 - 0
build/test/assets/index.00de5781.js


File diff suppressed because it is too large
+ 1 - 0
build/test/assets/index.00de5781.js.map


File diff suppressed because it is too large
+ 2 - 0
build/test/assets/index.0662cd38.js


File diff suppressed because it is too large
+ 1 - 0
build/test/assets/index.0662cd38.js.map


File diff suppressed because it is too large
+ 2 - 0
build/test/assets/index.08c2b548.js


File diff suppressed because it is too large
+ 1 - 0
build/test/assets/index.08c2b548.js.map


File diff suppressed because it is too large
+ 2 - 0
build/test/assets/index.14be1c4f.js


File diff suppressed because it is too large
+ 1 - 0
build/test/assets/index.14be1c4f.js.map


File diff suppressed because it is too large
+ 2 - 0
build/test/assets/index.1c427979.js


File diff suppressed because it is too large
+ 1 - 0
build/test/assets/index.1c427979.js.map


File diff suppressed because it is too large
+ 2 - 0
build/test/assets/index.2129ca47.js


File diff suppressed because it is too large
+ 1 - 0
build/test/assets/index.2129ca47.js.map


File diff suppressed because it is too large
+ 2 - 0
build/test/assets/index.2307aa4f.js


File diff suppressed because it is too large
+ 1 - 0
build/test/assets/index.2307aa4f.js.map


File diff suppressed because it is too large
+ 2 - 0
build/test/assets/index.24f23a29.js


File diff suppressed because it is too large
+ 1 - 0
build/test/assets/index.24f23a29.js.map


+ 0 - 0
build/test/assets/index.29628b7a.js


Some files were not shown because too many files changed in this diff