diff --git a/src/views/productionManagement/blbWorkOrder/components/glass.vue b/src/views/productionManagement/blbWorkOrder/components/glass.vue index 9c8d518..5607a78 100644 --- a/src/views/productionManagement/blbWorkOrder/components/glass.vue +++ b/src/views/productionManagement/blbWorkOrder/components/glass.vue @@ -29,26 +29,23 @@ @@ -167,7 +164,7 @@ export default { editBtnIcon: ' ', viewBtnText: '详情', labelWidth: 120, - menuWidth: 260, + menuWidth: 220, dialogWidth: 1200, dialogClickModal: false, searchEnter: true, diff --git a/src/views/productionManagement/blbWorkOrder/components/others.vue b/src/views/productionManagement/blbWorkOrder/components/others.vue index 08edf4f..9a705b2 100644 --- a/src/views/productionManagement/blbWorkOrder/components/others.vue +++ b/src/views/productionManagement/blbWorkOrder/components/others.vue @@ -29,26 +29,23 @@ @@ -167,7 +164,7 @@ export default { editBtnIcon: ' ', viewBtnText: '详情', labelWidth: 120, - menuWidth: 260, + menuWidth: 220, dialogWidth: 1200, dialogClickModal: false, searchEnter: true, diff --git a/src/views/productionManagement/sinTerWorkOrder/index.vue b/src/views/productionManagement/sinTerWorkOrder/index.vue index 580534e..9070b6f 100644 --- a/src/views/productionManagement/sinTerWorkOrder/index.vue +++ b/src/views/productionManagement/sinTerWorkOrder/index.vue @@ -30,27 +30,30 @@ 已完工 @@ -114,7 +117,7 @@ import closedDialog from '../components/closedDialog.vue'; import abnormalDialog from '../components/abnormalDialog.vue'; import productionMonitoringDialog from '../components/productionMonitoringDialog.vue'; -import { getList,interlocking } from '@/api/productionManagement/sinTerWorkOrder'; +import { getList, interlocking } from '@/api/productionManagement/sinTerWorkOrder'; export default { components: { productionDialog, @@ -174,7 +177,7 @@ export default { viewBtnText: '详情', labelWidth: 120, // searchLabelWidth: 120, - menuWidth: 260, + menuWidth: 220, dialogWidth: 1200, dialogClickModal: false, searchEnter: true, @@ -341,7 +344,7 @@ export default { overHidden: true, width: 150, }, - { + { label: '订单优先级', prop: 'priorityName', type: 'select', @@ -350,7 +353,6 @@ export default { overHidden: true, width: 150, // searchLabelWidth: 100, - }, { label: '订单优先级', @@ -361,7 +363,7 @@ export default { overHidden: true, width: 150, searchLabelWidth: 100, - hide:true, + hide: true, dicUrl: '/blade-system/dict/dictionary?code=orderPriority', props: { label: 'dictValue', @@ -498,8 +500,8 @@ export default { }, mounted() {}, methods: { - printCraftCard_new(row){ - window.open(window.PROCESS_FLOW_CARD_HEAT_SINTER+'?woId='+row.woId); + printCraftCard_new(row) { + window.open(window.PROCESS_FLOW_CARD_HEAT_SINTER + '?woId=' + row.woId); }, // 合批 handleInterlocking(row) { @@ -511,11 +513,11 @@ export default { cancelButtonText: '取消', type: 'warning', }).then(() => { - let ids= this.selectionList.map(item => item.woId); - let query = { - woIds:ids.join(','), + let ids = this.selectionList.map(item => item.woId); + let query = { + woIds: ids.join(','), }; - interlocking(query).then((res) => { + interlocking(query).then(res => { this.$message.success('操作成功'); this.onLoad(this.page, this.query); }); @@ -601,7 +603,7 @@ export default { this.showAbnormal = false; this.isPriorityOpen = false; // if (type) { - this.onLoad(this.page, this.query); + this.onLoad(this.page, this.query); // } }, currentChange(currentPage) { diff --git a/src/views/productionSchedulingPlan/basic/principalProducer.vue b/src/views/productionSchedulingPlan/basic/principalProducer.vue index 25e64a6..a192cf2 100644 --- a/src/views/productionSchedulingPlan/basic/principalProducer.vue +++ b/src/views/productionSchedulingPlan/basic/principalProducer.vue @@ -90,34 +90,34 @@ export default { searchMenuPosition: 'right', align: 'center', column: [ - { - label: '工序', - prop: 'processId', - search: true, - sortable: true, - span: 12, - type: 'select', - filterable: true, - dicUrl: '/blade-scheduling/processSet/findList', - props: { - label: 'name', - value: 'id', - }, - rules: [ - { - required: true, - message: '请选择', - trigger: 'blur', - }, - ], - change: (val, row) => { - this.onChangeData(val.item, 'processId'); - }, - }, + // { + // label: '工序', + // prop: 'processId', + // search: true, + // sortable: true, + // span: 12, + // type: 'select', + // filterable: true, + // dicUrl: '/blade-scheduling/processSet/findList', + // props: { + // label: 'name', + // value: 'id', + // }, + // rules: [ + // { + // required: true, + // message: '请选择', + // trigger: 'blur', + // }, + // ], + // change: (val, row) => { + // this.onChangeData(val.item, 'processId'); + // }, + // }, { label: '工序', prop: 'processName', - search: false, + search: true, sortable: true, span: 12, hide: true,