修改分管领导判断安全交底、技术交底

oa-ui/src/views/flowable/form/oa/carForm.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-02-29 11:44:28
- * @LastEditors: wrh
- * @LastEditTime: 2024-09-06 14:14:38
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-09-19 10:53:41
 -->
 
 <template>
@@ -100,7 +100,7 @@
               </el-form-item>
               <el-divider></el-divider>
               <!-- 部门审核意见 -->
-              <el-form-item label="部门审核意见：" prop="deptComment" label-width="120px" v-if="showFormItem('部门审核')">
+              <el-form-item label="部门审核意见：" prop="deptComment" label-width="125px" v-if="showFormItem('部门审核')">
                 <el-input type="textarea" :rows="2" placeholder="请输入部门审核意见" v-model="form.deptComment"
                   :disabled="taskName != '部门审核'">
                 </el-input>
@@ -118,7 +118,7 @@
                 </el-col>
               </el-row>
               <!-- 分管审核意见 -->
-              <el-form-item label="分管审核意见：" prop="managerComment" label-width="120px" v-if="showFormItem('分管审核')">
+              <el-form-item label="分管审核意见：" prop="managerComment" label-width="125px" v-if="showFormItem('分管审核')">
                 <el-input type="textarea" :rows="2" placeholder="请输入分管审核意见" v-model="form.managerComment"
                   :disabled="taskName != '分管审核'">
                 </el-input>

oa-ui/src/views/flowable/form/projectProcess/manageReview.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-08 13:56:14
- * @LastEditors: wrh
- * @LastEditTime: 2024-09-12 16:18:28
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-09-19 10:40:21
 -->
 <template>
   <div class="app-container">
@@ -159,13 +159,16 @@ export default {
       let resPlan = await getTechnicalPlan(formId);
       let resTech = await getTechnical(formId);
       if (resSafe.data) {
-        this.safe = true
+        if (resSafe.data.acceptComment && resSafe.data.acceptTime)
+          this.safe = true
       }
       if (resPlan.data) {
-        this.plan = true
+        if (resPlan.data.technicalDocument && resPlan.data.technicalComment)
+          this.plan = true
       }
       if (resTech.data) {
-        this.tech = true
+        if (resTech.data.acceptComment)
+          this.tech = true
       }
     },
     getDeptLeader(val) {

oa-ui/src/views/flowable/form/projectProcess/planTab.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-19 15:32:00
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-08-02 10:43:19
+ * @LastEditTime: 2024-09-19 10:27:58
 -->
 <template>
   <div class="app-container">
@@ -186,7 +186,7 @@ export default {
       form: {},
       rules: {},
       userList: [],
-      openPrint:false,
+      openPrint: false,
     };
   },
   mounted() {
@@ -206,15 +206,12 @@ export default {
           let qualityInspector = this.processQualityInspector(technicalPlanRes.data)
           technicalPlanRes.data.qualityInspector = qualityInspector
           this.form = technicalPlanRes.data;
-          if (!this.projectNumber || !this.projectName) {
-            // 仅在需要时调用getProject  
-            const projectRes = await getProject(this.taskForm.formId);
-            if (projectRes.data) {
-              this.$set(this.form, "projectNumber", projectRes.data.projectNumber);
-              this.$set(this.form, "projectName", projectRes.data.projectName);
-              this.$set(this.form, "projectLeader", projectRes.data.projectLeader);
-              this.$set(this.form, "undertakingDept", projectRes.data.undertakingDept);
-            }
+          const projectRes = await getProject(this.taskForm.formId);
+          if (projectRes.data) {
+            this.$set(this.form, "projectNumber", projectRes.data.projectNumber);
+            this.$set(this.form, "projectName", projectRes.data.projectName);
+            this.$set(this.form, "projectLeader", projectRes.data.projectLeader);
+            this.$set(this.form, "undertakingDept", projectRes.data.undertakingDept);
           }
         }
       } catch (error) {

oa-ui/src/views/flowable/task/myProcess/index.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-13 14:47:39
+ * @LastEditTime: 2024-09-19 11:18:09
 -->
 <template>
   <div class="app-container">
@@ -296,6 +296,7 @@ export default {
     },
     /**  发起流程申请 */
     handleStartProcess(row) {
+      console.log(row);
       // if (row.category == "assess" || row.category == "car" || ) {
       let formId = new Snowflake(1n, 1n, 0n).nextId().toString();
       getNextFlowNodeByStart({ deploymentId: row.deploymentId, variables: { formId: formId } }).then(res => {