yinq
/
XMXS-OS-UI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change - 生产计划详情跳转、生产工单详情跳转

Browse Source
main
yinq 2 months ago
parent a0141035dc
commit 96c1206669
7 changed files with 119 additions and 58 deletions
Show Stats Download Patch File Download Diff File

29
src/router/index.js
Unescape Escape View File

@ -241,7 +241,34 @@ export const dynamicRoutes = [
} }
] ]
}, },
{
path: '/mes/prodOrder-detail',
component: Layout,
hidden: true,
permissions: ['mes/prod:prodOrderDetail:list'],
children: [
{
path: 'index/:orderCode',
component: () => import('@/views/mes/prod/prodOrderDetail/index'),
name: 'prodOrderDetail',
meta: { title: '订单明细', activeMenu: '/mes/prodOrderDetail' }
}
]
},
{
path: '/mes/prodPlan-erpInfo',
component: Layout,
hidden: true,
permissions: ['mes/prod:prodPlanErpInfo:list'],
children: [
{
path: 'index/:planCode',
component: () => import('@/views/mes/prod/prodPlanErpInfo/index'),
name: 'prodPlanErpInfo',
meta: { title: '生产计划', activeMenu: '/mes/prodPlanErpInfo' }
}
]
},
] ]
// 防止连续点击多次路由报错 // 防止连续点击多次路由报错

2
src/views/ems/report/energyPreview/index.vue
Unescape Escape View File

@ -75,7 +75,7 @@
class="centered-image" class="centered-image"
src="@/assets/images/electricityIcon.svg" src="@/assets/images/electricityIcon.svg"
/> />
<div class="centered-text total-consumption-label"> <div class="centered-text total-consumption-label" style="margin-bottom: 20px;">
总耗量 总耗量
</div> </div>
<div class="centered-text total-consumption-value"> <div class="centered-text total-consumption-value">

32
src/views/mes/base/baseDeviceLedger/index.vue
Unescape Escape View File

