Commit a6e995e5 authored by yanzhengyang's avatar yanzhengyang

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

parent 71ec9ba3
...@@ -13,11 +13,14 @@ export function getCCAPPlanDescriptions(id,taskType) { ...@@ -13,11 +13,14 @@ export function getCCAPPlanDescriptions(id,taskType) {
} }
// 查询CCAP控制计划关键零部件列表 // 查询CCAP控制计划关键零部件列表
export function getCCAPPlanKeyList(query) { export function getCCAPPlanKeyList(id,query) {
return request({ return request({
url: '/control/ccapKeyParts/list', url: '/control/ccapKeyParts/list',
method: 'get', method: 'get',
params: query params: {
controlPlanId:id,
query
}
}) })
} }
......
...@@ -426,7 +426,7 @@ ...@@ -426,7 +426,7 @@
<el-button class="btn-A" @click="openDialog">选择用户(多选)</el-button> <el-button class="btn-A" @click="openDialog">选择用户(多选)</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="loading" :data="keyPartsList" style="width: 100%" border > <el-table v-loading="loading" :data="keyPartsListDetail" style="width: 100%" border >
<el-table-column prop="date" label="序号" align="center" width="80"> <el-table-column prop="date" label="序号" align="center" width="80">
<template #header> <template #header>
<div class="el-form-label"> <div class="el-form-label">
...@@ -539,7 +539,7 @@ ...@@ -539,7 +539,7 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="createBy" label="填写人" align="center" width="120" fixed="right"> <el-table-column prop="mainDataEntryBy" label="填写人" align="center" width="120" fixed="right">
<template #header> <template #header>
<div class="el-form-label"> <div class="el-form-label">
<div>填写人</div> <div>填写人</div>
...@@ -547,7 +547,7 @@ ...@@ -547,7 +547,7 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="createTime" label="填写时间" align="center" width="160" fixed="right"> <el-table-column prop="mainDataEntryTime" label="填写时间" align="center" width="160" fixed="right">
<template #header> <template #header>
<div class="el-form-label"> <div class="el-form-label">
<div>填写时间</div> <div>填写时间</div>
...@@ -555,7 +555,7 @@ ...@@ -555,7 +555,7 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="address" label="填写状态" align="center" width="120" fixed="right"> <el-table-column prop="mainDataEntryStatus" label="填写状态" align="center" width="120" fixed="right">
<template #header> <template #header>
<div class="el-form-label"> <div class="el-form-label">
<div>填写状态</div> <div>填写状态</div>
...@@ -1034,6 +1034,8 @@ const descriptionsList = ref([]) ...@@ -1034,6 +1034,8 @@ const descriptionsList = ref([])
const stepList = ref([]) const stepList = ref([])
//关键零部件列表 //关键零部件列表
const keyPartsList = ref([]) const keyPartsList = ref([])
//关键零部件详细数据列表
const keyPartsListDetail = ref([])
const activeTab = ref('CCAP_KEY_PARTS_TASK') // 默认激活第一个标签页 const activeTab = ref('CCAP_KEY_PARTS_TASK') // 默认激活第一个标签页
if(route.query.tab){ if(route.query.tab){
activeTab.value = route.query.tab activeTab.value = route.query.tab
...@@ -1056,7 +1058,8 @@ const queryParams = ref({ ...@@ -1056,7 +1058,8 @@ const queryParams = ref({
partAssemblyNo:null, partAssemblyNo:null,
professionalDepartment:null, professionalDepartment:null,
ccCertificationMark:null, ccCertificationMark:null,
createBy:null mainDataEntryBy:null,
mainDataEntryStatus:null
}) })
const selectRole = ref(false) const selectRole = ref(false)
const selectType = ref('') const selectType = ref('')
...@@ -1124,20 +1127,27 @@ function getFrom() { ...@@ -1124,20 +1127,27 @@ function getFrom() {
formList.value = res.data formList.value = res.data
descriptionsList.value = formList.value.compilationTaskDetail descriptionsList.value = formList.value.compilationTaskDetail
stepList.value = formList.value.nodeRecords stepList.value = formList.value.nodeRecords
console.log("666",formList.value) // console.log("666",formList.value)
console.log("777",descriptionsList.value) // console.log("777",descriptionsList.value)
console.log("888",stepList.value) // console.log("888",stepList.value)
// if (formList.value.length > 0) { // if (formList.value.length > 0) {
// activeTab.value = formList.value[0].id // 默认第一个标签的id // activeTab.value = formList.value[0].id // 默认第一个标签的id
// getList(formList.value[0].id) // 初始化加载第一个标签的数据 // getList(formList.value[0].id) // 初始化加载第一个标签的数据
// } // }
}) })
getCCAPPlanKeyList().then(res => { getCCAPPlanKeyList(id,queryParams.value).then(res => {
keyPartsList.value = res.data keyPartsList.value = res.data
// console.log("999",keyPartsList.value) keyPartsListDetail.value = keyPartsList.value.keyPartsDetailDTOS
console.log("963",keyPartsList.value)
console.log("852",keyPartsListDetail.value)
}) })
loading.value = false loading.value = false
} }
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
getFrom();
}
const handleBack = () => { const handleBack = () => {
proxy.$router.push({ path: '/control/CCAPControlPlan/CCAPControlPlanIndex'}); proxy.$router.push({ path: '/control/CCAPControlPlan/CCAPControlPlanIndex'});
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment