master
yinq 4 weeks ago
parent cadbc80e67
commit 0fdb3f0f95

@ -161,10 +161,13 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="prodOrderInfoList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="prodOrderInfoList" @selection-change="handleSelectionChange"
@sort-change="handleSortChange"
:default-sort="{ prop: 'beginDate', order: 'descending' }"
>
<el-table-column type="selection" width="55" align="center"/> <el-table-column type="selection" width="55" align="center"/>
<el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/> <el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
<el-table-column label="任务编号" align="center" prop="orderCode" v-if="columns[1].visible" width="130"/> <el-table-column label="任务编号" align="center" prop="orderCode" v-if="columns[1].visible" width="130" sortable="custom"/>
<el-table-column label="销售任务编号" align="center" prop="saleOrderCode" v-if="columns[2].visible"/> <el-table-column label="销售任务编号" align="center" prop="saleOrderCode" v-if="columns[2].visible"/>
<el-table-column label="销售订单行号" align="center" prop="saleOrderLineNumber" v-if="columns[3].visible"/> <el-table-column label="销售订单行号" align="center" prop="saleOrderLineNumber" v-if="columns[3].visible"/>
<el-table-column label="物料编码" align="center" prop="materialCode" v-if="columns[4].visible" width="100"/> <el-table-column label="物料编码" align="center" prop="materialCode" v-if="columns[4].visible" width="100"/>
@ -184,7 +187,7 @@
<dict-tag :options="dict.type.finish_flag" :value="scope.row.finishFlag"/> <dict-tag :options="dict.type.finish_flag" :value="scope.row.finishFlag"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="计划开始时间" align="center" prop="beginDate" width="180" v-if="columns[13].visible"> <el-table-column label="计划开始时间" align="center" prop="beginDate" width="180" v-if="columns[13].visible" sortable="custom">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.beginDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ parseTime(scope.row.beginDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template> </template>
@ -455,7 +458,7 @@ import {
addProdOrderInfo, addProdOrderInfo,
updateProdOrderInfo, getERPProductionPlan, getERPWorkOrder updateProdOrderInfo, getERPProductionPlan, getERPWorkOrder
} from '@/api/mes/prod/prodOrderInfo' } from '@/api/mes/prod/prodOrderInfo'
import router from "@//router"; import router from '@//router'
export default { export default {
name: 'ProdOrderInfo', name: 'ProdOrderInfo',
@ -489,6 +492,8 @@ export default {
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
orderByColumn: 'beginDate',
isAsc: 'desc' ,
orderCode: null, orderCode: null,
saleOrderCode: null, saleOrderCode: null,
saleOrderLineNumber: null, saleOrderLineNumber: null,
@ -573,17 +578,25 @@ export default {
}, },
/** 下达计划 */ /** 下达计划 */
handleReleasePlan(row) { handleReleasePlan(row) {
const objId = row.objId; const objId = row.objId
const orderCode = row.orderCode; const orderCode = row.orderCode
const params = {queryParams: this.queryParams}; const params = { queryParams: this.queryParams }
this.$tab.closeOpenPage(router.currentRoute); this.$tab.closeOpenPage(router.currentRoute)
this.$tab.openPage("订单[" + orderCode + "]下达", '/mes/release-order/index/' + objId, {}); this.$tab.openPage('订单[' + orderCode + ']下达', '/mes/release-order/index/' + objId, {})
},
handleSortChange({ column, prop, order }) {
this.queryParams = {
...this.queryParams,
orderByColumn: prop || 'beginDate',
isAsc: order === 'ascending' ? 'asc' : 'desc'
}
this.getList() //
}, },
/** 查看明细 */ /** 查看明细 */
handlePlanDetails(row) { handlePlanDetails(row) {
const params = {orderCode: row.orderCode}; const params = { orderCode: row.orderCode }
// this.$tab.closeOpenPage(router.currentRoute); // this.$tab.closeOpenPage(router.currentRoute);
this.$tab.openPage("任务[" + row.orderCode + "]订单明细", '/mes/prodOrder-detail/index/' + row.orderCode, {}); this.$tab.openPage('任务[' + row.orderCode + ']订单明细', '/mes/prodOrder-detail/index/' + row.orderCode, {})
}, },
// //
cancel() { cancel() {

Loading…
Cancel
Save