From b3cdb967634dddba8a88bca2550f7e07c9ac262c Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期五, 29 十二月 2023 16:51:13 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index fd7022f..0069da7 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -114,7 +114,7 @@
<div>
<el-tabs class="rawMaterial-detail" @tab-click="tabsClick">
<el-tab-pane label="妫�楠岄」鐩�">
- <el-row style="width:100%;z-index: 10;height:50px;">
+ <el-row style="width:100%;z-index: 10;height:50px;" v-if="resultVal==null">
<el-col :sm="15" :lg="18"></el-col>
<el-col :sm="3" :lg="2" style="text-align: right;">
<el-button v-if="dataForm.id==null" size="small" @click="clickAddLine()">娣诲姞妫�楠岄」鐩�</el-button>
@@ -241,7 +241,7 @@
element-loading-text="璇风◢绛夛紝鏂囦欢涓婁紶涓�"
>
<el-upload
- :disabled="dataForm.rawInsNo==null"
+ :disabled="dataForm.rawInsNo==null || resultVal!=null"
drag
ref="upload"
action="/mes/rawInsProduct/upload"
@@ -568,19 +568,18 @@
getResultInfo(data){
if(!data.includes("part_no")){
this.$message({
- message: '鏈瘑鍒嚭浜屼綅鐮侀浂浠朵俊鎭紒',
+ message: '鏈瘑鍒嚭浜岀淮鐮侀浂浠朵俊鎭紒',
type: 'warning'
});
}
let obj=JSON.parse(data)
let info={"code":obj["part_no"]}
- console.log("鍊�",info);
if(info.code!=undefined&&info.code!=''){
this.paramObj = info
this.showPart = true
}else{
this.$message({
- message: '鏈瘑鍒嚭浜屼綅鐮侀浂浠朵俊鎭紒',
+ message: '鏈瘑鍒嚭浜岀淮鐮侀浂浠朵俊鎭紒',
type: 'warning'
});
}
@@ -590,9 +589,9 @@
},
// 鎵撳紑鐩告満
Turnonthecamera() {
- this.qrcode = true
- this.$refs.codeCompont.openCamera()
- },
+ this.qrcode = true
+ this.$refs.codeCompont.openCamera()
+ },
// 纭鍥炶皟
selectPart(param, nodePart, index) {
if (typeof param !== 'undefined') {
@@ -829,16 +828,22 @@
this.list.push(ele)
}}
})
- let rVal = '1'
+ let rVal = ''
+ let passNum = 0
+ let unPassNum = 0
this.list.forEach(item=>{
if(item.children){
item.children.forEach(ele=>{
if(ele.testState == 0){
- rVal = '0'
+ unPassNum += 1
+ }
+ if(ele.testState == 1){
+ passNum+=1
}
})
}
})
+ rVal = (passNum+unPassNum)>0 ? unPassNum>0 ? '0' :'1' : ''
this.conclusionTable = [{
code: data.code,
name: data.name,
@@ -975,7 +980,7 @@
.rawMaterial-basic {
background-color: #fff;
- height: 155px;
+ height: 170px;
display: flex;
flex-wrap: wrap;
padding: 10px 20px;
--
Gitblit v1.9.3