修改安全、技术交底完分管才能审核通过，修改技术方案由部门负责人安排

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-19 09:24:06
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-05 16:56:04
+ * @LastEditTime: 2024-09-12 10:08:01
 -->
 <template>
   <div class="app-container">
@@ -175,13 +175,12 @@ export default {
         this.peopleForm.deptList = res.data
       })
     },
-    getDeptLeader(val) {
+    async getDeptLeader(val) {
       this.deptLeaderList = [];
       for (let v of val) {
-        getUsersDeptLeaderByDept({ deptId: Number(v) }).then(res => {
-          this.deptLeaderList.push(res.data.userId);
-          this.form.deptLeader = this.deptLeaderList;
-        })
+        let res = await getUsersDeptLeaderByDept({ deptId: Number(v) })
+        this.deptLeaderList.push(res.data.userId);
+        this.form.deptLeader = this.deptLeaderList;
       }
       val.forEach(item => {
         listUser({ pageSize: 999, deptId: item }).then(res => {
@@ -257,8 +256,8 @@ export default {
             // 获取下一个流程节点
             getNextFlowNode(params).then(res => {
               this.$set(this.taskForm.variables, "formId", this.taskForm.formId);
-              this.$set(this.taskForm.variables, "budgetInitiator", this.peopleForm.userId || this.form.projectLeader);
-              this.$set(this.taskForm.variables, "planInitiator", this.peopleForm.userId || this.form.projectLeader);
+              this.$set(this.taskForm.variables, "budgetInitiator", this.form.projectLeader);
+              this.$set(this.taskForm.variables, "planInitiator", this.deptLeaderList[0]);
               this.$set(this.taskForm.variables, "approval", approvalId);
               complete(this.taskForm).then(response => {
                 this.$modal.msgSuccess(response.msg);

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

@@ -2,12 +2,26 @@
  * @Author: ysh
  * @Date: 2024-04-08 13:56:14
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-11 16:29:59
+ * @LastEditTime: 2024-09-12 11:35:24
 -->
 <template>
   <div class="app-container">
     <h2 style="text-align:center;">分管审核</h2>
     <el-form :model="form" :rules="rules" label-width="100px" :disabled="disabled">
+      <el-form-item label="交底情况：">
+        <el-row>
+          <el-checkbox v-model="safe" disabled>安全交底</el-checkbox>
+          <el-link class="ml20" type="primary" @click="openSafe = true">安全交底记录表</el-link>
+        </el-row>
+        <el-row>
+          <el-checkbox v-model="tech" disabled>技术交底</el-checkbox>
+          <el-link class="ml20" type="primary" @click="openTech = true">技术交底记录表</el-link>
+        </el-row>
+        <el-row>
+          <el-checkbox v-model="plan" disabled>技术方案</el-checkbox>
+          <el-link class="ml20" type="primary" @click="openPlan = true">技术方案</el-link>
+        </el-row>
+      </el-form-item>
       <el-form-item label="审核意见：" prop="manageComment">
         <el-input type="textarea" :rows="4" placeholder="请输入审核意见" v-model="form.manageComment">
         </el-input>
@@ -22,6 +36,16 @@
         <p style="text-align:center;"><el-button type="primary" @click="confirm">确认审核</el-button></p>
       </el-form-item>
     </el-form>
+
+    <el-dialog title="安全交底记录表" :visible.sync="openSafe" width="1000px" append-to-body>
+      <safe-tab :taskForm="taskForm"></safe-tab>
+    </el-dialog>
+    <el-dialog title="技术交底记录表" :visible.sync="openTech" width="1000px" append-to-body>
+      <technical-tab :taskForm="taskForm"></technical-tab>
+    </el-dialog>
+    <el-dialog title="技术方案" :visible.sync="openPlan" width="1000px" append-to-body>
+      <plan-tab :taskForm="taskForm"></plan-tab>
+    </el-dialog>
   </div>
 </template>
 
@@ -32,10 +56,17 @@ import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate
 import { getProjectComment, addProjectComment, updateProjectComment } from "@/api/oa/project/projectComment"
 import { getProject } from "@/api/oa/project/project"
 import { getUsersDeptLeaderByDept } from '@/api/system/post'
+import { getSafe } from "@/api/oa/safe/safe";
+import { getTechnical } from "@/api/oa/technical/technical";
+import { getTechnicalPlan } from "@/api/oa/technical/technicalPlan";
+import safeTab from '@/views/flowable/form/projectProcess/safeTab.vue';
+import PlanTab from '@/views/flowable/form/projectProcess/planTab.vue';
+import TechnicalTab from '@/views/flowable/form/projectProcess/technicalTab.vue';
 export default {
   computed: {
     ...mapGetters(['name', 'userId']),
   },
+  components: { safeTab, PlanTab, TechnicalTab },
   props: {
     disabled: {
       type: Boolean,
@@ -56,8 +87,14 @@ export default {
       form: {
         manageApprover: '',
         manageApproverName: '',
-        manageApprovalTime: ''
+        manageApprovalTime: '',
       },
+      safe: false,
+      tech: false,
+      plan: false,
+      openSafe: false,
+      openTech: false,
+      openPlan: false,
       rules: {
         manageComment: [{ required: true, message: "请输入审核意见", trigger: "blur" }]
       },
@@ -108,6 +145,22 @@ export default {
           }
         }
       })
+      this.haveJD();
+    },
+    async haveJD() {
+      let formId = this.taskForm.formId;
+      let resSafe = await getSafe(formId);
+      let resPlan = await getTechnicalPlan(formId);
+      let resTech = await getTechnical(formId);
+      if (resSafe.data) {
+        this.safe = true
+      }
+      if (resPlan.data) {
+        this.plan = true
+      }
+      if (resTech.data) {
+        this.tech = true
+      }
     },
     getDeptLeader(val) {
       this.deptLeaderList = [this.projectLeader];
@@ -123,6 +176,10 @@ export default {
       }
     },
     confirm() {
+      if (!(this.safe && this.tech)) {
+        this.$message.error('安全交底或者技术交底未全部完成，等待相关人员完成才可提交')
+        return
+      }
       this.form.projectId = this.taskForm.formId
       updateProjectComment({ projectId: this.taskForm.formId, manageComment: this.form.manageComment })
       const params = { taskId: this.taskForm.taskId };
@@ -153,7 +210,26 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+@import "@/assets/styles/element-reset.scss";
+
 ::v-deep .el-textarea.is-disabled .el-textarea__inner {
   color: #121212 !important;
 }
+
+::v-deep .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner::after {
+  border-color: #fff;
+}
+
+::v-deep .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner {
+  background-color: #409eff;
+  border-color: #409eff;
+}
+
+::v-deep .el-checkbox__input.is-disabled+span.el-checkbox__label {
+  color: #000;
+}
+
+::v-deep .el-checkbox__label {
+  font-size: 12px;
+}
 </style>

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

@@ -157,12 +157,12 @@
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
               <el-form-item label="签名" prop="techDeptLeader">
-                <span class="auditor"> {{ form.techDeptLeader ? form.techDeptUser.nickName : managerUser }} </span>
+                <span class="auditor"> {{ form.techDeptLeader ? form.techDeptUser.nickName : techUser }} </span>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="日期：" label-width="120px">
-                <span> {{ form.techDeptTime ? form.techDeptTime : manageApprovalTime }} </span>
+                <span> {{ form.techDeptTime ? form.techDeptTime : techApprovalTime }} </span>
               </el-form-item>
             </el-col>
           </el-row>
@@ -273,12 +273,14 @@ export default {
       baseUrl: process.env.VUE_APP_BASE_API,
       planUser: '',
       managerUser: '',
+      techUser:'',
       designUser: '',
       auditUser: '',
       technicalTime: undefined,
       technicalUploadTime: undefined,
       techApprovalTime: undefined,
       manageApprovalTime: undefined,
+      techApprovalTime:undefined,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -354,10 +356,14 @@ export default {
       this.auditUser = this.$store.getters.name;
       this.techApprovalTime = parseTime(new Date(), '{y}-{m}-{d}')
     }
-    // if (this.taskName == '总工审核') {
-    this.managerUser = this.$store.getters.name;
-    this.manageApprovalTime = parseTime(new Date(), '{y}-{m}-{d}')
-    // }
+    if (this.taskName == '总工审核') {
+      this.managerUser = this.$store.getters.name;
+      this.manageApprovalTime = parseTime(new Date(), '{y}-{m}-{d}')
+    }
+    if(this.taskName == '技术质量部审核'){
+      this.techUser = this.$store.getters.name;
+      this.techApprovalTime = parseTime(new Date(), '{y}-{m}-{d}')
+    }
     this.getProjectById();
     this.getUserList();
     this.getList();