root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
zds
2022-11-18 11:16:33 +08:00
parent d3f8e2b4f8
commit 1ee2332fa0
12 changed files with 120 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mes/qd/src/views/wms/pa/performance/AddDialog.vue
View File

@@ -98,6 +98,7 @@
/>
</template>
</el-table-column>
<el-table-column prop="workload_audit" label="审核工作量" align="center" />
<el-table-column prop="time_quota" label="工时定额" align="center" />
<el-table-column prop="describes" label="积分标准" align="center" />
<el-table-column v-permission="['admin','productbom:edit','productbom:del']" label="操作" width="150px" align="center">
@@ -217,6 +218,7 @@ export default {
}
})
if (same_mater) {
item.workload_audit = 0
this.form.tableData.splice(-1, 0, item)
}
})
@@ -224,7 +226,7 @@ export default {
},
delOne(index, rows) {
// 将总分值减去每行的总分
var num = parseFloat(this.form.total_score) - parseFloat(rows[index].single_score) * parseFloat(rows[index].workload)
var num = parseFloat(this.form.total_score) - parseFloat(rows[index].single_score) * parseFloat(rows[index].workload_audit)
this.form.total_score = num.toFixed(2)
rows.splice(index, 1)
this.form.num = this.form.tableData.length
@@ -232,8 +234,9 @@ export default {
change(val, row, index) {
// 将每行的算出来的分值相加
let all = 0
row.workload_audit = val
this.form.tableData.forEach((item) => {
all = all + parseFloat(item.workload) * parseFloat(item.single_score)
all = all + parseFloat(item.workload_audit) * parseFloat(item.single_score)
})
this.form.total_score = all.toFixed(2)
},

15
mes/qd/src/views/wms/pa/workloadreview/AddDialog.vue
View File

@@ -83,9 +83,10 @@
<el-table-column prop="unit_name" label="单位" align="center" />
<el-table-column prop="item_type" label="项点分类" align="center" :formatter="formatItemTypeName" />
<el-table-column prop="single_score" label="单项分值" align="center" />
<el-table-column prop="workload" label="工作量" align="center">
<el-table-column prop="workload" label="工作量" align="center" />
<el-table-column prop="workload_audit" label="审核工作量" align="center">
<template slot-scope="scope">
<el-input v-model="form.tableData[scope.$index].workload" size="mini" class="edit-input" :disabled="crud.status.view > 0" @input="change($event,form.tableData[scope.$index],scope.$index)" />
<el-input v-model="form.tableData[scope.$index].workload_audit" size="mini" class="edit-input" :disabled="crud.status.view > 0" @input="change($event,form.tableData[scope.$index],scope.$index)" />
</template>
</el-table-column>
<el-table-column prop="time_quota" label="工时定额" align="center" />
@@ -214,7 +215,7 @@ export default {
},
delOne(index, rows) {
// 将总分值减去每行的总分
var num = parseFloat(this.form.total_score) - parseFloat(rows[index].single_score) * parseFloat(rows[index].workload)
var num = parseFloat(this.form.total_score) - parseFloat(rows[index].single_score) * parseFloat(rows[index].workload_audit)
this.form.total_score = num.toFixed(2)
rows.splice(index, 1)
this.form.num = this.form.tableData.length
@@ -225,17 +226,17 @@ export default {
const numRe = new RegExp(numReg)
if (!numRe.test(val)) {
this.crud.notify('请输入不小于0的数字', CRUD.NOTIFICATION_TYPE.INFO)
row.workload = 0
row.workload_audit = 0
} else {
if (row.workload === '') {
row.workload = 0
if (row.workload_audit === '') {
row.workload_audit = 0
}
}
this.form.tableData.splice(index, 1, row)
// 将每行的算出来的分值相加
let all = 0
this.form.tableData.forEach((item) => {
all = all + parseFloat(item.workload) * parseFloat(item.single_score)
all = all + parseFloat(item.workload_audit) * parseFloat(item.single_score)
})
this.form.total_score = all.toFixed(2)
},

2
mes/qd/src/views/wms/pa/workloadreview/index.vue
View File

@@ -89,7 +89,7 @@ export default {
cruds() {
return CRUD({
title: '工作量汇报',
url: 'api/performancemst',
url: 'api/performancemst/query2',
idField: 'performance_id',
sort: 'performance_id,desc',
crudMethod: { ...crudPerformancemst },

6
mes/qd/src/views/wms/sb/repair/devicerepairplan/index.vue
View File

@@ -129,9 +129,9 @@
<el-table-column fixed="left" prop="maintenancecycle" label="维修周期" :formatter="formatMainName" min-width="75" />
<el-table-column fixed="left" prop="repair_type" label="维修类型" :formatter="formatRepairpType" min-width="75" />
<el-table-column prop="plan_start_date" label="计划初始日期" min-width="100" />
<el-table-column prop="real_start_date" label="最近保养开始日期" min-width="125" />
<el-table-column prop="real_end_date" label="最近保养结束日期" min-width="125" />
<el-table-column prop="next_end_date" label="下次保养日期" min-width="100" />
<el-table-column prop="real_start_date" label="最近维修开始日期" min-width="125" />
<el-table-column prop="real_end_date" label="最近维修结束日期" min-width="125" />
<el-table-column prop="next_end_date" label="下次维修日期" min-width="100" />
<el-table-column prop="create_name" label="创建人" min-width="90" />
<el-table-column prop="create_time" label="创建时间" min-width="140" />
<el-table-column prop="confirm_optname" label="审核人" min-width="90" />