@ -9,8 +9,8 @@
<!-- @keyup.enter.native="handleQuery"--> <!-- @keyup.enter.native="handleQuery"-->
<!-- />--> <!-- />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="所属产线" prop="productLineCode"> <el-form-item label="所属工位" prop="productLineCode">
<el-select v-model="queryParams.productLineCode" placeholder="请选择所属产线" clearable> <el-select v-model="queryParams.productLineCode" placeholder="请选择所属工位" clearable>
<el-option <el-option
v-for="item in productLineList" v-for="item in productLineList"
:key="item.productLineCode" :key="item.productLineCode"
@ -55,10 +55,10 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="班组编号" prop="teamCode">--> <!-- <el-form-item label="班组名称" prop="teamCode">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="queryParams.teamCode"--> <!-- v-model="queryParams.teamCode"-->
<!-- placeholder="请输入班组编号"--> <!-- placeholder="请输入班组名称"-->
<!-- clearable--> <!-- clearable-->
<!-- @keyup.enter.native="handleQuery"--> <!-- @keyup.enter.native="handleQuery"-->
<!-- />--> <!-- />-->
@ -131,7 +131,7 @@
<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="deviceCode" v-if="columns[1].visible"/> <el-table-column label="设备编号" align="center" prop="deviceCode" v-if="columns[1].visible"/>
<el-table-column label="设备名称" align="center" prop="deviceName" v-if="columns[2].visible"/> <el-table-column label="设备名称" align="center" prop="deviceName" v-if="columns[2].visible" width="180"/>
<el-table-column label="设备型号" align="center" prop="deviceModel" v-if="columns[3].visible"/> <el-table-column label="设备型号" align="center" prop="deviceModel" v-if="columns[3].visible"/>
<el-table-column label="设备类型" align="center" prop="deviceType" v-if="columns[4].visible"> <el-table-column label="设备类型" align="center" prop="deviceType" v-if="columns[4].visible">
<template slot-scope="scope"> <template slot-scope="scope">
@ -152,14 +152,14 @@
<span>{{ parseTime(scope.row.enableDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.enableDate, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="所属产线" align="center" prop="productLineName" v-if="columns[11].visible"/> <el-table-column label="所属工位" align="center" prop="productLineName" v-if="columns[11].visible"/>
<el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[12].visible"> <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[12].visible">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/> <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="工厂编号" align="center" prop="factoryCode" v-if="columns[17].visible"/> <el-table-column label="工厂编号" align="center" prop="factoryCode" v-if="columns[17].visible"/>
<el-table-column label="班组编号" align="center" prop="teamCode" v-if="columns[18].visible"/> <el-table-column label="班组名称" align="center" prop="teamCode" v-if="columns[18].visible"/>
<el-table-column label="资产编号" align="center" prop="assetCode" v-if="columns[19].visible"/> <el-table-column label="资产编号" align="center" prop="assetCode" v-if="columns[19].visible"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
@ -244,8 +244,8 @@
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="所属产线" prop="productLineCode"> <el-form-item label="所属工位" prop="productLineCode">
<el-select v-model="form.productLineCode" placeholder="请选择所属产线"> <el-select v-model="form.productLineCode" placeholder="请选择所属工位">
<el-option <el-option
v-for="item in productLineList" v-for="item in productLineList"
:key="item.productLineCode" :key="item.productLineCode"
@ -267,8 +267,8 @@
<!-- <el-form-item label="工厂编号" prop="factoryCode">--> <!-- <el-form-item label="工厂编号" prop="factoryCode">-->
<!-- <el-input v-model="form.factoryCode" placeholder="请输入工厂编号"/>--> <!-- <el-input v-model="form.factoryCode" placeholder="请输入工厂编号"/>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="班组编号" prop="teamCode"> <el-form-item label="班组名称" prop="teamCode">
<el-input v-model="form.teamCode" placeholder="请输入班组编号"/> <el-input v-model="form.teamCode" placeholder="请输入班组名称"/>
</el-form-item> </el-form-item>
<!-- <el-form-item label="资产编号" prop="assetCode">--> <!-- <el-form-item label="资产编号" prop="assetCode">-->
<!-- <el-input v-model="form.assetCode" placeholder="请输入资产编号"/>--> <!-- <el-input v-model="form.assetCode" placeholder="请输入资产编号"/>-->
@ -358,14 +358,14 @@ export default {
{ key: 8, label: `成本中心`, visible: false }, { key: 8, label: `成本中心`, visible: false },
{ key: 9, label: `生产厂商`, visible: true }, { key: 9, label: `生产厂商`, visible: true },
{ key: 10, label: `启用日期`, visible: true }, { key: 10, label: `启用日期`, visible: true },
{ key: 11, label: `所属产线`, visible: true }, { key: 11, label: `所属工位`, visible: true },
{ key: 12, label: `启用标识`, visible: true }, { key: 12, label: `启用标识`, visible: false },
{ key: 13, label: `创建人`, visible: false }, { key: 13, label: `创建人`, visible: false },
{ key: 14, label: `创建时间`, visible: false }, { key: 14, label: `创建时间`, visible: false },
{ key: 15, label: `更新人`, visible: false }, { key: 15, label: `更新人`, visible: false },
{ key: 16, label: `更新时间`, visible: false }, { key: 16, label: `更新时间`, visible: false },
{ key: 17, label: `工厂编号`, visible: true }, { key: 17, label: `工厂编号`, visible: false },
{ key: 18, label: `班组编号`, visible: true }, { key: 18, label: `班组名称`, visible: false },
{ key: 19, label: `资产编号`, visible: false } { key: 19, label: `资产编号`, visible: false }
], ],
// 产线选项 // 产线选项
@ -373,7 +373,7 @@ export default {
} }
}, },
created() { created() {
getBaseProductLineList({ productLineType: 1 }).then(response => { getBaseProductLineList({ productLineType: 2 }).then(response => {
this.productLineList = response.data this.productLineList = response.data
}) })
this.getList() this.getList()

4
src/views/mes/prod/prodOrderDetail/index.vue
Unescape Escape View File

@ -751,6 +751,10 @@ export default {
} }
}, },
created() { created() {
const orderCode = this.$route.params && this.$route.params.orderCode;
if (orderCode != null){
this.queryParams.SeqNo = orderCode;
}
this.getList() this.getList()
}, },
methods: { methods: {

19
src/views/mes/prod/prodOrderInfo/index.vue
Unescape Escape View File

@ -205,12 +205,19 @@
</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-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-bottom"-->
<!-- @click="handleReleasePlan(scope.row)"-->
<!-- >订单下达-->
<!-- </el-button>-->
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-bottom" icon="el-icon-right"
@click="handleReleasePlan(scope.row)" @click="handlePlanDetails(scope.row)"
>订单下达 >查看明细
</el-button> </el-button>
<!-- <el-button--> <!-- <el-button-->
<!-- size="mini"--> <!-- size="mini"-->
@ -535,6 +542,12 @@ export default {
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, {});
}, },
/** 查看明细 */
handlePlanDetails(row) {
const params = {orderCode: row.orderCode};
// this.$tab.closeOpenPage(router.currentRoute);
this.$tab.openPage("任务[" + row.orderCode + "]订单明细", '/mes/prodOrder-detail/index/' + row.orderCode, {});
},
// 取消按钮 // 取消按钮
cancel() { cancel() {
this.open = false this.open = false

6
src/views/mes/prod/prodPlanErpInfo/index.vue
Unescape Escape View File

@ -117,6 +117,7 @@
<el-table-column label="硬件" align="center" prop="hardware" v-if="columns[1].visible"/> <el-table-column label="硬件" align="center" prop="hardware" v-if="columns[1].visible"/>
<el-table-column label="软件" align="center" prop="software" v-if="columns[2].visible"/> <el-table-column label="软件" align="center" prop="software" v-if="columns[2].visible"/>
<el-table-column label="阶段文字" align="center" prop="stageText" v-if="columns[3].visible"/> <el-table-column label="阶段文字" align="center" prop="stageText" v-if="columns[3].visible"/>
<el-table-column label="任务编号" align="center" prop="taskCode" v-if="columns[25].visible" width="140"/>
<el-table-column label="计划流水号" align="center" prop="seqNo" v-if="columns[4].visible" width="240"/> <el-table-column label="计划流水号" align="center" prop="seqNo" v-if="columns[4].visible" width="240"/>
<el-table-column label="计划开始时间" align="center" prop="planStartTime" width="180" v-if="columns[5].visible"> <el-table-column label="计划开始时间" align="center" prop="planStartTime" width="180" v-if="columns[5].visible">
<template slot-scope="scope"> <template slot-scope="scope">
@ -146,7 +147,6 @@
<el-table-column label="工艺阶段" align="center" prop="processStage" v-if="columns[22].visible"/> <el-table-column label="工艺阶段" align="center" prop="processStage" v-if="columns[22].visible"/>
<el-table-column label="前置工艺" align="center" prop="preProcess" v-if="columns[23].visible"/> <el-table-column label="前置工艺" align="center" prop="preProcess" v-if="columns[23].visible"/>
<el-table-column label="发布订单" align="center" prop="releaseOrder" v-if="columns[24].visible"/> <el-table-column label="发布订单" align="center" prop="releaseOrder" v-if="columns[24].visible"/>
<el-table-column label="任务编号" align="center" prop="taskCode" v-if="columns[25].visible"/>
<el-table-column label="输送带长度规格" align="center" prop="conveyorLengthSpecification" v-if="columns[26].visible"/> <el-table-column label="输送带长度规格" align="center" prop="conveyorLengthSpecification" v-if="columns[26].visible"/>
<el-table-column label="上胶厚度" align="center" prop="upGlueThickness" v-if="columns[27].visible"/> <el-table-column label="上胶厚度" align="center" prop="upGlueThickness" v-if="columns[27].visible"/>
<el-table-column label="上缓冲胶厚度" align="center" prop="upBufferGlueThickness" v-if="columns[28].visible"/> <el-table-column label="上缓冲胶厚度" align="center" prop="upBufferGlueThickness" v-if="columns[28].visible"/>
@ -640,6 +640,10 @@ export default {
} }
}, },
created() { created() {
const planCode = this.$route.params && this.$route.params.planCode;
if (planCode != null){
this.queryParams.seqNo = planCode;
}
this.getList() this.getList()
}, },
methods: { methods: {

85
src/views/mes/prod/prodPlanInfo/index.vue
Unescape Escape View File

@ -17,30 +17,30 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="物料编号" prop="materialCode"> <!-- <el-form-item label="物料编号" prop="materialCode">-->
<el-input <!-- <el-input-->
v-model="queryParams.materialCode" <!-- v-model="queryParams.materialCode"-->
placeholder="请输入物料编号" <!-- placeholder="请输入物料编号"-->
clearable <!-- clearable-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="物料名称" prop="materialName"> <!-- <el-form-item label="物料名称" prop="materialName">-->
<el-input <!-- <el-input-->
v-model="queryParams.materialName" <!-- v-model="queryParams.materialName"-->
placeholder="请输入物料名称" <!-- placeholder="请输入物料名称"-->
clearable <!-- clearable-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="计划工位" prop="stationCode"> <!-- <el-form-item label="计划工位" prop="stationCode">-->
<el-input <!-- <el-input-->
v-model="queryParams.stationCode" <!-- v-model="queryParams.stationCode"-->
placeholder="请输入计划工位" <!-- placeholder="请输入计划工位"-->
clearable <!-- clearable-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<!-- <el-form-item label="设备编号" prop="deviceCode">--> <!-- <el-form-item label="设备编号" prop="deviceCode">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="queryParams.deviceCode"--> <!-- v-model="queryParams.deviceCode"-->
@ -49,14 +49,14 @@
<!-- @keyup.enter.native="handleQuery"--> <!-- @keyup.enter.native="handleQuery"-->
<!-- />--> <!-- />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="计划班组" prop="teamCode"> <!-- <el-form-item label="计划班组" prop="teamCode">-->
<el-input <!-- <el-input-->
v-model="queryParams.teamCode" <!-- v-model="queryParams.teamCode"-->
placeholder="请输入计划班组" <!-- placeholder="请输入计划班组"-->
clearable <!-- clearable-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="实际开始时间"> <el-form-item label="实际开始时间">
<el-date-picker <el-date-picker
v-model="daterangeBeginTime" v-model="daterangeBeginTime"
@ -182,8 +182,15 @@
<span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">--> <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
size="mini"
type="text"
icon="el-icon-right"
@click="handlePlanDetails(scope.row)"
>查看明细
</el-button>
<!-- <el-button--> <!-- <el-button-->
<!-- size="mini"--> <!-- size="mini"-->
<!-- type="text"--> <!-- type="text"-->
@ -200,8 +207,8 @@
<!-- v-hasPermi="['mes/prod:prodPlanInfo:remove']"--> <!-- v-hasPermi="['mes/prod:prodPlanInfo:remove']"-->
<!-- >删除--> <!-- >删除-->
<!-- </el-button>--> <!-- </el-button>-->
<!-- </template>--> </template>
<!-- </el-table-column>--> </el-table-column>
</el-table> </el-table>
<pagination <pagination
@ -453,6 +460,12 @@ export default {
this.single = selection.length !== 1 this.single = selection.length !== 1
this.multiple = !selection.length this.multiple = !selection.length
}, },
/** 查看明细 */
handlePlanDetails(row) {
// const params = {planCode: row.planCode};
// this.$tab.closeOpenPage(router.currentRoute);
this.$tab.openPage("计划[" + row.planCode + "]生产计划", '/mes/prodPlan-erpInfo/index/' + row.planCode, {});
},
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset() this.reset()

Write Preview
Loading…
Cancel
Save