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

生产管理接口联调

Browse Source
dev-scheduling
zhangdi 3 months ago
parent 12131306f0
commit d322b99dc6
7 changed files with 783 additions and 1032 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. 235
      src/views/productionManagement/blbWorkOrder/components/glass.vue
  2. 150
      src/views/productionManagement/blbWorkOrder/components/others.vue
  3. 24
      src/views/productionManagement/frontTooling.vue
  4. 31
      src/views/productionManagement/productionMonitoring.vue
  5. 162
      src/views/productionManagement/sinTerWorkOrder/index.vue
  6. 53
      src/views/productionManagement/sinteringProductionMonitoring.vue
  7. 110
      src/views/productionManagement/sjKitPreparation/index.vue

235
src/views/productionManagement/blbWorkOrder/components/glass.vue
Unescape View File

@ -1,5 +1,5 @@
<template> <template>
<basic-container> <div>
<!--玻璃饼--> <!--玻璃饼-->
<avue-crud <avue-crud
:option="option" :option="option"
@ -22,10 +22,11 @@
<el-button type="primary" @click="priorityFn">优先级调整</el-button> <el-button type="primary" @click="priorityFn">优先级调整</el-button>
</template> </template>
<template #menu-right> <template #menu-right>
<el-button type="success" plain @click="processingHandle">在制品</el-button> <el-button type="success" plain @click="queryOrdersHandle('3,4,5,6')">在制品</el-button>
<el-button type="warning" plain>加工中</el-button> <el-button type="warning" plain @click="queryOrdersHandle('3')">加工中</el-button>
<el-button type="danger" plain>检验中</el-button> <el-button type="danger" plain @click="queryOrdersHandle('4')">检验中</el-button>
<el-button type="success" plain>已完工</el-button> <el-button type="success" plain @click="queryOrdersHandle('15')">已完工</el-button>
<el-button type="primary" @click="queryOrdersHandle('')">全部</el-button>
</template> </template>
<template #menu="scope"> <template #menu="scope">
<el-button type="text" @click="clickProduction(scope.row)">生产监控</el-button> <el-button type="text" @click="clickProduction(scope.row)">生产监控</el-button>
@ -46,36 +47,6 @@
>异常申报</el-button >异常申报</el-button
> >
</template> </template>
<template #tsName="{ row }">{{ row.makeTeam && row.makeTeam.tsName }}</template>
<template #ppsName="{ row }">{{ row.procedureSet && row.procedureSet.ppsName }}</template>
<template #planTime1="{ row }">
{{ Array.isArray(row.planTime1) ? row.planTime1.join(' ~ ') : row.planTime1 || '-' }}
</template>
<template #planTime="{ row }">
{{ Array.isArray(row.planTime) ? row.planTime.join(' ~ ') : row.planTime || '-' }}
</template>
<template #putStoreTime="{ row }">
{{
Array.isArray(row.putStoreTime) ? row.putStoreTime.join(' ~ ') : row.putStoreTime || '-'
}}
</template>
<template #partCode="{ row }">{{ row.pjYieldOrder && row.pjYieldOrder.partCode }}</template>
<template #prodIdent="{ row }">{{ row.pjYieldOrder && row.pjYieldOrder.prodIdent }}</template>
<template #partName="{ row }">{{ row.pjYieldOrder && row.pjYieldOrder.partName }}</template>
<template #plate="{ row }">{{ row.pjYieldOrder && row.pjYieldOrder.plate }}</template>
<template #productType="{ row }">{{
row.pjYieldOrder && row.pjYieldOrder.productType
}}</template>
<template #useDept="{ row }">{{ row.pjYieldOrder && row.pjYieldOrder.useDept }}</template>
<template #poArea="{ row }">{{ row.pjYieldOrder && row.pjYieldOrder.poArea }}</template>
<template #userName="{ row }">{{ row.dispatcher && row.dispatcher.userName }}</template>
<template #nextPpsName="{ row }">{{
row.nextProcedureSet && row.nextProcedureSet.ppsName
}}</template>
<template #nextTeamName="{ row }">{{ row.nextMakeTeam && row.nextMakeTeam.tsName }}</template>
<template #failureMan="{ row }">{{
row.pjYieldOrder && row.pjYieldOrder.failureMan && row.pjYieldOrder.failureMan.userName
}}</template>
</avue-crud> </avue-crud>
<el-dialog append-to-body v-model="printDialog" title="打印标签"> <el-dialog append-to-body v-model="printDialog" title="打印标签">
<el-form ref="printForm" :model="printForm" :rules="printRules"> <el-form ref="printForm" :model="printForm" :rules="printRules">
@ -112,7 +83,7 @@
@closeDialog="closeDialog" @closeDialog="closeDialog"
@submitPriority="handlePrioritySubmit" @submitPriority="handlePrioritySubmit"
></productionMonitoringDialog> ></productionMonitoringDialog>
</basic-container> </div>
</template> </template>
<script> <script>
@ -201,8 +172,9 @@ export default {
align: 'center', align: 'center',
column: [ column: [
{ {
label: '当前工序', label: '当前工序',
prop: 'ppsName', prop: 'wpId',
fixed: 'left', fixed: 'left',
search: false, search: false,
sortable: true, sortable: true,
@ -211,7 +183,7 @@ export default {
}, },
{ {
label: '下一工序', label: '下一工序',
prop: 'nextPpsName', prop: 'ppsNameNext',
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
@ -225,50 +197,11 @@ export default {
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 200,
dicUrl: '/blade-system/dict/dictionary?code=order_status',
dicData: [ props: {
{ label: 'dictValue',
value: 2, value: 'dictKey',
label: '待生产',
},
{
value: 3,
label: '生产中',
},
{
value: 4,
label: '检验中',
},
{
value: 6,
label: '审理中',
}, },
{
value: 5,
label: '工艺变更',
},
{
value: 19,
label: '已返工',
},
{
value: 15,
label: '已完成',
},
{
value: 21,
label: '已作废',
},
],
},
{
label: '领料状态',
prop: 'llStatus',
search: true,
sortable: true,
overHidden: true,
width: 200,
hide: true,
}, },
{ {
label: '车间订单号', label: '车间订单号',
@ -278,7 +211,6 @@ export default {
overHidden: true, overHidden: true,
width: 200, width: 200,
}, },
{ {
label: '加工班组', label: '加工班组',
prop: 'tsId', prop: 'tsId',
@ -306,25 +238,25 @@ export default {
width: 200, width: 200,
}, },
{ {
label: '烧结生产订单号', label: '计划单号',
prop: 'sjCode', prop: 'poCode',
search: false, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 200,
}, },
{ {
label: '零件号', label: '返工单号',
prop: 'partCode', prop: 'qcReworkCode',
search: true, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 200,
}, },
{ {
label: '烧结零件号', label: '零件号',
prop: 'sjPartCode', prop: 'partCode',
search: false, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 200,
@ -347,7 +279,7 @@ export default {
}, },
{ {
label: '产品名称', label: '产品名称',
prop: 'str3', prop: 'false',
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
@ -365,7 +297,7 @@ export default {
{ {
label: 'MES流程卡号', label: 'MES流程卡号',
prop: 'str4', prop: 'mesCardNo',
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
@ -373,7 +305,7 @@ export default {
}, },
{ {
label: '生产标识', label: '生产标识',
prop: 'prodIdent', prop: 'productIdent',
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
@ -388,96 +320,43 @@ export default {
width: 200, width: 200,
}, },
{ {
label: '面积(dm²)', label: '订单优先级',
prop: 'poArea', prop: 'priority',
search: false, type: 'select',
sortable: true, search: true,
overHidden: true,
width: 200,
},
{
label: '单批次面积',
prop: 'batchArea',
search: false,
sortable: true,
overHidden: true,
width: 200,
},
{
label: '是否印字',
prop: 'str1',
search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 200,
type: 'select', dicUrl: '/blade-system/dict/dictionary?code=orderPriority',
dicData: [ props: {
{ label: 'dictValue',
label: '是', value: 'dictKey',
value: '1',
}, },
{
label: '否',
value: '0',
},
],
}, },
{ {
label: '粉重', label: '需求部门',
prop: 'fenzhong', prop: 'useDept',
search: false, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 200,
}, },
{ {
label: '材料号', label: '需求交期',
prop: 'materialNo', prop: 'demandDate',
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 200,
}, },
{ {
label: '成型厚度', label: '会议要求周期',
prop: 'formingThickness', prop: 'meetCycle',
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 200,
}, },
{
label: '订单优先级',
prop: 'priorityTitle',
type: 'select',
search: true,
sortable: true,
overHidden: true,
width: 200,
dicData: [
{
value: 1,
label: '正常-白色',
},
{
value: 2,
label: '项目要求日期急件-橙色',
},
{
value: 3,
label: '合同急件-黄色',
},
{
value: 4,
label: '绩效零件-青色',
},
{
value: 5,
label: '调度标注急件-蓝色',
},
],
},
{ {
label: '调度员', label: '调度员',
prop: 'userName', prop: 'userName',
@ -486,15 +365,7 @@ export default {
overHidden: true, overHidden: true,
width: 200, width: 200,
}, },
{
label: '需求部门',
prop: 'str2',
search: true,
sortable: true,
overHidden: true,
hide: true,
width: 200,
},
{ {
label: '计划下达时间', label: '计划下达时间',
prop: 'planTime', prop: 'planTime',
@ -561,7 +432,7 @@ export default {
}, },
{ {
label: '试验数量', label: '试验数量',
prop: 'testQuantity', prop: 'testQty',
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
@ -569,7 +440,7 @@ export default {
}, },
{ {
label: '报废数量', label: '报废数量',
prop: 'scrapQuantity', prop: 'scrapQty',
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
@ -589,6 +460,14 @@ export default {
}, },
mounted() {}, mounted() {},
methods: { methods: {
//查询【生产中3、工艺变更5、检验中4、审理中6】状态的订单
queryOrdersHandle(status) {
this.query = {
runStatus: status,
};
this.onLoad(this.page, this.query);
},
// 优先级调整 // 优先级调整
priorityFn(row) { priorityFn(row) {
this.rowItem = row; this.rowItem = row;
@ -685,10 +564,14 @@ export default {
this.$refs.crud.toggleSelection(); this.$refs.crud.toggleSelection();
}, },
onLoad(page, params = {}) { onLoad(page, params = {}) {
// this.loading = true; this.loading = true;
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { getList(
page.currentPage,
page.pageSize,
Object.assign(params, this.query, { yieldType: '3' })
).then(res => {
this.data = res.data.data.records; this.data = res.data.data.records;
// this.loading = false; this.loading = false;
this.page.total = res.data.data.total; this.page.total = res.data.data.total;
this.selectionClear(); this.selectionClear();
}); });

150
src/views/productionManagement/blbWorkOrder/components/others.vue
Unescape View File

@ -1,5 +1,5 @@
<template> <template>
<basic-container> <div>
<!--玻璃饼--> <!--玻璃饼-->
<avue-crud <avue-crud
:option="option" :option="option"
@ -22,10 +22,11 @@
<el-button type="primary" @click="priorityFn">优先级调整</el-button> <el-button type="primary" @click="priorityFn">优先级调整</el-button>
</template> </template>
<template #menu-right> <template #menu-right>
<el-button type="success" plain @click="queryOrdersHandle">在制品</el-button> <el-button type="success" plain @click="queryOrdersHandle('3,4,5,6')">在制品</el-button>
<el-button type="warning" plain>加工中</el-button> <el-button type="warning" plain @click="queryOrdersHandle('3')">加工中</el-button>
<el-button type="danger" plain>检验中</el-button> <el-button type="danger" plain @click="queryOrdersHandle('4')">检验中</el-button>
<el-button type="success" plain>已完工</el-button> <el-button type="success" plain @click="queryOrdersHandle('15')">已完工</el-button>
<el-button type="primary" @click="queryOrdersHandle('')">全部</el-button>
</template> </template>
<template #menu="scope"> <template #menu="scope">
<el-button type="text" @click="clickProduction(scope.row)">生产监控</el-button> <el-button type="text" @click="clickProduction(scope.row)">生产监控</el-button>
@ -114,7 +115,7 @@
@closeDialog="closeDialog" @closeDialog="closeDialog"
@submitPriority="handlePrioritySubmit" @submitPriority="handlePrioritySubmit"
></productionMonitoringDialog> ></productionMonitoringDialog>
</basic-container> </div>
</template> </template>
<script> <script>
@ -203,7 +204,7 @@ export default {
column: [ column: [
{ {
label: '当前工序', label: '当前工序',
prop: 'ppsName', prop: 'wpId',
fixed: 'left', fixed: 'left',
search: false, search: false,
sortable: true, sortable: true,
@ -212,7 +213,7 @@ export default {
}, },
{ {
label: '下一工序', label: '下一工序',
prop: 'nextPpsName', prop: 'ppsNameNext',
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
@ -226,50 +227,11 @@ export default {
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 200,
dicUrl: '/blade-system/dict/dictionary?code=order_status',
dicData: [ props: {
{ label: 'dictValue',
value: 2, value: 'dictKey',
label: '待生产',
},
{
value: 3,
label: '生产中',
}, },
{
value: 4,
label: '检验中',
},
{
value: 6,
label: '审理中',
},
{
value: 5,
label: '工艺变更',
},
{
value: 19,
label: '已返工',
},
{
value: 15,
label: '已完成',
},
{
value: 21,
label: '已作废',
},
],
},
{
label: '领料状态',
prop: 'llStatus',
search: true,
sortable: true,
overHidden: true,
width: 200,
hide: true,
}, },
{ {
label: '车间订单号', label: '车间订单号',
@ -307,15 +269,15 @@ export default {
}, },
{ {
label: '计划单号', label: '计划单号',
prop: 'str1', prop: 'poCode',
search: false, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 200,
}, },
{ {
label: '返工单号', label: '返工单号',
prop: 'str2', prop: 'qcReworkCode',
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
@ -347,7 +309,7 @@ export default {
}, },
{ {
label: '产品名称', label: '产品名称',
prop: 'str3', prop: 'false',
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
@ -365,7 +327,7 @@ export default {
{ {
label: 'MES流程卡号', label: 'MES流程卡号',
prop: 'str4', prop: 'mesCardNo',
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
@ -373,15 +335,7 @@ export default {
}, },
{ {
label: '生产标识', label: '生产标识',
prop: 'prodIdent', prop: 'productIdent',
search: false,
sortable: true,
overHidden: true,
width: 200,
},
{
label: '镀种信息',
prop: 'str',
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
@ -395,59 +349,31 @@ export default {
overHidden: true, overHidden: true,
width: 200, width: 200,
}, },
{
label: '面积(dm²)',
prop: 'poArea',
search: false,
sortable: true,
overHidden: true,
width: 200,
},
{
label: '单批次面积',
prop: 'batchArea',
search: false,
sortable: true,
overHidden: true,
width: 200,
},
{ {
label: '订单优先级', label: '订单优先级',
prop: 'priorityTitle', prop: 'priority',
type: 'select', type: 'select',
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 200,
dicUrl: '/blade-system/dict/dictionary?code=orderPriority',
dicData: [ props: {
{ label: 'dictValue',
value: 1, value: 'dictKey',
label: '一级(ERP优先级)',
},
{
value: 2,
label: '二级',
},
{
value: 3,
label: '三级',
}, },
],
}, },
{ {
label: '需求部门', label: '需求部门',
prop: 'str0', prop: 'useDept',
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
hide: true,
width: 200, width: 200,
}, },
{ {
label: '需求交期', label: '需求交期',
prop: 'str5', prop: 'demandDate',
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
@ -455,7 +381,7 @@ export default {
}, },
{ {
label: '会议要求周期', label: '会议要求周期',
prop: 'str6', prop: 'meetCycle',
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
@ -469,6 +395,7 @@ export default {
overHidden: true, overHidden: true,
width: 200, width: 200,
}, },
{ {
label: '计划下达时间', label: '计划下达时间',
prop: 'planTime', prop: 'planTime',
@ -535,7 +462,7 @@ export default {
}, },
{ {
label: '试验数量', label: '试验数量',
prop: 'testQuantity', prop: 'testQty',
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
@ -543,7 +470,7 @@ export default {
}, },
{ {
label: '报废数量', label: '报废数量',
prop: 'scrapQuantity', prop: 'scrapQty',
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
@ -563,6 +490,13 @@ export default {
}, },
mounted() {}, mounted() {},
methods: { methods: {
//查询【生产中3、工艺变更5、检验中4、审理中6】状态的订单
queryOrdersHandle(status) {
this.query = {
runStatus: status,
};
this.onLoad(this.page, this.query);
},
// 优先级调整 // 优先级调整
priorityFn(row) { priorityFn(row) {
this.rowItem = row; this.rowItem = row;
@ -659,10 +593,14 @@ export default {
this.$refs.crud.toggleSelection(); this.$refs.crud.toggleSelection();
}, },
onLoad(page, params = {}) { onLoad(page, params = {}) {
// this.loading = true; this.loading = true;
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { getList(
page.currentPage,
page.pageSize,
Object.assign(params, this.query, { yieldType: '4,5,6' })
).then(res => {
this.data = res.data.data.records; this.data = res.data.data.records;
// this.loading = false; this.loading = false;
this.page.total = res.data.data.total; this.page.total = res.data.data.total;
this.selectionClear(); this.selectionClear();
}); });

24
src/views/productionManagement/frontTooling.vue
Unescape View File

@ -282,27 +282,11 @@ searchMenuPosition:'right',
trigger: 'blur', trigger: 'blur',
}, },
], ],
dicData: [ dicUrl: '/blade-system/dict/dictionary?code=orderPriority',
{ props: {
value: 1, label: 'dictValue',
label: '正常-白色' value: 'dictKey',
}, {
value: 2,
label: '项目要求日期急件-橙色'
},
{
value: 3,
label: '合同急件-黄色'
}, },
{
value: 4,
label: '绩效零件-青色'
},
{
value: 5,
label: '调度标注急件-蓝色'
}
]
}, },
{ {
label: '计划下达时间', label: '计划下达时间',

31
src/views/productionManagement/productionMonitoring.vue
Unescape View File

@ -27,12 +27,11 @@
</template> </template>
<template #menu-right> <template #menu-right>
<el-button type="success" plain @click="queryOrdersHandle">在制品</el-button> <el-button type="success" plain @click="queryOrdersHandle('3,4,5,6')">在制品</el-button>
<el-button type="warning" plain>加工中</el-button> <el-button type="warning" plain @click="queryOrdersHandle('3')">加工中</el-button>
<el-button type="danger" plain>检验中</el-button> <el-button type="danger" plain @click="queryOrdersHandle('4')">检验中</el-button>
<!-- <el-button type="success">已下达</el-button> --> <el-button type="success" plain @click="queryOrdersHandle('15')">已完工</el-button>
<el-button type="success" plain>已完工</el-button> <el-button type="primary" @click="queryOrdersHandle('')">全部</el-button>
<!-- <el-button type="primary">全部</el-button> -->
</template> </template>
<template #menu="scope"> <template #menu="scope">
@ -126,6 +125,7 @@
<!-- 分批弹窗 --> <!-- 分批弹窗 -->
<batches-dialog :show-batches="showBatches" @closeDialog="closeDialog"></batches-dialog> <batches-dialog :show-batches="showBatches" @closeDialog="closeDialog"></batches-dialog>
<!-- 关闭弹窗 --> <!-- 关闭弹窗 -->
<closed-dialog <closed-dialog
v-if="showClose" v-if="showClose"
:show-close="showClose" :show-close="showClose"
@ -722,14 +722,13 @@ export default {
} }
}, },
//查询【生产中3、工艺变更5、检验中4、审理中6】状态的订单 //查询【生产中3、工艺变更5、检验中4、审理中6】状态的订单
queryOrdersHandle() { queryOrdersHandle(status) {
const targetStatuses = [3, 5, 4, 6]; this.query = {
const filteredData = this.data.filter(item => targetStatuses.includes(item.runStatus)); runStatus: status,
const originalData = [...this.data]; };
this.data = filteredData; this.onLoad(this.page, this.query);
this.$message.success(`已筛选出${filteredData.length}条符合条件的订单`);
}, },
// 异常申报 // 异常申报
handleAbnormal() { handleAbnormal() {
this.showAbnormal = true; this.showAbnormal = true;
@ -776,14 +775,14 @@ export default {
this.$refs.crud.toggleSelection(); this.$refs.crud.toggleSelection();
}, },
onLoad(page, params = {}) { onLoad(page, params = {}) {
// this.loading = true; this.loading = true;
getList( getList(
page.currentPage, page.currentPage,
page.pageSize, page.pageSize,
Object.assign(params, this.query, { yieldType: 1 }) Object.assign(params, this.query, { yieldType: '1' })
).then(res => { ).then(res => {
this.data = res.data.data.records; this.data = res.data.data.records;
// this.loading = false; this.loading = false;
this.page.total = res.data.data.total; this.page.total = res.data.data.total;
this.selectionClear(); this.selectionClear();
}); });

162
src/views/productionManagement/sinTerWorkOrder/index.vue
Unescape View File

@ -21,13 +21,14 @@
<el-button type="primary" @click="handlePrintTags">过程记录打印</el-button> <el-button type="primary" @click="handlePrintTags">过程记录打印</el-button>
<el-button type="primary" @click="handlePrintTags">打印标签</el-button> <el-button type="primary" @click="handlePrintTags">打印标签</el-button>
<el-button type="primary" @click="handlePrint">配套单打印</el-button> <el-button type="primary" @click="handlePrint">配套单打印</el-button>
<el-button type="primary" @click="priorityFn">优先级调整</el-button> <el-button type="primary" @click="priorityFnBatch">优先级调整</el-button>
</template> </template>
<template #menu-right> <template #menu-right>
<el-button type="success" plain @click="processingHandle">在制品</el-button> <el-button type="success" plain @click="queryOrdersHandle('3,4,5,6')">在制品</el-button>
<el-button type="warning" plain>加工中</el-button> <el-button type="warning" plain @click="queryOrdersHandle('3')">加工中</el-button>
<el-button type="danger" plain>检验中</el-button> <el-button type="danger" plain @click="queryOrdersHandle('4')">检验中</el-button>
<el-button type="success" plain>已完工</el-button> <el-button type="success" plain @click="queryOrdersHandle('15')">已完工</el-button>
<el-button type="primary" @click="queryOrdersHandle('')">全部</el-button>
</template> </template>
<template #menu="scope"> <template #menu="scope">
<el-button type="text" @click="clickProduction(scope.row)">生产监控</el-button> <el-button type="text" @click="clickProduction(scope.row)">生产监控</el-button>
@ -50,36 +51,6 @@
>异常申报</el-button >异常申报</el-button
> >
</template> </template>
<template #tsName="{ row }">{{ row.makeTeam && row.makeTeam.tsName }}</template>
<template #ppsName="{ row }">{{ row.procedureSet && row.procedureSet.ppsName }}</template>
<template #planTime1="{ row }">
{{ Array.isArray(row.planTime1) ? row.planTime1.join(' ~ ') : row.planTime1 || '-' }}
</template>
<template #planTime="{ row }">
{{ Array.isArray(row.planTime) ? row.planTime.join(' ~ ') : row.planTime || '-' }}
</template>
<template #putStoreTime="{ row }">
{{
Array.isArray(row.putStoreTime) ? row.putStoreTime.join(' ~ ') : row.putStoreTime || '-'
}}
</template>
<template #partCode="{ row }">{{ row.pjYieldOrder && row.pjYieldOrder.partCode }}</template>
<template #prodIdent="{ row }">{{ row.pjYieldOrder && row.pjYieldOrder.prodIdent }}</template>
<template #partName="{ row }">{{ row.pjYieldOrder && row.pjYieldOrder.partName }}</template>
<template #plate="{ row }">{{ row.pjYieldOrder && row.pjYieldOrder.plate }}</template>
<template #productType="{ row }">{{
row.pjYieldOrder && row.pjYieldOrder.productType
}}</template>
<template #useDept="{ row }">{{ row.pjYieldOrder && row.pjYieldOrder.useDept }}</template>
<template #poArea="{ row }">{{ row.pjYieldOrder && row.pjYieldOrder.poArea }}</template>
<template #userName="{ row }">{{ row.dispatcher && row.dispatcher.userName }}</template>
<template #nextPpsName="{ row }">{{
row.nextProcedureSet && row.nextProcedureSet.ppsName
}}</template>
<template #nextTeamName="{ row }">{{ row.nextMakeTeam && row.nextMakeTeam.tsName }}</template>
<template #failureMan="{ row }">{{
row.pjYieldOrder && row.pjYieldOrder.failureMan && row.pjYieldOrder.failureMan.userName
}}</template>
</avue-crud> </avue-crud>
<el-dialog append-to-body v-model="printDialog" title="打印标签"> <el-dialog append-to-body v-model="printDialog" title="打印标签">
<el-form ref="printForm" :model="printForm" :rules="printRules"> <el-form ref="printForm" :model="printForm" :rules="printRules">
@ -107,9 +78,15 @@
<!-- 分批弹窗 --> <!-- 分批弹窗 -->
<batches-dialog :show-batches="showBatches" @closeDialog="closeDialog"></batches-dialog> <batches-dialog :show-batches="showBatches" @closeDialog="closeDialog"></batches-dialog>
<!-- 关闭弹窗 --> <!-- 关闭弹窗 -->
<closed-dialog :show-close="showClose" @closeDialog="closeDialog"></closed-dialog> <closed-dialog
v-if="showClose"
:show-close="showClose"
@closeDialog="closeDialog"
:itemData="itemData"
></closed-dialog>
<!-- 异常处理 --> <!-- 异常处理 -->
<abnormalDialog :show-abnormal="showAbnormal" @closeDialog="closeDialog"></abnormalDialog> <abnormalDialog :show-abnormal="showAbnormal" @closeDialog="closeDialog"></abnormalDialog>
<!-- 优先级调整 -->
<productionMonitoringDialog <productionMonitoringDialog
:showDialog="isPriorityOpen" :showDialog="isPriorityOpen"
v-if="isPriorityOpen" v-if="isPriorityOpen"
@ -137,6 +114,8 @@ export default {
}, },
data() { data() {
return { return {
itemData: [],
isPriorityOpen: false, isPriorityOpen: false,
showAbnormal: false, showAbnormal: false,
showRadio: true, showRadio: true,
@ -206,7 +185,7 @@ export default {
column: [ column: [
{ {
label: '当前工序', label: '当前工序',
prop: 'ppsName', prop: 'wpId',
fixed: 'left', fixed: 'left',
search: false, search: false,
sortable: true, sortable: true,
@ -215,7 +194,7 @@ export default {
}, },
{ {
label: '下一工序', label: '下一工序',
prop: 'nextPpsName', prop: 'ppsNameNext',
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
@ -229,41 +208,11 @@ export default {
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 200,
dicUrl: '/blade-system/dict/dictionary?code=order_status',
dicData: [ props: {
{ label: 'dictValue',
value: 2, value: 'dictKey',
label: '待生产',
},
{
value: 3,
label: '生产中',
},
{
value: 4,
label: '检验中',
}, },
{
value: 6,
label: '审理中',
},
{
value: 5,
label: '工艺变更',
},
{
value: 19,
label: '已返工',
},
{
value: 15,
label: '已完成',
},
{
value: 21,
label: '已作废',
},
],
}, },
{ {
label: '车间订单号', label: '车间订单号',
@ -359,7 +308,7 @@ export default {
{ {
label: 'MES流程卡号', label: 'MES流程卡号',
prop: 'false', prop: 'mesCardNo',
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
@ -367,7 +316,7 @@ export default {
}, },
{ {
label: '生产标识', label: '生产标识',
prop: 'prodIdent', prop: 'productIdent',
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
@ -383,35 +332,17 @@ export default {
}, },
{ {
label: '订单优先级', label: '订单优先级',
prop: 'priorityTitle', prop: 'priority',
type: 'select', type: 'select',
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 200,
dicUrl: '/blade-system/dict/dictionary?code=orderPriority',
dicData: [ props: {
{ label: 'dictValue',
value: 1, value: 'dictKey',
label: '正常-白色',
},
{
value: 2,
label: '项目要求日期急件-橙色',
},
{
value: 3,
label: '合同急件-黄色',
},
{
value: 4,
label: '绩效零件-青色',
},
{
value: 5,
label: '调度标注急件-蓝色',
}, },
],
}, },
{ {
label: '需求部门', label: '需求部门',
@ -512,7 +443,7 @@ export default {
}, },
{ {
label: '试验数量', label: '试验数量',
prop: 'testQuantity', prop: 'testQty',
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
@ -520,7 +451,7 @@ export default {
}, },
{ {
label: '报废数量', label: '报废数量',
prop: 'scrapQuantity', prop: 'scrapQty',
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
@ -540,12 +471,24 @@ export default {
}, },
mounted() {}, mounted() {},
methods: { methods: {
//查询【生产中3、工艺变更5、检验中4、审理中6】状态的订单
queryOrdersHandle(status) {
this.query = {
runStatus: status,
};
this.onLoad(this.page, this.query);
},
// 优先级调整 // 优先级调整
priorityFn(row) { priorityFn(row) {
this.rowItem = row; this.itemData = [row];
console.log(row.runStatus, 123); this.isPriorityOpen = true;
},
priorityFnBatch() {
if (this.selectionList.length == 0) {
return this.$message.error('请先选择数据');
}
this.itemData = this.selectionList;
this.isPriorityOpen = true; this.isPriorityOpen = true;
// console.log(runStatus,123)
}, },
handlePrioritySubmit(data) { handlePrioritySubmit(data) {
this.$message.success( this.$message.success(
@ -610,12 +553,15 @@ export default {
this.showAbnormal = true; this.showAbnormal = true;
}, },
// 关闭弹窗 // 关闭弹窗
closeDialog() { closeDialog(type) {
this.monitorDialog = false; this.monitorDialog = false;
this.showBatches = false; this.showBatches = false;
this.showClose = false; this.showClose = false;
this.showAbnormal = false; this.showAbnormal = false;
this.isPriorityOpen = false; this.isPriorityOpen = false;
if (type) {
this.onLoad(this.page, this.query);
}
}, },
currentChange(currentPage) { currentChange(currentPage) {
this.page.currentPage = currentPage; this.page.currentPage = currentPage;
@ -645,10 +591,14 @@ export default {
this.$refs.crud.toggleSelection(); this.$refs.crud.toggleSelection();
}, },
onLoad(page, params = {}) { onLoad(page, params = {}) {
// this.loading = true; this.loading = true;
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { getList(
page.currentPage,
page.pageSize,
Object.assign(params, this.query, { yieldType: '2' })
).then(res => {
this.data = res.data.data.records; this.data = res.data.data.records;
// this.loading = false; this.loading = false;
this.page.total = res.data.data.total; this.page.total = res.data.data.total;
this.selectionClear(); this.selectionClear();
}); });

53
src/views/productionManagement/sinteringProductionMonitoring.vue
Unescape View File

@ -424,32 +424,11 @@ align: 'center',
trigger: 'blur', trigger: 'blur',
}, },
], ],
dicData: [ dicUrl: '/blade-system/dict/dictionary?code=order_status',
{ props: {
value: 1, label: 'dictValue',
label: '正常' value: 'dictKey',
},
{
value: 3,
label: '加工中'
},
{
value: 4,
label: '检验中'
}, },
{
value: 19,
label: '已返工'
},
{
value: 15,
label: '已完工'
},
{
value: 21,
label: '已作废'
}
]
}, },
{ {
label: '子件状态', label: '子件状态',
@ -732,27 +711,11 @@ align: 'center',
trigger: 'blur', trigger: 'blur',
}, },
], ],
dicData: [ dicUrl: '/blade-system/dict/dictionary?code=orderPriority',
{ props: {
value: 1, label: 'dictValue',
label: '正常-白色' value: 'dictKey',
}, {
value: 2,
label: '项目要求日期急件-橙色'
}, },
{
value: 3,
label: '合同急件-黄色'
},
{
value: 4,
label: '绩效零件-青色'
},
{
value: 5,
label: '调度标注急件-蓝色'
}
]
}, },
{ {

110
src/views/productionManagement/sjKitPreparation/index.vue
Unescape View File

@ -1,34 +1,39 @@
<template> <template>
<basic-container> <basic-container>
<div class="search_box"> <div class="search_box"></div>
<avue-crud
</div> :option="option"
<avue-crud :option="option" :table-loading="loading" :data="data" v-model="form" v-model:page="page" ref="crud" :table-loading="loading"
@row-del="rowDel" @search-change="searchChange" @search-reset="searchReset" :data="data"
@selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange" v-model="form"
@refresh-change="refreshChange" @on-load="onLoad"> v-model:page="page"
<template #menu-left> ref="crud"
</template> @row-del="rowDel"
<template #menu-right> @search-change="searchChange"
</template> @search-reset="searchReset"
@selection-change="selectionChange"
@current-change="currentChange"
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad"
>
<template #menu-left> </template>
<template #menu-right> </template>
<template #menu="{ row }"> <template #menu="{ row }">
<el-button type="text">完成</el-button>
<el-button type="text">发送</el-button> <el-button type="text">发送</el-button>
<el-button type="text">车间订单生成</el-button>
</template> </template>
<template #heatTreat="scope"> <template #heatTreat="scope">
<el-tag v-if="scope.row.afterPlating" type="success">是</el-tag> <el-tag v-if="scope.row.afterPlating" type="success">是</el-tag>
<el-tag v-else type="warning">否</el-tag> <el-tag v-else type="warning">否</el-tag>
</template> </template>
</avue-crud> </avue-crud>
</basic-container> </basic-container>
</template> </template>
<script> <script>
import { import {
add, add,
getRole, getRole,
@ -42,10 +47,8 @@ import {
import { mapGetters } from 'vuex'; import { mapGetters } from 'vuex';
import { validatenull } from '@/utils/validate'; import { validatenull } from '@/utils/validate';
export default { export default {
components: { components: {},
},
data() { data() {
return { return {
inBatchesOpen: false, inBatchesOpen: false,
@ -125,7 +128,6 @@ export default {
sortable: true, sortable: true,
width: 150, width: 150,
span: 12, span: 12,
}, },
{ {
label: '配套时间', label: '配套时间',
@ -225,7 +227,6 @@ export default {
width: 150, width: 150,
span: 12, span: 12,
type: 'switch', type: 'switch',
}, },
{ {
label: '数量', label: '数量',
@ -234,7 +235,6 @@ export default {
sortable: true, sortable: true,
width: 150, width: 150,
span: 12, span: 12,
}, },
{ {
label: '面积(d㎡)', label: '面积(d㎡)',
@ -243,7 +243,6 @@ export default {
sortable: true, sortable: true,
width: 150, width: 150,
span: 12, span: 12,
}, },
{ {
label: '需求交期', label: '需求交期',
@ -252,7 +251,6 @@ export default {
sortable: true, sortable: true,
width: 150, width: 150,
span: 12, span: 12,
}, },
{ {
label: '计划员', label: '计划员',
@ -261,7 +259,6 @@ export default {
sortable: true, sortable: true,
width: 150, width: 150,
span: 12, span: 12,
}, },
{ {
label: '计划下达时间', label: '计划下达时间',
@ -270,7 +267,6 @@ export default {
sortable: true, sortable: true,
width: 150, width: 150,
span: 12, span: 12,
}, },
{ {
label: '流转编号', label: '流转编号',
@ -279,7 +275,6 @@ export default {
sortable: true, sortable: true,
width: 150, width: 150,
span: 12, span: 12,
}, },
{ {
label: '备注', label: '备注',
@ -288,7 +283,6 @@ export default {
sortable: true, sortable: true,
width: 150, width: 150,
span: 12, span: 12,
}, },
{ {
label: '状态', label: '状态',
@ -297,7 +291,6 @@ export default {
sortable: true, sortable: true,
width: 150, width: 150,
span: 12, span: 12,
}, },
], ],
}, },
@ -308,6 +301,50 @@ export default {
}; };
}, },
methods: { methods: {
// 车间订单生成
orderGen(cardNo) {
this.$confirm('生成车间订单？', this.$t('global.tips'), {
confirmButtonText: this.$t('global.confirm'),
cancelButtonText: this.$t('global.cancle'),
type: 'warning',
})
.then(() => {
this.$ajax
.get('pdaLoad/loadBigWmsSend/' + cardNo + '/' + this.mark)
.then((res) => {
if (res.code === 0) {
this.$message.success(this.$t('global.saveOk'));
this.cancel(true);
}
});
})
.catch(() => {
this.$message.info('已取消');
});
},
// 完成
moldComplete(yoId) {
this.$confirm('模具准备完成？', this.$t('global.tips'), {
confirmButtonText: this.$t('global.confirm'),
cancelButtonText: this.$t('global.cancle'),
type: 'warning',
})
.then(() => {
this.$ajax
.post('pjYieldOrder/moldComplete', {
yoId: yoId,
})
.then((res) => {
if (res.code === 0) {
this.$message.success(this.$t('global.saveOk'));
this.cancel(true);
}
});
})
.catch(() => {
this.$message.info('已取消');
});
},
// 批量接收 // 批量接收
batchReceiving() { batchReceiving() {
this.$confirm('确定将选择数据批量接收?', { this.$confirm('确定将选择数据批量接收?', {
@ -346,11 +383,11 @@ export default {
}, },
// 加急 // 加急
rushFn() { rushFn() {
this.isRushOpen = true this.isRushOpen = true;
}, },
closeDialog() { closeDialog() {
this.isRushOpen = false this.isRushOpen = false;
this.isBatchOpen = false this.isBatchOpen = false;
}, },
inBatchesFn(row) { inBatchesFn(row) {
this.rowItem = row; this.rowItem = row;
@ -554,10 +591,8 @@ export default {
onLoad(page, params = {}) { onLoad(page, params = {}) {
this.loading = true; this.loading = true;
this.data = [ this.data = [];
this.page.total = this.data.length;
]
this.page.total = this.data.length
// getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { // getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
// this.data = res.data.data.records; // this.data = res.data.data.records;
this.loading = false; this.loading = false;
@ -566,7 +601,6 @@ export default {
// }); // });
}, },
}, },
mounted() { mounted() {},
}
}; };
</script> </script>

Write Preview
Loading…
Cancel
Save