master
yinq 4 weeks ago
parent cadbc80e67
commit 0fdb3f0f95

@ -135,18 +135,18 @@
>同步计划 >同步计划
</el-button> </el-button>
</el-col> </el-col>
<!-- <el-col :span="1.5">--> <!-- <el-col :span="1.5">-->
<!-- <el-button--> <!-- <el-button-->
<!-- type="danger"--> <!-- type="danger"-->
<!-- plain--> <!-- plain-->
<!-- icon="el-icon-delete"--> <!-- icon="el-icon-delete"-->
<!-- size="mini"--> <!-- size="mini"-->
<!-- :disabled="multiple"--> <!-- :disabled="multiple"-->
<!-- @click="handleDelete"--> <!-- @click="handleDelete"-->
<!-- v-hasPermi="['mes/prod:prodOrderInfo:remove']"--> <!-- v-hasPermi="['mes/prod:prodOrderInfo:remove']"-->
<!-- >删除--> <!-- >删除-->
<!-- </el-button>--> <!-- </el-button>-->
<!-- </el-col>--> <!-- </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
@ -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>
@ -228,13 +231,13 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100" fixed="right"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <el-button--> <!-- <el-button-->
<!-- size="mini"--> <!-- size="mini"-->
<!-- type="text"--> <!-- type="text"-->
<!-- icon="el-icon-bottom"--> <!-- icon="el-icon-bottom"-->
<!-- @click="handleReleasePlan(scope.row)"--> <!-- @click="handleReleasePlan(scope.row)"-->
<!-- >订单下达--> <!-- >订单下达-->
<!-- </el-button>--> <!-- </el-button>-->
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
@ -383,54 +386,54 @@
</el-dialog> </el-dialog>
<!-- 下达计划对话框 --> <!-- 下达计划对话框 -->
<!-- <el-dialog :title="title" :visible.sync="releaseOpen" width="800px" append-to-body>--> <!-- <el-dialog :title="title" :visible.sync="releaseOpen" width="800px" append-to-body>-->
<!-- <el-form ref="form" :model="form" :rules="rules" label-width="100px">--> <!-- <el-form ref="form" :model="form" :rules="rules" label-width="100px">-->
<!-- <el-row :gutter="10">--> <!-- <el-row :gutter="10">-->
<!-- <el-col :span="12">--> <!-- <el-col :span="12">-->
<!-- <el-form-item label="任务编号" prop="orderCode">--> <!-- <el-form-item label="任务编号" prop="orderCode">-->
<!-- <el-input v-model="form.orderCode" disabled/>--> <!-- <el-input v-model="form.orderCode" disabled/>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- <el-form-item label="物料编码" prop="materialCode">--> <!-- <el-form-item label="物料编码" prop="materialCode">-->
<!-- <el-input v-model="form.materialCode" disabled/>--> <!-- <el-input v-model="form.materialCode" disabled/>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- <el-form-item label="计划开始时间" prop="beginDate">--> <!-- <el-form-item label="计划开始时间" prop="beginDate">-->
<!-- <el-date-picker clearable--> <!-- <el-date-picker clearable-->
<!-- v-model="form.beginDate"--> <!-- v-model="form.beginDate"-->
<!-- type="date"--> <!-- type="date"-->
<!-- value-format="yyyy-MM-dd"--> <!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="请选择计划开始时间"--> <!-- placeholder="请选择计划开始时间"-->
<!-- >--> <!-- >-->
<!-- </el-date-picker>--> <!-- </el-date-picker>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </el-col>--> <!-- </el-col>-->
<!-- <el-col :span="12">--> <!-- <el-col :span="12">-->
<!-- <el-form-item label="订单计划数量" prop="orderAmount">--> <!-- <el-form-item label="订单计划数量" prop="orderAmount">-->
<!-- <el-input v-model="form.orderAmount" placeholder="请输入订单计划数量" disabled/>--> <!-- <el-input v-model="form.orderAmount" placeholder="请输入订单计划数量" disabled/>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- <el-form-item label="输送带规格" prop="materialName">--> <!-- <el-form-item label="输送带规格" prop="materialName">-->
<!-- <el-input v-model="form.materialName" disabled/>--> <!-- <el-input v-model="form.materialName" disabled/>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- <el-form-item label="计划结束时间" prop="endDate">--> <!-- <el-form-item label="计划结束时间" prop="endDate">-->
<!-- <el-date-picker clearable--> <!-- <el-date-picker clearable-->
<!-- v-model="form.endDate"--> <!-- v-model="form.endDate"-->
<!-- type="date"--> <!-- type="date"-->
<!-- value-format="yyyy-MM-dd"--> <!-- value-format="yyyy-MM-dd"-->
<!-- placeholder="请选择计划结束时间"--> <!-- placeholder="请选择计划结束时间"-->
<!-- >--> <!-- >-->
<!-- </el-date-picker>--> <!-- </el-date-picker>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </el-col>--> <!-- </el-col>-->
<!-- </el-row>--> <!-- </el-row>-->
<!-- <el-form-item label="选择BOM" prop="bomCode">--> <!-- <el-form-item label="选择BOM" prop="bomCode">-->
<!-- <el-input v-model="form.bomCode" placeholder="请输入BOM编号"/>--> <!-- <el-input v-model="form.bomCode" placeholder="请输入BOM编号"/>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </el-form>--> <!-- </el-form>-->
<!-- <div slot="footer" class="dialog-footer">--> <!-- <div slot="footer" class="dialog-footer">-->
<!-- <el-button type="primary" @click="submitReleaseForm"> </el-button>--> <!-- <el-button type="primary" @click="submitReleaseForm"> </el-button>-->
<!-- <el-button @click="cancel"> </el-button>--> <!-- <el-button @click="cancel"> </el-button>-->
<!-- </div>--> <!-- </div>-->
<!-- </el-dialog>--> <!-- </el-dialog>-->
<!-- 同步ERP订单信息对话框 --> <!-- 同步ERP订单信息对话框 -->
<el-dialog :title="title" :visible.sync="orderOpen" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="orderOpen" width="500px" append-to-body>
@ -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,
@ -551,7 +556,7 @@ export default {
} }
}, },
created() { created() {
if (this.$route.params != null){ if (this.$route.params != null) {
this.queryParams.params = this.$route.params this.queryParams.params = this.$route.params
} }
this.getList() this.getList()
@ -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