去掉项目流转生产确认、修改技术交底、修改技术方案

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-10 16:23:32
+ * @LastEditTime: 2024-09-11 16:28:20
 -->
 
 <template>
@@ -29,10 +29,10 @@
             <manage-review :taskForm="taskForm" :taskName="taskName" :disabled="taskName != '分管审核'"
               @goBack="goBack"></manage-review>
           </el-tab-pane>
-          <el-tab-pane label="生产确认" name="生产确认">
+          <!-- <el-tab-pane label="生产确认" name="生产确认">
             <sc-confirm :taskForm="taskForm" :taskName="taskName" :disabled="taskName != '生产确认'"
               @goBack="goBack"></sc-confirm>
-          </el-tab-pane>
+          </el-tab-pane> -->
           <el-tab-pane label="项目生产" name="项目生产">
             <in-progress :taskForm="taskForm" :taskName="taskName" :disabled="taskName != '项目生产'"
               @goBack="goBack"></in-progress>

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-03 11:01:13
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-09-11 16:29:59
 -->
 <template>
   <div class="app-container">
@@ -127,12 +127,24 @@ export default {
       updateProjectComment({ projectId: this.taskForm.formId, manageComment: this.form.manageComment })
       const params = { taskId: this.taskForm.taskId };
       // 获取下一个流程节点
+      // getNextFlowNode(params).then(res => {
+      //   this.$set(this.taskForm.variables, "approvalList", this.deptLeaderList);
+      //   complete(this.taskForm).then(response => {
+      //     this.$modal.msgSuccess(response.msg);
+      //     this.$emit("goBack");
+      //   });
+      // });
       getNextFlowNode(params).then(res => {
-        this.$set(this.taskForm.variables, "approvalList", this.deptLeaderList);
-        complete(this.taskForm).then(response => {
-          this.$modal.msgSuccess(response.msg);
-          this.$emit("goBack");
-        });
+        getProject(this.taskForm.formId).then(res => {
+          if (res.data) {
+            this.$set(this.taskForm.variables, "approval", res.data.projectLeader);
+            complete(this.taskForm).then(response => {
+              this.$modal.msgSuccess(response.msg);
+              this.$emit("goBack");
+            });
+          }
+        })
+
       });
     },
 

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-07-04 17:37:29
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-11 11:37:30
+ * @LastEditTime: 2024-09-11 16:50:14
 -->
 <template>
   <div class="app-container" v-loading="loading">
@@ -54,6 +54,7 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <!--  -->
         <el-form-item label="接受交底意见" prop="acceptComment">
           <el-input v-model="form.acceptComment" placeholder="请输入接受交底意见" type="textarea" :autosize="{ minRows: 4 }" />
         </el-form-item>
@@ -69,6 +70,22 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <!--  -->
+        <el-form-item label="确认交底意见" prop="confirmComment">
+          <el-input v-model="form.confirmComment" placeholder="请输入确认交底意见" type="textarea" :autosize="{ minRows: 4 }" />
+        </el-form-item>
+        <el-row>
+          <el-col :span="6" :xs="24" :offset="12">
+            <el-form-item label="签名">
+              <span class="auditor"> {{ form.confirmUser ? form.confirmUser.nickName : '' }} </span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="日期：" label-width="120px">
+              <span> {{ parseTime(form.confirmTime, '{y}-{m}-{d}') }} </span>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </div>
     <el-dialog title="技术交底表格预览" :visible.sync="openPrint" width="65%" append-to-body>

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

@@ -7,17 +7,17 @@
             <el-input v-model="chooseProject.projectNumber" placeholder="请输入项目编号" disabled style="width: 300px" />
             <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="1">
               <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
-              }}</el-descriptions-item>
+                }}</el-descriptions-item>
               <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
-              }}</el-descriptions-item>
+                }}</el-descriptions-item>
               <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ?
-                chooseProject.projectLeaderUser.nickName : ''
-              }}</el-descriptions-item>
+      chooseProject.projectLeaderUser.nickName : ''
+                }}</el-descriptions-item>
               <el-descriptions-item label="承担部门" label-class-name="my-label">
                 <el-tag size="small">{{ chooseProject.undertakingDeptName }}</el-tag>
               </el-descriptions-item>
               <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
-              }}</el-descriptions-item>
+                }}</el-descriptions-item>
             </el-descriptions>
           </el-form-item>
           <el-form-item label="接受交底人" prop="accepter">
@@ -28,8 +28,8 @@
             </el-select>
           </el-form-item>
           <el-form-item label="技术交底内容" prop="content">
