CCAP编制任务处理列表

src/api/CCAPCompileTaskProcessing/CCAPCompileTaskProcessing.js

@@ -14,5 +14,12 @@ export function getAllvehicleModelCode() {
     method: 'get',
   })
 }
-
+// 查询人员的编制任务列表
+export function getAssignPersonList(query) {
+  return request({
+    url: '/control/assignPerson/list',
+    method: 'get',
+    params: query
+  })
+}
 

src/locales/controlPlan/CCAPControlPlan/CCAPCompileTaskProcessing/index/cn.json

@@ -53,5 +53,7 @@
   "copTestAndChecklist": "COP试验和检查表",
   "compilationResponsiblePerson": "编制负责人",
   "manufacturingCompilationResponsiblePerson": "制造编制负责人",
-  "qualityControlCompilationResponsiblePerson": "质管编制负责人"
+  "qualityControlCompilationResponsiblePerson": "质管编制负责人",
+  "taskName": "任务名称",
+  "myProcessingStatus": "我的处理状态"
 }

src/locales/controlPlan/CCAPControlPlan/CCAPCompileTaskProcessing/index/en.json

@@ -53,5 +53,7 @@
   "copTestAndChecklist": "COP Test and Checklist",
   "compilationResponsiblePerson": "Compilation Responsible Person",
   "manufacturingCompilationResponsiblePerson": "Manufacturing Compilation Responsible Person",
-  "qualityControlCompilationResponsiblePerson": "Quality Control Compilation Responsible Person"
+  "qualityControlCompilationResponsiblePerson": "Quality Control Compilation Responsible Person",
+  "taskName": "Task Name",
+  "myProcessingStatus": "My Processing Status"
 }

src/views/controlPlan/CCAPControlPlan/CCAPControlPlanManagement/index.vue

@@ -530,7 +530,7 @@
           <el-checkbox v-model="isChecked1">
             {{cn.keyPartsList}}{{en.keyPartsList}}：
             <el-input v-model="personInCharge1" :disabled="!isChecked1" style="width: 200px;margin-right: 10px" />
-            <el-button type="primary" plain icon="user" :disabled="!isChecked1" @click="selectPersonnel()">{{cn.selectPersonnel}}{{en.selectPersonnel}}</el-button>
+            <el-button type="primary" plain icon="user" :disabled="!isChecked1" @click="openSelectPersonnelDialog(1)">{{cn.selectPersonnel}}{{en.selectPersonnel}}</el-button>
           </el-checkbox>
         </div>
         <!-- 02.关键工序、装配、检验清单-->
@@ -539,9 +539,9 @@
             <span class="components-span">02.{{cn.keyProcessAssemblyInspectionList}}{{en.keyProcessAssemblyInspectionList}}</span>
           </div>
           <el-checkbox v-model="isChecked2">
-            {{cn.keyPartsList}}{{en.keyPartsList}}：
+            {{cn.keyProcessAssemblyInspectionList}}{{en.keyProcessAssemblyInspectionList}}：
             <el-input v-model="personInCharge2" :disabled="!isChecked2" style="width: 200px;margin-right: 10px" />
-            <el-button type="primary" plain icon="user" :disabled="!isChecked2"  @click="selectPersonnel()">{{cn.selectPersonnel}}{{en.selectPersonnel}}</el-button>
+            <el-button type="primary" plain icon="user" :disabled="!isChecked2" @click="openSelectPersonnelDialog(2)">{{cn.selectPersonnel}}{{en.selectPersonnel}}</el-button>
           </el-checkbox>
         </div>
         <!-- 03.COP试验和检查表-->
@@ -551,13 +551,13 @@
           </div>
           <el-checkbox v-model="isChecked3">
             {{cn.manufacturingCompilationResponsiblePerson}}{{en.manufacturingCompilationResponsiblePerson}}：
-            <el-input v-model="manufacturingPersonInCharge" :disabled="!isChecked3" style="width: 200px;margin-right: 10px" />
-            <el-button type="primary" plain icon="user" :disabled="!isChecked3"  @click="selectPersonnel()">{{cn.selectPersonnel}}{{en.selectPersonnel}}</el-button>
+            <el-input v-model="personInCharge3" :disabled="!isChecked3" style="width: 200px;margin-right: 10px" />
+            <el-button type="primary" plain icon="user" :disabled="!isChecked3" @click="openSelectPersonnelDialog(3)">{{cn.selectPersonnel}}{{en.selectPersonnel}}</el-button>
           </el-checkbox>
           <el-checkbox v-model="isChecked4" style="margin-top: 15px">
             {{cn.qualityControlCompilationResponsiblePerson}}{{en.qualityControlCompilationResponsiblePerson}}：
