Commit d8caaccd authored by yanzhengyang's avatar yanzhengyang

CCAP控制计划管理-关键零部件清单接口对接

parent 1f0df9c8
import request from '@/utils/request.js'
// 查询CCAP控制计划审批和描述列表
export function getCCAPPlanDescriptions(controlPlanId) {
return request({
url: '/control/compilationTask/' + controlPlanId,
method: 'get',
})
}
// 查询CCAP控制计划关键零部件列表
export function getCCAPPlanKeyList(query) {
return request({
url: '/control/ccapKeyParts/list',
method: 'get',
params: query
})
}
...@@ -493,7 +493,7 @@ const handlePagination = ({ page, limit }) => { ...@@ -493,7 +493,7 @@ const handlePagination = ({ page, limit }) => {
// }) // })
// } // }
const handleBack = () => { const handleBack = () => {
proxy.$router.push({ path: '/control/CCAPControlPlan/view'}); proxy.$router.push({ path: '/control/CCAPControlPlan/view',query: { tab: activeTab.value }});
} }
// const changeView = () => { // const changeView = () => {
// proxy.$router.push({ path: '/control/CCAPControlPlan/change',query: { tab: activeTab.value }}) // proxy.$router.push({ path: '/control/CCAPControlPlan/change',query: { tab: activeTab.value }})
......
...@@ -20,53 +20,50 @@ ...@@ -20,53 +20,50 @@
</el-text> </el-text>
</div> </div>
<div> <div>
已编制 <span v-if="activeTab === 'first'">666</span>
<span v-if="activeTab === 'second'">777</span>
<span v-if="activeTab === 'third'">888</span>
<span v-if="activeTab === 'four'">999</span>
</div> </div>
</div> </div>
<div class="component-selector"> <div class="component-selector">
<el-tabs v-model="activeTab" class="demo-tabs"> <el-tabs v-model="activeTab" class="demo-tabs">
<el-tab-pane label="关键零部件清单" name="first"> <el-tab-pane label="关键零部件清单" name="first">
<el-steps :active="2" align-center style="margin-top: 20px"> <el-steps :active="2" align-center style="margin-top: 20px">
<el-step title="发起编制任务" description="(发起人: 杨帆)2025-02-06 12:00:00" /> <el-step
<el-step title="填写" description="Some description" /> v-for="(item,index) in stepList"
<el-step title="审核" description="Some description" /> :key="index" :title="item.nodeName"
<el-step title="批准" description="Some description" /> :description="item.handleName+ ' ' + (item.handleTime ? item.handleTime : '处理中')"/>
<el-step title="最终确认" description="Some description" />
</el-steps> </el-steps>
<div> <div>
<div class="tab-components"> <div class="tab-components">
<span class="components-span">编制详情</span> <span class="components-span">编制详情</span>
<el-button class="btn-A" @click="changeView">查看变更履历</el-button> <div>
<el-button class="btn-A" @click="backLog = true">查看退回记录</el-button>
<el-button class="btn-A" @click="changeView">查看变更履历</el-button>
</div>
</div> </div>
<el-descriptions border :column="4" style="margin-top: 20px"> <el-descriptions border :column="4" style="margin-top: 20px">
<el-descriptions-item label="文件编号:" label-align="right">kooriookami</el-descriptions-item> <el-descriptions-item label="文件编号:" label-align="right" min-width="120">{{ descriptionsList.fileNo }}</el-descriptions-item>
<el-descriptions-item label="清单版本号:" label-align="right">18100000000</el-descriptions-item> <el-descriptions-item label="清单版本号:" label-align="right" min-width="120">{{ descriptionsList.versionNo }}</el-descriptions-item>
<el-descriptions-item label="修订日期:" label-align="right">Suzhou</el-descriptions-item> <el-descriptions-item label="修订日期:" label-align="right" min-width="120">{{ descriptionsList.revisionDate }}</el-descriptions-item>
<el-descriptions-item label="编制/日期:" label-align="right">132132/666</el-descriptions-item> <el-descriptions-item label="编制/日期:" label-align="right" min-width="120">{{ descriptionsList.compilationDeadline }}</el-descriptions-item>
<el-descriptions-item label="车型代码:" label-align="right">Province</el-descriptions-item> <el-descriptions-item label="车型代码:" label-align="right">{{ descriptionsList.vehicleModelCode }}</el-descriptions-item>
<el-descriptions-item label="车型系列名称:" label-align="right">CJ1A</el-descriptions-item> <el-descriptions-item label="车型系列名称:" label-align="right">{{ descriptionsList.vehicleSeries }}</el-descriptions-item>
<el-descriptions-item label=""></el-descriptions-item> <el-descriptions-item label=""></el-descriptions-item>
<el-descriptions-item label="审核/日期:" label-align="right">CJ1A</el-descriptions-item> <el-descriptions-item label="审核/日期:" label-align="right">{{ descriptionsList.auditDate }}</el-descriptions-item>
<el-descriptions-item label="联系人:" label-align="right">于昌淼</el-descriptions-item> <el-descriptions-item label="联系人:" label-align="right">{{descriptionsList.chargeUserName}}</el-descriptions-item>
<el-descriptions-item label="联系部门:" label-align="right">123456789</el-descriptions-item> <el-descriptions-item label="联系部门:" label-align="right">{{descriptionsList.chargeDeptName}}</el-descriptions-item>
<el-descriptions-item label="联系电话:" label-align="right">999666333</el-descriptions-item> <el-descriptions-item label="联系电话:" label-align="right">{{ descriptionsList.chargeUserPhone }}</el-descriptions-item>
<el-descriptions-item label="批准/日期:" label-align="right">CJ1A</el-descriptions-item> <el-descriptions-item label="批准/日期:" label-align="right">{{ descriptionsList.approvalDate }}</el-descriptions-item>
<el-descriptions-item label="生产厂:" label-align="right">奇瑞汽车股份有限公司</el-descriptions-item> <el-descriptions-item label="生产厂:" label-align="right">{{ descriptionsList.productionFactory }}</el-descriptions-item>
<el-descriptions-item label="生产地址:" label-align="right">中国安徽省芜湖市经济开发区长春路8号</el-descriptions-item> <el-descriptions-item label="生产地址:" label-align="right">{{ descriptionsList.productionAddress }}</el-descriptions-item>
<el-descriptions-item label="生产情况:" label-align="right"> <el-descriptions-item label="生产情况:" label-align="right">
<el-radio-group v-model="radio1" class="ml-4"> {{ descriptionsList.productionStatus }}
<el-radio label="1" >试生产</el-radio>
<el-radio label="2" >生产</el-radio>
</el-radio-group>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="清单编号:" label-align="right">2025046135222462</el-descriptions-item> <el-descriptions-item label="清单编号:" label-align="right">{{ descriptionsList.noTimestamp }}</el-descriptions-item>
<el-descriptions-item label="系列车型型号:" label-align="right" width="120px"> <el-descriptions-item label="系列车型型号:" label-align="right" >
999666333、888555222、777444111、 {{ descriptionsList.seriesCarModels }}
999666333、888555222、777444111、
999666333、888555222、777444111、
999666333、888555222、777444111、
999666333、888555222、777444111、
999666333、888555222、777444111、
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-form :inline="true" :model="queryParams" class="demo-form-inline" style="margin-top: 20px" > <el-form :inline="true" :model="queryParams" class="demo-form-inline" style="margin-top: 20px" >
...@@ -176,17 +173,17 @@ ...@@ -176,17 +173,17 @@
</el-form> </el-form>
<el-table :data="tableData" style="width: 100%" border > <el-table :data="tableData" style="width: 100%" border >
<el-table-column prop="date" label="序号" align="center" width="60"/> <el-table-column prop="date" label="序号" align="center" width="60"/>
<el-table-column prop="name" label="零部件一级名称" align="center" width="120"/> <el-table-column prop="partOrMaterialLevel1" label="零部件一级名称" align="center" width="120"/>
<el-table-column prop="address" label="零部件二级名称" align="center" width="120"/> <el-table-column prop="partOrMaterialLevel2" label="零部件二级名称" align="center" width="120"/>
<el-table-column prop="address" label="型号规格" align="center" width="120"/> <el-table-column prop="modelSpecification" label="型号规格" align="center" width="120"/>
<el-table-column prop="address" label="生产厂" align="center" width="160"/> <el-table-column prop="manufacturer" label="生产厂" align="center" width="160"/>
<el-table-column prop="address" label="CCC/自愿型产品认证证书编号" align="center" width="130"/> <el-table-column prop="cccVoluntaryCertification" label="CCC/自愿型产品认证证书编号" align="center" width="130"/>
<el-table-column prop="address" label="适用车型" align="center" width="120"/> <el-table-column prop="applicableModel" label="适用车型" align="center" width="120"/>
<el-table-column prop="address" label="检验文件编号" align="center" width="140"/> <el-table-column prop="inspectionDocumentNumber" label="检验文件编号" align="center" width="140"/>
<el-table-column prop="address" label="备注" align="center"/> <el-table-column prop="remark" label="备注" align="center"/>
<el-table-column prop="address" label="零件号" align="center"/> <el-table-column prop="partNumber" label="零件号" align="center"/>
<el-table-column prop="address" label="填写人" align="center"/> <el-table-column prop="createBy" label="填写人" align="center"/>
<el-table-column prop="address" label="填写时间" align="center" width="160"/> <el-table-column prop="createTime" label="填写时间" align="center" width="160"/>
<el-table-column prop="address" label="填写状态" align="center"/> <el-table-column prop="address" label="填写状态" align="center"/>
</el-table> </el-table>
</div> </div>
...@@ -319,7 +316,7 @@ ...@@ -319,7 +316,7 @@
</el-table> </el-table>
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="COP试验检查表-制造" name="third"> <el-tab-pane label="COP试验检查表-制造" name="third">
<el-steps :active="2" align-center style="margin-top: 20px"> <el-steps :active="2" align-center style="margin-top: 20px">
<el-step title="发起编制任务" description="(发起人: 杨帆)2025-02-06 12:00:00" /> <el-step title="发起编制任务" description="(发起人: 杨帆)2025-02-06 12:00:00" />
<el-step title="填写" description="Some description" /> <el-step title="填写" description="Some description" />
...@@ -609,34 +606,54 @@ ...@@ -609,34 +606,54 @@
<!-- 测试 --> <!-- 测试 -->
<select-role <select-role
v-if="deptList.length > 0"
v-model="selectRole" v-model="selectRole"
:dept-list="deptList" :dept-list="deptList"
name-list-key="name"
name-key="name" name-key="name"
name-id-key="id"
dept-key="dept" dept-key="dept"
:selection-mode="selectType" :selection-mode="selectType"
@submit="handleSelectionSubmit" @submit="handleSelectionSubmit"
@close="() => selectRole = false" @close="() => selectRole = false"
/> />
<!-- 查看退回记录 -->
<el-dialog v-model="backLog" title="退回记录">
<el-table :data="gridData" border>
<el-table-column property="date" label="序号" width="60" />
<el-table-column property="name" label="处理人" width="200" />
<el-table-column property="address" label="处理时间" width="200"/>
<el-table-column label="退回意见" />
</el-table>
</el-dialog>
</template> </template>
<script setup> <script setup>
import {useRoute} from "vue-router"; import {useRoute} from "vue-router";
import SelectRole from "@/components/SelectRole/index.vue" import SelectRole from "@/components/SelectRole/index.vue"
import cn from '@/locales/controlPlan/CCAPControlPlan/CCAPControlPlanManagement/index/cn.json'; import cn from '@/locales/controlPlan/CCAPControlPlan/CCAPControlPlanManagement/index/cn.json';
import en from '@/locales/controlPlan/CCAPControlPlan/CCAPControlPlanManagement/index/en.json'; import en from '@/locales/controlPlan/CCAPControlPlan/CCAPControlPlanManagement/index/en.json';
import {getCCAPPlanDescriptions,getCCAPPlanKeyList} from '@/api/CCAPControlPlanManagement/view.js'
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance();
import { ref, getCurrentInstance } from 'vue' import { ref, getCurrentInstance } from 'vue'
const route = useRoute() const route = useRoute()
const total = ref(0) const total = ref(0)
//大数据列表
const formList = ref([]) const formList = ref([])
//descriptions数据列表
const descriptionsList = ref([])
//审批数据列表
const stepList = ref([])
//关键零部件列表
const keyPartsList = ref([])
const activeTab = ref('first') // 默认激活第一个标签页 const activeTab = ref('first') // 默认激活第一个标签页
if(route.query.tab){ if(route.query.tab){
activeTab.value = route.query.tab activeTab.value = route.query.tab
} }
const radio1 = ref('1') const radio1 = ref('1')
const templateDetailList = ref([])
// 修改data定义方式 // 修改data定义方式
const queryParams = ref({ const queryParams = ref({
pageNum: 1, pageNum: 1,
...@@ -663,45 +680,41 @@ const deptList = [ ...@@ -663,45 +680,41 @@ const deptList = [
id: 1, id: 1,
dept: '前端', dept: '前端',
name: [ name: [
{name:'北京'}, {name:'北京',id:1},
{name:'上海'}, {name:'上海',id:2},
{name:'天津'}, {name:'天津',id:3},
{name:'重庆'}, {name:'重庆',id:4},
], ],
address: 'No. 189, Grove St, Los Angeles',
}, },
{ {
id: 2, id: 2,
dept: '后端', dept: '后端',
name: [ name: [
{name:'杭州'}, {name:'杭州',id:5},
{name:'西安'}, {name:'西安',id:6},
{name:'深圳'}, {name:'深圳',id:7},
{name:'青岛'}, {name:'青岛',id:8},
], ],
address: 'No. 189, Grove St, Los Angeles',
}, },
{ {
id: 3, id: 3,
dept: '测试', dept: '测试',
name: [ name: [
{name:'北京'}, {name:'北京',id:1},
{name:'上海'}, {name:'上海',id:2},
{name:'天津'}, {name:'天津',id:3},
{name:'重庆'}, {name:'重庆',id:4},
], ],
address: 'No. 189, Grove St, Los Angeles',
}, },
{ {
id: 4, id: 4,
dept: '运维', dept: '运维',
name: [ name: [
{name:'北京'}, {name:'北京',id:1},
{name:'上海'}, {name:'上海',id:2},
{name:'天津'}, {name:'天津',id:3},
{name:'重庆'}, {name:'重庆',id:4},
], ],
address: 'No. 189, Grove St, Los Angeles',
}, },
] ]
...@@ -714,34 +727,35 @@ const handlePagination = ({ page, limit }) => { ...@@ -714,34 +727,35 @@ const handlePagination = ({ page, limit }) => {
queryParams.value.pageSize = limit queryParams.value.pageSize = limit
// getList(activeTab.value) // getList(activeTab.value)
} }
// function getFrom() {
// const id = proxy.$route.query.id function getFrom() {
// listTemplateForm(id).then(response => { const id = proxy.$route.query.id
// formList.value = response.data getCCAPPlanDescriptions("1914495012314279936").then(res => {
// if (formList.value.length > 0) { formList.value = res.data
// activeTab.value = formList.value[0].id // 默认第一个标签的id descriptionsList.value = formList.value.compilationTaskDetail
// getList(formList.value[0].id) // 初始化加载第一个标签的数据 stepList.value = formList.value.nodeRecords
// } console.log("666",formList.value)
// }) console.log("777",descriptionsList.value)
// } console.log("888",stepList.value)
// function getList(formId){ // if (formList.value.length > 0) {
// listTemplateDetail({ // activeTab.value = formList.value[0].id // 默认第一个标签的id
// id: formId, // getList(formList.value[0].id) // 初始化加载第一个标签的数据
// pageNum: queryParams.value.pageNum, // }
// pageSize: queryParams.value.pageSize })
// }).then(response => { getCCAPPlanKeyList().then(res => {
// templateDetailList.value = response.rows keyPartsList.value = res.data
// total.value = response.total console.log("999",keyPartsList.value)
// }) })
// } }
const handleBack = () => { const handleBack = () => {
proxy.$router.push({ path: '/control/CCAPControlPlan/index'}); proxy.$router.push({ path: '/control/CCAPControlPlan/index'});
} }
const changeView = () => { const changeView = () => {
proxy.$router.push({ path: '/control/CCAPControlPlan/change',query: { tab: activeTab.value }}) proxy.$router.push({ path: '/control/CCAPControlPlan/change',query: { tab: activeTab.value }})
} }
const backLog = ref(false)
onMounted(() => { onMounted(() => {
// getFrom(); getFrom();
}) })
</script> </script>
......
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