bonus
/
yn_digital_gadgets_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

This commit is contained in:
BianLzhaoMin 2026-02-05 16:43:31 +08:00
parent 978893de2a
commit c565f3df97
4 changed files with 84 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/basicManage/workloadCategory/index.vue
View File

@ -50,7 +50,7 @@
:min="0.1" :min="0.1"
:max="10000" :max="10000"
:precision="2" :precision="2"
:step="10" :step="1"
v-model="addAndEditForm.unitPrice" v-model="addAndEditForm.unitPrice"
> >
<template #prefix> <template #prefix>
@ -65,7 +65,7 @@
:min="0.1" :min="0.1"
:max="10000" :max="10000"
:precision="2" :precision="2"
:step="10" :step="1"
v-model="addAndEditForm.settlementUnitPrice" v-model="addAndEditForm.settlementUnitPrice"
> >
<template #prefix> <template #prefix>

152
src/views/planMange/dailyPlan/config.js
View File

@ -159,75 +159,75 @@ export const tableColumns_1 = [
{ prop: 'planChanges', label: '计划变更及未完成情况说明', fixed: false, width: '200' }, { prop: 'planChanges', label: '计划变更及未完成情况说明', fixed: false, width: '200' },
] ]
export const tableColumns_2 = [ export const tableColumns_2 = [
{ prop: 'plannedWorkload', label: '计划工作量(基)', width: '80' }, // { prop: 'plannedWorkload', label: '计划工作量(基)', width: '80' },
{ // {
prop: 'stationName', // prop: 'stationName',
label: '拟投入高处作业人员数量', // label: '拟投入高处作业人员数量',
fixed: false, // fixed: false,
width: '80', // width: '80',
formatter: (row) => {
return row.proposedPersonnelList?.filter((item) => item.dataSource == 2).length || ''
},
},
{
prop: 'proposedPersonnelListHigh',
label: '高处作业人员姓名',
fixed: false,
width: '200',
formatter: (row) => {
return (
row.proposedPersonnelList
?.filter((item) => item.dataSource == 2)
.map((item) => item.name)
.join(',') || ''
)
},
},
{
prop: 'proposedPersonnelListGroundNum',
label: '拟投入地面作业人员数量',
fixed: false,
width: '80',
formatter: (row) => {
return row.proposedPersonnelList?.filter((item) => item.dataSource == 3).length || ''
},
},
{
prop: 'proposedPersonnelListGround',
label: '地面作业人员姓名',
width: '200',
fixed: false,
formatter: (row) => {
return (
row.proposedPersonnelList
?.filter((item) => item.dataSource == 3)
.map((item) => item.name)
.join(',') || ''
)
},
},
{
prop: 'proposedProficientPersonnel',
label: '拟投入检修熟练工数量(分包高空作业人员)',
fixed: false,
width: '80',
},
{
prop: 'proposedAssistancePersonnel',
label: '拟投入检修辅助工数量(分包地面作业人员)',
fixed: false,
width: '80',
},
{
prop: 'proposedLongTimeCar',
label: '拟投入车辆',
fixed: false,
width: '200',
slot: 'proposedLongTimeCar',
// formatter: (row) => { // formatter: (row) => {
// return `长租车${row.proposedLongTimeCar}辆,临租车${row.proposedTemporaryCar}辆` || '' // return row.proposedPersonnelList?.filter((item) => item.dataSource == 2).length || ''
// },
// },
// {
// prop: 'proposedPersonnelListHigh',
// label: '高处作业人员姓名',
// fixed: false,
// width: '200',
// formatter: (row) => {
// return (
// row.proposedPersonnelList
// ?.filter((item) => item.dataSource == 2)
// .map((item) => item.name)
// .join(',') || ''
// )
// },
// },
// {
// prop: 'proposedPersonnelListGroundNum',
// label: '拟投入地面作业人员数量',
// fixed: false,
// width: '80',
// formatter: (row) => {
// return row.proposedPersonnelList?.filter((item) => item.dataSource == 3).length || ''
// },
// },
// {
// prop: 'proposedPersonnelListGround',
// label: '地面作业人员姓名',
// width: '200',
// fixed: false,
// formatter: (row) => {
// return (
// row.proposedPersonnelList
// ?.filter((item) => item.dataSource == 3)
// .map((item) => item.name)
// .join(',') || ''
// )
// },
// },
// {
// prop: 'proposedProficientPersonnel',
// label: '拟投入检修熟练工数量(分包高空作业人员)',
// fixed: false,
// width: '80',
// },
// {
// prop: 'proposedAssistancePersonnel',
// label: '拟投入检修辅助工数量(分包地面作业人员)',
// fixed: false,
// width: '80',
// },
// {
// prop: 'proposedLongTimeCar',
// label: '拟投入车辆',
// fixed: false,
// width: '200',
// slot: 'proposedLongTimeCar',
// // formatter: (row) => {
// // return `长租车${row.proposedLongTimeCar}辆,临租车${row.proposedTemporaryCar}辆` || ''
// // },
// }, // },
},
{ {
prop: 'proposedPersonnelListHighNum', prop: 'proposedPersonnelListHighNum',
label: '实际投入高处作业人员数量', label: '实际投入高处作业人员数量',
@ -305,15 +305,15 @@ export const tableColumns_2 = [
return row.actualWorkloadList?.map((item) => item.workloadCategoryName).join(',') || '' return row.actualWorkloadList?.map((item) => item.workloadCategoryName).join(',') || ''
}, },
}, },
{ // {
prop: 'completionPercentage', // prop: 'completionPercentage',
label: '完成比例', // label: '完成比例',
fixed: false, // fixed: false,
width: '80', // width: '80',
formatter: (row) => { // formatter: (row) => {
return row.completionPercentage || '' // return row.completionPercentage || ''
}, // },
}, // },
{ prop: 'planCompletionStatus', label: '作业计划完成情况', fixed: false, width: '200' }, { prop: 'planCompletionStatus', label: '作业计划完成情况', fixed: false, width: '200' },
{ prop: 'planChanges', label: '计划变更及未完成情况说明', fixed: false, width: '200' }, { prop: 'planChanges', label: '计划变更及未完成情况说明', fixed: false, width: '200' },
] ]

4
src/views/planMange/dailyPlan/forms/projectForm.vue
View File

@ -412,7 +412,7 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <!-- <el-col :span="12">
<el-form-item label="完成比例" prop="completionPercentage"> <el-form-item label="完成比例" prop="completionPercentage">
<el-input <el-input
:model-value="calculatedCompletionPercentage" :model-value="calculatedCompletionPercentage"
@ -425,7 +425,7 @@
</template> </template>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col> -->
</el-row> </el-row>
<el-row :gutter="24"> <el-row :gutter="24">

4
src/views/planMange/dailyPlan/forms/repairForm.vue
View File

@ -483,7 +483,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <!-- <el-col :span="12">
<el-form-item label="完成比例" prop="completionPercentage"> <el-form-item label="完成比例" prop="completionPercentage">
<el-input <el-input
:model-value="calculatedCompletionPercentage" :model-value="calculatedCompletionPercentage"
@ -496,7 +496,7 @@
</template> </template>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col> -->
</el-row> </el-row>
<el-row :gutter="24"> <el-row :gutter="24">