-            <el-input v-model="qualityControlPersonInCharge" :disabled="!isChecked4" style="width: 200px;margin-right: 10px;" />
-            <el-button type="primary" plain icon="user" :disabled="!isChecked4"  @click="selectPersonnel()">{{cn.selectPersonnel}}{{en.selectPersonnel}}</el-button>
+            <el-input v-model="personInCharge4" :disabled="!isChecked4" style="width: 200px;margin-right: 10px;" />
+            <el-button type="primary" plain icon="user" :disabled="!isChecked4" @click="openSelectPersonnelDialog(4)">{{cn.selectPersonnel}}{{en.selectPersonnel}}</el-button>
           </el-checkbox>
         </div>
       </template>
@@ -568,19 +568,6 @@
         </div>
       </template>
     </el-dialog>
-    <!-- 选择人员 -->
-    <select-role
-      v-if="deptList.length > 0"
-      v-model="selectRole"
-      :dept-list="deptList"
-      name-list-key="name"
-      name-key="name"
-      name-id-key="id"
-      dept-key="dept"
-      :selection-mode="selectType"
-      @submit="handleSelectionSubmit"
-      @close="() => selectRole = false"
-    />
 
     <!--  变更弹出框-->
     <el-dialog
@@ -645,6 +632,21 @@
         </div>
       </template>
     </el-dialog>
+
+    <!-- 选择人员 -->
+    <select-role
+      v-if="deptList.length > 0"
+      v-model="selectRole"
+      :dept-list="deptList"
+      name-list-key="name"
+      name-key="name"
+      name-id-key="id"
+      dept-key="dept"
+      :selection-mode="selectType"
+      @submit="handleSelectionSubmit"
+      @close="() => selectRole = false"
+    />
+
   </div>
 </template>
 
@@ -704,19 +706,21 @@ const undoData = ref(null)
 const deleteDialogVisible = ref(false) //删除提示框
 const deletePlanId = ref(null);
 const drawer = ref(false) //提醒下载抽屉
-const adjustCompilationResponsiblePersonDialogVisible = ref(false)
+const adjustCompilationResponsiblePersonDialogVisible = ref(false)//调整编制负责人弹出框
 const isChecked1 = ref(false);
 const isChecked2 = ref(false);
 const isChecked3 = ref(false);
 const isChecked4 = ref(false);
 const personInCharge1 = ref('');
 const personInCharge2 = ref('');
+const personInCharge3 = ref('');
+const personInCharge4 = ref('');
 const manufacturingPersonInCharge = ref('');
 const qualityControlPersonInCharge = ref('');
 const changeDialogVisible = ref(false)
 const selectRole = ref(false)
 const selectType = ref('')
-
+const currentSelectField = ref(null)
 
 const deptList = [
   {
@@ -887,14 +891,32 @@ function adjustCompilationResponsiblePerson(row) {
   adjustCompilationResponsiblePersonDialogVisible.value = true
   currentRow.value = row;
 }
-function selectPersonnel() {
+function openSelectPersonnelDialog(field) {
   selectRole.value = true;// 打开选择人员对话框
   selectType.value = 'multiple'; // 多选
+  currentSelectField.value = field
 }
 const handleSelectionSubmit = (selectedItems) => {
-  console.log('已选中的项:', selectedItems);  // 处理已选择的用户
-  personInCharge1.value = selectedItems.map(item => item.name).join(',');
-  isChecked1.value = false;
+  // console.log('已选中的项:', selectedItems);
+  // 处理已选择的用户
+  switch (currentSelectField.value) {
+    case 1:
+      personInCharge1.value = selectedItems.map(item => item.name).join(',');
+      isChecked1.value = false;
+      break
+    case 2:
+      personInCharge2.value = selectedItems.map(item => item.name).join(',');
+      isChecked2.value = false;
+      break
+    case 3:
+      personInCharge3.value = selectedItems.map(item => item.name).join(',');
+      isChecked3.value = false;
+      break
+    case 4:
+      personInCharge4.value = selectedItems.map(item => item.name).join(',');
+      isChecked4.value = false;
+      break
+  }
   selectRole.value = false;
 };