From 41e0df8413624e6034c967f3afae30da59370879 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 11 十二月 2023 16:20:15 +0800
Subject: [PATCH] modified: src/components/verifition/Verify/VerifyPoints.vue modified: src/const/crud/admin/sys-public-param.js modified: src/page/full-screen/fullScreenPlus.vue modified: src/page/index/logo.vue modified: src/page/index/sidebar/sidebarItem.vue modified: src/page/login/index.vue modified: src/page/login/thirdpartylogin.vue modified: src/util/elAttr.js modified: src/views/accounting/unitworkfactor/unitworkfactor-form.vue modified: src/views/accounting/unitworkfactor/updateQuota-form.vue modified: src/views/basic/discmaintenance/discmaintenance-form.vue modified: src/views/basic/log/index.vue modified: src/views/basic/part/part-form.vue modified: src/views/basic/part/print-label-form.vue modified: src/views/basic/poc/index.vue modified: src/views/basic/tabletest/index.vue modified: src/views/basic/template/index.vue modified: src/views/basic/template/template-form.vue modified: src/views/basic/workstation/workstation-form.vue modified: src/views/common/custom-table.vue modified: src/views/common/documentDetail.vue modified: src/views/common/operationParamTemplate.vue modified: src/views/common/rawMaterial-part.vue modified: src/views/common/search-select.vue modified: src/views/common/ztt-table.vue modified: src/views/huawei/code19bind/list.vue modified: src/views/huawei/code19gen/form.vue modified: src/views/huawei/grossweightcode/list.vue modified: src/views/huawei/grossweightcode/task-secret-form.vue modified: src/views/oa/JiegouModal.vue modified: src/views/oa/PeizhiModal.vue modified: src/views/oa/technology-document-new.vue modified: src/views/oa/technology-document.vue modified: src/views/plan/customer/index.vue modified: src/views/plan/customerorder/confirm-pull-customerorder.vue modified: src/views/plan/customerorder/customerorder-config-history.vue modified: src/views/plan/customerorder/customerorder-form.vue modified: src/views/plan/customerorder/customerorder-return.vue modified: src/views/plan/customerorder/customerorder-ztt-table.vue modified: src/views/plan/customerorder/index.vue modified: src/views/plan/customerorder/other-customer-order-line.vue modified: src/views/plan/customerorder/sample-customerorder-form.vue modified: src/views/plan/customerorder/schedule-table.vue modified: src/views/plan/manufacturingorder/auto-operationtask.vue modified: src/views/plan/manufacturingorder/customerorder.vue modified: src/views/plan/manufacturingorder/customize-param-template.vue modified: src/views/plan/manufacturingorder/order-operation-form.vue modified: src/views/plan/manufacturingorder/productorder-form.vue modified: src/views/plan/manufacturingorderapply/index.vue modified: src/views/plan/masterproductionschedule/auto-manufacturingorder.vue modified: src/views/plan/operationtask/gantt.vue modified: src/views/plan/operationtask/operationtask-form.vue modified: src/views/plan/operationtask/task-material.vue modified: src/views/plan/productionschedul/index.vue modified: src/views/plan/productionschedul/template-form.vue modified: src/views/plan/schedule/gantt.vue modified: src/views/plan/schedulelookover/ganttview.vue modified: src/views/plan/segmentmerge/index.vue modified: src/views/plan/segmentmerge/operate-dialog.vue modified: src/views/plan/segmentmerge/operation-technology-form.vue modified: src/views/product/dutyrecord/index.vue modified: src/views/product/producttraceability/index.vue modified: src/views/product/producttraceability/traceability-diagram.vue modified: src/views/product/workbench/batchproductout-form-new.vue modified: src/views/product/workbench/batchproductout-form.vue modified: src/views/product/workbench/feed-form.vue modified: src/views/product/workbench/feed-pane.vue modified: src/views/product/workbench/feed-tab.vue modified: src/views/product/workbench/handymantype.vue modified: src/views/product/workbench/index.vue modified: src/views/product/workbench/mould-pane.vue modified: src/views/product/workbench/operation-task-pane.vue modified: src/views/product/workbench/product-record-form.vue modified: src/views/product/workbench/productout-form-by-batch.vue modified: src/views/product/workbench/productout-form.vue modified: src/views/product/workbench/productrecord-tab.vue modified: src/views/product/workbench/producttracking-tab.vue modified: src/views/product/workbench/shift-productout-form.vue modified: src/views/product/workbench/splitTaskForm.vue modified: src/views/product/workbench/taskinfo-pane.vue modified: src/views/quality/Packaging_ledger/pack-from.vue modified: src/views/quality/apply/index.vue modified: src/views/quality/exception/exception.vue modified: src/views/quality/exception/index.vue modified: src/views/quality/finishedProductInspection/finishedProduct-form.vue modified: src/views/quality/finishedProductInspection/finishedProduct-print.vue modified: src/views/quality/finishedProductInspection/finishedProducter-print.vue modified: src/views/quality/finishedProductInspection/index.vue modified: src/views/quality/newReport/ReportForm.vue modified: src/views/quality/processInspect/index.vue modified: src/views/quality/processInspect/processInspect-form.vue modified: src/views/quality/processconfiguration/index.vue modified: src/views/quality/processconfiguration/table-form.vue modified: src/views/quality/rawMaterial/QrcodeReader.vue modified: src/views/quality/rawMaterial/index.vue modified: src/views/quality/rawMaterial/rawMaterial-form.vue modified: src/views/quality/report/index.vue modified: src/views/quality/standardbind/standardbind-form.vue modified: src/views/quality/statistics/rateChart.vue modified: src/views/quality/testitemlayout/index.vue modified: src/views/quality/testplan/testplan-form.vue modified: src/views/quality/unqualifiedprocess/examineApproveform.vue modified: src/views/quality/unqualifiedprocess/index.vue modified: src/views/quality/unqualifiedprocess/loaction-form.vue modified: src/views/quality/unqualifiedprocess/unqualifiedprocessform.vue modified: src/views/technology/completeproductstructure/completeproductstructure-form.vue modified: src/views/technology/document/checkStandardTable.vue modified: src/views/technology/document/document-form.vue modified: src/views/technology/document/extendsOperation.vue modified: src/views/technology/document/extendsTestStandard.vue modified: src/views/technology/document/extendsTestStandardParam.vue modified: src/views/technology/document/teststandard.vue modified: src/views/technology/structure/single-structure-form.vue modified: src/views/warehouse/changestock/index.vue modified: src/views/warehouse/check/check-detail.vue modified: src/views/warehouse/pallettransports/ifslocation-form.vue modified: src/views/warehouse/pallettransports/ifsstock-form.vue modified: src/views/warehouse/pallettransports/index.vue modified: src/views/warehouse/returnstock/ifslocation-form.vue modified: src/views/warehouse/returnstock/index.vue modified: src/views/warehouse/returnstock/returnstock-form.vue modified: src/views/warehouse/returnstock/stock-part.vue modified: src/views/warehouse/stock/print-label-form.vue modified: src/views/warehouse/stock/small-print-label-form.vue modified: src/views/warehouse/stock/small-warehousing-label-form.vue modified: src/views/warehouse/stock/stock-table.vue modified: src/views/warehouse/stock/warehousing-label-form.vue modified: src/views/zte/pkgidbind/index.vue
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 81 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 79 insertions(+), 2 deletions(-)
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 62a368f..1d38bdc 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -34,6 +34,11 @@
icon="el-icon-search"
:disabled="resultVal!=null && dataForm.id!=null"
@click="queryCode()"></el-button>
+ <!-- <el-button
+ slot="append"
+ icon="el-icon-full-screen"
+ :disabled="resultVal!=null && dataForm.id!=null"
+ @click="Turnonthecamera"></el-button> -->
</el-input>
</el-form-item>
</el-col>
@@ -51,7 +56,6 @@
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
disabled>
-
</el-date-picker>
</el-form-item>
</el-col>
@@ -261,6 +265,7 @@
<el-button type="primary" @click="submitSave()">纭� 瀹�</el-button>
</span>
</el-dialog>
+ <!-- <qrcode :qrcode="qrcode" v-show="qrcode" :camera="camera" /> -->
</div>
</template>
@@ -273,13 +278,19 @@
updateRawInspectsById,
updateDeviceById, } from '@/api/quality/rawMaterial'
import rawMaterialPartDialog from '@/views/common/rawMaterial-part'
+ // import qrcode from './QrcodeReader.vue'
export default {
computed:{},
components:{
- rawMaterialPartDialog
+ rawMaterialPartDialog,
+ // qrcode
+ // qrcode: () => import('./QrcodeReader.vue'),
},
data(){
return{
+ qrcode: false,
+ torchActive: false,
+ camera: 'off',
userdata:[],
currentRow:[],
userlist:[],
@@ -352,6 +363,72 @@
},
},
methods:{
+ // 鎵撳紑鐩告満
+ Turnonthecamera() {
+ this.qrcode = true
+ this.camera = 'rear'
+ },
+ // 鎵爜缁撴灉鍥炶皟
+ // onDecode(result) {
+ // console.log(result)
+ // this.turnCameraOff()
+ // },
+ // 鐩告満鍙嶈浆
+ // switchCamera() {
+ // switch (this.camera) {
+ // case 'front':
+ // this.camera = 'rear'
+ // break
+ // case 'rear':
+ // this.camera = 'front'
+ // break
+ // default:
+ // this.$toast('閿欒')
+ // }
+ // },
+ // 鍏抽棴鐩告満
+ // turnCameraOff() {
+ // this.camera = 'off'
+ // this.qrcode = false
+ // },
+ // 鎵撳紑鎵嬬數绛�
+ // ClickFlash() {
+ // switch (this.torchActive) {
+ // case true:
+ // this.torchActive = false
+ // break
+ // case false:
+ // this.torchActive = true
+ // break
+ // default:
+ // this.$toast('閿欒')
+ // }
+ // },
+
+ // 妫�鏌ユ槸鍚﹁皟鐢ㄦ憚鍍忓ご
+ // async onInit(promise) {
+ // try {
+ // await promise
+ // } catch (error) {
+ // if (error.name === 'StreamApiNotSupportedError') {
+ // } else if (error.name === 'NotAllowedError') {
+ // this.errorMessage = 'Hey! I need access to your camera'
+ // } else if (error.name === 'NotFoundError') {
+ // this.errorMessage = 'Do you even have a camera on your device?'
+ // } else if (error.name === 'NotSupportedError') {
+ // this.errorMessage =
+ // 'Seems like this page is served in non-secure context (HTTPS, localhost or file://)'
+ // } else if (error.name === 'NotReadableError') {
+ // this.errorMessage =
+ // "Couldn't access your camera. Is it already in use?"
+ // } else if (error.name === 'OverconstrainedError') {
+ // this.errorMessage =
+ // "Constraints don't match any installed camera. Did you asked for the front camera although there is none?"
+ // } else {
+ // this.errorMessage = 'UNKNOWN ERROR: ' + error.message
+ // }
+ // }
+ // },
// 纭鍥炶皟
selectPart(param, nodePart, index) {
if (typeof param !== 'undefined') {
--
Gitblit v1.9.3