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/login/index.vue b/hb_client/src/views/login/index.vue index c92c074..96c4bb9 100644 --- a/hb_client/src/views/login/index.vue +++ b/hb_client/src/views/login/index.vue @@ -14,6 +14,13 @@ :rules="loginRules" > + + auto-complete="off" + > + + + + > + + - + 登录 + 登录 + @@ -75,10 +93,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 @@ - + 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, 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; }, 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 @@ - - + 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/qm/unproduct.vue b/hb_client/src/views/qm/unproduct.vue index fbb3e36..f0736f7 100644 --- a/hb_client/src/views/qm/unproduct.vue +++ b/hb_client/src/views/qm/unproduct.vue @@ -391,7 +391,7 @@ //不合格玻璃审理单查看 handledetailbhg(scope) { - this.$router.push({name: "ticketDetail", params: {ticketId: scope.row.ticket}}) + this.$router.push({name: "ticketDetail", params: {ticketId: scope.row.ticket,workflow:scope.row.workflow}}) }, //入场检验不合格 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 @@
diff --git a/hb_client/src/views/wpm/firstCheck.vue b/hb_client/src/views/wpm/firstCheck.vue index 826ad2a..38c74a0 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"; @@ -357,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; @@ -471,6 +480,8 @@ that.checkParams = params; that.limitedUserCheck = true; }, + + //人脸识别获取人员信息后 checkSubmit(data){ let that =this; let id = that.checkParams.id; @@ -478,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; }); } }, @@ -584,6 +604,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/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 508a582..a85a9c0 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() { @@ -1207,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", @@ -1228,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 @@ 确 定 + + +
操作人员确认
+
+ +
+