suojin
/
jonhon-mes-web
25
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

成本统计修改

Browse Source
dev-scheduling
jinna 1 month ago
parent babc35eea1
commit e399049f46
2 changed files with 42 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/views/costStatistics/index.vue
  2. 66
      src/views/productionSchedulingPlan/schedulingException/index.vue

1
src/views/costStatistics/index.vue
Unescape View File

@ -680,6 +680,7 @@ export default {
// 新增：可点击单元格的样式 // 新增：可点击单元格的样式
::v-deep .high_row { ::v-deep .high_row {
cursor: pointer !important; cursor: pointer !important;
color: #284c89 !important; /* Element UI 主题蓝，你可以改为 blue 或其他颜色 */
// 可选：增加悬停时的下划线效果，增强交互感 // 可选：增加悬停时的下划线效果，增强交互感
&:hover { &:hover {

66
src/views/productionSchedulingPlan/schedulingException/index.vue
Unescape View File

@ -15,19 +15,20 @@
@size-change="sizeChange" @size-change="sizeChange"
@refresh-change="refreshChange" @refresh-change="refreshChange"
@on-load="onLoad" @on-load="onLoad"
@sort-change="sortChange"
> >
<template #menu="scope"> <template #menu="scope">
<el-button <el-button
v-if=" v-if="
$route.path == '/productionSchedulingPlan/schedulingException/index' && $route.path == '/productionSchedulingPlan/schedulingException/index' &&
scope.row.errorInfo.indexOf('设备资源') > -1 scope.row.errorInfo.indexOf('设备资源') > -1 &&
permission.schedulingException_dispose
" "
type="text" type="text"
size="mini"
@click="handleFn(scope.row)" @click="handleFn(scope.row)"
>处理</el-button >处理</el-button
> >
<el-button type="text" size="mini" @click="recoveryFn(scope.row)">恢复</el-button> <el-button type="text" @click="recoveryFn(scope.row)" v-if="permission.schedulingException_recover">恢复</el-button>
</template> </template>
<template #demandDate="{ row }"> <template #demandDate="{ row }">
{{ row.demandDate ? row.demandDate.substring(0, 10) : '' }} {{ row.demandDate ? row.demandDate.substring(0, 10) : '' }}
@ -38,7 +39,7 @@
<script> <script>
import { getYieldOrderList,recoveryUpdate } from '@/api/productionSchedulingPlan/scheduling'; import { getYieldOrderList,recoveryUpdate } from '@/api/productionSchedulingPlan/scheduling';
import { mapGetters } from 'vuex';
export default { export default {
components: {}, components: {},
data() { data() {
@ -107,7 +108,7 @@ export default {
searchLabelPosition: 'left', searchLabelPosition: 'left',
searchGutter: 24, searchGutter: 24,
searchSpan: 6, searchSpan: 6,
menuAlign: 'left', menuAlign: 'center',
gridBtn: false, gridBtn: false,
searchMenuPosition: 'right', searchMenuPosition: 'right',
align: 'center', align: 'center',
@ -117,7 +118,7 @@ export default {
label: '时间', label: '时间',
prop: 'cycledate', prop: 'cycledate',
search: true, search: true,
sortable: true, sortable: 'custom',
span: 12, span: 12,
hide: true, hide: true,
type: 'date', type: 'date',
@ -131,7 +132,7 @@ export default {
label: '异常原因', label: '异常原因',
prop: 'errorInfo', prop: 'errorInfo',
search: false, search: false,
sortable: true, sortable: 'custom',
width: 300, width: 300,
span: 12, span: 12,
}, },
@ -139,7 +140,7 @@ export default {
// label: '处理方式', // label: '处理方式',
// prop: 'partName', // prop: 'partName',
// search: false, // search: false,
// sortable: true, // sortable: 'custom',
// width: 150, // width: 150,
// span: 12, // span: 12,
// }, // },
@ -147,7 +148,7 @@ export default {
label: '调度员', label: '调度员',
prop: 'dispatcher', prop: 'dispatcher',
search: false, search: false,
sortable: true, // sortable: 'custom',
width: 150, width: 150,
span: 12, span: 12,
}, },
@ -155,7 +156,7 @@ export default {
label: '生产单号', label: '生产单号',
prop: 'yoCode', prop: 'yoCode',
search: true, search: true,
sortable: true, sortable: 'custom',
width: 150, width: 150,
span: 12, span: 12,
display: false, display: false,
@ -164,7 +165,7 @@ export default {
label: '计划单号', label: '计划单号',
prop: 'ypCode', prop: 'ypCode',
search: false, search: false,
sortable: true, sortable: 'custom',
width: 150, width: 150,
span: 12, span: 12,
display: false, display: false,
@ -173,7 +174,7 @@ export default {
label: '订单优先级', label: '订单优先级',
prop: 'priorityApsStr', prop: 'priorityApsStr',
search: false, search: false,
sortable: true, sortable: 'custom',
width: 150, width: 150,
span: 12, span: 12,
display: false, display: false,
@ -182,7 +183,7 @@ export default {
label: '零件号', label: '零件号',
prop: 'partCode', prop: 'partCode',
search: true, search: true,
sortable: true, sortable: 'custom',
width: 150, width: 150,
span: 12, span: 12,
}, },
@ -190,7 +191,7 @@ export default {
label: '零件名称', label: '零件名称',
prop: 'partName', prop: 'partName',
search: false, search: false,
sortable: true, sortable: 'custom',
width: 150, width: 150,
span: 12, span: 12,
}, },
@ -198,7 +199,7 @@ export default {
// label: '产品型号', // label: '产品型号',
// prop: 'productType', // prop: 'productType',
// search: false, // search: false,
// sortable: true, // sortable: 'custom',
// width: 150, // width: 150,
// span: 12, // span: 12,
// }, // },
@ -206,7 +207,7 @@ export default {
label: '批次号', label: '批次号',
prop: 'batchNo', prop: 'batchNo',
search: true, search: true,
sortable: true, sortable: 'custom',
width: 150, width: 150,
span: 12, span: 12,
}, },
@ -214,7 +215,7 @@ export default {
label: '流程卡号', label: '流程卡号',
prop: 'cardNo', prop: 'cardNo',
search: true, search: true,
sortable: true, sortable: 'custom',
width: 150, width: 150,
span: 12, span: 12,
display: false, display: false,
@ -223,7 +224,7 @@ export default {
label: '流转编码', label: '流转编码',
prop: 'roamNo', prop: 'roamNo',
search: true, search: true,
sortable: true, sortable: 'custom',
width: 150, width: 150,
span: 12, span: 12,
}, },
@ -231,7 +232,7 @@ export default {
label: '镀种', label: '镀种',
prop: 'plate', prop: 'plate',
search: false, search: false,
sortable: true, sortable: 'custom',
width: 150, width: 150,
span: 12, span: 12,
}, },
@ -239,7 +240,7 @@ export default {
label: '生产标识', label: '生产标识',
prop: 'productIdent', prop: 'productIdent',
search: false, search: false,
sortable: true, sortable: 'custom',
width: 150, width: 150,
span: 12, span: 12,
}, },
@ -247,7 +248,7 @@ export default {
label: '生产数量', label: '生产数量',
prop: 'ypQty', prop: 'ypQty',
search: false, search: false,
sortable: true, sortable: 'custom',
width: 150, width: 150,
span: 12, span: 12,
}, },
@ -255,7 +256,7 @@ export default {
label: '面积(d㎡)', label: '面积(d㎡)',
prop: 'ypArea', prop: 'ypArea',
search: false, search: false,
sortable: true, sortable: 'custom',
width: 150, width: 150,
span: 12, span: 12,
}, },
@ -263,7 +264,7 @@ export default {
label: '需求交期', label: '需求交期',
prop: 'demandDate', prop: 'demandDate',
search: false, search: false,
sortable: true, sortable: 'custom',
width: 150, width: 150,
span: 12, span: 12,
}, },
@ -272,7 +273,7 @@ export default {
label: '计划下达时间', label: '计划下达时间',
prop: 'releaseDate', prop: 'releaseDate',
search: false, search: false,
sortable: true, sortable: 'custom',
width: 150, width: 150,
span: 12, span: 12,
}, },
@ -281,7 +282,7 @@ export default {
label: '备注', label: '备注',
prop: 'memo', prop: 'memo',
search: false, search: false,
sortable: true, sortable: 'custom',
width: 150, width: 150,
span: 12, span: 12,
}, },
@ -293,7 +294,22 @@ export default {
isBatchOpen: false, //分批处理 isBatchOpen: false, //分批处理
}; };
}, },
computed:{
...mapGetters(['permission']),
},
methods: { methods: {
// 表格排序
sortChange({ prop, order }) {
console.log('prop----------',prop)
console.log('order----------',order)
this.query.ascs = undefined;
this.query.descs = undefined;
const orderByFieldKey = order === 'ascending' ? 'ascs' : 'descs';
const orderByField = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
this.query[orderByFieldKey] = orderByField;
// // 重新加载数据
this.onLoad(this.page, this.query);
},
handleFn(row) { handleFn(row) {
if (row.errorInfo.indexOf('设备资源') > -1) { if (row.errorInfo.indexOf('设备资源') > -1) {
this.$router.push({ path: '/productionSchedulingPlan/basic/equipmentCapacity' }); this.$router.push({ path: '/productionSchedulingPlan/basic/equipmentCapacity' });

Write Preview
Loading…
Cancel
Save