fix(CCAP控制计划管理):关键零部件信息样式、接口修改

src/api/CCAPControlPlanManagement/view.js

 import request from '@/utils/request.js'
 
 // 查询CCAP控制计划审批和描述列表
-export function getCCAPPlanDescriptions(id,taskType) {
+export function getCCAPPlanDescriptions(descriptionsData) {
   return request({
     url: '/control/compilationTask/getCompilationTaskInfo',
     method: 'get',
-    params: {
-      controlPlanId: id,
-      taskType
-    }
+    params: descriptionsData
   })
 }
 
 // 查询CCAP控制计划关键零部件列表
-export function getCCAPPlanKeyList(id,query) {
+export function getCCAPPlanKeyList(query) {
   return request({
     url: '/control/ccapKeyParts/list',
     method: 'get',
-    params: {
-      controlPlanId:id,
-      query
-    }
+    params: query
   })
 }
 
@@ -35,3 +29,5 @@ export function getCCAPPlanChangeList(controlPlanId,taskId) {
     }
   })
 }
+
+

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

@@ -46,10 +46,10 @@
             </el-steps>
             <div>
               <div class="tab-components">
-                <span class="components-span">
+                <div class="components-span">
                   <div>编制详情</div>
                   <div>Compilation Details</div>
-                </span>
+                </div>
                 <div>
                   <el-button class="btn-S" @click="backLog = true">
                     查看退回记录/View Back Records
@@ -1026,6 +1026,12 @@ import { ref, getCurrentInstance } from 'vue'
 const route = useRoute()
 const total = ref(0)
 const loading = ref(true)
+// 接收路由参数
+const id = proxy.$route.query.id
+console.log("controlPlanId",id)
+console.log("controlPlanId",typeof id)
+const activeTab = ref('CCAP_KEY_PARTS_TASK') // 默认激活第一个标签页
+console.log("taskType",activeTab.value)
 //大数据列表
 const formList = ref([])
 //descriptions数据列表
@@ -1036,15 +1042,20 @@ const stepList = ref([])
 const keyPartsList = ref([])
 //关键零部件详细数据列表
 const keyPartsListDetail = ref([])
-const activeTab = ref('CCAP_KEY_PARTS_TASK') // 默认激活第一个标签页
 if(route.query.tab){
   activeTab.value = route.query.tab
 }
 const radio1 = ref('1')
-// 修改data定义方式
+// 描述和审批数据
+const descriptionsData = ref({
+  controlPlanId:id,
+  taskType:activeTab.value
+})
+// 查询参数定义方式
 const queryParams = ref({
   pageNum: 1,
   pageSize: 10,
+  controlPlanId:id,
   partOrMaterialLevel1:null,
   partOrMaterialLevel2:null,
   modelSpecification:null,
@@ -1120,26 +1131,23 @@ const deptList = [
   },
 ]
 
-const id = proxy.$route.query.id
 function getFrom() {
-  loading.value = true
-  getCCAPPlanDescriptions(id,activeTab.value).then(res => {
+  getCCAPPlanDescriptions(descriptionsData.value).then(res => {
     formList.value = res.data
     descriptionsList.value = formList.value.compilationTaskDetail
     stepList.value = formList.value.nodeRecords
     // console.log("666",formList.value)
     // console.log("777",descriptionsList.value)
     // console.log("888",stepList.value)
-    // if (formList.value.length > 0) {
-    //   activeTab.value = formList.value[0].id // 默认第一个标签的id
-    //   getList(formList.value[0].id) // 初始化加载第一个标签的数据
-    // }
   })
-  getCCAPPlanKeyList(id,queryParams.value).then(res => {
+}
+function getList(){
+  loading.value = true
+  getCCAPPlanKeyList(queryParams.value).then(res => {
     keyPartsList.value = res.data
     keyPartsListDetail.value = keyPartsList.value.keyPartsDetailDTOS
-    console.log("963",keyPartsList.value)
-    console.log("852",keyPartsListDetail.value)
+    // console.log("963",keyPartsList.value)
+    // console.log("852",keyPartsListDetail.value)
   })
   loading.value = false
 }
@@ -1148,6 +1156,32 @@ function handleQuery() {
   queryParams.value.pageNum = 1;
   getFrom();
 }
+/** 重置按钮操作 */
+function resetQuery() {
+  queryParams.value = {
+    pageNum: 1,
+    pageSize: 10,
+    controlPlanId:id,
+    partOrMaterialLevel1: null,
+    partOrMaterialLevel2: null,
+    modelSpecification: null,
+    manufacturer: null,
+    cccVoluntaryCertification: null,
+    applicableModel: null,
+    inspectionDocumentNumber: null,
+    remark: null,
+    partNumber: null,
+    p8PostMassProductionUnit: null,
+    partAssemblyNo: null,
+    professionalDepartment: null,
+    ccCertificationMark: null,
+    mainDataEntryBy: null,
+    partNumberEntryBy: null,
+    partNumberConfirmationBy: null,
+    inspectionDocumentEntryBy: null
+  }
+  handleQuery()
+}
 const handleBack = () => {
   proxy.$router.push({ path: '/control/CCAPControlPlan/CCAPControlPlanIndex'});
 }
@@ -1157,6 +1191,7 @@ const changeView = () => {
 const backLog = ref(false)
 onMounted(() => {
   getFrom();
+  getList();
 })
 </script>