diff --git a/src/api/wms/equipment.js b/src/api/wms/equipment.js index c7a4ccf6..3030ae87 100644 --- a/src/api/wms/equipment.js +++ b/src/api/wms/equipment.js @@ -96,3 +96,12 @@ export function changeEquipmentStatus(equipmentId, status) { data: data }) } + +// 查询人员列表 +export function getPersonList(query) { + return request({ + url: '/wms/equipment/getPersonList', + method: 'get', + params: query + }); +} diff --git a/src/views/device/repairOrder/index.vue b/src/views/device/repairOrder/index.vue index 62e2b460..45d07a46 100644 --- a/src/views/device/repairOrder/index.vue +++ b/src/views/device/repairOrder/index.vue @@ -1115,6 +1115,17 @@ + + + + + + diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue index 4e7774e3..c3905d70 100644 --- a/src/views/wms/equipment/index.vue +++ b/src/views/wms/equipment/index.vue @@ -328,6 +328,7 @@ + @@ -512,24 +513,23 @@ - - - - - + + + + + + + @@ -617,7 +617,7 @@ - +
+ + +
+ +
+
上一步 - 下一步 提 交 {{ - form.equipmentHeadName + form.equipmentHead }} @@ -890,11 +906,12 @@ import { listTeamMembers } from "@/api/wms/team"; import EquipmentSpareParts from "./single.vue"; import { Message } from "element-ui"; import { getToken } from "@/utils/auth"; +import ItemSelectPerson from "./single.vue"; export default { name: "Equipment", dicts: ["sys_normal_disable", "equ_type", "equipment_status"], - components: { EquipmentSpareParts }, + components: { EquipmentSpareParts ,ItemSelectPerson}, data() { return { CS: { @@ -969,6 +986,9 @@ export default { repairRecordSteps: 0, leftList: [], rightList: [], + //辅助设备 + auxiliaryEquipmentRightList:[], + auxiliaryEquipmentLeftList:[], bind: undefined, imageFileList: [], qrFileList: [], @@ -1108,16 +1128,13 @@ export default { this.queryEquipmentHeadParams.pageNum = 1; this.queryEquipmentHeadParams.pageSize = 2000; listTeamMembers(this.queryHeadParams).then((response) => { - console.log(response.rows); this.equipmentHeadOption = response.rows; }); }, /** 查询设备分类 */ getEquipmentType() { getEquipmentTypeList().then((response) => { - console.log(response.rows); this.equipmentTypeOption = response.rows; - console.log(this.treeData1); }); }, /** 查询设备备件 */ @@ -1147,6 +1164,17 @@ export default { getList() { this.loading = true; listEquipment(this.queryParams).then((response) => { + for (let i in response.rows) { + // 将返回的列表赋值于穿梭框左边列表 + this.auxiliaryEquipmentLeftList.push({ + key: response.rows[i].equipmentCode, + label: response.rows[i].equipmentName, + }); + } + for (let i in response.selected) { + this.auxiliaryEquipmentLeftList.push(response.selected[i].key); + this.form.auxiliaryEquipmentRightData = this.auxiliaryEquipmentRightList; + } this.equipmentList = response.rows; this.total = response.total; this.loading = false; @@ -1194,6 +1222,7 @@ export default { workshopSection: null, equipmentLocation: null, hourlyUnitPrice: null, + equipmentHead : null, }; this.resetForm("form"); }, @@ -1246,25 +1275,29 @@ export default { this.reset(); getWorkCenterList().then((response) => { this.options1 = response.rows; - console.log(this.options1); }); + this.repairRecordSteps = 0; this.open = true; this.title = "添加设备管理"; }, + /** 修改按钮操作 */ handleUpdate(row) { this.reset(); const equipmentId = row.equipmentId || this.ids; getWorkCenterList().then((response) => { this.options1 = response.rows; - console.log(this.options1); }); getEquipment(equipmentId).then((response) => { this.form = response.data; for (let i in response.data.selectedData) { - // 将返回的列表赋值于穿梭框右边列表 + // 将返回的备品备件列表赋值于穿梭框右边列表 this.rightList.push(response.data.selectedData[i].spareCode); } + for (let i in response.data.selectedEquipmentData) { + // 将返回的辅助设备列表赋值于穿梭框右边列表 + this.auxiliaryEquipmentRightList.push(response.data.selectedEquipmentData[i].auxiliaryEquipmentCode); + } if (response.data.imageFiles != null) { var newFiles = []; @@ -1275,7 +1308,6 @@ export default { newFiles.push(newFile); }); this.form.imageFileList = newFiles; - console.log("55555", this.form.imageFileList); } if (response.data.qrFiles != null) { var newFiles = []; @@ -1298,16 +1330,17 @@ export default { this.form.barCodeFileList = newFiles; } this.form.workCenter = this.form.workshopCode; + this.repairRecordSteps = 0; this.open = true; this.title = "修改设备管理"; }); }, + // 查询明细按钮操作 handleView(row) { this.reset(); const equipmentId = row.equipmentId || this.ids; getWorkCenterList().then((response) => { - console.log(this.options1); }); getEquipment(equipmentId).then((response) => { this.form = response.data; @@ -1341,6 +1374,7 @@ export default { this.optType = "view"; }); }, + /** 提交按钮 */ submitForm() { if (Array.isArray(this.form.qrFileList)) { @@ -1358,6 +1392,7 @@ export default { if (valid) { if (this.form.equipmentId != null) { this.form.rightData = this.rightList; + this.form.auxiliaryEquipmentRightData = this.auxiliaryEquipmentRightList; updateEquipment(this.form).then((response) => { this.$modal.msgSuccess("修改成功"); this.open = false; @@ -1381,6 +1416,7 @@ export default { "【设备基础信息】设备类型为空，请选择设备类型！" ); } else { + this.form.auxiliaryEquipmentRightData = this.auxiliaryEquipmentRightList; this.form.rightData = this.rightList; addEquipment(this.form).then((response) => { this.$modal.msgSuccess("新增成功"); @@ -1467,6 +1503,17 @@ export default { ); }, + //人员选择 + handleSelectPerson() { + this.$refs.itemSelectPerson.showFlag = true; + }, + + //人员选择 + onItemSelectedPerson(obj) { + this.$set(this.form,"equipmentHead",obj[0].nickName + "(" + obj[0].userName+")" ); + console.log(this.form.equipmentHead); + }, + // 设备状态修改 handleStatusChange(row) { let text = row.status === "1" ? "启用" : "停用"; @@ -1498,4 +1545,8 @@ export default { .step-body { margin-top: 50px; } + +.el-transfer-panel { + width: 350px; +} diff --git a/src/views/wms/equipment/single.vue b/src/views/wms/equipment/single.vue index f96aecc3..c6e7ba82 100644 --- a/src/views/wms/equipment/single.vue +++ b/src/views/wms/equipment/single.vue @@ -1,37 +1,130 @@ -