Skip to content

Q
qr-consistency-vue3
Commit bb582cf7 authored by qiyaxin's avatar qiyaxin
Browse files
Options

style(CCAP编制任务处理):主列表状态标签

parent 216a26ce
Show whitespace changes
Inline Side-by-side
Showing with 156 additions and 34 deletions
src/api/CCAPCompileTaskProcessing/CCAPCompileTaskProcessing.js
View file @ bb582cf7
import request from '@/utils/request.js'
// 查询所有事业部名称
// 查询事业部名称
export function getAllBusinessUnitName() {
return request({
url: '/control/unit/list',
url: '/control/unit/currentUnitInfo',
method: 'get',
})
}
......
src/locales/controlPlan/CCAPControlPlan/CCAPCompileTaskProcessing/index/cn.json
View file @ bb582cf7
......@@ -55,5 +55,7 @@
"manufacturingCompilationResponsiblePerson": "制造编制负责人",
"qualityControlCompilationResponsiblePerson": "质管编制负责人",
"taskName": "任务名称",
"myProcessingStatus": "我的处理状态"
"myProcessingStatus": "我的处理状态",
"audit": "审核",
"approve": "批准"
}
src/locales/controlPlan/CCAPControlPlan/CCAPCompileTaskProcessing/index/en.json
View file @ bb582cf7
......@@ -55,5 +55,7 @@
"manufacturingCompilationResponsiblePerson": "Manufacturing Compilation Responsible Person",
"qualityControlCompilationResponsiblePerson": "Quality Control Compilation Responsible Person",
"taskName": "Task Name",
"myProcessingStatus": "My Processing Status"
"myProcessingStatus": "My Processing Status",
"audit": "审核",
"approve": "批准"
}
src/views/controlPlan/CCAPControlPlan/CCAPCompileTaskProcessing/index.vue
View file @ bb582cf7
......@@ -239,15 +239,21 @@
</div>
</template>
</el-table-column>
<el-table-column label="我的处理状态" fixed="right" width="150" align="center" prop="entryStatus" >
<el-table-column label="我的处理状态" fixed="right" width="120" align="center" prop="entryStatus" >
<template #header>
<div style="display: flex;flex-direction: column">
<div>{{cn.myProcessingStatus}}</div>
<div>{{en.myProcessingStatus}}</div>
</div>
</template>
<template #default="scope">
<!-- 根据 entryStatus 的值显示不同的标签 -->
<el-tag :type="getTagType(scope.row.entryStatus)">
{{ getEntryStatusLabel(scope.row.entryStatus) }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="任务状态" fixed="right" width="150" align="center" prop="taskStatus" >
<el-table-column label="任务状态" fixed="right" width="120" align="center" prop="taskStatus" >
<template #header>
<div style="display: flex;flex-direction: column">
<div>{{cn.taskStatus}}</div>
......@@ -258,7 +264,7 @@
<dict-tag :options="control_compilation_task_status" :value="scope.row.taskStatus"/>
</template>
</el-table-column>
<el-table-column label="控制计划状态" fixed="right" width="150" align="center" prop="controlPlanStatus" >
<el-table-column label="控制计划状态" fixed="right" width="120" align="center" prop="controlPlanStatus" >
<template #header>
<div style="display: flex;flex-direction: column">
<div>{{cn.controlPlanStatus}}</div>
......@@ -288,7 +294,8 @@
<!-- 编制负责人 处理 按钮显示田条件：
fillerLevel = '0' 为 编制负责人
entryStatus:UN_FINISH 为我的任务状态未成 -->
<el-button v-show="scope.row.fillerLevel === '0' && scope.row.entryStatus === 'UN_FINISH'" link type="primary" @click="handleProcess1(scope.row)">
<el-button v-show="scope.row.fillerLevel === '0' && scope.row.entryStatus === 'UN_FINISH'"
link type="primary" @click="handleProcess(scope.row)">
<div>
<div>{{cn.process}}</div>
<div>{{en.process}}</div>
......@@ -307,7 +314,7 @@
(scope.row.entryStatus === 'FINISH' && scope.row.taskStatus === 'plan_compilation_task_filling')
)
"
link type="primary" @click="handleProcess1(scope.row)">
link type="primary" @click="handleFill(scope.row)">
<div>
<div>{{cn.fill}}</div>
<div>{{en.fill}}</div>
......@@ -319,10 +326,10 @@
禁用：taskStatus != plan_compilation_pending_review 任务状态不是待审核时 -->
<el-button v-show="scope.row.fillerLevel !== '0' && scope.row.entryType === 'AUDIT' && scope.row.entryStatus === 'UN_FINISH' "
:disabled="scope.row.taskStatus !== 'plan_compilation_pending_review'"
link type="primary" @click="handleProcess1(scope.row)">
link type="primary" @click="handleAudit(scope.row)">
<div>
<div>审核</div>
<div>{{en.fill}}</div>
<div>{{cn.audit}}</div>
<div>{{en.audit}}</div>
</div>
</el-button>
<!-- 批准人 批准 按钮显示条件：
......@@ -331,10 +338,10 @@
禁用：taskStatus != plan_compilation_pending_approval 任务状态不是待批准时 -->
<el-button v-show="scope.row.fillerLevel !== '0' && scope.row.entryType === 'APPROVE' && scope.row.entryStatus === 'UN_FINISH' "
:disabled="scope.row.taskStatus!== 'plan_compilation_pending_approval'"
link type="primary" @click="handleProcess1(scope.row)">
link type="primary" @click="handleApprove(scope.row)">
<div>
<div>批准</div>
<div>{{en.fill}}</div>
<div>{{cn.approve}}</div>
<div>{{en.approve}}</div>
</div>
</el-button>
</template>
......@@ -345,7 +352,7 @@
:total="total1"
v-model:page="queryParams1.pageNum"
v-model:limit="queryParams1.pageSize"
@pagination="getList"
@pagination="getList1"
/>
</el-tab-pane>
......@@ -587,15 +594,21 @@
</div>
</template>
</el-table-column>
<el-table-column label="我的处理状态" fixed="right" width="150" align="center" prop="entryStatus" >
<el-table-column label="我的处理状态" fixed="right" width="120" align="center" prop="entryStatus" >
<template #header>
<div style="display: flex;flex-direction: column">
<div>{{cn.myProcessingStatus}}</div>
<div>{{en.myProcessingStatus}}</div>
</div>
</template>
<template #default="scope">
<!-- 根据 entryStatus 的值显示不同的标签 -->
<el-tag :type="getTagType(scope.row.entryStatus)">
{{ getEntryStatusLabel(scope.row.entryStatus) }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="任务状态" fixed="right" width="150" align="center" prop="taskStatus" >
<el-table-column label="任务状态" fixed="right" width="120" align="center" prop="taskStatus" >
<template #header>
<div style="display: flex;flex-direction: column">
<div>{{cn.taskStatus}}</div>
......@@ -606,7 +619,7 @@
<dict-tag :options="control_compilation_task_status" :value="scope.row.taskStatus"/>
</template>
</el-table-column>
<el-table-column label="控制计划状态" fixed="right" width="150" align="center" prop="controlPlanStatus" >
<el-table-column label="控制计划状态" fixed="right" width="120" align="center" prop="controlPlanStatus" >
<template #header>
<div style="display: flex;flex-direction: column">
<div>{{cn.controlPlanStatus}}</div>
......@@ -641,7 +654,7 @@
:total="total2"
v-model:page="queryParams2.pageNum"
v-model:limit="queryParams2.pageSize"
@pagination="getList"
@pagination="getList2"
/>
</el-tab-pane>
</el-tabs>
......@@ -688,10 +701,36 @@ const completedStatuses = [
"plan_compilation_final_confirmed",
"plan_compilation_completed"
];
/** 根据 entryStatus 的值返回对应的标签内容 */
function getEntryStatusLabel(entryStatus) {
switch (entryStatus) {
case 'UN_FINISH':
return '未完成';
case 'FINISH':
return '已完成';
case 'BACK':
return '已退回';
default:
return '';
}
}
/** 根据 entryStatus 的值返回对应的标签类型 */
function getTagType(entryStatus) {
switch (entryStatus) {
case 'UN_FINISH':
return 'warning';
case 'FINISH':
return 'success';
case 'BACK':
return 'danger';
default:
return 'info';
}
}
function getAllBusinessUnit() {
getAllBusinessUnitName().then(res => {
businessList.value = res.rows
businessList.value = res.data
console.log("businessList",res.data)
})
}
function getAllVehicleModelCode() {
......@@ -771,11 +810,23 @@ function resetQuery1() {
}
/** 编制中 查看按钮操作 */
function handleView1(row) {
proxy.$router.push({ path: ''});
proxy.$router.push({ path: '/control/CCAPControlPlan/CCAPCompileView' ,query: {id: row.id,type:"查看"}});
}
/** 编制中 编制负责人 处理按钮操作 */
function handleProcess(row) {
proxy.$router.push({ path: '/control/CCAPControlPlan/CCAPCompileView' ,query: {id: row.id,type:"处理"}});
}
/** 编制中 处理按钮操作 */
function handleProcess1(row) {
proxy.$router.push({ path: '/control/CCAPControlPlan/CCAPCompileView' ,query: {id: row.id,type:"编辑"}});
/** 编制中 填写人 填写按钮操作 */
function handleFill(row) {
proxy.$router.push({ path: '/control/CCAPControlPlan/CCAPCompileView' ,query: {id: row.id,type:"填写"}});
}
/** 编制中 审核人 审核按钮操作 */
function handleAudit(row) {
proxy.$router.push({ path: '/control/CCAPControlPlan/CCAPCompileView' ,query: {id: row.id,type:"审核"}});
}
/** 编制中 批准人 批准按钮操作 */
function handleApprove(row) {
proxy.$router.push({ path: '/control/CCAPControlPlan/CCAPCompileView' ,query: {id: row.id,type:"批准"}});
}
......@@ -809,12 +860,9 @@ function resetQuery2() {
}
/** 编制完成 查看按钮操作 */
function handleView2(row) {
proxy.$router.push({ path: '' });
}
/** 编制完成 处理按钮操作 */
function handleProcess2(row) {
proxy.$router.push({ path: '' });
proxy.$router.push({ path: '/control/CCAPControlPlan/CCAPCompileView' ,query: {id: row.id,type:"查看"}});
}
onMounted(()=>{
getAllBusinessUnit()
getAllVehicleModelCode()
......
src/views/controlPlan/CCAPControlPlan/CCAPControlPlanManagement/index.vue
View file @ bb582cf7
......@@ -322,29 +322,44 @@
</div>
</template>
</el-table-column>
<el-table-column label="关键件清单表单状态" fixed="right" width="190" align="center" prop="keyPartsListTaskStatus" >
<el-table-column label="关键件清单表单状态" fixed="right" width="150" align="center" prop="keyPartsListTaskStatus" >
<template #header>
<div style="display: flex;flex-direction: column">
<div>{{cn.keyPartsListFormStatus}}</div>
<div>{{en.keyPartsListFormStatus}}</div>
</div>
</template>
<template #default="scope">
<el-tag :type="getTagType(scope.row.keyPartsListTaskStatus)">
{{ getStatusLabel(scope.row.keyPartsListTaskStatus) }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="关键工序……表单状态" fixed="right" width="190" align="center" prop="keyProcessTaskStatus" >
<el-table-column label="关键工序……表单状态" fixed="right" width="150" align="center" prop="keyProcessTaskStatus" >
<template #header>
<div style="display: flex;flex-direction: column">
<div>{{cn.keyProcessFormStatus}}</div>
<div>{{en.keyProcessFormStatus}}</div>
</div>
</template>
<template #default="scope">
<el-tag :type="getTagType(scope.row.keyPartsListTaskStatus)">
{{ getStatusLabel(scope.row.keyPartsListTaskStatus) }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="COP试验和检查表表单状态" fixed="right" width="250" align="center" prop="copTestAndInspectionTaskStatus" >
<el-table-column label="COP试验和检查表表单状态" fixed="right" width="150" align="center" prop="copTestAndInspectionTaskStatus" >
<template #header>
<div style="display: flex;flex-direction: column">
<div>{{cn.COPTestAndChecklistFormStatus}}</div>
<div>{{en.COPTestAndChecklistFormStatus}}</div>
</div>
</template>
<template #default="scope">
<el-tag :type="getTagType(scope.row.keyPartsListTaskStatus)">
{{ getStatusLabel(scope.row.keyPartsListTaskStatus) }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="控制计划状态" fixed="right" width="150" align="center" prop="controlPlanStatus" >
<template #header>
......@@ -779,9 +794,64 @@ function getList() {
getCCAPPlanList(queryParams.value).then(res => {
total.value = res.total
tableList.value = res.rows
console.log("控制计划列表",res.rows)
});
}
/** 根据 keyPartsListTaskStatus, keyProcessTaskStatus, copTestAndInspectionTaskStatus 的值返回对应的标签内容 */
function getStatusLabel(status) {
switch (status) {
case 'wait_to_start':
return '待开始';
case 'plan_compilation_task_filling':
return '填写中';
case 'plan_compilation_pending_review':
return '待审核';
case 'plan_compilation_pending_approval':
return '待批准';
case 'plan_compilation_final_confirm':
return '待最终确认';
case 'plan_compilation_completed':
return '编制完成';
case 'plan_compilation_final_confirmed':
return '已最终确认';
case 'plan_compilation_returned':
return '已退回';
case 'plan_compilation_revoked':
return '已撤销';
case 'plan_compilation_deleted':
return '已删除';
default:
return '/';
}
}
/** 根据 keyPartsListTaskStatus, keyProcessTaskStatus, copTestAndInspectionTaskStatus 的值返回对应的标签类型 */
function getTagType(status) {
switch (status) {
case 'wait_to_start': //待开始
return 'info';
case 'plan_compilation_task_filling': //填写中
return 'primary';
case 'plan_compilation_pending_review': //待审核
return 'warning';
case 'plan_compilation_pending_approval': //待批准
return 'warning';
case 'plan_compilation_final_confirm': //待最终确认
return 'warning';
case 'plan_compilation_completed': //编制完成
return 'success';
case 'plan_compilation_final_confirmed': //已最终确认
return 'success';
case 'plan_compilation_returned': //已退回
return 'info';
case 'plan_compilation_revoked': //已撤销
return 'info';
case 'plan_compilation_deleted': //已删除
return 'info';
default:
return '';
}
}
// //字典转换
// //控制计划状态字典
// getDicts("control_plan_status").then(response => {
......
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