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 | 148 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 103 insertions(+), 45 deletions(-)
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 578e65c..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>
@@ -170,10 +170,11 @@
<template slot-scope="scope">
<div v-if="!scope.row.children">
<el-tooltip :disabled="scope.row.deviceId != null" class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�" placement="top-start">
- <el-select @blur="changeState(scope.row, index)" style="width:100%" allow-create filterable default-first-option
+ <el-select style="width:100%" allow-create filterable default-first-option
:disabled="scope.row.deviceId == null || (dataForm.id!=null&&resultVal!=null)"
v-model="scope.row.testValueList[index]"
- placeholder="璇疯緭鍏ユ垨閫夋嫨妫�娴嬪��" @change="updateTestValue(scope.row,scope.$index)">
+ placeholder="璇疯緭鍏ユ垨閫夋嫨妫�娴嬪��"
+ @change="changeState(scope.row,scope.$index)">
<el-option label="鏄�" value="鏄�"/>
<el-option label="鍚�" value="鍚�"/>
</el-select>
@@ -265,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>
@@ -276,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:[],
@@ -312,7 +321,7 @@
formTime: '',
message: '',
name: '',
- code: '88.118.1/A0498220',
+ code: '',
specs: '',
unit: '',
number: '',
@@ -336,7 +345,9 @@
userName: '',
testState: ''
}],
- dataRule: {},
+ dataRule: {
+ code:[{ required: true, message: '璇锋壂鎻忛�夋嫨闆朵欢', trigger: 'blur' }]
+ },
deviceList: [],
}
},
@@ -363,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) {
@@ -501,6 +524,7 @@
let data = {
id: this.dataForm.id,
number: this.unqualifiedNum,
+ result: this.conclusionTable[0].testState
}
updateRawInspectsById(data).then(res => {
if(res.data.code == 0 && (res.data.data=='1'|| res.data.data=='0')){
@@ -567,37 +591,45 @@
}
},
+ changeRowResult(){
+ if(this.list){
+ this.list.forEach(e=>{
+ if(e.children){
+ e.children.forEach(i=>{
+ if(i.testValueList.length>1){
+ let arr = i.testValue.split(",")
+ arr.splice((arr.length-1),1)
+ let obj = {
+ deviceId: i.deviceId,
+ rpId: i.rpId,
+ testValue: arr.join(","),
+ note: i.note
+ }
+ updateRawInsProduct(obj).then(res=>{
+ if(res.data.code === 0){
+ this.init()
+ }
+ })
+ }
+ })
+ }
+ })
+ }
+ },
delTeatValueColumn(){
if (this.empiricalValueAdd - 1 > 0) {
if (this.empiricalValueAddMaxNumber != this.empiricalValueAdd - 1) {
this.empiricalValueAdd = this.empiricalValueAdd - 1;
+ this.changeRowResult()
this.list.forEach(i => {
- i.testValueList.splice(this.empiricalValueAdd, 1);
+ if(i.children){
+ i.children.forEach(ele=>{
+ ele.testValueList.splice(this.empiricalValueAdd, 1);
+ })
+ }
});
}
}
- },
- updateTestValue(row,index){
- if(row.rpId == null){
- return
- }
- let val = row.testValueList.join(",");
- let obj = {
- deviceId: row.deviceId,
- rpId: row.rpId,
- testValue: val,
- note: row.note
- }
- updateRawInsProduct(obj).then(res=>{
- if(res.data.code === 0){
- this.$message.success("鏇存柊鎴愬姛")
- this.init()
- }else{
- this.$message.success("鏇存柊澶辫触")
- }
- }).catch(error=>{
- this.$message.error(error)
- })
},
init(){
if(this.dataForm.id){
@@ -656,11 +688,21 @@
this.list.push(ele)
}}
})
+ let rVal = '1'
+ this.list.forEach(item=>{
+ if(item.children){
+ item.children.forEach(ele=>{
+ if(ele.testState == 0){
+ rVal = '0'
+ }
+ })
+ }
+ })
this.conclusionTable = [{
code: data.code,
name: data.name,
userName: Array.from(new Set(userNameList)).join(','),
- testState: this.resultVal==null?null:this.resultVal
+ testState: this.resultVal==null?rVal:this.resultVal
}]
}).catch(error=>{
this.$message.error("鑾峰彇澶辫触",error)
@@ -670,6 +712,22 @@
}
},
changeState(row, index) {
+ if(row){
+ let isTrue = true
+ for(var i=0;i<row.testValueList.length;i++){
+ let val = row.testValueList[i]
+ let reg = /^[0-9]*[1-9][0-9]*$/
+ console.log(['鏄�','鍚�'].includes(val));
+ if(!reg.test(val) && !['鏄�','鍚�'].includes(val)){
+ this.$message.error("璇疯緭鍏ユ暟瀛楁垨閫夋嫨鏄惁")
+ row.testValueList[i] = null
+ isTrue = false
+ }
+ }
+ if(!isTrue){
+ return
+ }
+ }
if (row.rpId != null && row.rpId != '') {
let val = row.testValueList.join(",")
if (val === undefined || val === '' || val === null) {
--
Gitblit v1.9.3