diff --git a/src/api/mes/dv/checkplan.js b/src/api/mes/dv/checkplan.js index 3943d85..0e37cff 100644 --- a/src/api/mes/dv/checkplan.js +++ b/src/api/mes/dv/checkplan.js @@ -42,3 +42,12 @@ export function delCheckplan(planId) { method: 'delete' }) } + +// 根据设备编码和计划类型查询设备点检计划头列表 +export function getCheckPlan(query) { + return request({ + url: '/mes/dv/checkplan/getCheckPlan', + method: 'get', + params: query + }) +} diff --git a/src/api/mes/dv/repair.js b/src/api/mes/dv/repair.js index 2fb450e..8268ff0 100644 --- a/src/api/mes/dv/repair.js +++ b/src/api/mes/dv/repair.js @@ -42,3 +42,12 @@ export function delRepair(repairId) { method: 'delete' }) } + +// 根据设备编码查询设备维修单列表 +export function getRepairList(query) { + return request({ + url: '/mes/dv/repair/getRepairList', + method: 'get', + params: query + }) +} diff --git a/src/views/mes/dv/machinery/components/Checkplan.vue b/src/views/mes/dv/machinery/components/Checkplan.vue new file mode 100644 index 0000000..5fe983f --- /dev/null +++ b/src/views/mes/dv/machinery/components/Checkplan.vue @@ -0,0 +1,82 @@ + + + diff --git a/src/views/mes/dv/machinery/components/Repair.vue b/src/views/mes/dv/machinery/components/Repair.vue new file mode 100644 index 0000000..e9c96cc --- /dev/null +++ b/src/views/mes/dv/machinery/components/Repair.vue @@ -0,0 +1,80 @@ + + + diff --git a/src/views/mes/dv/machinery/index.vue b/src/views/mes/dv/machinery/index.vue index 6817242..c080985 100644 --- a/src/views/mes/dv/machinery/index.vue +++ b/src/views/mes/dv/machinery/index.vue @@ -263,6 +263,17 @@ + + + + + + + + + + +
确 定 取 消 @@ -309,16 +320,19 @@ import {genCode} from "@/api/system/autocode/rule" import { getToken } from "@/utils/auth"; import Treeselect from "@riophae/vue-treeselect"; import "@riophae/vue-treeselect/dist/vue-treeselect.css"; -import BarcodeImg from "@/components/barcodeImg/index.vue" +import BarcodeImg from "@/components/barcodeImg/index.vue"; +import CheckPlan from "@/views/mes/dv/machinery/components/Checkplan.vue" +import Repair from "@/views/mes/dv/machinery/components/Repair.vue" import {getBarcodeUrl} from "@/api/mes/wm/barcode"; import { option } from "runjs"; export default { name: "Machinery", dicts: ['sys_yes_no','mes_machinery_status'], - components: { Treeselect,BarcodeImg }, + components: { Treeselect,BarcodeImg, CheckPlan, Repair }, data() { return { + activeName: "check", //自动生成编码 autoGenFlag:false, optType: undefined, @@ -346,8 +360,6 @@ export default { open: false, // 设备类型名称 machineryTypeName: undefined, - //自动生成物料编码标识 - autoGenFlag: false, // 表单参数 form: {}, defaultProps: { @@ -425,6 +437,21 @@ export default { this.getTreeselect(); }, methods: { + handleActive (tab) { + const query = {} + query.machineryCode = this.form.machineryCode + if (tab.name == "check") { + query.planType = "CHECK" + this.$refs.checkList.getOpen(query) + } + if (tab.name == "maintenance") { + query.planType = "MAINTEN" + this.$refs.maintenanceList.getOpen(query) + } + if (tab.name == "repair") { + this.$refs.repairList.getOpen(query) + } + }, changeWorkshop(val) { const workshop = this.workshopOptions.filter(item => item.workshopId == val) this.form.workshopId = workshop[0].workshopId @@ -532,8 +559,14 @@ export default { this.open = true; this.title = "查看设备信息"; this.optType = "view"; + this.activeName = "check" + const query = { + machineryCode: this.form.machineryCode, + planType: "CHECK" + } this.$nextTick(()=>{ this.$refs.barcodeImg.getBarcode(); + this.$refs.checkList.getOpen(query) }) }); }, @@ -561,8 +594,14 @@ export default { this.open = true; this.title = "修改设备"; this.optType = "edit"; + this.activeName = "check" + const query = { + machineryCode: this.form.machineryCode, + planType: "CHECK" + } this.$nextTick(()=>{ this.$refs.barcodeImg.getBarcode(); + this.$refs.checkList.getOpen(query) }) }); }, diff --git a/src/views/mes/md/workshop/index.vue b/src/views/mes/md/workshop/index.vue index e680529..6872258 100644 --- a/src/views/mes/md/workshop/index.vue +++ b/src/views/mes/md/workshop/index.vue @@ -148,6 +148,7 @@ + @@ -188,40 +189,6 @@ 取 消
- - - - - - - - - - - - - - - - -
- 确 定 - 取 消 -
- @@ -231,21 +198,17 @@ import {genCode} from "@/api/system/autocode/rule" import BarcodeImg from "@/components/barcodeImg/index.vue" import {getBarcodeUrl} from "@/api/mes/wm/barcode"; import {listUser} from "@/api/system/user"; +import UserSingleSelect from "@/components/userSelect/single.vue"; export default { - components:{BarcodeImg}, + components:{UserSingleSelect, BarcodeImg}, name: "Workshop", dicts: ['sys_yes_no'], data() { return { - userTotal: 0, - userTitle: '用户选择', - userOpen: false, autoGenFlag:false, optType: undefined, // 遮罩层 loading: true, - // 用户数据 - userList: [], // 选中数组 ids: [], // 非单个禁用 @@ -301,44 +264,22 @@ export default { { max: 250, message: '长度必须小于250个字符', trigger: 'blur' } ] }, - userQuery: { - pageNum: 1, - pageSize: 10, - } }; }, created() { this.getList(); }, methods: { - cacelUser(row) { - this.$refs.singleTable.setCurrentRow(row); - this.userOpen = false - }, /** 选择用户 */ - handleCurrentChange(val) { + onUserSelected(val) { if (val) { this.form.charge = val.nickName this.form.chargeId = val.userId - this.cacelUser() } }, /** 点击负责人输入框 */ handleCharge() { - this.userOpen = true - this.userQuery.pageNum = 1 - this.userQuery.pageSize = 10 - this.getUserList() - }, - /** 查询用户列表 */ - getUserList() { - this.loading = true; - listUser(this.userQuery, this.dateRange).then(response => { - this.userList = response.rows; - this.userTotal = response.total; - this.loading = false; - } - ); + this.$refs.userSelect.showFlag = true; }, /** 查询车间列表 */ getList() {