diff --git a/src/views/mes/qms/print-sampling-label/index.vue b/src/views/mes/qms/print-sampling-label/index.vue index 99c8367..bc3f096 100644 --- a/src/views/mes/qms/print-sampling-label/index.vue +++ b/src/views/mes/qms/print-sampling-label/index.vue @@ -15,7 +15,22 @@ :modal-fetch-fun="openItemList" @inputDialogSelected="itemSelected" > - + + + + + + @@ -38,12 +53,24 @@ > + - + + + - + + @@ -76,7 +103,9 @@ import {mapGetters} from 'vuex'; import {getStore} from '@/util/store'; import { itemDialogObj, - lotNoDialogObj + lotNoDialogObj, + operationDialogObj, + resourceDialogObj } from "@/views/mes/qms/print-sampling-label/init"; import { fetchLotNoPage, @@ -87,6 +116,8 @@ import { import {hideLoading, showLoading} from "@/const/loading"; import { isBlank } from '@/util/string'; import {listByActivityId} from "@/api/admin/activity-option"; +import {findOperationList as fetchOperationList} from "@/api/mes/prd/operation"; +import {findResourceList as fetchResourceList} from "@/api/mes/pms/resrce"; export default { name: 'print-sampling-label', data() { @@ -101,6 +132,12 @@ export default { itemDialogObj: {...itemDialogObj}, // 产品编号 openItemList: null, itemDialogVisible: false, + operationDialogObj, + operationDialogFetchFun: fetchOperationList, + operationDialogVisible: false, + resourceDialogObj, + resourceDialogFetchFun: fetchResourceList, + resourceDialogVisible: false, selectPrinterName: [], minValue: 0, // 最小值,这里是 0,只能输入正整数 printerNameList: null, // 打印机名称 @@ -263,6 +300,27 @@ export default { itemSelected(row) { this.searchForm.item = row.item this.searchForm = Object.assign({}, this.searchForm) + }, + // 工序编号点击开窗 + showOperationDialog() { + let me = this + this.operationDialogVisible = true + }, + // 工序选择回填 + operationSelected(row) { + this.searchForm.operation = row.operation + this.searchForm = Object.assign({}, this.searchForm) + }, + // 设备编号点击开窗 + showResourceDialog() { + let me = this + this.resourceDialogVisible = true + }, + + // 资源选择回填 + resourceSelected(row) { + this.searchForm.resrce = row.resrce + this.searchForm = Object.assign({}, this.searchForm) }, }, } diff --git a/src/views/mes/qms/print-sampling-label/init.js b/src/views/mes/qms/print-sampling-label/init.js index 3679b7e..227a390 100644 --- a/src/views/mes/qms/print-sampling-label/init.js +++ b/src/views/mes/qms/print-sampling-label/init.js @@ -19,3 +19,21 @@ export const itemDialogObj = { ], queryParam: {} } + +export const operationDialogObj = { + searchText: 'operation', + tableColumn: [ + { prop: 'operation', label: 'mes.process', width: '200' }, + { prop: 'description', label: 'mes.description' }, + ], + title: 'mes.process', +} + +export const resourceDialogObj = { + searchText: 'resrce', + tableColumn: [ + { prop: 'resrce', label: 'mes.pms.resource', width: '200' }, + { prop: 'description', label: 'mes.description' }, + ], + title: 'mes.pms.resource', +} \ No newline at end of file