From ce46af16e0c4172af498d5f371a7b788cf1da0d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com> Date: Wed, 17 Apr 2024 17:04:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7=E7=95=8C?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hw-ui/src/api/board/index.js | 8 + hw-ui/src/views/board/fifthFloor/index.vue | 140 +++++++++++++++- hw-ui/src/views/board/firstFloor/index.vue | 31 +++- .../src/views/board/fourthFloor/assemble.vue | 10 +- .../views/board/fourthFloor/laserLight.vue | 3 +- hw-ui/src/views/board/fourthFloor/weld.vue | 154 +++++++++++++++++- 6 files changed, 327 insertions(+), 19 deletions(-) diff --git a/hw-ui/src/api/board/index.js b/hw-ui/src/api/board/index.js index 1279c8e..55c0b07 100644 --- a/hw-ui/src/api/board/index.js +++ b/hw-ui/src/api/board/index.js @@ -231,3 +231,11 @@ export function assignTask(data) { data: data }) } +// 查询物料安装情况 +export function selectMaterialInstallationCircumstance(query) { + return request({ + url: '/api/selectMaterialInstallationCircumstance', + method: 'get', + params: query + }) +} diff --git a/hw-ui/src/views/board/fifthFloor/index.vue b/hw-ui/src/views/board/fifthFloor/index.vue index 0313e0f..1935d83 100644 --- a/hw-ui/src/views/board/fifthFloor/index.vue +++ b/hw-ui/src/views/board/fifthFloor/index.vue @@ -156,6 +156,7 @@ size="small" style="margin-right: 12px" type="text" + @click="SOP(scope.row)" > SOP预览 @@ -441,6 +442,65 @@ + + + + +
+ + {{ file.name }} + + + + + + + + +
+ +
+ 关 闭 +
+ + + + + + + @@ -515,6 +575,10 @@ export default { dicts: ['wms_raw_return_task_type'], data() { return { + fileList: [], + SOPModel: false, + pictureDetailModel: false, + dialogImageUrl: '', returnModelVisible: false, returnModelForm:{}, WarehousesList:[], @@ -629,6 +693,14 @@ export default { } }, async mounted() { + setInterval(() => { + this.$notify.info({ + title: '通知', + message: '通知公告', + position: 'bottom-right', + duration: 0 + }); + }, 60 * 1000) getProductPlans({pageNum: this.nowNum1, pageSize: 5}).then(e => { this.tableData = e.rows this.totalNum1 = Math.ceil(e.total / 5) @@ -1517,7 +1589,73 @@ export default { return false; } }); - } + }, + + async SOP(e) { + this.fileList = [] + + console.log(e) + // const data = await fun() + // this.fileList = data.map(v=>v) + + this.fileList = [ + { + name: 'Snipaste_2023-09-04_08-16-59.png', + url: 'http://175.27.215.92:9665/statics/2024/04/17/Snipaste_2023-09-04_08-16-59_20240417142903A013.png' + }, + { + name: '会议纪要 0825_20240417143926A014.docx', + url: 'http://175.27.215.92:9665/statics/2024/04/17/会议纪要 0825_20240417143926A014.docx' + }, + { + name: '会议纪要 0825_20240417143926A014.docx', + url: 'http://175.27.215.92:9665/statics/2024/04/17/会议纪要 0825_20240417143926A014.docx' + }, + { + name: '会议纪要 0825_20240417143926A014.docx', + url: 'http://175.27.215.92:9665/statics/2024/04/17/会议纪要 0825_20240417143926A014.docx' + }, + { + name: 'Snipaste_2023-09-04_08-16-59.png', + url: 'http://175.27.215.92:9665/statics/2024/04/17/Snipaste_2023-09-04_08-16-59_20240417142903A013.png' + }, + { + name: 'Snipaste_2023-09-04_08-16-59.png', + url: 'http://175.27.215.92:9665/statics/2024/04/17/Snipaste_2023-09-04_08-16-59_20240417142903A013.png' + }, + { + name: 'Snipaste_2023-09-04_08-16-59.png', + url: 'http://175.27.215.92:9665/statics/2024/04/17/Snipaste_2023-09-04_08-16-59_20240417142903A013.png' + }, + { + name: 'Snipaste_2023-09-04_08-16-59.png', + url: 'http://175.27.215.92:9665/statics/2024/04/17/Snipaste_2023-09-04_08-16-59_20240417142903A013.png' + }, + { + name: 'Snipaste_2023-09-04_08-16-59.png', + url: 'http://175.27.215.92:9665/statics/2024/04/17/Snipaste_2023-09-04_08-16-59_20240417142903A013.png' + }, + { + name: '会议纪要 0825_20240417143926A014.docx', + url: 'http://175.27.215.92:9665/statics/2024/04/17/会议纪要 0825_20240417143926A014.docx' + }, + ] + this.SOPModel = true; + }, + //查看图纸预览 + handlePictureCardPreview(file) { + this.dialogImageUrl = file.url; + this.pictureDetailModel = true; + }, + //图纸下载 + async handleDownload(file) { + this.fileDownload(file) + }, + isAssetTypeAnImage(ext) { + let suffix = ext.lastIndexOf("."); + let name = ext.substr(suffix + 1); + return ['png', 'jpg', 'jpeg'].includes(name.toLowerCase()) + }, } } diff --git a/hw-ui/src/views/board/firstFloor/index.vue b/hw-ui/src/views/board/firstFloor/index.vue index 01fc5c4..af52d54 100644 --- a/hw-ui/src/views/board/firstFloor/index.vue +++ b/hw-ui/src/views/board/firstFloor/index.vue @@ -598,8 +598,7 @@
- 确 定 - 取 消 + 关 闭
@@ -629,9 +628,13 @@ import { applyRawOutstock, getProductPlans, insertProductPlanDetails, - getProductPlanDetails, startProductPlanDetail, completeProductPlanDetail, + getProductPlanDetails, + startProductPlanDetail, + completeProductPlanDetail, firstFloorProduceInstock, - scanMaterial2Confirm, applyRawReturn + scanMaterial2Confirm, + applyRawReturn, + selectMaterialInstallationCircumstance } from '@/api/board' import {getToken} from "@/utils/auth"; @@ -709,6 +712,14 @@ export default { } }, mounted() { + setInterval(() => { + this.$notify.info({ + title: '通知', + message: '通知公告', + position: 'bottom-right', + duration: 0 + }); + }, 60 * 1000) getProductPlans({pageNum: 1, pageSize: 5}).then(e => { this.tableData = e.rows this.totalNum1 = Math.ceil(e.total / 5) @@ -1003,12 +1014,11 @@ export default { } }, // 生成/获取明细 - getDetail(e) { - console.log(e.row) + async getDetail(e) { this.planId = e.row.planId this.nowMaterial = e.row.materialName this.nowNum2 = 1 - getProductPlanDetails({pageNum: 1, pageSize: 5, planId: e.row.planId}).then(res => { + await getProductPlanDetails({pageNum: 1, pageSize: 5, planId: e.row.planId}).then(res => { if (res.rows.length === 0) { this.$confirm('是否生成计划明细', '确认', { confirmButtonText: '确定', @@ -1040,7 +1050,12 @@ export default { } }) - + const table1 = await selectMaterialInstallationCircumstance({ + installType:1, + planDetailId:e.row.planDetailId, + materialBomId:e.row.materialBomId + }) + console.log(table1) }, // 领料页面 getMaterials(val) { diff --git a/hw-ui/src/views/board/fourthFloor/assemble.vue b/hw-ui/src/views/board/fourthFloor/assemble.vue index 000e089..8ebe68d 100644 --- a/hw-ui/src/views/board/fourthFloor/assemble.vue +++ b/hw-ui/src/views/board/fourthFloor/assemble.vue @@ -199,7 +199,7 @@
-
当日产量
+
每周产量
@@ -466,6 +466,14 @@ export default { } }, mounted() { + setInterval(() => { + this.$notify.info({ + title: '通知', + message: '通知公告', + position: 'bottom-right', + duration: 0 + }); + }, 60 * 1000) getProductPlans({pageNum: 1, pageSize: 5}).then(e => { this.tableData = e.rows this.totalNum1 = Math.ceil(e.total / 5) diff --git a/hw-ui/src/views/board/fourthFloor/laserLight.vue b/hw-ui/src/views/board/fourthFloor/laserLight.vue index 87dde0c..4538c13 100644 --- a/hw-ui/src/views/board/fourthFloor/laserLight.vue +++ b/hw-ui/src/views/board/fourthFloor/laserLight.vue @@ -177,7 +177,7 @@
-
当周产量
+
每周产量
@@ -271,6 +271,7 @@ export default { this.$notify.info({ title: '通知', message: '通知公告', + position: 'bottom-right', duration: 0 }); }, 60 * 1000) diff --git a/hw-ui/src/views/board/fourthFloor/weld.vue b/hw-ui/src/views/board/fourthFloor/weld.vue index d7cf695..f358978 100644 --- a/hw-ui/src/views/board/fourthFloor/weld.vue +++ b/hw-ui/src/views/board/fourthFloor/weld.vue @@ -112,17 +112,19 @@ width="120" > @@ -193,6 +252,10 @@ export default { }, data() { return { + fileList: [], + SOPModel: false, + pictureDetailModel: false, + dialogImageUrl: '', nowNum1: 1, totalNum1: 0, form: {}, @@ -201,6 +264,14 @@ export default { } }, mounted() { + setInterval(() => { + this.$notify.info({ + title: '通知', + message: '通知公告', + position: 'bottom-right', + duration: 0 + }); + }, 60 * 1000) this.$refs.chart2.setData({ tooltip: { trigger: 'axis', @@ -767,7 +838,74 @@ export default { message: '已取消' }); }); - } + }, + + + async SOP(e) { + this.fileList = [] + + console.log(e) + // const data = await fun() + // this.fileList = data.map(v=>v) + + this.fileList = [ + { + name: 'Snipaste_2023-09-04_08-16-59.png', + url: 'http://175.27.215.92:9665/statics/2024/04/17/Snipaste_2023-09-04_08-16-59_20240417142903A013.png' + }, + { + name: '会议纪要 0825_20240417143926A014.docx', + url: 'http://175.27.215.92:9665/statics/2024/04/17/会议纪要 0825_20240417143926A014.docx' + }, + { + name: '会议纪要 0825_20240417143926A014.docx', + url: 'http://175.27.215.92:9665/statics/2024/04/17/会议纪要 0825_20240417143926A014.docx' + }, + { + name: '会议纪要 0825_20240417143926A014.docx', + url: 'http://175.27.215.92:9665/statics/2024/04/17/会议纪要 0825_20240417143926A014.docx' + }, + { + name: 'Snipaste_2023-09-04_08-16-59.png', + url: 'http://175.27.215.92:9665/statics/2024/04/17/Snipaste_2023-09-04_08-16-59_20240417142903A013.png' + }, + { + name: 'Snipaste_2023-09-04_08-16-59.png', + url: 'http://175.27.215.92:9665/statics/2024/04/17/Snipaste_2023-09-04_08-16-59_20240417142903A013.png' + }, + { + name: 'Snipaste_2023-09-04_08-16-59.png', + url: 'http://175.27.215.92:9665/statics/2024/04/17/Snipaste_2023-09-04_08-16-59_20240417142903A013.png' + }, + { + name: 'Snipaste_2023-09-04_08-16-59.png', + url: 'http://175.27.215.92:9665/statics/2024/04/17/Snipaste_2023-09-04_08-16-59_20240417142903A013.png' + }, + { + name: 'Snipaste_2023-09-04_08-16-59.png', + url: 'http://175.27.215.92:9665/statics/2024/04/17/Snipaste_2023-09-04_08-16-59_20240417142903A013.png' + }, + { + name: '会议纪要 0825_20240417143926A014.docx', + url: 'http://175.27.215.92:9665/statics/2024/04/17/会议纪要 0825_20240417143926A014.docx' + }, + ] + this.SOPModel = true; + }, + //查看图纸预览 + handlePictureCardPreview(file) { + this.dialogImageUrl = file.url; + this.pictureDetailModel = true; + }, + //图纸下载 + async handleDownload(file) { + this.fileDownload(file) + }, + isAssetTypeAnImage(ext) { + let suffix = ext.lastIndexOf("."); + let name = ext.substr(suffix + 1); + return ['png', 'jpg', 'jpeg'].includes(name.toLowerCase()) + }, } }