技术质量部流程节点修改

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

@@ -94,9 +94,9 @@
           </el-row> -->
           <el-form-item label="技术质量与安全部负责人审核" prop="deptComment">
             <el-input type="textarea" v-model="form.deptComment" placeholder="请输入技术质量与安全部负责人审核意见"
-              :disabled="taskName != '技术质量部审核'" :autosize="{ minRows: 4 }" />
+              :disabled="taskName != '技术质量与安全部审核'" :autosize="{ minRows: 4 }" />
           </el-form-item>
-          <auditor-row key="1" :isCurrent="taskName == '技术质量部审核'" :signature="form.deptLeader"
+          <auditor-row key="1" :isCurrent="taskName == '技术质量与安全部审核'" :signature="form.deptLeader"
             :signTime="form.deptTime"></auditor-row>
           <el-form-item label="资料管理">
             <el-button type="success" size="mini" @click="gotoFile" :disabled="taskName != '成果归档'">前往资料管理系统</el-button>
@@ -254,7 +254,7 @@ export default {
       this.qualityUser = this.$store.getters.name;
       this.qualityTime = parseTime(new Date(), '{y}-{m}-{d}')
     }
-    else if (this.taskName == '技术质量部审核') {
+    else if (this.taskName == '技术质量与安全部审核') {
       this.deptUser = this.$store.getters.name;
       this.deptTime = parseTime(new Date(), '{y}-{m}-{d}')
     }
@@ -323,7 +323,7 @@ export default {
             { required: true, message: '请填写审核意见', trigger: 'blur' }
           ]
         }
-      } else if (this.taskName == '技术质量部审核') {
+      } else if (this.taskName == '技术质量与安全部审核') {
         this.rules = {
           deptComment: [
             { required: true, message: '请填写审核意见', trigger: 'blur' }
@@ -411,7 +411,7 @@ export default {
                   });
                 });
               }
-              if (this.taskName == '技术质量部审核') {
+              if (this.taskName == '技术质量与安全部审核') {
                 getUserByRole({ roleId: 6 }).then(result => {
                   this.$set(this.taskForm.variables, "approval", result.data[0]);
                   complete(this.taskForm).then(response => {

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-06-21 18:51:54
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-05 13:55:35
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-10-09 09:57:41
 -->
 <template>
   <div>
@@ -34,7 +34,7 @@
         <el-form-item label="使用车辆：">
           <el-tooltip class="item" effect="dark" content="直接获取用车申请中的车辆,若无车辆,则需要先提交项目的用车申请" placement="top-end">
             <el-select v-model="form.cars" multiple disabled style="width:90%">
-              <el-option v-for="item in carList" :label="item.licensePlate + item.brand" :value="item.carId"
+              <el-option v-for="item in carList" :label="item.licensePlate + (item.brand ? item.brand : '') + (item.series ? item.series : '')" :value="item.carId"
                 :key="item.carId">
               </el-option>
             </el-select>

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

@@ -363,7 +363,7 @@
               </el-col>
             </el-row>
             <el-form-item label="技术质量与安全部(质量及工作量)">
-              <el-input v-model="form.jsComment" type="textarea" :disabled="taskName != '技术质量部审核'" clearable
+              <el-input v-model="form.jsComment" type="textarea" :disabled="taskName != '技术质量与安全部审核'" clearable
                 :autosize="{ minRows: 4, maxRows: 10 }">
               </el-input>
             </el-form-item>
@@ -748,7 +748,7 @@ export default {
         this.form.zhUserName = this.$store.state.user.name;
         this.form.zhUserId = this.$store.state.user.id;
         this.form.zhTime = parseTime(new Date(), "{y}-{m}-{d}");
-      } else if (this.taskName == "技术质量部审核") {
+      } else if (this.taskName == "技术质量与安全部审核") {
         this.form.jsUserName = this.$store.state.user.name;
         this.form.jsUserId = this.$store.state.user.id;
         this.form.jsTime = parseTime(new Date(), "{y}-{m}-{d}");
@@ -803,7 +803,7 @@ export default {
             })
           } else if (this.taskName == "综合事务部处理") {
             this.getNextFlowNodeFn(null, 109, false);
-          } else if (this.taskName == "技术质量部审核") {
+          } else if (this.taskName == "技术质量与安全部审核") {
             this.getNextFlowNodeFn(null, 105, true);
           } else if (this.taskName == "经营发展部校核") {
             this.getNextFlowNodeFn(null, this.deptId, true);

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

@@ -137,10 +137,10 @@
             </el-col>
           </el-row>
           <el-form-item label="修改技术方案" prop="reviseDocument">
-            <FileUpload v-if="taskName == '技术质量部审核'" ref="final" :limit="1" :filePathName="'技术方案/质量部修改'"
+            <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 != '技术质量部审核'">
+            <div v-if="form.reviseDocument && taskName != '技术质量与安全部审核'">
               <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.reviseDocument}`)">
                 {{ getFileName(form.reviseDocument) }}
               </el-link>
@@ -152,7 +152,7 @@
           </el-form-item>
           <el-form-item label="技术质量与安全部审核意见" prop="techDeptComment">
             <el-input type="textarea" v-model="form.techDeptComment" :autosize="{ minRows: 4 }" placeholder="请输入意见"
-              :disabled="taskName != '技术质量部审核'" />
+              :disabled="taskName != '技术质量与安全部审核'" />
           </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
@@ -360,7 +360,7 @@ export default {
       this.managerUser = this.$store.getters.name;
       this.manageApprovalTime = parseTime(new Date(), '{y}-{m}-{d}')
     }
-    if(this.taskName == '技术质量部审核'){
+    if(this.taskName == '技术质量与安全部审核'){
       this.techUser = this.$store.getters.name;
       this.techApprovalTime = parseTime(new Date(), '{y}-{m}-{d}')
     }
@@ -395,7 +395,7 @@ export default {
             { required: true, message: '请输入技术方案审核意见', trigger: 'blur' }
           ]
         }
-      } else if (this.taskName == '技术质量部审核') {
+      } else if (this.taskName == '技术质量与安全部审核') {
         this.rules = {
           techDeptComment: [
             { required: true, message: '请输入技术方案审核意见', trigger: 'blur' }
@@ -554,7 +554,7 @@ export default {
               else if (this.taskName == '技术审核') {
                 this.commentOpen = true;
                 this.examineLabel = '是否提交到技术质量与安全部审核？'
-              } else if (this.taskName == '技术质量部审核') {
+              } else if (this.taskName == '技术质量与安全部审核') {
                 this.commentOpen = true;
                 this.examineLabel = '是否提交到总工程师审核？'
               }
@@ -595,7 +595,7 @@ export default {
       if (this.taskName == '技术审核') {
         let res = await getUsersDeptLeaderByDept({ deptId: 109 })
         this.$set(this.taskForm.variables, "approval", res.data.userId);
-      } else if (this.taskName == '技术质量部审核') {
+      } else if (this.taskName == '技术质量与安全部审核') {
         let res = await getUserByPost({ postName: "总工程师" })
         this.$set(this.taskForm.variables, "approval", res.data[0].userId);
       }

oa-ui/src/views/oa/project/info.vue

@@ -355,7 +355,7 @@
                 使用车辆
               </template>
               <el-select v-model="cars" multiple disabled style="width:100%">
-                <el-option v-for="item in carList" :label="item.licensePlate + item.brand" :value="item.carId"
+                <el-option v-for="item in carList" :label="item.licensePlate + (item.brand ? item.brand : '') + (item.series ? item.series : '')" :value="item.carId"
                   :key="item.carId">
                 </el-option>
               </el-select>