From 44e0016452556be30dc0c898dfe7cacbea7b217b Mon Sep 17 00:00:00 2001 From: wws <18630710203@163.com> Date: Wed, 6 Dec 2023 15:04:47 +0800 Subject: [PATCH 01/18] =?UTF-8?q?=E5=A4=87=E4=BB=B6=E7=94=B3=E9=A2=86?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/device/upkeepOrder/index.vue | 386 +++++++++++++------------ src/views/device/upkeepPlan/index.vue | 344 ++++++++++++---------- 2 files changed, 393 insertions(+), 337 deletions(-) diff --git a/src/views/device/upkeepOrder/index.vue b/src/views/device/upkeepOrder/index.vue index 3e7b818..16612eb 100644 --- a/src/views/device/upkeepOrder/index.vue +++ b/src/views/device/upkeepOrder/index.vue @@ -692,158 +692,138 @@ - - - - - - - - - - - - - - 搜索 - 重置 - - - - - - - - - - - - - - - - - + + + + + 选择备件 + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + 搜索 + 重置 + + + + + + + + + + + + + + + + + + + - - 取 消 + + + + 取 消 确 定 - - - - - - 领用数量 - - - - - - - - - - - - - - - - - - - - - - - - - - - - 取 消 - 确 定 - - - - 完成 - + @@ -1200,6 +1180,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 +1382,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 +1419,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 +1676,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 +1739,6 @@ export default { // 改变巡检周期事件 changeArray(e) { }, - // 选择备件确定按钮 - confirmSelectSpareBtn() { - }, - // 多选备件按钮 - selectChangeSpare(e) { - this.selOnSpare = e; - }, // 备件搜索重置按钮 resetSpare() { this.spareQuery = { @@ -1713,18 +1749,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 8693446..4d7f8dc 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; }) }, @@ -1629,7 +1661,7 @@ export default { this.planLoading = true; if (this.form.planId != null) { this.form.personList = this.selectPersonList; - updateUpkeepPlan(this.form).then(response => { + updatePlan(this.form).then(response => { this.planLoading = false; this.$modal.msgSuccess("修改成功"); this.open = false; @@ -1637,7 +1669,7 @@ export default { }); } else { this.form.personList = this.selectPersonList; - addUpkeepPlan(this.form).then(response => { + addPlan(this.form).then(response => { this.planLoading = false; this.$modal.msgSuccess("新增成功"); this.open = false; From a2016f72b81c680d515f01b14084df605c1448ac Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 6 Dec 2023 16:44:30 +0800 Subject: [PATCH 02/18] =?UTF-8?q?=E8=BF=87=E7=A8=8B=E6=A3=80=E9=AA=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/quality/income.js | 11 +- src/api/quality/project.js | 10 ++ src/api/quality/qcProduce.js | 12 ++ src/views/quality/checkTypeProject/index.vue | 8 +- src/views/quality/project/index.vue | 1 - src/views/quality/qcProduce/index.vue | 61 ++++++-- .../quality/qcProduce/selectWorkOrder.vue | 139 ++++++++++++++++++ 7 files changed, 222 insertions(+), 20 deletions(-) create mode 100644 src/views/quality/qcProduce/selectWorkOrder.vue diff --git a/src/api/quality/income.js b/src/api/quality/income.js index d8c9e08..0527800 100644 --- a/src/api/quality/income.js +++ b/src/api/quality/income.js @@ -145,7 +145,7 @@ export function getDefectList(defectType) { }); } -// 查询人员列表 +// 查询来料单列表 export function getLLWorkOrder(query) { return request({ url: '/quality/qcIncome/getLLWorkOrder', @@ -153,3 +153,12 @@ export function getLLWorkOrder(query) { 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 c23c159..3c56e50 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 70dc437..b980cec 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/views/quality/checkTypeProject/index.vue b/src/views/quality/checkTypeProject/index.vue index c4f68fc..35d6af4 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 aa8c39b..8d4d886 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/qcProduce/index.vue b/src/views/quality/qcProduce/index.vue index 9c96725..6d81fac 100644 --- a/src/views/quality/qcProduce/index.vue +++ b/src/views/quality/qcProduce/index.vue @@ -162,10 +162,10 @@ - + - + @@ -256,8 +256,10 @@ - - + + + + @@ -280,13 +282,7 @@ - - - - - + + + + + + + + + + @@ -372,6 +380,11 @@ 取 消 + + From b643ea02b0cf53237a28a0ca310b9a25f203e225 Mon Sep 17 00:00:00 2001 From: wws <18630710203@163.com> Date: Thu, 7 Dec 2023 14:30:43 +0800 Subject: [PATCH 03/18] =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E7=A1=AE?= =?UTF-8?q?=E5=AE=9A=E6=8C=89=E9=92=AE=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/device/deviceOrder/index.vue | 3 +-- src/views/device/inspectionWork/index.vue | 3 +-- src/views/device/item/index.vue | 3 ++- src/views/device/maintenanceWork/index.vue | 3 +-- src/views/device/spotInspectionOrder/index.vue | 3 +-- src/views/device/spotInspectionWork/index.vue | 3 +-- src/views/device/upkeepOrder/index.vue | 3 +-- 7 files changed, 8 insertions(+), 13 deletions(-) diff --git a/src/views/device/deviceOrder/index.vue b/src/views/device/deviceOrder/index.vue index 48846ae..8cdbc73 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/inspectionWork/index.vue b/src/views/device/inspectionWork/index.vue index 03bff7e..cebbbd5 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 ea3eb90..2c4b78b 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 be4ac95..a29fc2e 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/spotInspectionOrder/index.vue b/src/views/device/spotInspectionOrder/index.vue index 7ae6832..4cdf526 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 d57f23d..74ce124 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 16612eb..1df03c0 100644 --- a/src/views/device/upkeepOrder/index.vue +++ b/src/views/device/upkeepOrder/index.vue @@ -1155,8 +1155,7 @@ - 取 消 - 确 定 + 关 闭 From 1215f67a968f527df9e04fd2904b040ba5e6bc37 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Fri, 8 Dec 2023 14:04:49 +0800 Subject: [PATCH 04/18] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E8=BE=85=E5=8A=A9=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/equipment/index.vue | 113 ++++++++++---- src/views/wms/equipment/single.vue | 229 +++++++++++++++++++++++------ 2 files changed, 262 insertions(+), 80 deletions(-) diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue index 4e7774e..c3905d7 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 f96aecc..00f3889 100644 --- a/src/views/wms/equipment/single.vue +++ b/src/views/wms/equipment/single.vue @@ -1,37 +1,130 @@ - From 4bdf044c512cb6cf7a5b843407ec2c40891c1883 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Fri, 8 Dec 2023 14:38:25 +0800 Subject: [PATCH 05/18] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E8=BE=85=E5=8A=A9=E8=AE=BE=E5=A4=872?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/equipment.js | 9 +++++++++ src/views/wms/equipment/single.vue | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/api/wms/equipment.js b/src/api/wms/equipment.js index c7a4ccf..3030ae8 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/wms/equipment/single.vue b/src/views/wms/equipment/single.vue index 00f3889..c6e7ba8 100644 --- a/src/views/wms/equipment/single.vue +++ b/src/views/wms/equipment/single.vue @@ -113,7 +113,7 @@ + \ No newline at end of file diff --git a/src/views/kanban/quality/kanban1.vue b/src/views/kanban/quality/kanban1.vue new file mode 100644 index 0000000..5e2e34e --- /dev/null +++ b/src/views/kanban/quality/kanban1.vue @@ -0,0 +1,2324 @@ + + + + + \ No newline at end of file diff --git a/src/views/kanban/quality/kanban2.vue b/src/views/kanban/quality/kanban2.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/views/kanban/quality/kanban3.vue b/src/views/kanban/quality/kanban3.vue new file mode 100644 index 0000000..e69de29 From b095b6a12ae03323ac576ade81edd1c5e5a33c56 Mon Sep 17 00:00:00 2001 From: wws <18630710203@163.com> Date: Mon, 11 Dec 2023 09:10:05 +0800 Subject: [PATCH 09/18] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/device/upkeepPlan.js | 8 ++++++++ src/views/device/upkeepOrder/index.vue | 4 ++-- src/views/device/upkeepPlan/index.vue | 25 ++++++++++++++++++------- 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/src/api/device/upkeepPlan.js b/src/api/device/upkeepPlan.js index 6f03617..fdd6297 100644 --- a/src/api/device/upkeepPlan.js +++ b/src/api/device/upkeepPlan.js @@ -17,6 +17,14 @@ export function formatEquItem(data) { data: data }); } +// 处理计划-设备信息 +export function formatEquItemNoCondition(data) { + return request({ + url: '/device/upkeepPlan/formatEquItemNoCondition', + method: 'post', + data: data + }); +} // 查询保养计划列表 export function listUpkeepPlan(query) { diff --git a/src/views/device/upkeepOrder/index.vue b/src/views/device/upkeepOrder/index.vue index 1df03c0..615f92f 100644 --- a/src/views/device/upkeepOrder/index.vue +++ b/src/views/device/upkeepOrder/index.vue @@ -1169,7 +1169,7 @@ import { addUpkeepOrder, updateUpkeepOrder, subInspect } from "@/api/device/upkeepOrder"; -import {formatEquItem, querySpareList} from "@/api/device/upkeepPlan"; +import {formatEquItem, formatEquItemNoCondition, querySpareList} from "@/api/device/upkeepPlan"; import {getEquList, getPersonList, getWorkCenter} from "@/api/device/plan"; import {delDeviceOrder, getDeviceOrder, listDeviceOrder, updateDeviceOrder} from "@/api/device/deviceOrder"; import {getInspectionWork, updateInspectionWork} from "@/api/device/inspectionWork"; @@ -1636,7 +1636,7 @@ export default { this.form.equipmentItem = []; // 处理信息 - formatEquItem(this.selectEquList).then(response => { + formatEquItemNoCondition(this.selectEquList).then(response => { for (let i = 0; i < response.data.length; i++) { this.form.equipmentItem.push(response.data[i]); diff --git a/src/views/device/upkeepPlan/index.vue b/src/views/device/upkeepPlan/index.vue index be0c414..e79f265 100644 --- a/src/views/device/upkeepPlan/index.vue +++ b/src/views/device/upkeepPlan/index.vue @@ -873,7 +873,7 @@ import { delUpkeepPlan, addUpkeepPlan, updateUpkeepPlan, - formatEquItem, setSpareList, querySpareList + formatEquItem, setSpareList, querySpareList, formatEquItemNoCondition } from "@/api/device/upkeepPlan"; import { addPlan, @@ -1401,14 +1401,25 @@ export default { } // 处理信息 - formatEquItem(this.selectEquList).then(response => { + if (this.form.calculationRule == "2"){ + formatEquItem(this.selectEquList).then(response => { - for (let i = 0; i < response.data.length; i++) { - this.form.equipmentItem.push(response.data[i]); - } + for (let i = 0; i < response.data.length; i++) { + this.form.equipmentItem.push(response.data[i]); + } - this.selectEqu = false; - }) + this.selectEqu = false; + }) + }else { + formatEquItemNoCondition(this.selectEquList).then(response => { + + for (let i = 0; i < response.data.length; i++) { + this.form.equipmentItem.push(response.data[i]); + } + + this.selectEqu = false; + }) + } }, // 选择设备多选操作 From 48cba41dce490457580e7524bce16821e17ef142 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Mon, 11 Dec 2023 10:43:40 +0800 Subject: [PATCH 10/18] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BB=BC=E5=90=88?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/device/item.js | 24 + src/views/device/repairOrder/index.vue | 1 - src/views/device/summaryReport/index.vue | 665 ++++++++++++++++++ .../summaryReport/selectSingleEquipment.vue | 296 ++++++++ 4 files changed, 985 insertions(+), 1 deletion(-) create mode 100644 src/views/device/summaryReport/index.vue create mode 100644 src/views/device/summaryReport/selectSingleEquipment.vue diff --git a/src/api/device/item.js b/src/api/device/item.js index 9e977fc..078f576 100644 --- a/src/api/device/item.js +++ b/src/api/device/item.js @@ -58,3 +58,27 @@ export function delItem(itemId) { method: 'delete' }); } +/////////////////////////////////////////下面都是汇总报表用 +// 查询检查项汇总表 +export function getSummaryReport() { + return request({ + url: '/device/item/summaryReport', + method: 'get' + }); +} + +// 查询工作中心 +export function getWorkCenter() { + return request({ + url: '/device/item/getWorkCenter', + method: 'get' + }); +} + +// 查询工单匹配检查项 +export function selectMatchList(query) { + return request({ + url: '/device/item/matchList', + params: query + }); +} diff --git a/src/views/device/repairOrder/index.vue b/src/views/device/repairOrder/index.vue index 45d07a4..d23430d 100644 --- a/src/views/device/repairOrder/index.vue +++ b/src/views/device/repairOrder/index.vue @@ -1126,7 +1126,6 @@ > -
diff --git a/src/views/device/summaryReport/index.vue b/src/views/device/summaryReport/index.vue new file mode 100644 index 0000000..a37dff7 --- /dev/null +++ b/src/views/device/summaryReport/index.vue @@ -0,0 +1,665 @@ + + + + + diff --git a/src/views/device/summaryReport/selectSingleEquipment.vue b/src/views/device/summaryReport/selectSingleEquipment.vue new file mode 100644 index 0000000..d35b063 --- /dev/null +++ b/src/views/device/summaryReport/selectSingleEquipment.vue @@ -0,0 +1,296 @@ + + + From c9d0e531f01278f0acc0bca655c185c2276f88d0 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Mon, 11 Dec 2023 12:05:22 +0800 Subject: [PATCH 11/18] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/quality/checkTypeProject.js | 18 ++ src/views/mes/reportWork/index.vue | 2 +- src/views/quality/checkTypeProject/index.vue | 53 ++++-- .../checkTypeProject/selectProject.vue | 170 ++++++++++++++++++ src/views/quality/project/index.vue | 11 +- src/views/quality/qcProduce/index.vue | 7 +- src/views/quality/qcWarehousing/index.vue | 124 ++++++++----- .../quality/qcWarehousing/selectWorkOrder.vue | 139 ++++++++++++++ src/views/technology/proroute/index.vue | 2 +- 9 files changed, 463 insertions(+), 63 deletions(-) create mode 100644 src/views/quality/checkTypeProject/selectProject.vue create mode 100644 src/views/quality/qcWarehousing/selectWorkOrder.vue diff --git a/src/api/quality/checkTypeProject.js b/src/api/quality/checkTypeProject.js index 1346424..429d0d3 100644 --- a/src/api/quality/checkTypeProject.js +++ b/src/api/quality/checkTypeProject.js @@ -55,3 +55,21 @@ export function changeStatus(id,status) { data: data }); } + +//批量添加检测项 +export function submitProjects(data) { + return request({ + url: '/quality/checkTypeProject/submitProjects', + method: 'post', + data: data + }); +} + +//获取检测项列表 +export function getProjectInfoList(query) { + return request({ + url: '/quality/checkTypeProject/getProjectInfoList', + method: 'get', + params: query + }); +} \ No newline at end of file diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue index 140df50..aafa55b 100644 --- a/src/views/mes/reportWork/index.vue +++ b/src/views/mes/reportWork/index.vue @@ -773,7 +773,7 @@ export default { return; } const values = data.map(item => Number(item[column.property])); - if (!values.every(value => isNaN(value))) { + if (!values.every(value => isNaN(value))&& column.label!='用人数') { sums[index] = values.reduce((prev, curr) => { const value = Number(curr); if (!isNaN(value)) { diff --git a/src/views/quality/checkTypeProject/index.vue b/src/views/quality/checkTypeProject/index.vue index 35d6af4..3db50c2 100644 --- a/src/views/quality/checkTypeProject/index.vue +++ b/src/views/quality/checkTypeProject/index.vue @@ -105,8 +105,8 @@ @selection-change="handleSelectionChange" > - - + + @@ -221,6 +221,11 @@ 取 消
+ +
@@ -231,16 +236,17 @@ import { delCheckTypeProject, addCheckTypeProject, updateCheckTypeProject, - changeStatus + changeStatus, + submitProjects } from "@/api/quality/checkTypeProject"; import MaterialGroupAdd from "./MaterialGroupAdd.vue"; import {listCheckType} from "@/api/quality/checkType"; import {getProjectList} from "@/api/quality/project"; - +import SelectProject from "./selectProject.vue"; export default { name: "CheckTypeProject", dicts: ["qc_rule_prop",'unit'], - components: {MaterialGroupAdd,}, + components: {MaterialGroupAdd,SelectProject}, data() { return { // 遮罩层 @@ -355,6 +361,7 @@ export default { groupId: null, materialCode: null, projectNo: null, + projectInfos:[] }; this.resetForm("form"); }, @@ -414,12 +421,17 @@ export default { }, /** 新增按钮操作 */ handleAdd() { - this.reset(); - this.open = true; - this.title = "添加物料检验项目维护"; - this.form.groupId = this.groupId; - this.form.materialCode = this.materialCode; - this.form.typeId = this.editableTabsValue; + + if(this.groupId==null||this.materialCode){ + this.$modal.msgError("请点击左侧节点"); + return + }; + if(this.queryParams.typeId==null){ + this.$modal.msgError("请选择头部节点"); + retrun + }; + this.$refs.child.showFlag = true; + this.$refs.child.init(this.groupId,this.materialCode,this.queryParams.typeId); }, /** 修改按钮操作 */ handleUpdate(row) { @@ -525,6 +537,25 @@ export default { row.status = row.status === "0" ? "1" : "0"; }); }, + //检验项目添加确认 + onSelectProjects(objs) { + let _this = this; + objs.forEach(function(item,index,arr){ + item.projectId = item.id; + item.projectNo = item.orderNum; + item.unit = item.unitCode; + item.standardValue = item.checkStandard; + item.typeId = _this.queryParams.typeId; + item.groupId = _this.groupId; + item.materialCode = _this.materialCode; + + }); + submitProjects(objs).then(response => { + this.$modal.msgSuccess("提交成功"); + this.open = false; + this.getList(); + }); + }, }, }; diff --git a/src/views/quality/checkTypeProject/selectProject.vue b/src/views/quality/checkTypeProject/selectProject.vue new file mode 100644 index 0000000..7a30708 --- /dev/null +++ b/src/views/quality/checkTypeProject/selectProject.vue @@ -0,0 +1,170 @@ + + diff --git a/src/views/quality/project/index.vue b/src/views/quality/project/index.vue index 8d4d886..3540349 100644 --- a/src/views/quality/project/index.vue +++ b/src/views/quality/project/index.vue @@ -92,8 +92,8 @@ - - + + - + From c79a9c4d0019a2e464fef3404cf56636464ddf47 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Mon, 11 Dec 2023 14:08:53 +0800 Subject: [PATCH 12/18] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E9=A1=B9=E5=A4=9A=E7=85=A7=E7=89=87=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/device/repairOrder/index.vue | 75 ++++++++++++++++---------- 1 file changed, 48 insertions(+), 27 deletions(-) diff --git a/src/views/device/repairOrder/index.vue b/src/views/device/repairOrder/index.vue index d23430d..df17742 100644 --- a/src/views/device/repairOrder/index.vue +++ b/src/views/device/repairOrder/index.vue @@ -799,7 +799,7 @@ @@ -807,10 +807,10 @@ {{ form.workCode @@ -876,8 +876,8 @@ + - + @@ -1490,15 +1476,28 @@ export default { CS: { "text-align": "center", }, + CS1: { + "text-align": "center", + width: "250px", + }, LS: { "text-align": "center", width: "225px", }, + LS1: { + "text-align": "center", + width: "250px", + }, //图片表格样式 LSP: { "text-align": "center", width: "225px", }, + //图片表格样式 + LSP1: { + "text-align": "center", + width: "250px", + }, //检查项表格数据 detailList: [], //维修前照片 @@ -1818,6 +1817,7 @@ export default { this.openAdd = true; this.title = "快速工单"; }, + /** 填写按钮操作 */ handleWrite(row) { this.reset(); @@ -1894,7 +1894,18 @@ export default { standard.repairValue = item.repairValue; standard.repairReach = item.repairReach; standard.standardType = item.standardType; - //检查项图片 + + if (item.picturePaths != null) { + var newFiles = []; + item.picturePaths.forEach((item) => { + var newFile = {}; + newFile.name = item.fileName; + newFile.url = item.fileAddress; + newFiles.push(newFile); + }); + standard.picturePath = newFiles; + } + //检查项图片显示 var standardUrlLists = []; if (item.picturePaths != null) { item.picturePaths.forEach((item2) => { @@ -1985,12 +1996,22 @@ export default { this.form.afterRepairFile ); } - this.form.faultType = this.form.faultType.join(","); + + if (this.form.faultType != null) { + 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; + //每个检查项 + this.form.standardList.forEach((item) => { + if (Array.isArray(item.picturePath)) { + item.picturePath = this.listToString(item.picturePath); + } + }); console.log(this.form.standardList); writeRepairOrder(this.form).then((response) => { this.openWrite = false; From 15080fa7b22cdb09a716044d7b82c049d6b1b375 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Mon, 11 Dec 2023 14:40:36 +0800 Subject: [PATCH 13/18] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E7=BB=86=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/device/repairOrder/index.vue | 81 +++++++++++-------- .../device/repairOrder/selectSpareParts.vue | 5 ++ 2 files changed, 53 insertions(+), 33 deletions(-) diff --git a/src/views/device/repairOrder/index.vue b/src/views/device/repairOrder/index.vue index df17742..8623238 100644 --- a/src/views/device/repairOrder/index.vue +++ b/src/views/device/repairOrder/index.vue @@ -1055,7 +1055,7 @@ - + @@ -1069,7 +1069,7 @@ - + @@ -1275,6 +1275,7 @@ + @@ -161,7 +162,7 @@ - + @@ -724,7 +725,7 @@ export default { var y = dd.getFullYear(); var m = dd.getMonth() + 1;//获取当前月份的日期 var d = dd.getDate(); - return y + "-" + m + "-" + d+" 00:00:00"; + return y + "-" + m + "-" + d; }, /** 查询报工报表列表 */ @@ -736,8 +737,8 @@ export default { }**/ if(this.queryParams.feedbackTimeArray !=null && this.queryParams.feedbackTimeArray.length>0){ - this.queryParams.feedbackTimeStart = moment(this.queryParams.feedbackTimeArray[0]).format('YYYY-MM-DD 00:00:00'); - this.queryParams.feedbackTimeEnd = moment(this.queryParams.feedbackTimeArray[1]).format('YYYY-MM-DD 23:59:59'); + this.queryParams.feedbackTimeStart = moment(this.queryParams.feedbackTimeArray[0]).format('YYYY-MM-DD'); + this.queryParams.feedbackTimeEnd = moment(this.queryParams.feedbackTimeArray[1]).format('YYYY-MM-DD'); } this.loading = true; listReportWork(this.queryParams).then(response => { diff --git a/src/views/quality/qcIncome/selectMaterial.vue b/src/views/quality/qcIncome/selectMaterial.vue index bf9f8db..07aab87 100644 --- a/src/views/quality/qcIncome/selectMaterial.vue +++ b/src/views/quality/qcIncome/selectMaterial.vue @@ -150,7 +150,6 @@ export default { this.selectedRows.name = this.idsName; this.$emit('onSelected', this.selectedRows); this.showFlag = false; - this.queryParams.itemCodeGet = ""; } } }; From 58a9afa5926f4006f4dab157b642b985670f2766 Mon Sep 17 00:00:00 2001 From: wws <18630710203@163.com> Date: Wed, 13 Dec 2023 09:06:00 +0800 Subject: [PATCH 16/18] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/device/item/index.vue | 16 ++++++++-------- src/views/device/upkeepOrder/index.vue | 10 ++++++---- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/views/device/item/index.vue b/src/views/device/item/index.vue index 2c4b78b..990f93b 100644 --- a/src/views/device/item/index.vue +++ b/src/views/device/item/index.vue @@ -310,14 +310,14 @@ - - - + + + diff --git a/src/views/device/upkeepOrder/index.vue b/src/views/device/upkeepOrder/index.vue index 615f92f..c254d5e 100644 --- a/src/views/device/upkeepOrder/index.vue +++ b/src/views/device/upkeepOrder/index.vue @@ -43,7 +43,7 @@ @keyup.enter.native="handleQuery" /> - + - + - + - + Date: Wed, 13 Dec 2023 10:14:03 +0800 Subject: [PATCH 17/18] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BB=84=E7=BA=BF/?= =?UTF-8?q?=E8=BE=85=E5=8A=A9=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/equipment/index.vue | 46 +++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue index c3905d7..b245ff6 100644 --- a/src/views/wms/equipment/index.vue +++ b/src/views/wms/equipment/index.vue @@ -59,6 +59,22 @@ /> + + + + + + - + + + + + + + + + + + + + @@ -910,7 +952,7 @@ import ItemSelectPerson from "./single.vue"; export default { name: "Equipment", - dicts: ["sys_normal_disable", "equ_type", "equipment_status"], + dicts: ["sys_normal_disable", "equ_type", "equipment_status","equipment_category"], components: { EquipmentSpareParts ,ItemSelectPerson}, data() { return { From b94f46231633f1f92a8fa4ee22fc91241777664d Mon Sep 17 00:00:00 2001 From: A0010407 Date: Wed, 13 Dec 2023 14:56:39 +0800 Subject: [PATCH 18/18] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=AE=A1=E7=90=86=20=E8=AE=BE=E5=A4=87=E7=BB=84=E7=BA=BF?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/equipment.js | 9 ++ src/views/wms/equipment/index.vue | 113 +++++++++------- src/views/wms/equipment/itemEquipment.vue | 123 ++++++++++++++++++ .../equipment/{single.vue => itemPerson.vue} | 0 4 files changed, 201 insertions(+), 44 deletions(-) create mode 100644 src/views/wms/equipment/itemEquipment.vue rename src/views/wms/equipment/{single.vue => itemPerson.vue} (100%) diff --git a/src/api/wms/equipment.js b/src/api/wms/equipment.js index 3030ae8..b746322 100644 --- a/src/api/wms/equipment.js +++ b/src/api/wms/equipment.js @@ -105,3 +105,12 @@ export function getPersonList(query) { params: query }); } + +// 查询设备管理列表 +export function getAuxiliaryEquipmentList(query) { + return request({ + url: '/wms/equipment/getAuxiliaryEquipmentList', + method: 'get', + params: query + }); +} diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue index b245ff6..028480f 100644 --- a/src/views/wms/equipment/index.vue +++ b/src/views/wms/equipment/index.vue @@ -12,7 +12,7 @@ @@ -22,7 +22,7 @@ v-model="queryParams.equipmentName" placeholder="请输入设备名称" clearable - style="width: 180px" + style="width: 200px" @keyup.enter.native="handleQuery" /> @@ -33,7 +33,7 @@ @change="$forceUpdate()" clearable filterable - style="width: 180px" + style="width: 200px" @keyup.enter.native="handleQuery" > - + - + - +