-            <el-input v-model="form.content" placeholder="请输入技术交底内容" type="textarea"
-              :disabled="taskName != '技术交底'" :autosize="{ minRows: 8 }" />
+            <el-input v-model="form.content" placeholder="请输入技术交底内容" type="textarea" :disabled="taskName != '技术交底'"
+              :autosize="{ minRows: 8 }" />
           </el-form-item>
           <el-form-item label="附件" prop="document">
             <FileUpload v-if="taskName == '技术交底'" ref="bsFile" :limit="1" :filePathName="'技术交底'"
@@ -63,7 +63,7 @@
           </el-row>
           <el-form-item label="接受交底意见" prop="acceptComment" v-if="taskName != '技术交底'">
             <el-input v-model="form.acceptComment" placeholder="请输入接受交底意见" type="textarea" :autosize="{ minRows: 4 }"
-              :disabled="taskName == ''" />
+              :disabled="taskName != '接受交底'" />
           </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
@@ -77,7 +77,7 @@
               </el-form-item>
             </el-col>
           </el-row>
-          
+
           <el-form-item label="确认交底意见" prop="confirmComment" v-if="taskName != '技术交底' && taskName != '接受交底'">
             <el-input v-model="form.confirmComment" placeholder="请输入确认交底意见" type="textarea" :autosize="{ minRows: 4 }"
               :disabled="taskName == ''" />
@@ -118,6 +118,7 @@ import { listUser } from '@/api/system/user';
 import flow from '@/views/flowable/task/todo/detail/flow';
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
 import { flowXmlAndNode } from "@/api/flowable/definition";
+import { getUsersManageLeaderByDept, getUsersDeptLeaderByDept, getUserByPost } from '@/api/system/post'
 
 export default {
   components: {
@@ -235,7 +236,9 @@ export default {
           this.formTotal = 1;
           this.form = res.data;
           this.acceptUser = this.$store.getters.name;
+          this.confirmUser = this.$store.getters.name;
           this.form.acceptTime = new Date();
+          this.form.confirmTime = new Date();
         }
       })
     },
@@ -262,11 +265,6 @@ export default {
         this.loading = false;
       });
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
     isEmptyObject(obj) {
       for (var key in obj) {
         if (obj.hasOwnProperty(key)) {
@@ -290,38 +288,6 @@ export default {
       };
       this.resetForm("form");
     },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.technicalId)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加cmc技术交底";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const technicalId = row.technicalId || this.ids
-      getTechnical(technicalId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改cmc技术交底";
-      });
-    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
@@ -333,9 +299,13 @@ export default {
               this.getList();
             });
             const params = { taskId: this.taskForm.taskId };
