From 619f774244a75d747878a9618e960bcede1a077b Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 15 十二月 2023 10:54:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 60 +++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 41 insertions(+), 19 deletions(-)
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 93a3a20..9d51fc8 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -29,16 +29,16 @@
<el-col :span="6">
<el-form-item label="闆朵欢鍙�" prop="code">
<el-input v-model="dataForm.code" :disabled="resultVal!=null && dataForm.id!=null">
- <el-button
+ <!-- <el-button
slot="append"
icon="el-icon-search"
:disabled="resultVal!=null && dataForm.id!=null"
- @click="queryCode()"></el-button>
- <!-- <el-button
+ @click="queryCode()"></el-button> -->
+ <el-button
slot="append"
icon="el-icon-full-screen"
:disabled="resultVal!=null && dataForm.id!=null"
- @click="Turnonthecamera"></el-button> -->
+ @click="Turnonthecamera"></el-button>
</el-input>
</el-form-item>
</el-col>
@@ -266,7 +266,18 @@
<el-button type="primary" @click="submitSave()">纭� 瀹�</el-button>
</span>
</el-dialog>
- <!-- <qrcode :qrcode="qrcode" v-show="qrcode" :camera="camera" /> -->
+ <el-dialog
+ title="鎵弿"
+ :visible.sync="qrcode"
+ width="60%">
+ <div style="height: 100vh;width: 100%;">
+ <qr-code-app ref="codeCompont" @ok="getResultInfo" @cancelCodeDialog="cancelCodeDialog"></qr-code-app>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="qrcode = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="qrcode = false">纭� 瀹�</el-button>
+ </span>
+</el-dialog>
</div>
</template>
@@ -277,21 +288,18 @@
getObj,
updateRawInsProduct,
updateRawInspectsById,
- updateDeviceById, } from '@/api/quality/rawMaterial'
+ updateDeviceById, chooseIFS} from '@/api/quality/rawMaterial'
import rawMaterialPartDialog from '@/views/common/rawMaterial-part'
- // import qrcode from './QrcodeReader.vue'
-export default {
+ import qrCodeApp from '@/views/common/qrCodeApp'
+ export default {
+ components:{
+ rawMaterialPartDialog,
+ qrCodeApp
+ },
computed:{},
- components:{
- rawMaterialPartDialog,
- // qrcode
- // qrcode: () => import('./QrcodeReader.vue'),
- },
data(){
return{
qrcode: false,
- torchActive: false,
- camera: 'off',
userdata:[],
currentRow:[],
userlist:[],
@@ -313,7 +321,7 @@
formTime: '',
message: '',
name: '',
- code: '88.118.1/A0498220',
+ code: '',
specs: '',
unit: '',
number: '',
@@ -337,7 +345,9 @@
userName: '',
testState: ''
}],
- dataRule: {},
+ dataRule: {
+ code:[{ required: true, message: '璇锋壂鎻忛�夋嫨闆朵欢', trigger: 'blur' }]
+ },
deviceList: [],
}
},
@@ -364,10 +374,22 @@
},
},
methods:{
+ getResultInfo(data){
+ console.log("鎵弿鍚庢墽琛�");
+ let obj=JSON.parse(data)
+ let info={"code":obj["part_no"]}
+ this.paramObj = info
+ this.showPart = true
+ },
+ cancelCodeDialog(){
+ this.qrcode = false
+ },
// 鎵撳紑鐩告満
Turnonthecamera() {
- this.qrcode = true
- this.camera = 'rear'
+ console.log("鎵ц");
+ this.qrcode = true
+ this.$refs.codeCompont.openCamera()
+ // this.camera = 'rear'
},
// 鎵爜缁撴灉鍥炶皟
// onDecode(result) {
--
Gitblit v1.9.3