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

生产管理测试问题修改

Browse Source
dev-scheduling
zhangdi 3 weeks ago
parent fb1e39ae12
commit 4531def5db
4 changed files with 92 additions and 96 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. 37
      src/views/productionManagement/blbWorkOrder/components/glass.vue
  2. 37
      src/views/productionManagement/blbWorkOrder/components/others.vue
  3. 52
      src/views/productionManagement/sinTerWorkOrder/index.vue
  4. 50
      src/views/productionSchedulingPlan/basic/principalProducer.vue

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

@ -29,26 +29,23 @@
<!-- <el-button type="primary" @click="queryOrdersHandle('')">全部</el-button> --> <!-- <el-button type="primary" @click="queryOrdersHandle('')">全部</el-button> -->
</template> </template>
<template #menu="scope"> <template #menu="scope">
<el-row>
<el-col :span="6">
<el-button type="text" @click="clickProduction(scope.row)">生产监控</el-button> <el-button type="text" @click="clickProduction(scope.row)">生产监控</el-button>
<el-button type="text" @click="printCraftCard_new(scope.row)">工艺流程卡</el-button> </el-col>
<el-button type="text" @click="priorityFn(scope.row)" v-if="scope.row.runStatus === 2" <el-col :span="6">
>优先级调整</el-button <el-button type="text" @click="printCraftCard_new(scope.row)">流程卡</el-button>
> </el-col>
<el-button <el-col :span="6" v-if="scope.row.runStatus === 2">
type="text" <el-button type="text" @click="priorityFn(scope.row)">优先级</el-button>
@click="handleBatches(scope.row)" </el-col>
v-if="[2, 3, 4, 6].includes(scope.row.runStatus)" <el-col :span="6" v-if="[2, 3, 4, 6].includes(scope.row.runStatus)">
>分批</el-button <el-button type="text" @click="handleBatches(scope.row)">分批</el-button>
> </el-col>
<el-button <el-col :span="6" v-if="scope.row.runStatus < 15">
type="text" <el-button type="text" @click="handleClose(scope.row)">关闭</el-button>
@click="handleAbnormal(scope.row)" </el-col>
v-if="scope.row.runStatus === 3 || scope.row.runStatus === 4" </el-row>
>异常申报</el-button
>
<el-button type="text" @click="handleClose(scope.row)" v-if="scope.row.runStatus < 15"
>关闭</el-button
>
</template> </template>
</avue-crud> </avue-crud>
<el-dialog append-to-body v-model="printDialog" title="打印标签"> <el-dialog append-to-body v-model="printDialog" title="打印标签">
@ -167,7 +164,7 @@ export default {
editBtnIcon: ' ', editBtnIcon: ' ',
viewBtnText: '详情', viewBtnText: '详情',
labelWidth: 120, labelWidth: 120,
menuWidth: 260, menuWidth: 220,
dialogWidth: 1200, dialogWidth: 1200,
dialogClickModal: false, dialogClickModal: false,
searchEnter: true, searchEnter: true,

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

@ -29,26 +29,23 @@
<!-- <el-button type="primary" @click="queryOrdersHandle('')">全部</el-button> --> <!-- <el-button type="primary" @click="queryOrdersHandle('')">全部</el-button> -->
</template> </template>
<template #menu="scope"> <template #menu="scope">
<el-row>
<el-col :span="6">
<el-button type="text" @click="clickProduction(scope.row)">生产监控</el-button> <el-button type="text" @click="clickProduction(scope.row)">生产监控</el-button>
<el-button type="text" @click="printCraftCard_new(scope.row)">工艺流程卡</el-button> </el-col>
<el-button type="text" @click="priorityFn(scope.row)" v-if="scope.row.runStatus === 2" <el-col :span="6">
>优先级调整</el-button <el-button type="text" @click="printCraftCard_new(scope.row)">流程卡</el-button>
> </el-col>
<el-button <el-col :span="6" v-if="scope.row.runStatus === 2">
type="text" <el-button type="text" @click="priorityFn(scope.row)">优先级</el-button>
@click="handleBatches(scope.row)" </el-col>
v-if="[2, 3, 4, 6].includes(scope.row.runStatus)" <el-col :span="6" v-if="[2, 3, 4, 6].includes(scope.row.runStatus)">
>分批</el-button <el-button type="text" @click="handleBatches(scope.row)">分批</el-button>
> </el-col>
<el-button <el-col :span="6" v-if="scope.row.runStatus < 15">
type="text" <el-button type="text" @click="handleClose(scope.row)">关闭</el-button>
@click="handleAbnormal(scope.row)" </el-col>
v-if="scope.row.runStatus === 3 || scope.row.runStatus === 4" </el-row>
>异常申报</el-button
>
<el-button type="text" @click="handleClose(scope.row)" v-if="scope.row.runStatus < 15"
>关闭</el-button
>
</template> </template>
</avue-crud> </avue-crud>
<el-dialog append-to-body v-model="printDialog" title="打印标签"> <el-dialog append-to-body v-model="printDialog" title="打印标签">
@ -167,7 +164,7 @@ export default {
editBtnIcon: ' ', editBtnIcon: ' ',
viewBtnText: '详情', viewBtnText: '详情',
labelWidth: 120, labelWidth: 120,
menuWidth: 260, menuWidth: 220,
dialogWidth: 1200, dialogWidth: 1200,
dialogClickModal: false, dialogClickModal: false,
searchEnter: true, searchEnter: true,

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

@ -30,27 +30,30 @@
<el-button type="success" plain @click="queryOrdersHandle('15')">已完工</el-button> <el-button type="success" plain @click="queryOrdersHandle('15')">已完工</el-button>
</template> </template>
<template #menu="scope"> <template #menu="scope">
<el-row>
<el-col :span="6">
<el-button type="text" @click="clickProduction(scope.row)">生产监控</el-button> <el-button type="text" @click="clickProduction(scope.row)">生产监控</el-button>
<el-button type="text" @click="printCraftCard_new(scope.row)">工艺流程卡</el-button> </el-col>
<el-button type="text" @click="priorityFn(scope.row)" v-if="scope.row.runStatus === 2" <el-col :span="6">
>优先级调整</el-button <el-button type="text" @click="printCraftCard_new(scope.row)">流程卡</el-button>
> </el-col>
<el-button <el-col :span="6" v-if="scope.row.runStatus === 2">
type="text" <el-button type="text" @click="priorityFn(scope.row)">优先级</el-button>
@click="handleBatches(scope.row)" </el-col>
v-if="[2, 3, 4, 6].includes(scope.row.runStatus)" <el-col :span="6" v-if="[2, 3, 4, 6].includes(scope.row.runStatus)">
>分批</el-button <el-button type="text" @click="handleBatches(scope.row)">分批</el-button>
> </el-col>
<el-button <el-col :span="6" v-if="scope.row.runStatus < 15">
<el-button type="text" @click="handleClose(scope.row)">关闭</el-button>
</el-col>
</el-row>
<!-- <el-button
type="text" type="text"
@click="handleAbnormal(scope.row)" @click="handleAbnormal(scope.row)"
v-if="scope.row.runStatus === 3 || scope.row.runStatus === 4" v-if="scope.row.runStatus === 3 || scope.row.runStatus === 4"
>异常申报</el-button >异常申报</el-button
> > -->
<el-button type="text" @click="handleClose(scope.row)" v-if="scope.row.runStatus < 15"
>关闭</el-button
>
</template> </template>
</avue-crud> </avue-crud>
<!-- 打印标签 --> <!-- 打印标签 -->
@ -114,7 +117,7 @@ import closedDialog from '../components/closedDialog.vue';
import abnormalDialog from '../components/abnormalDialog.vue'; import abnormalDialog from '../components/abnormalDialog.vue';
import productionMonitoringDialog from '../components/productionMonitoringDialog.vue'; import productionMonitoringDialog from '../components/productionMonitoringDialog.vue';
import { getList,interlocking } from '@/api/productionManagement/sinTerWorkOrder'; import { getList, interlocking } from '@/api/productionManagement/sinTerWorkOrder';
export default { export default {
components: { components: {
productionDialog, productionDialog,
@ -174,7 +177,7 @@ export default {
viewBtnText: '详情', viewBtnText: '详情',
labelWidth: 120, labelWidth: 120,
// searchLabelWidth: 120, // searchLabelWidth: 120,
menuWidth: 260, menuWidth: 220,
dialogWidth: 1200, dialogWidth: 1200,
dialogClickModal: false, dialogClickModal: false,
searchEnter: true, searchEnter: true,
@ -350,7 +353,6 @@ export default {
overHidden: true, overHidden: true,
width: 150, width: 150,
// searchLabelWidth: 100, // searchLabelWidth: 100,
}, },
{ {
label: '订单优先级', label: '订单优先级',
@ -361,7 +363,7 @@ export default {
overHidden: true, overHidden: true,
width: 150, width: 150,
searchLabelWidth: 100, searchLabelWidth: 100,
hide:true, hide: true,
dicUrl: '/blade-system/dict/dictionary?code=orderPriority', dicUrl: '/blade-system/dict/dictionary?code=orderPriority',
props: { props: {
label: 'dictValue', label: 'dictValue',
@ -498,8 +500,8 @@ export default {
}, },
mounted() {}, mounted() {},
methods: { methods: {
printCraftCard_new(row){ printCraftCard_new(row) {
window.open(window.PROCESS_FLOW_CARD_HEAT_SINTER+'?woId='+row.woId); window.open(window.PROCESS_FLOW_CARD_HEAT_SINTER + '?woId=' + row.woId);
}, },
// 合批 // 合批
handleInterlocking(row) { handleInterlocking(row) {
@ -511,11 +513,11 @@ export default {
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning',
}).then(() => { }).then(() => {
let ids= this.selectionList.map(item => item.woId); let ids = this.selectionList.map(item => item.woId);
let query = { let query = {
woIds:ids.join(','), woIds: ids.join(','),
}; };
interlocking(query).then((res) => { interlocking(query).then(res => {
this.$message.success('操作成功'); this.$message.success('操作成功');
this.onLoad(this.page, this.query); this.onLoad(this.page, this.query);
}); });

50
src/views/productionSchedulingPlan/basic/principalProducer.vue
Unescape View File

@ -90,34 +90,34 @@ export default {
searchMenuPosition: 'right', searchMenuPosition: 'right',
align: 'center', align: 'center',
column: [ column: [
{ // {
label: '工序', // label: '工序',
prop: 'processId', // prop: 'processId',
search: true, // search: true,
sortable: true, // sortable: true,
span: 12, // span: 12,
type: 'select', // type: 'select',
filterable: true, // filterable: true,
dicUrl: '/blade-scheduling/processSet/findList', // dicUrl: '/blade-scheduling/processSet/findList',
props: { // props: {
label: 'name', // label: 'name',
value: 'id', // value: 'id',
}, // },
rules: [ // rules: [
{ // {
required: true, // required: true,
message: '请选择', // message: '请选择',
trigger: 'blur', // trigger: 'blur',
}, // },
], // ],
change: (val, row) => { // change: (val, row) => {
this.onChangeData(val.item, 'processId'); // this.onChangeData(val.item, 'processId');
}, // },
}, // },
{ {
label: '工序', label: '工序',
prop: 'processName', prop: 'processName',
search: false, search: true,
sortable: true, sortable: true,
span: 12, span: 12,
hide: true, hide: true,

Write Preview
Loading…
Cancel
Save