-            getNextFlowNode(params).then(res => {
-              if (this.taskName == '技术交底')                
+            getNextFlowNode(params).then(async res => {
+              if (this.taskName == '技术交底')
                 this.$set(this.taskForm.variables, "approval", this.form.accepter);
+              else if (this.taskName == '接受交底') {
+                let res = await getUsersDeptLeaderByDept({ deptId: 109 })
+                this.$set(this.taskForm.variables, "approval", res.data.userId);
+              }
               complete(this.taskForm).then(response => {
                 this.$modal.msgSuccess(response.msg);
                 this.$emit('goBack')

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

@@ -136,6 +136,36 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-form-item label="修改技术方案" prop="reviseDocument">
+            <FileUpload v-if="taskName == '技术质量部审核'" ref="final" :limit="1" :filePathName="'技术方案/质量部修改'"
+              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getReviseDoc">
+            </FileUpload>
+            <div v-if="form.reviseDocument && taskName != '技术质量部审核'">
+              <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.reviseDocument}`)">
+                {{ getFileName(form.reviseDocument) }}
+              </el-link>
+              <el-link class="ml20" type="warning" :href="`${baseUrl}${'/profile/upload' + form.reviseDocument}`"
+                :underline="false" target="_blank">
+                <span class="el-icon-download">下载文件</span>
+              </el-link>
+            </div>
+          </el-form-item>
+          <el-form-item label="技术质量与安全部审核意见" prop="techDeptComment">
+            <el-input type="textarea" v-model="form.techDeptComment" :autosize="{ minRows: 4 }" placeholder="请输入意见"
+              :disabled="taskName != '技术质量部审核'" />
+          </el-form-item>
+          <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>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="日期：" label-width="120px">
+                <span> {{ form.techDeptTime ? form.techDeptTime : manageApprovalTime }} </span>
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-form-item label="最终技术方案" prop="finalDocument">
             <FileUpload v-if="taskName == '总工审核'" ref="final" :limit="1" :filePathName="'技术方案/最终'"
               :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getFinalDoc"></FileUpload>
@@ -194,6 +224,21 @@
         <el-button type="primary" @click="taskComplete">确 定</el-button>
       </span>
     </el-dialog>
+    <el-dialog title="选择审核方式" :visible.sync="commentOpen" width="450px" append-to-body>
+      <div class="text-center">
+        <el-form>
+          <el-form-item :label="examineLabel"></el-form-item>
+        </el-form>
+        <el-radio-group v-model="common">
+          <el-radio label="0" border>是</el-radio>
+          <el-radio label="1" border>否</el-radio>
+        </el-radio-group>
+      </div>
+      <span slot="footer" class="text-center">
+        <el-button @click="commentOpen = false">取 消</el-button>
+        <el-button type="primary" @click="confirmExamine">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -206,7 +251,7 @@ import FlowUser from '@/components/flow/User';
 import flow from '@/views/flowable/task/todo/detail/flow';
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
 import { flowXmlAndNode } from "@/api/flowable/definition";
-import { getUsersManageLeaderByDept, getUserByPost } from '@/api/system/post'
+import { getUsersManageLeaderByDept, getUsersDeptLeaderByDept, getUserByPost } from '@/api/system/post'
 
 export default {
   components: {
@@ -290,7 +335,10 @@ export default {
       completeOpen: false,
       completeTitle: '',
       checkType: 'single',
-      isDocumentValid: true
+      isDocumentValid: true,
+      commentOpen: false,
+      common: '0',
+      examineLabel: ''
     };
   },
   created() {
@@ -306,10 +354,10 @@ 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}')
+    // }
     this.getProjectById();
     this.getUserList();
     this.getList();
@@ -341,6 +389,12 @@ export default {
             { required: true, message: '请输入技术方案审核意见', trigger: 'blur' }
           ]
         }
+      } else if (this.taskName == '技术质量部审核') {
+        this.rules = {
+          techDeptComment: [
+            { required: true, message: '请输入技术方案审核意见', trigger: 'blur' }
+          ]
+        }
       } else if (this.taskName == '总工审核') {
         this.rules = {
           manageComment: [
@@ -403,6 +457,9 @@ export default {
     getFinalDoc(val) {
       this.getDoc(val, 'finalDocument')
     },
+    getReviseDoc(val){
+      this.getDoc(val, 'reviseDocument')
+    },
     getDoc(val, name) {
       if (val) {
         let arr = val.split('/upload')
@@ -471,6 +528,7 @@ export default {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
+              this.initForm();
             });
             const params = { taskId: this.taskForm.taskId };
             getNextFlowNode(params).then(res => {
@@ -488,13 +546,11 @@ export default {
                 this.completeTitle = "流程审批";
               }
               else if (this.taskName == '技术审核') {
-                getUserByPost({ postName: "总工程师" }).then(res => {
-                  this.$set(this.taskForm.variables, "approval", res.data[0].userId);
-                  complete(this.taskForm).then(response => {
-                    this.$modal.msgSuccess(response.msg);
-                    this.$emit('goBack')
-                  });
-                })
+                this.commentOpen = true;
+                this.examineLabel = '是否提交到技术质量与安全部审核？'
+              } else if (this.taskName == '技术质量部审核') {
+                this.commentOpen = true;
+                this.examineLabel = '是否提交到总工程师审核？'
               }
               else if (this.taskName == '总工审核') {
                 complete(this.taskForm).then(response => {
@@ -526,6 +582,22 @@ export default {
         }
       });
     },
+    async confirmExamine() {
+      let res = this.common == '0' ? false : true;
+      console.log(res);
+      this.$set(this.taskForm.variables, "common", res);
+      if (this.taskName == '技术审核') {
+        let res = await getUsersDeptLeaderByDept({ deptId: 109 })
+        this.$set(this.taskForm.variables, "approval", res.data.userId);
+      } else if (this.taskName == '技术质量部审核') {
+        let res = await getUserByPost({ postName: "总工程师" })
+        this.$set(this.taskForm.variables, "approval", res.data[0].userId);
+      }
+      await complete(this.taskForm).then(response => {
+        this.$modal.msgSuccess(response.msg);
+        this.$emit('goBack')
+      });
+    },
     showFormItem(name) {
       let isShow = false;
       if (name == '技术安排')