From 1c2f425e7899f30e75deca5a2d3b515060d8a536 Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 27 Apr 2022 17:14:50 +0800 Subject: [PATCH 01/12] functionBrtton --- hb_client/src/views/workflow/customfield.vue | 11 +- hb_client/src/views/workflow/transitions.vue | 316 ++++++++++--------- 2 files changed, 163 insertions(+), 164 deletions(-) diff --git a/hb_client/src/views/workflow/customfield.vue b/hb_client/src/views/workflow/customfield.vue index 8013b84..7f321d7 100644 --- a/hb_client/src/views/workflow/customfield.vue +++ b/hb_client/src/views/workflow/customfield.vue @@ -39,20 +39,17 @@ width="220px" > diff --git a/hb_client/src/views/workflow/transitions.vue b/hb_client/src/views/workflow/transitions.vue index d0827f6..70e0c84 100644 --- a/hb_client/src/views/workflow/transitions.vue +++ b/hb_client/src/views/workflow/transitions.vue @@ -1,23 +1,26 @@ - + - - - - + - - + + - - + - - + + - - - - + + + + - - - + + -
取消 @@ -128,28 +123,35 @@
From 1986621d4c3c15e19b9634db0c89412ae0d2a062 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 28 Apr 2022 08:43:57 +0800 Subject: [PATCH 02/12] gongyingshanggongyingwuliao --- hb_client/src/views/procurement/vendor.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hb_client/src/views/procurement/vendor.vue b/hb_client/src/views/procurement/vendor.vue index 72a5c9b..c13b362 100644 --- a/hb_client/src/views/procurement/vendor.vue +++ b/hb_client/src/views/procurement/vendor.vue @@ -55,8 +55,8 @@ - - + From 87d004b60cdea0d44ff1c89aca270f3e7e866dbd Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 28 Apr 2022 10:39:04 +0800 Subject: [PATCH 03/12] fun --- hb_client/src/views/login/index.vue | 2 +- hb_client/src/views/personnel/userupdate.vue | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hb_client/src/views/login/index.vue b/hb_client/src/views/login/index.vue index c92c074..414dbc3 100644 --- a/hb_client/src/views/login/index.vue +++ b/hb_client/src/views/login/index.vue @@ -126,7 +126,7 @@ }, created() { this.getUP(); - localStorage.setItem('tolerance','0.42'); + localStorage.setItem('tolerance','0.36'); }, watch: { $route: { diff --git a/hb_client/src/views/personnel/userupdate.vue b/hb_client/src/views/personnel/userupdate.vue index e277c8b..c8a03ad 100644 --- a/hb_client/src/views/personnel/userupdate.vue +++ b/hb_client/src/views/personnel/userupdate.vue @@ -333,9 +333,9 @@ export default { this.user.avatar = res.data.path; }, beforeAvatarUpload(file) { - const isLt2M = file.size / 1024 / 1024 < 5; + const isLt2M = file.size / 1024 / 1024 < 10; if (!isLt2M) { - this.$message.error("上传头像图片大小不能超过 5MB!"); + this.$message.error("上传头像图片大小不能超过 10MB!"); } return isLt2M; }, @@ -344,9 +344,9 @@ export default { return data.label.indexOf(value) !== -1; }, beforeUpload(file) { - const isLt1M = file.size / 1024 / 1024 < 5; + const isLt1M = file.size / 1024 / 1024 < 10; if (!isLt1M) { - this.$message.error("上传头像图片大小不能超过 5MB!"); + this.$message.error("上传头像图片大小不能超过 10MB!"); } return isLt1M; }, From da2b2950b58b5a18e7a0428099fbad7a51b0794c Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 28 Apr 2022 17:15:44 +0800 Subject: [PATCH 04/12] materilDetailAndEditmateril --- hb_client/src/views/mtm/materialDetail.vue | 4 +++- hb_client/src/views/mtm/productprocess.vue | 7 +++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/hb_client/src/views/mtm/materialDetail.vue b/hb_client/src/views/mtm/materialDetail.vue index b16753b..af258b5 100644 --- a/hb_client/src/views/mtm/materialDetail.vue +++ b/hb_client/src/views/mtm/materialDetail.vue @@ -24,7 +24,7 @@ {{ materialdetail.count }} - {{materialdetail.file_.name}} + {{materialdetail.file_.name}} @@ -486,6 +486,8 @@ getpickList() getMaterial() { getMaterial(this.material).then((response) => { if (response.data) { + debugger; + this.materialdetail = response.data; //物料基本信息 } }); diff --git a/hb_client/src/views/mtm/productprocess.vue b/hb_client/src/views/mtm/productprocess.vue index 90bdf09..ef23993 100644 --- a/hb_client/src/views/mtm/productprocess.vue +++ b/hb_client/src/views/mtm/productprocess.vue @@ -633,8 +633,7 @@ getMaterial, getInputmaterialList, createInputmaterial, - updateInputmaterial - , + updateInputmaterial, deleteInputmaterial, getOutputmaterialList, createOutputmaterial, @@ -648,8 +647,7 @@ gettechdocList, createtechdoc, updatetechdoc, - deletetechdoc - , + deletetechdoc, getsubproducationList, createsubproducation, updatesubproducation, @@ -763,6 +761,7 @@ let hei = document.getElementsByClassName('app-main')[0].clientHeight; let h = document.getElementById('processCard').clientHeight; that.halfHeight = (hei - h - 176) / 2; + this.getmaterialList();//物料列表 }, methods: { checkPermission, From a75ea367b83d7f1e39f78faaf9416adbb2d2e6e2 Mon Sep 17 00:00:00 2001 From: shijing Date: Fri, 29 Apr 2022 09:56:41 +0800 Subject: [PATCH 05/12] exportrPoint --- hb_client/src/views/qm/producttest.vue | 22 +++++++++++++--- hb_client/src/views/qm/taskrecordfrom.vue | 16 ++++++++++-- hb_client/src/views/wpm/firstCheck.vue | 19 ++++++++++++++ hb_client/src/views/wpm/operationdo.vue | 31 ++++++++++++++++------- 4 files changed, 74 insertions(+), 14 deletions(-) diff --git a/hb_client/src/views/qm/producttest.vue b/hb_client/src/views/qm/producttest.vue index ab55b26..2c25c36 100644 --- a/hb_client/src/views/qm/producttest.vue +++ b/hb_client/src/views/qm/producttest.vue @@ -112,6 +112,10 @@ @click="handleRecordDetail(scope)" >查看 + 导出 + @@ -155,11 +159,11 @@ diff --git a/hb_client/src/views/qm/taskrecordfrom.vue b/hb_client/src/views/qm/taskrecordfrom.vue index ebedb8a..9a19d09 100644 --- a/hb_client/src/views/qm/taskrecordfrom.vue +++ b/hb_client/src/views/qm/taskrecordfrom.vue @@ -48,6 +48,7 @@ @@ -90,8 +91,7 @@ diff --git a/hb_client/src/views/wpm/firstCheck.vue b/hb_client/src/views/wpm/firstCheck.vue index 826ad2a..0b1e9c1 100644 --- a/hb_client/src/views/wpm/firstCheck.vue +++ b/hb_client/src/views/wpm/firstCheck.vue @@ -91,6 +91,13 @@ > 查看 + + 导出 + @@ -239,6 +246,7 @@ import faceLogin from '@/components/faceLogin/review.vue'; import {getProcessList,getrecordformList} from "@/api/mtm"; import {getsubplanList} from "@/api/wpm"; + import {getTestRecordExport} from "@/api/qm"; import {firstTestInit,firstAudit} from "@/api/pm"; import {getTestRecordItem,putTestRecordItem,subTestRecordItem} from "@/api/qm"; @@ -584,6 +592,17 @@ }) } }, + handleExportClick(scope){ + let exportFormId = scope.row.id; + getTestRecordExport(exportFormId).then(res=>{ + if(res.code===200){ + let link = document.createElement('a'); + link.href = res.data.path; + document.body.appendChild(link); + link.click(); + } + }) + }, }, mounted() { this.getProcessList(); diff --git a/hb_client/src/views/wpm/operationdo.vue b/hb_client/src/views/wpm/operationdo.vue index 508a582..0d74c7d 100644 --- a/hb_client/src/views/wpm/operationdo.vue +++ b/hb_client/src/views/wpm/operationdo.vue @@ -253,6 +253,12 @@ @click="handlerecord(scope)" >填写表单 + 导出 + @@ -646,7 +652,6 @@ .word-wrap { padding: 25px; } - .box-card { height: 300px; } @@ -668,22 +673,20 @@ deleteOperationequip, deleteOperationwproduct, gettoolList, - createTool, createInputs, recordInit, createOutputs, deleteOperationeinput, wproductPlace, } from "@/api/wpm"; - import mammoth from "mammoth"; - import {getrffieldList, gettechdocList} from "@/api/mtm"; + import { gettechdocList} from "@/api/mtm"; import checkPermission from "@/utils/permission"; import {getprogressList} from "@/api/pm"; - import Pagination from "@/components/Pagination"; // secondary package based on el-pagination + import {getTestRecordExport} from "@/api/qm"; import faceLogin from '@/components/faceLogin/review.vue'; export default { - components: {Pagination, faceLogin}, + components: {faceLogin}, inject: ["reload"], data() { return { @@ -810,8 +813,7 @@ pdf: "", }; }, - computed: {}, - watch: {}, + created() { this.id = this.$route.params.id; //操作ID this.readbook(); @@ -825,6 +827,7 @@ this.getprogressList(); //产出物料调出 this.gettoolList(); //工序工装 }, + methods: { checkPermission, @@ -990,13 +993,23 @@ this.formID = scope.row.id; recordInit(this.formID).then((response) => { if (response.data) { - debugger; this.fieldList = response.data; this.fieldList.name = response.data.form_.name; } }); this.dialogVisibleForm = true; }, + handlerecordExport(scope){ + let exportFormId = scope.row.id; + getTestRecordExport(exportFormId).then(res=>{ + if(res.code===200){ + let link = document.createElement('a'); + link.href = res.data.path; + document.body.appendChild(link); + link.click(); + } + }) + }, //工序工装列表 gettoolList() { From 7273dbc35a1e5a7a454ff3b689898f91bb5940cd Mon Sep 17 00:00:00 2001 From: shijing Date: Fri, 29 Apr 2022 11:17:01 +0800 Subject: [PATCH 06/12] confirmationBeforeFaceBrushSubmit --- hb_client/src/components/faceLogin/review.vue | 12 ++- hb_client/src/views/wpm/firstCheck.vue | 50 ++++++----- hb_client/src/views/wpm/need.vue | 57 +++++++------ hb_client/src/views/wpm/operationdo.vue | 31 ++++--- hb_client/src/views/wpm/productjy.vue | 84 ++++++++++++++++--- 5 files changed, 162 insertions(+), 72 deletions(-) diff --git a/hb_client/src/components/faceLogin/review.vue b/hb_client/src/components/faceLogin/review.vue index 35be360..76a2b46 100644 --- a/hb_client/src/components/faceLogin/review.vue +++ b/hb_client/src/components/faceLogin/review.vue @@ -2,10 +2,10 @@
- - + +
- +
@@ -132,7 +132,7 @@ if(res.data.access){ let item= {name:res.data.name,token:res.data.access}; that.$emit('func',item); - that.$message.success("身份认证成功！"); + // that.$message.success("身份认证成功！"); this.closeCamera(); }else{ that.uploadLock = false; @@ -165,7 +165,6 @@ beforeDestroy() { let video = document.getElementById('video'); let stream = video.srcObject; - // console.log(stream); let tracks = stream.getTracks(); tracks.forEach(track => { track.stop() @@ -188,8 +187,7 @@ .video-box { margin: auto; position: relative; - width: 500px; - height: 500px; + width: 600px; text-align: center; } diff --git a/hb_client/src/views/wpm/firstCheck.vue b/hb_client/src/views/wpm/firstCheck.vue index 0b1e9c1..38c74a0 100644 --- a/hb_client/src/views/wpm/firstCheck.vue +++ b/hb_client/src/views/wpm/firstCheck.vue @@ -365,6 +365,7 @@ //首件审批 handleSelectclick(scope,index){ let that = this; + debugger; this.reviewVisible = true; that.planId = scope.row.id; that.leader_1 = scope.row.leader_1_?scope.row.leader_1_.name:null; @@ -479,6 +480,8 @@ that.checkParams = params; that.limitedUserCheck = true; }, + + //人脸识别获取人员信息后 checkSubmit(data){ let that =this; let id = that.checkParams.id; @@ -486,26 +489,35 @@ params.is_testok = that.checkParams.is_testok; params.record_data = that.checkParams.record_data; params.token = data.token; + let text = '确定以操作员'+data.name+'身份提交？'; if(data.token!==''&&data.token!==null&&data.token!==undefined) { - putTestRecordItem(id, params).then((res) => { - if (res.code >= 200) { - subTestRecordItem(id, params).then((res) => { - debugger; - that.limitedUserCheck = false; - if (res.code >= 200) { - that.recordVisible = false; - that.getTableData(); - }else{ - that.$message.error(res.msg) - } - }).catch(()=>{ - that.limitedUserCheck = false; - }); - } else { - that.$message.error(res.msg) - } - }).catch((err) => { - that.$message.error(err); + this.$confirm(text, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + putTestRecordItem(id, params).then((res) => { + if (res.code >= 200) { + subTestRecordItem(id, params).then((res) => { + debugger; + that.limitedUserCheck = false; + if (res.code >= 200) { + that.recordVisible = false; + that.getTableData(); + }else{ + that.$message.error(res.msg) + } + }).catch(()=>{ + that.limitedUserCheck = false; + }); + } else { + that.$message.error(res.msg) + } + }).catch((err) => { + that.$message.error(err); + }); + }).catch(() => { + that.limitedUserCheck = false; }); } }, diff --git a/hb_client/src/views/wpm/need.vue b/hb_client/src/views/wpm/need.vue index 7bf8169..37dd99b 100644 --- a/hb_client/src/views/wpm/need.vue +++ b/hb_client/src/views/wpm/need.vue @@ -1544,33 +1544,40 @@ params.is_testok = that.params.is_testok; params.record_data = that.params.record_data; params.token = data.token; + let text = '确定以操作员'+data.name+'身份提交？'; if (data.token !== '' && data.token !== null && data.token !== undefined) { - putTestRecordItem(id, params).then((res) => { - if (res.code >= 200) { - subTestRecordItem(id, params).then((res) => { - debugger; - that.limitedPhoto = false; - if (res.code >= 200) { - that.recordVisible = false; - that.limitedReview = false; - that.limitedCheckRecord = false; - that.getList(); - that.getList2(); - that.getList1(); - that.getList3(); - that.refreshRecord(); - } else { - that.$message.error(res.msg) - } - }).catch(() => { - that.limitedPhoto = false; - }); - } else { - that.$message.error(res.msg) - } - }).catch((err) => { - that.$message.error(err); + this.$confirm(text, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + that.limitedPhoto = false; + putTestRecordItem(id, params).then((res) => { + if (res.code >= 200) { + subTestRecordItem(id, params).then((res) => { + if (res.code >= 200) { + that.recordVisible = false; + that.limitedReview = false; + that.limitedCheckRecord = false; + that.getList(); + that.getList2(); + that.getList1(); + that.getList3(); + that.refreshRecord(); + } else { + that.$message.error(res.msg) + } + }).catch(() => {}); + } else { + that.$message.error(res.msg) + } + }).catch((err) => { + that.$message.error(err); + }); + }).catch(() => { + that.limitedPhoto = false; }); + } }, diff --git a/hb_client/src/views/wpm/operationdo.vue b/hb_client/src/views/wpm/operationdo.vue index 0d74c7d..a85a9c0 100644 --- a/hb_client/src/views/wpm/operationdo.vue +++ b/hb_client/src/views/wpm/operationdo.vue @@ -1220,9 +1220,10 @@ getMsgFormSon(data) { let that = this; that.operationData.user = data.name; + let text = '确定以操作员'+data.name+'身份提交？'; if (data.token !== '' && data.token !== null && data.token !== undefined) { if (that.inputData == "") { - that.$confirm("没有消耗物料确定提交吗?", "提示", { + that.$confirm("没有消耗物料，"+text, "提示", { confirmButtonText: "确认", cancelButtonText: "取消", type: "error", @@ -1241,16 +1242,26 @@ that.limitedPhoto = false; }); } else { - submitOperation(that.id,{token:data.token}).then((res) => { - if (res.code === 200) { - that.$router.push({name: "operation"}); - that.$message.success("操作提交成功！"); - }else{ - that.$message.error(res.msg) - } - }).catch((err) => { - that.$message.error(err); + this.$confirm(text, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + that.limitedPhoto = false; + submitOperation(that.id,{token:data.token}).then((res) => { + if (res.code === 200) { + that.$router.push({name: "operation"}); + that.$message.success("操作提交成功！"); + }else{ + that.$message.error(res.msg) + } + }).catch((err) => { + that.$message.error(err); + }); + }).catch(() => { + that.limitedPhoto = false; }); + } } }, diff --git a/hb_client/src/views/wpm/productjy.vue b/hb_client/src/views/wpm/productjy.vue index b046105..756ad2d 100644 --- a/hb_client/src/views/wpm/productjy.vue +++ b/hb_client/src/views/wpm/productjy.vue @@ -288,16 +288,27 @@ 确 定 + + +
操作人员确认
+
+ +
+ From 42ba14422302aa63c0f2f66b018cf7442265c722 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 5 May 2022 11:28:06 +0800 Subject: [PATCH 07/12] unproductticketDetail --- hb_client/src/views/qm/unproduct.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hb_client/src/views/qm/unproduct.vue b/hb_client/src/views/qm/unproduct.vue index fbb3e36..ca5d534 100644 --- a/hb_client/src/views/qm/unproduct.vue +++ b/hb_client/src/views/qm/unproduct.vue @@ -391,7 +391,10 @@ //不合格玻璃审理单查看 handledetailbhg(scope) { - this.$router.push({name: "ticketDetail", params: {ticketId: scope.row.ticket}}) + debugger; + console.log(scope.row); + debugger; + this.$router.push({name: "ticketDetail", params: {ticketId: scope.row.ticket,workflow:scope.row.workflow}}) }, //入场检验不合格 From e40977274dd548290594924d7f763fd99fe92d55 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 5 May 2022 13:35:32 +0800 Subject: [PATCH 08/12] unproductticketDetail --- hb_client/src/views/qm/unproduct.vue | 3 --- 1 file changed, 3 deletions(-) diff --git a/hb_client/src/views/qm/unproduct.vue b/hb_client/src/views/qm/unproduct.vue index ca5d534..f0736f7 100644 --- a/hb_client/src/views/qm/unproduct.vue +++ b/hb_client/src/views/qm/unproduct.vue @@ -391,9 +391,6 @@ //不合格玻璃审理单查看 handledetailbhg(scope) { - debugger; - console.log(scope.row); - debugger; this.$router.push({name: "ticketDetail", params: {ticketId: scope.row.ticket,workflow:scope.row.workflow}}) }, From df91dd18f4ab51c27a03af5940266bc18a426b39 Mon Sep 17 00:00:00 2001 From: shijing Date: Fri, 6 May 2022 09:06:46 +0800 Subject: [PATCH 09/12] login --- hb_client/src/views/login/index.vue | 114 ++++-- hb_client/src/views/mtm/materialDetail.vue | 396 +++++++++++---------- hb_client/src/views/mtm/materialdo.vue | 4 +- 3 files changed, 289 insertions(+), 225 deletions(-) diff --git a/hb_client/src/views/login/index.vue b/hb_client/src/views/login/index.vue index 414dbc3..74cd956 100644 --- a/hb_client/src/views/login/index.vue +++ b/hb_client/src/views/login/index.vue @@ -13,6 +13,30 @@ :model="loginForm" :rules="loginRules" > + + auto-complete="off" + > + + + + > + + - + 登录 + 登录 + @@ -75,10 +109,11 @@ diff --git a/hb_client/src/views/mtm/materialdo.vue b/hb_client/src/views/mtm/materialdo.vue index a0ec526..0a923e6 100644 --- a/hb_client/src/views/mtm/materialdo.vue +++ b/hb_client/src/views/mtm/materialdo.vue @@ -449,9 +449,9 @@ - + From 6e6fc0c0ac59fcef50af3d91acad5e4f18215f0e Mon Sep 17 00:00:00 2001 From: shijing Date: Fri, 6 May 2022 09:10:46 +0800 Subject: [PATCH 10/12] login --- hb_client/src/views/login/index.vue | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/hb_client/src/views/login/index.vue b/hb_client/src/views/login/index.vue index 74cd956..77dfe69 100644 --- a/hb_client/src/views/login/index.vue +++ b/hb_client/src/views/login/index.vue @@ -160,7 +160,7 @@ }; }, created() { - this.getUP(); + // this.getUP(); localStorage.setItem('tolerance', '0.36'); }, watch: { @@ -217,9 +217,8 @@ //读取cookie getUP() { - - this.loginForm.username = localStorage.getItem("rem_username"); - this.loginForm.password = localStorage.getItem("rem_password"); + // this.loginForm.username = localStorage.getItem("rem_username"); + // this.loginForm.password = localStorage.getItem("rem_password"); }, //人脸登录 takePhoto() { @@ -227,7 +226,6 @@ }, /*关闭相机*/ closeCamera() { - debugger; this.reload(); this.$refs.faceTracking.closeCamera(); // this.thisVideo.srcObject.getTracks()[0].stop(); From 6b99cb6cc42ffac21d0972a375d6fa59ac3841e5 Mon Sep 17 00:00:00 2001 From: shijing Date: Fri, 6 May 2022 09:25:11 +0800 Subject: [PATCH 11/12] login --- hb_client/src/views/login/index.vue | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/hb_client/src/views/login/index.vue b/hb_client/src/views/login/index.vue index 77dfe69..c4d8ec2 100644 --- a/hb_client/src/views/login/index.vue +++ b/hb_client/src/views/login/index.vue @@ -38,6 +38,13 @@ --> + Date: Fri, 6 May 2022 09:29:50 +0800 Subject: [PATCH 12/12] login --- hb_client/src/views/login/index.vue | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/hb_client/src/views/login/index.vue b/hb_client/src/views/login/index.vue index c4d8ec2..96c4bb9 100644 --- a/hb_client/src/views/login/index.vue +++ b/hb_client/src/views/login/index.vue @@ -13,30 +13,6 @@ :model="loginForm" :rules="loginRules" > -