diff --git a/src/api/device/repairOrder.js b/src/api/device/repairOrder.js index 42ef4d8f..de607b47 100644 --- a/src/api/device/repairOrder.js +++ b/src/api/device/repairOrder.js @@ -70,4 +70,13 @@ export function getMaintenancePersonList(query) { }); } +// 传故障类型 +export function queryEquFaultTypeTree(query) { + return request({ + url: '/device/repairOrder/queryEquFaultTypeTree', + method: 'get', + params: query + }); +} + diff --git a/src/api/quality/income.js b/src/api/quality/income.js index 177511a3..05278004 100644 --- a/src/api/quality/income.js +++ b/src/api/quality/income.js @@ -120,11 +120,12 @@ export function commitActualValue(recordId, actualValues) { } //审核结果提交 -export function commitCheckResult(recordId,typeCode,checkType) { +export function commitCheckResult(recordId,typeCode,checkType,orderNo) { const data = { recordId, typeCode, - checkType + checkType, + orderNo } return request({ url: '/quality/qcIncome/commitCheckResult', @@ -142,4 +143,22 @@ export function getDefectList(defectType) { method: 'put', data: data }); -} \ No newline at end of file +} + +// 查询来料单列表 +export function getLLWorkOrder(query) { + return request({ + url: '/quality/qcIncome/getLLWorkOrder', + method: 'get', + params: query + }); + } + +// 查询生产过程-工单列表 +export function getWorkOrder(query) { + return request({ + url: '/quality/qcIncome/getWorkOrder', + method: 'get', + params: query + }); + } diff --git a/src/api/quality/project.js b/src/api/quality/project.js index c23c1592..3c56e50a 100644 --- a/src/api/quality/project.js +++ b/src/api/quality/project.js @@ -9,6 +9,16 @@ export function listProject(query) { }); } +// 查询检验项目维护列表 +export function getProjectList(query) { + return request({ + url: '/quality/project/getProjectList', + method: 'get', + params: query + }); +} + + // 查询检验项目维护详细 export function getProject(id) { return request({ diff --git a/src/api/quality/qcProduce.js b/src/api/quality/qcProduce.js index 70dc437f..b980cec5 100644 --- a/src/api/quality/qcProduce.js +++ b/src/api/quality/qcProduce.js @@ -77,3 +77,15 @@ export function changeProduceStatus(recordId, status) { data: data }) } + +//获取批次 +export function getBatchList(workorderCode) { + const data = { + workorderCode + } + return request({ + url: '/quality/qcIncome/getBatchList', + method: 'put', + data: data + }); +} \ No newline at end of file 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/deviceOrder/index.vue b/src/views/device/deviceOrder/index.vue index 48846aed..8cdbc736 100644 --- a/src/views/device/deviceOrder/index.vue +++ b/src/views/device/deviceOrder/index.vue @@ -637,8 +637,7 @@ - 取 消 - 确 定 + 关 闭 diff --git a/src/views/device/inspectionPlan/index.vue b/src/views/device/inspectionPlan/index.vue index 5b4b81a8..14e75674 100644 --- a/src/views/device/inspectionPlan/index.vue +++ b/src/views/device/inspectionPlan/index.vue @@ -892,7 +892,7 @@ export default { for (let i = 0; i < response.data.length; i++) { this.personList.push({ label: response.data[i].nickName + '(' + response.data[i].userName + ')', - key: response.data[i].userId, + key: response.data[i].userName, }) } }); @@ -1231,7 +1231,11 @@ export default { } this.planLoading = true; if (this.form.planId != null) { - this.form.personList = this.selectPersonList; + this.form.personList = this.selectPersonList.map(item => { + return{ + userName: item.toString() + } + }); updatePlan(this.form).then(response => { this.planLoading = false; this.$modal.msgSuccess("修改成功"); @@ -1239,7 +1243,11 @@ export default { this.getList(); }); } else { - this.form.personList = this.selectPersonList; + this.form.personList = this.selectPersonList.map(item => { + return{ + userName: item.toString() + } + }); addPlan(this.form).then(response => { this.planLoading = false; this.$modal.msgSuccess("新增成功"); diff --git a/src/views/device/inspectionWork/index.vue b/src/views/device/inspectionWork/index.vue index 03bff7e0..cebbbd52 100644 --- a/src/views/device/inspectionWork/index.vue +++ b/src/views/device/inspectionWork/index.vue @@ -512,8 +512,7 @@ - 取 消 - 确 定 + 关 闭 diff --git a/src/views/device/item/index.vue b/src/views/device/item/index.vue index ea3eb905..2c4b78b6 100644 --- a/src/views/device/item/index.vue +++ b/src/views/device/item/index.vue @@ -20,7 +20,7 @@ @@ -616,6 +616,7 @@ export default { // 重置日期范围 this.queryParams.createTimeArray = []; this.queryParams.updateTimeArray = []; + this.queryParams.itemTools = null; this.handleQuery(); }, // 多选框选中数据 diff --git a/src/views/device/maintenanceWork/index.vue b/src/views/device/maintenanceWork/index.vue index be4ac95a..a29fc2ed 100644 --- a/src/views/device/maintenanceWork/index.vue +++ b/src/views/device/maintenanceWork/index.vue @@ -591,8 +591,7 @@ - 取 消 - 确 定 + 关 闭 diff --git a/src/views/device/repairOrder/index.vue b/src/views/device/repairOrder/index.vue index 8ee458ca..45d07a46 100644 --- a/src/views/device/repairOrder/index.vue +++ b/src/views/device/repairOrder/index.vue @@ -751,7 +751,12 @@ append-to-body > - + {{ form.equipmentCode }} @@ -801,7 +806,12 @@ - + {{ form.workCode }} @@ -864,7 +874,11 @@ }} - + - + - + @@ -909,7 +933,10 @@ width="110" > @@ -1184,6 +1537,8 @@ export default { openApplyView: false, // 是否显示填写维修记录弹出层 openWrite: false, + // 是否显示查看维修记录弹出层 + queryWrite: false, // 查询参数 queryParams: { pageNum: 1, @@ -1395,6 +1750,11 @@ export default { this.openWrite = false; this.reset(); }, + // 查看维修记录-取消按钮 + cancelQueryWriteForm() { + this.openWrite = false; + this.reset(); + }, // 表单重置 reset() { this.form = { @@ -1467,7 +1827,9 @@ export default { getRepairOrder(workId).then((response) => { this.form = response.data; //转成list - this.form.faultType = response.data.faultType.split(","); + if (response.data.faultType != null) { + this.form.faultType = response.data.faultType.split(","); + } //遍历response.data.beforeRepairFiles if (response.data.beforeRepairFiles != null) { var beforeNewFiles = []; @@ -1516,6 +1878,7 @@ export default { if (item1 != null) { item1.standardList.forEach((item) => { var standard = {}; + standard.id = item.id; standard.itemTypeName = item1.itemTypeName; standard.itemName = item1.itemName; standard.itemMethod = item1.itemMethod; @@ -1550,8 +1913,13 @@ export default { this.detailList = standards; console.log("111111111111", this.detailList); } - this.openWrite = true; - this.title = "填写维修记录"; + if (this.form.workStatus == "1") { + this.queryWrite = true; + this.title = "查看维修记录"; + } else { + this.openWrite = true; + this.title = "填写维修记录"; + } }); }, /** 委外申请按钮操作 */ @@ -1618,12 +1986,13 @@ export default { this.form.afterRepairFile ); } - this.form.faultType = this.form.faultType.join(','); + this.form.faultType = this.form.faultType.join(","); console.log(this.form.faultType); this.$refs["form"].validate((valid) => { if (valid) { if (this.form.workId != null) { this.form.standardList = this.detailList; + console.log(this.form.standardList); writeRepairOrder(this.form).then((response) => { this.openWrite = false; this.$modal.msgSuccess("填写维修记录成功！"); @@ -1737,7 +2106,6 @@ export default { } return strs != "" ? strs.substr(0, strs.length - 1) : ""; }, - }, }; diff --git a/src/views/device/spotCheckPlan/index.vue b/src/views/device/spotCheckPlan/index.vue index 7de6a8cb..c14520f1 100644 --- a/src/views/device/spotCheckPlan/index.vue +++ b/src/views/device/spotCheckPlan/index.vue @@ -937,7 +937,7 @@ export default { for (let i = 0; i < response.data.length; i++) { this.personList.push({ label: response.data[i].nickName + '(' + response.data[i].userName + ')', - key: response.data[i].userId, + key: response.data[i].userName, }) } }); @@ -1265,7 +1265,11 @@ export default { } this.planLoading = true; if (this.form.planId != null) { - this.form.personList = this.selectPersonList; + this.form.personList = this.selectPersonList.map(item => { + return{ + userName: item.toString() + } + }); updatePlan(this.form).then(response => { this.planLoading = false; this.$modal.msgSuccess("修改成功"); @@ -1273,7 +1277,11 @@ export default { this.getList(); }); } else { - this.form.personList = this.selectPersonList; + this.form.personList = this.selectPersonList.map(item => { + return{ + userName: item.toString() + } + }); addPlan(this.form).then(response => { this.planLoading = false; this.$modal.msgSuccess("新增成功"); diff --git a/src/views/device/spotInspectionOrder/index.vue b/src/views/device/spotInspectionOrder/index.vue index 7ae68329..4cdf5267 100644 --- a/src/views/device/spotInspectionOrder/index.vue +++ b/src/views/device/spotInspectionOrder/index.vue @@ -628,8 +628,7 @@ - 取 消 - 确 定 + 关 闭 diff --git a/src/views/device/spotInspectionWork/index.vue b/src/views/device/spotInspectionWork/index.vue index d57f23d6..74ce1242 100644 --- a/src/views/device/spotInspectionWork/index.vue +++ b/src/views/device/spotInspectionWork/index.vue @@ -501,8 +501,7 @@ - 取 消 - 确 定 + 关 闭 diff --git a/src/views/device/upkeepOrder/index.vue b/src/views/device/upkeepOrder/index.vue index 3e7b8182..1df03c08 100644 --- a/src/views/device/upkeepOrder/index.vue +++ b/src/views/device/upkeepOrder/index.vue @@ -692,158 +692,138 @@ - - - - - - - - - - - - - - 搜索 - 重置 - - - - - - - - - - - - - - - - - + + + + + 选择备件 + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + 搜索 + 重置 + + + + + + + + + + + + + + + + + + + + + - - 取 消 + + 取 消 确 定 - - - - - - 领用数量 - - - - - - - - - - - - - - - - - - - - - - - - - - - - 取 消 - 确 定 - - - - 完成 - + @@ -1175,8 +1155,7 @@ - 取 消 - 确 定 + 关 闭 @@ -1200,6 +1179,10 @@ export default { dicts: ['device_order_status', 'device_loop_type','device_reach_standard','device_upkeep_type','device_inspect_status'], data() { return { + // 备件选择list + spareOnList:[], + // 备件选择 + selectSpareDialog:false, standardListVo:[], workDetail:false, // 初始化VO @@ -1398,6 +1381,32 @@ export default { this.getList(); }, methods: { + // 获取备件信息 + setSpareList() { + querySpareList(this.spareQuery).then(response => { + this.spareTotal = response.total; + this.spareList = response.rows; + this.spareLoading = false; + }) + }, + // 备件选择btn + choseSpareBtn(){ + // 清理缓存 + this.spareOnList = []; + // 打开选择备件弹窗 + this.selectSpareDialog = true; + }, + // 备件数量 + handleEdit(index, row) { + // 库存数量-冻结数量 + if ((Number(row.amount)-Number(row.storageAmount)) < Number(row.applyNum)) { + this.$message({ + message: '领用最大数量为:'+(Number(row.amount)-Number(row.storageAmount)), + type: 'warning' + }) + row.applyNum = (Number(row.amount)-Number(row.storageAmount)); + } + }, // 重置设备搜索 resetEqu() { this.equipmentQuery = { @@ -1409,14 +1418,16 @@ export default { }; this.getEquList(); }, - // 备件数量 - handleEdit(index, row) { - if (row.amount < Number(row.applyNum)) { - this.$message({ - message: '超过库存数量！', - type: 'warning' - }) - row.applyNum = row.amount; + // 删除备件-备件数量 + delSpareList(e) { + for (let i = 0; i < this.chooseSpareList.length; i++){ + if (this.chooseSpareList[i].materialCode == e.materialCode) { + this.chooseSpareList.splice(i,1); + this.$message({ + message: '删除成功！', + type: 'success' + }) + } } }, // 展示 @@ -1664,17 +1675,48 @@ export default { this.selOnSpare[i].applyNum = e; } }, - // 删除备件-备件数量 - delSpareList(e) { + // 选择备件确定按钮 + confirmSelectSpareBtn() { + if (this.spareOnList.length == 0) { + this.$message({ + message: "请勾选要申领的备件！", + type: "warning" + }) + return + } + for (let i = 0; i < this.chooseSpareList.length; i++){ - if (this.chooseSpareList[i].materialCode == e.materialCode) { - this.chooseSpareList.splice(i,1); - this.$message({ - message: '删除成功！', - type: 'success' - }) + for (let j = 0; j < this.spareOnList.length; j++) { + if (this.chooseSpareList[i].materialCode == this.spareOnList[j].materialCode) { + this.$message({ + message: '不可重复添加！', + type: 'warning' + }) + return; + } + } + } + for (let j = 0; j < this.spareOnList.length; j++) { + if (this.spareOnList[j].applyNum == null) { + this.spareOnList[j].applyNum=1; } + this.chooseSpareList.push(this.spareOnList[j]); } + + this.$message({ + message: '添加成功！', + type: 'success' + }) + + // 关闭备件选择弹窗 + this.selectSpareDialog = false; + }, + // 多选备件按钮 + selectChangeSpare(e) { + // 清理缓存 + this.spareOnList = []; + // 置入值 + this.spareOnList = e; }, // 选择备件-添加备件 addSpareList(e) { @@ -1696,13 +1738,6 @@ export default { // 改变巡检周期事件 changeArray(e) { }, - // 选择备件确定按钮 - confirmSelectSpareBtn() { - }, - // 多选备件按钮 - selectChangeSpare(e) { - this.selOnSpare = e; - }, // 备件搜索重置按钮 resetSpare() { this.spareQuery = { @@ -1713,18 +1748,6 @@ export default { }; this.setSpareList(); }, - // 获取备件信息 - setSpareList() { - querySpareList(this.spareQuery).then(response => { - this.spareTotal = response.total; - this.spareList = response.rows; - // 设置库存：总量-冻结数量 - for (let i = 0; i < this.spareList.length; i++) { - this.spareList[i].amount = Number(this.spareList[i].amount) - Number(this.spareList[i].storageAmount) - } - this.spareLoading = false; - }) - }, // 搜索备件按钮 getSpareList() { this.setSpareList() diff --git a/src/views/device/upkeepPlan/index.vue b/src/views/device/upkeepPlan/index.vue index 8693446f..be0c4145 100644 --- a/src/views/device/upkeepPlan/index.vue +++ b/src/views/device/upkeepPlan/index.vue @@ -675,155 +675,135 @@ width="50%" append-to-body > - - - - - - - - - - - - - - 搜索 - 重置 - - - - - - - - - - - - - - - - - + + + + + 选择备件 + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + 搜索 + 重置 + + + + + + + + + + + + + + + + + + + + + - - 取 消 + + 取 消 确 定 - - - - - - 领用数量 - - - - - - - - - - - - - - - - - - - - - - - - - - - - 取 消 - 确 定 - - - - 完成 - + @@ -895,13 +875,25 @@ import { updateUpkeepPlan, formatEquItem, setSpareList, querySpareList } from "@/api/device/upkeepPlan"; -import {delPlan, getEquList, getPersonList, getWorkCenter, initUpdatePlanInfo, listPlan} from "@/api/device/plan"; +import { + addPlan, + delPlan, + getEquList, + getPersonList, + getWorkCenter, + initUpdatePlanInfo, + listPlan, updatePlan +} from "@/api/device/plan"; export default { name: "UpkeepPlan", dicts: ['device_loop_type', 'sys_normal_disable','device_upkeep_type'], data() { return { + // 备件选择list + spareOnList:[], + // 备件选择 + selectSpareDialog:false, // 日期范围选择快捷 pickerOptions: { shortcuts: [{ @@ -1061,14 +1053,22 @@ export default { this.setWorkCenter(); }, methods: { + // 备件选择btn + choseSpareBtn(){ + // 清理缓存 + this.spareOnList = []; + // 打开选择备件弹窗 + this.selectSpareDialog = true; + }, // 备件数量 handleEdit(index, row) { - if (row.amount < Number(row.applyNum)) { + // 库存数量-冻结数量 + if ((Number(row.amount)-Number(row.storageAmount)) < Number(row.applyNum)) { this.$message({ - message: '超过库存数量！', + message: '领用最大数量为:'+(Number(row.amount)-Number(row.storageAmount)), type: 'warning' }) - row.applyNum = row.amount; + row.applyNum = (Number(row.amount)-Number(row.storageAmount)); } }, // 备件选择完成按钮 @@ -1212,10 +1212,46 @@ export default { }, // 选择备件确定按钮 confirmSelectSpareBtn() { + if (this.spareOnList.length == 0) { + this.$message({ + message: "请勾选要申领的备件！", + type: "warning" + }) + return + } + + for (let i = 0; i < this.chooseSpareList.length; i++){ + for (let j = 0; j < this.spareOnList.length; j++) { + if (this.chooseSpareList[i].materialCode == this.spareOnList[j].materialCode) { + this.$message({ + message: '不可重复添加！', + type: 'warning' + }) + return; + } + } + } + for (let j = 0; j < this.spareOnList.length; j++) { + if (this.spareOnList[j].applyNum == null) { + this.spareOnList[j].applyNum=1; + } + this.chooseSpareList.push(this.spareOnList[j]); + } + + this.$message({ + message: '添加成功！', + type: 'success' + }) + + // 关闭备件选择弹窗 + this.selectSpareDialog = false; }, // 多选备件按钮 selectChangeSpare(e) { - this.selOnSpare = e; + // 清理缓存 + this.spareOnList = []; + // 置入值 + this.spareOnList = e; }, // 备件搜索重置按钮 resetSpare() { @@ -1232,10 +1268,6 @@ export default { querySpareList(this.spareQuery).then(response => { this.spareTotal = response.total; this.spareList = response.rows; - // 设置库存：总量-冻结数量 - for (let i = 0; i < this.spareList.length; i++) { - this.spareList[i].amount = Number(this.spareList[i].amount) - Number(this.spareList[i].storageAmount) - } this.spareLoading = false; }) }, @@ -1258,7 +1290,7 @@ export default { for (let i = 0; i < response.data.length; i++) { this.personList.push({ label: response.data[i].nickName + '(' + response.data[i].userName + ')', - key: response.data[i].userId, + key: response.data[i].userName, }) } }); @@ -1628,16 +1660,24 @@ export default { } this.planLoading = true; if (this.form.planId != null) { - this.form.personList = this.selectPersonList; - updateUpkeepPlan(this.form).then(response => { + this.form.personList = this.selectPersonList.map(item => { + return{ + userName: item.toString() + } + }); + updatePlan(this.form).then(response => { this.planLoading = false; this.$modal.msgSuccess("修改成功"); this.open = false; this.getList(); }); } else { - this.form.personList = this.selectPersonList; - addUpkeepPlan(this.form).then(response => { + this.form.personList = this.selectPersonList.map(item => { + return{ + userName: item.toString() + } + }); + addPlan(this.form).then(response => { this.planLoading = false; this.$modal.msgSuccess("新增成功"); this.open = false; diff --git a/src/views/quality/checkTypeProject/index.vue b/src/views/quality/checkTypeProject/index.vue index c4f68fc5..35d6af40 100644 --- a/src/views/quality/checkTypeProject/index.vue +++ b/src/views/quality/checkTypeProject/index.vue @@ -166,7 +166,7 @@ - + { - this.checkRuleList = response.rows; + getProjectList().then((response) => { + this.checkRuleList = response; }); }, /** 查询物料检验项目维护列表 */ diff --git a/src/views/quality/project/index.vue b/src/views/quality/project/index.vue index aa8c39b9..8d4d8864 100644 --- a/src/views/quality/project/index.vue +++ b/src/views/quality/project/index.vue @@ -108,7 +108,6 @@ - diff --git a/src/views/quality/qcIncome/checkProjectType.vue b/src/views/quality/qcIncome/checkProjectType.vue index 5c3f24e0..a93c2018 100644 --- a/src/views/quality/qcIncome/checkProjectType.vue +++ b/src/views/quality/qcIncome/checkProjectType.vue @@ -16,7 +16,14 @@ - + + + @@ -98,7 +105,7 @@ import { getCkeckProjectList,changeCheckDetailStatus,commitActualValue,commitCheckResult,getDefectList } from "@/api/quality/income"; export default { name: "itemSelectUser", - dicts: ["check_result"], + dicts: ["check_result","qc_rule_prop"], data() { return { showFlag:false, @@ -150,7 +157,7 @@ export default { methods: { getDefect(){ - getDefectList('defect_produce').then(response => { + getDefectList('defect_in').then(response => { this.defectList = response; }); }, @@ -160,6 +167,7 @@ export default { this.queryParams.belongTo = this.data.recordId; this.typeCode = typeCode; this.checkType = this.data.checkType; + this.orderNo = this.data.orderNo; this.getList(); }, @@ -188,7 +196,7 @@ export default { //提交整体检测结果 submitBomForm() { - commitCheckResult(this.queryParams.belongTo,this.typeCode,this.checkType).then(response => { + commitCheckResult(this.queryParams.belongTo,this.typeCode,this.checkType,this.orderNo).then(response => { this.$modal.msgSuccess("检测完成"); this.$emit('saveCheck'); this.showFlag = false; diff --git a/src/views/quality/qcIncome/index.vue b/src/views/quality/qcIncome/index.vue index 28c24a6c..ab77a977 100644 --- a/src/views/quality/qcIncome/index.vue +++ b/src/views/quality/qcIncome/index.vue @@ -138,7 +138,7 @@ - + @@ -214,23 +214,30 @@ - - - + + + + + - + + + - - - + @@ -239,16 +246,9 @@ - - - - - + + + @@ -325,11 +325,11 @@ 取 消 - - + + import { listIncome, getIncome, delIncome, addIncome, updateIncome ,changeIncomeStatus} from "@/api/quality/income"; import { getCheckTypes } from "@/api/quality/qcProduce"; -import ItemSelectMaterial from "./selectMaterial.vue"; +import ItemSelectWorkOrder from "./selectLLWorkOrder.vue"; import ItemSelectSupplier from "./selectSupplier.vue"; import ItemSelectUser from "./selectUser.vue"; import ItemSelectProject from "./checkProjectType.vue"; import moment from 'moment'; export default { name: "Income", - components: { ItemSelectMaterial,ItemSelectSupplier,ItemSelectUser,ItemSelectProject}, + components: { ItemSelectWorkOrder,ItemSelectSupplier,ItemSelectUser,ItemSelectProject}, dicts: ["unit","check_status","check_result"], data() { return { @@ -414,6 +414,9 @@ export default { checkTypes:[], // 表单校验 rules: { + checkType:[ + { required: true, message: "检验类型不能为空", trigger: "blur" } + ], incomeBatchNo: [ { required: true, message: "来料批次号不能为空", trigger: "blur" } ], @@ -611,14 +614,21 @@ export default { }); }, - /**物料选择弹出框**/ - handleSelectMaterial() { - this.$refs.itemSelectMaterial.showFlag = true; + /**工单选择弹出框**/ + handleSelectWorkOrder() { + this.$refs.itemSelectWorkOrder.showFlag = true; }, - //物料选择确认 - onSelectMaterial(obj) { - this.form.materialCode = obj.code; - this.form.materialName = obj.name; + //工单选择确认 + onSelectWorkOrder(obj) { + this.form.orderNo = obj.orderNo; + this.form.materialName = obj.materialName; + this.form.materialCode = obj.materialCode; + this.form.quality = obj.quality; + this.form.incomeBatchNo = obj.incomeBatchNo; + this.form.unit = obj.unit; + this.form.supplierCode = obj.supplierCode; + this.form.supplierName = obj.supplierName; + this.form.incomeTime = obj.incomeTime; }, /**供应商选择弹出框**/ diff --git a/src/views/quality/qcIncome/selectLLWorkOrder.vue b/src/views/quality/qcIncome/selectLLWorkOrder.vue new file mode 100644 index 00000000..70ca1fe4 --- /dev/null +++ b/src/views/quality/qcIncome/selectLLWorkOrder.vue @@ -0,0 +1,137 @@ + + diff --git a/src/views/quality/qcProduce/index.vue b/src/views/quality/qcProduce/index.vue index 05a92af8..6d81fac7 100644 --- a/src/views/quality/qcProduce/index.vue +++ b/src/views/quality/qcProduce/index.vue @@ -162,10 +162,10 @@ - + - + @@ -242,56 +242,58 @@ + - - + + + + - + + + - - - + - + - - - - + + - - - - - - - - + + + + + @@ -304,6 +306,18 @@ + + + + + + + + + @@ -336,13 +350,8 @@ - - - + + @@ -371,11 +380,11 @@ 取 消 - - + + 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 @@ -