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/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/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/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/api/wms/equipment.js b/src/api/wms/equipment.js index c7a4ccf..b746322 100644 --- a/src/api/wms/equipment.js +++ b/src/api/wms/equipment.js @@ -96,3 +96,21 @@ export function changeEquipmentStatus(equipmentId, status) { data: data }) } + +// 查询人员列表 +export function getPersonList(query) { + return request({ + url: '/wms/equipment/getPersonList', + method: 'get', + params: query + }); +} + +// 查询设备管理列表 +export function getAuxiliaryEquipmentList(query) { + return request({ + url: '/wms/equipment/getAuxiliaryEquipmentList', + method: 'get', + params: query + }); +} diff --git a/src/assets/images/quality/bg- border1.png b/src/assets/images/quality/bg- border1.png new file mode 100644 index 0000000..f44d97c Binary files /dev/null and b/src/assets/images/quality/bg- border1.png differ diff --git a/src/assets/images/quality/bg-body.png b/src/assets/images/quality/bg-body.png new file mode 100644 index 0000000..aae8b1f Binary files /dev/null and b/src/assets/images/quality/bg-body.png differ diff --git a/src/assets/images/quality/bg-border2.png b/src/assets/images/quality/bg-border2.png new file mode 100644 index 0000000..a7ef2cc Binary files /dev/null and b/src/assets/images/quality/bg-border2.png differ diff --git a/src/assets/images/quality/bg-border5(1).png b/src/assets/images/quality/bg-border5(1).png new file mode 100644 index 0000000..e9ed00e Binary files /dev/null and b/src/assets/images/quality/bg-border5(1).png differ diff --git a/src/assets/images/quality/bg-border5(2).png b/src/assets/images/quality/bg-border5(2).png new file mode 100644 index 0000000..e9ed00e Binary files /dev/null and b/src/assets/images/quality/bg-border5(2).png differ diff --git a/src/assets/images/quality/bg-border5(3).png b/src/assets/images/quality/bg-border5(3).png new file mode 100644 index 0000000..e9ed00e Binary files /dev/null and b/src/assets/images/quality/bg-border5(3).png differ diff --git a/src/assets/images/quality/bg-border5.png b/src/assets/images/quality/bg-border5.png new file mode 100644 index 0000000..e9ed00e Binary files /dev/null and b/src/assets/images/quality/bg-border5.png differ diff --git a/src/assets/images/quality/bg-border6(1).png b/src/assets/images/quality/bg-border6(1).png new file mode 100644 index 0000000..8a632e0 Binary files /dev/null and b/src/assets/images/quality/bg-border6(1).png differ diff --git a/src/assets/images/quality/bg-border6.png b/src/assets/images/quality/bg-border6.png new file mode 100644 index 0000000..8a632e0 Binary files /dev/null and b/src/assets/images/quality/bg-border6.png differ diff --git a/src/assets/images/quality/bg-head.png b/src/assets/images/quality/bg-head.png new file mode 100644 index 0000000..7bfdb83 Binary files /dev/null and b/src/assets/images/quality/bg-head.png differ diff --git a/src/assets/images/quality/bg-jianyan1.png b/src/assets/images/quality/bg-jianyan1.png new file mode 100644 index 0000000..949145b Binary files /dev/null and b/src/assets/images/quality/bg-jianyan1.png differ diff --git a/src/assets/images/quality/bg-jianyan2.png b/src/assets/images/quality/bg-jianyan2.png new file mode 100644 index 0000000..dda142d Binary files /dev/null and b/src/assets/images/quality/bg-jianyan2.png differ diff --git a/src/assets/images/quality/bg-title(1).png b/src/assets/images/quality/bg-title(1).png new file mode 100644 index 0000000..4c0208f Binary files /dev/null and b/src/assets/images/quality/bg-title(1).png differ diff --git a/src/assets/images/quality/bg-title(2).png b/src/assets/images/quality/bg-title(2).png new file mode 100644 index 0000000..4c0208f Binary files /dev/null and b/src/assets/images/quality/bg-title(2).png differ diff --git a/src/assets/images/quality/bg-title(3).png b/src/assets/images/quality/bg-title(3).png new file mode 100644 index 0000000..4c0208f Binary files /dev/null and b/src/assets/images/quality/bg-title(3).png differ diff --git a/src/assets/images/quality/bg-title.png b/src/assets/images/quality/bg-title.png new file mode 100644 index 0000000..4c0208f Binary files /dev/null and b/src/assets/images/quality/bg-title.png differ diff --git a/src/assets/images/quality/bg-title备份 2.png b/src/assets/images/quality/bg-title备份 2.png new file mode 100644 index 0000000..0080095 Binary files /dev/null and b/src/assets/images/quality/bg-title备份 2.png differ diff --git a/src/assets/images/quality/bg-title备份.png b/src/assets/images/quality/bg-title备份.png new file mode 100644 index 0000000..0080095 Binary files /dev/null and b/src/assets/images/quality/bg-title备份.png differ diff --git a/src/assets/images/quality/logo.png b/src/assets/images/quality/logo.png new file mode 100644 index 0000000..dcdccaa Binary files /dev/null and b/src/assets/images/quality/logo.png differ diff --git a/src/assets/images/quality/编组 12.png b/src/assets/images/quality/编组 12.png new file mode 100644 index 0000000..3d70560 Binary files /dev/null and b/src/assets/images/quality/编组 12.png differ diff --git a/src/assets/images/quality/编组 12备份 14.png b/src/assets/images/quality/编组 12备份 14.png new file mode 100644 index 0000000..3d70560 Binary files /dev/null and b/src/assets/images/quality/编组 12备份 14.png differ diff --git a/src/assets/images/quality/编组 12备份 15.png b/src/assets/images/quality/编组 12备份 15.png new file mode 100644 index 0000000..3d70560 Binary files /dev/null and b/src/assets/images/quality/编组 12备份 15.png differ diff --git a/src/assets/images/quality/编组 12备份 16.png b/src/assets/images/quality/编组 12备份 16.png new file mode 100644 index 0000000..3d70560 Binary files /dev/null and b/src/assets/images/quality/编组 12备份 16.png differ diff --git a/src/assets/images/quality/编组 12备份 17.png b/src/assets/images/quality/编组 12备份 17.png new file mode 100644 index 0000000..3d70560 Binary files /dev/null and b/src/assets/images/quality/编组 12备份 17.png differ diff --git a/src/assets/images/quality/编组 12备份 18.png b/src/assets/images/quality/编组 12备份 18.png new file mode 100644 index 0000000..3d70560 Binary files /dev/null and b/src/assets/images/quality/编组 12备份 18.png differ diff --git a/src/assets/images/quality/编组 12备份 19(1).png b/src/assets/images/quality/编组 12备份 19(1).png new file mode 100644 index 0000000..8ad27b9 Binary files /dev/null and b/src/assets/images/quality/编组 12备份 19(1).png differ diff --git a/src/assets/images/quality/编组 12备份 19(2).png b/src/assets/images/quality/编组 12备份 19(2).png new file mode 100644 index 0000000..5dc38cd Binary files /dev/null and b/src/assets/images/quality/编组 12备份 19(2).png differ diff --git a/src/assets/images/quality/编组 12备份 19(3).png b/src/assets/images/quality/编组 12备份 19(3).png new file mode 100644 index 0000000..8437d52 Binary files /dev/null and b/src/assets/images/quality/编组 12备份 19(3).png differ diff --git a/src/assets/images/quality/编组 12备份 19(4).png b/src/assets/images/quality/编组 12备份 19(4).png new file mode 100644 index 0000000..c21ee30 Binary files /dev/null and b/src/assets/images/quality/编组 12备份 19(4).png differ diff --git a/src/assets/images/quality/编组 12备份 19(5).png b/src/assets/images/quality/编组 12备份 19(5).png new file mode 100644 index 0000000..1c48746 Binary files /dev/null and b/src/assets/images/quality/编组 12备份 19(5).png differ diff --git a/src/assets/images/quality/编组 12备份 19(6).png b/src/assets/images/quality/编组 12备份 19(6).png new file mode 100644 index 0000000..6584f29 Binary files /dev/null and b/src/assets/images/quality/编组 12备份 19(6).png differ diff --git a/src/assets/images/quality/编组 12备份 19(7).png b/src/assets/images/quality/编组 12备份 19(7).png new file mode 100644 index 0000000..6190526 Binary files /dev/null and b/src/assets/images/quality/编组 12备份 19(7).png differ diff --git a/src/assets/images/quality/编组 12备份 19.png b/src/assets/images/quality/编组 12备份 19.png new file mode 100644 index 0000000..3d70560 Binary files /dev/null and b/src/assets/images/quality/编组 12备份 19.png differ diff --git a/src/assets/images/quality/编组 12备份 20.png b/src/assets/images/quality/编组 12备份 20.png new file mode 100644 index 0000000..3d70560 Binary files /dev/null and b/src/assets/images/quality/编组 12备份 20.png differ diff --git a/src/assets/images/quality/编组 12备份 21.png b/src/assets/images/quality/编组 12备份 21.png new file mode 100644 index 0000000..3d70560 Binary files /dev/null and b/src/assets/images/quality/编组 12备份 21.png differ diff --git a/src/assets/images/quality/编组 12备份 22.png b/src/assets/images/quality/编组 12备份 22.png new file mode 100644 index 0000000..3d70560 Binary files /dev/null and b/src/assets/images/quality/编组 12备份 22.png differ diff --git a/src/assets/images/quality/编组 12备份 23.png b/src/assets/images/quality/编组 12备份 23.png new file mode 100644 index 0000000..3d70560 Binary files /dev/null and b/src/assets/images/quality/编组 12备份 23.png differ diff --git a/src/assets/images/quality/编组 12备份 24.png b/src/assets/images/quality/编组 12备份 24.png new file mode 100644 index 0000000..3d70560 Binary files /dev/null and b/src/assets/images/quality/编组 12备份 24.png differ diff --git a/src/assets/images/quality/路径.png b/src/assets/images/quality/路径.png new file mode 100644 index 0000000..598cf10 Binary files /dev/null and b/src/assets/images/quality/路径.png differ diff --git a/src/router/index.js b/src/router/index.js index 6398d8a..1524fe6 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -100,12 +100,34 @@ export const constantRoutes = [ component: () => import("@/views/kanban/exception/index"), hidden: true, }, - // 看板路由 + // 看板路由 { path: "/kanban/equipment", component: () => import("@/views/kanban/equipment/index"), hidden: true, }, + // 质量看板1 + { + path: "/kanban/qualitykanban1", + component: () => import("@/views/kanban/quality/kanban1"), + hidden: true, + }, // 质量看板2 + { + path: "/kanban/qualitykanban2", + component: () => import("@/views/kanban/quality/kanban2"), + hidden: true, + }, // 质量看板3 + { + path: "/kanban/qualitykanban3", + component: () => import("@/views/kanban/quality/kanban3"), + hidden: true, + }, + { + path: "/kanban/circle", + component: () => import("@/views/kanban/quality/circle"), + hidden: true, + }, + ] // 动态路由，基于用户权限动态去加载 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/inspectionPlan/index.vue b/src/views/device/inspectionPlan/index.vue index 5b4b81a..14e7567 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 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..990f93b 100644 --- a/src/views/device/item/index.vue +++ b/src/views/device/item/index.vue @@ -20,7 +20,7 @@ @@ -310,14 +310,14 @@ - - - + + + @@ -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/repairOrder/index.vue b/src/views/device/repairOrder/index.vue index 62e2b46..8623238 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 @@ + - + @@ -1069,7 +1055,7 @@ - + @@ -1083,7 +1069,7 @@ - + @@ -1115,6 +1101,16 @@ + + + + + @@ -1279,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 => { @@ -773,7 +774,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 c4f68fc..3db50c2 100644 --- a/src/views/quality/checkTypeProject/index.vue +++ b/src/views/quality/checkTypeProject/index.vue @@ -105,8 +105,8 @@ @selection-change="handleSelectionChange" > - - + + @@ -166,7 +166,7 @@ - + 取 消 + + @@ -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 {listProject} from "@/api/quality/project"; - +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 { // 遮罩层 @@ -310,8 +316,8 @@ export default { methods: { /**获取检测项目列表**/ getProjectList(){ - listProject().then((response) => { - this.checkRuleList = response.rows; + getProjectList().then((response) => { + this.checkRuleList = response; }); }, /** 查询物料检验项目维护列表 */ @@ -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 aa8c39b..3540349 100644 --- a/src/views/quality/project/index.vue +++ b/src/views/quality/project/index.vue @@ -92,8 +92,8 @@ - - + + - + diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue index 4e7774e..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" > + + + + + + - + + + + + @@ -459,6 +489,24 @@ + + + + + + + + + @@ -512,23 +560,22 @@ - - + - - + + + + @@ -617,8 +664,8 @@ - -
+ +
+ + +
+ +
上一步 - 下一步 提 交 {{ - form.equipmentHeadName + form.equipmentHead }} @@ -760,7 +822,12 @@ }} - + + + { - console.log(response.rows); this.equipmentHeadOption = response.rows; }); }, /** 查询设备分类 */ getEquipmentType() { getEquipmentTypeList().then((response) => { - console.log(response.rows); this.equipmentTypeOption = response.rows; - console.log(this.treeData1); }); }, /** 查询设备备件 */ @@ -1143,10 +1216,23 @@ export default { indexMethod(index) { return index + 1; }, + /** 查询设备管理列表 */ 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 +1280,7 @@ export default { workshopSection: null, equipmentLocation: null, hourlyUnitPrice: null, + equipmentHead: null, }; this.resetForm("form"); }, @@ -1246,25 +1333,35 @@ export default { this.reset(); getWorkCenterList().then((response) => { this.options1 = response.rows; - console.log(this.options1); }); + this.repairRecordSteps = 0; + this.rightList = []; + this.auxiliaryEquipmentRightList = []; 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; + this.rightList = []; for (let i in response.data.selectedData) { - // 将返回的列表赋值于穿梭框右边列表 + // 将返回的备品备件列表赋值于穿梭框右边列表 this.rightList.push(response.data.selectedData[i].spareCode); } + this.auxiliaryEquipmentRightList = []; + for (let i in response.data.selectedEquipmentData) { + // 将返回的辅助设备列表赋值于穿梭框右边列表 + this.auxiliaryEquipmentRightList.push( + response.data.selectedEquipmentData[i].auxiliaryEquipmentCode + ); + } if (response.data.imageFiles != null) { var newFiles = []; @@ -1275,7 +1372,6 @@ export default { newFiles.push(newFile); }); this.form.imageFileList = newFiles; - console.log("55555", this.form.imageFileList); } if (response.data.qrFiles != null) { var newFiles = []; @@ -1298,17 +1394,16 @@ 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; //设备图片 @@ -1335,12 +1430,12 @@ export default { }); this.form.barCodeFileList = newFiles; } - this.queryOpen = true; this.title = "查看设备信息"; this.optType = "view"; }); }, + /** 提交按钮 */ submitForm() { if (Array.isArray(this.form.qrFileList)) { @@ -1358,6 +1453,8 @@ 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 +1478,8 @@ export default { "【设备基础信息】设备类型为空，请选择设备类型！" ); } else { + this.form.auxiliaryEquipmentRightData = + this.auxiliaryEquipmentRightList; this.form.rightData = this.rightList; addEquipment(this.form).then((response) => { this.$modal.msgSuccess("新增成功"); @@ -1467,6 +1566,21 @@ 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 +1612,8 @@ export default { .step-body { margin-top: 50px; } + +.el-transfer-panel { + width: 350px; +} diff --git a/src/views/wms/equipment/itemEquipment.vue b/src/views/wms/equipment/itemEquipment.vue new file mode 100644 index 0000000..248da2a --- /dev/null +++ b/src/views/wms/equipment/itemEquipment.vue @@ -0,0 +1,123 @@ + + + diff --git a/src/views/wms/equipment/itemPerson.vue b/src/views/wms/equipment/itemPerson.vue new file mode 100644 index 0000000..c6e7ba8 --- /dev/null +++ b/src/views/wms/equipment/itemPerson.vue @@ -0,0 +1,229 @@ + + + diff --git a/src/views/wms/equipment/single.vue b/src/views/wms/equipment/single.vue deleted file mode 100644 index f96aecc..0000000 --- a/src/views/wms/equipment/single.vue +++ /dev/null @@ -1,98 +0,0 @@ - - - -