From 03be129c50068164b8cc4186d4d4e5b860503476 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 03 一月 2024 14:35:58 +0800
Subject: [PATCH] 包装检验-默认检验项目
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 94 +++++++++++++++++++++++++----------------------
1 files changed, 50 insertions(+), 44 deletions(-)
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 5b45117..b4d8e55 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -28,16 +28,16 @@
</el-col>
<el-col :span="6">
<el-form-item label="闆朵欢鍙�" prop="code">
- <el-input v-model="dataForm.code" disabled>
+ <el-input v-model="dataForm.code">
<el-button
slot="append"
icon="el-icon-search"
- :disabled="resultVal!=null && dataForm.id!=null"
+ :disabled="resultVal!=null"
@click="queryCode"></el-button>
<el-button
slot="append"
icon="el-icon-full-screen"
- :disabled="resultVal!=null && dataForm.id!=null"
+ :disabled="resultVal!=null"
@click="Turnonthecamera"></el-button>
</el-input>
</el-form-item>
@@ -114,15 +114,11 @@
<div>
<el-tabs class="rawMaterial-detail" @tab-click="tabsClick">
<el-tab-pane label="妫�楠岄」鐩�">
- <el-row style="width:100%;z-index: 10;height:50px;">
- <el-col :xs="12" :lg="18"></el-col>
- <el-col :xs="4" :lg="2" style="text-align: right;">
+ <el-row style="width:100%;z-index: 10;height:50px;" v-if="resultVal==null">
+ <el-col :span="12"></el-col>
+ <el-col :span="12" style="text-align: right;">
<el-button v-if="dataForm.id==null" size="small" @click="clickAddLine()">娣诲姞妫�楠岄」鐩�</el-button>
- </el-col>
- <el-col :xs="4" :lg="2" style="text-align: right;">
<el-button class="pad-addcol-btn" v-if="resultVal==null || dataForm.id==null" size="small" @click="addTeatValueColumn()">娣诲姞妫�娴嬪�煎垪</el-button>
- </el-col>
- <el-col :xs="4" :lg="2" style="text-align: right;">
<el-button v-if="resultVal==null || dataForm.id==null" size="small" @click="delTeatValueColumn()">鍒犻櫎妫�娴嬪�煎垪</el-button>
</el-col>
</el-row>
@@ -141,12 +137,12 @@
:tree-props="{children: 'children', hasChildren: 'hasChildren'}">
<el-table-column type="index" label="搴忓彿" width="60">
</el-table-column>
- <el-table-column prop="father" label="妫�楠岄」鐩�" width="260">
+ <el-table-column prop="father" label="妫�楠岄」鐩�" width="160">
<template slot-scope="scope">
<el-input v-if="scope.row.children" style="width:90%" :disabled="dataForm.id!=null" v-model="scope.row.father" placeholder="璇疯緭鍏ユ楠岄」鐩�"></el-input>
</template>
</el-table-column>
- <el-table-column prop="name" label="椤圭洰" width="260">
+ <el-table-column prop="name" label="椤圭洰" width="160">
<template slot-scope="scope">
<div v-if="!scope.row.children">
<el-input class="inline-input" :disabled="dataForm.id!=null" v-model="scope.row.name"
@@ -154,15 +150,15 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="unit" label="鍗曚綅" width="260">
+ <el-table-column prop="unit" label="鍗曚綅" width="160">
<template slot-scope="scope">
<div v-if="!scope.row.children">
<el-input :disabled="dataForm.id != null" v-model="scope.row.unit" placeholder="璇疯緭鍏ュ崟浣�"></el-input>
</div>
</template>
-
+
</el-table-column>
- <el-table-column prop="required" label="鏍囧噯鍊�" width="260">
+ <el-table-column prop="required" label="鏍囧噯鍊�" width="160">
<template slot-scope="scope">
<div v-if="!scope.row.children">
<el-input :disabled="dataForm.id != null" v-model="scope.row.required"
@@ -170,14 +166,14 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="testValue" label="妫�娴嬪��" min-width="260" v-for="(item,index) in empiricalValueAdd" :key="index">
+ <el-table-column prop="testValue" label="妫�娴嬪��" min-width="160" v-for="(item,index) in empiricalValueAdd" :key="index">
<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 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="璇疯緭鍏ユ垨閫夋嫨妫�娴嬪��"
+ placeholder="璇疯緭鍏ユ垨閫夋嫨妫�娴嬪��"
@change="changeState(scope.row,scope.$index)">
<el-option label="鏄�" value="鏄�"/>
<el-option label="鍚�" value="鍚�"/>
@@ -186,10 +182,10 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="deviceName" label="璇曢獙璁惧" min-width="260">
+ <el-table-column prop="deviceName" label="璇曢獙璁惧" min-width="200">
<template slot-scope="scope">
<div v-if="!scope.row.children">
- <el-select ref="" :disabled="dataForm!=null && resultVal!=null" style="width:80%"
+ <el-select ref="" :disabled="dataForm!=null && resultVal!=null" style="width:60%"
v-model="scope.row.deviceId" filterable @change="updateDevice(scope.row,scope.$index)">
<el-option v-for="(item,index) in deviceList"
:key="index" :value="item.id" :label="item.code +'-'+ item.name"></el-option>
@@ -203,7 +199,7 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="note" label="妫�楠屾弿杩�" width="260" >
+ <el-table-column prop="note" label="妫�楠屾弿杩�" width="160" >
<template slot-scope="scope">
<div v-if="!scope.row.children">
<el-input @blur="changeState(scope.row, scope.$index)" :disabled="scope.row.deviceId == null || (dataForm.id!=null&&resultVal!=null)" v-model="scope.row.note" placeholder="妫�楠屾弿杩�"></el-input>
@@ -241,6 +237,7 @@
element-loading-text="璇风◢绛夛紝鏂囦欢涓婁紶涓�"
>
<el-upload
+ :disabled="dataForm.rawInsNo==null || resultVal!=null"
drag
ref="upload"
action="/mes/rawInsProduct/upload"
@@ -263,6 +260,7 @@
<el-table-column
prop="rawInsNo"
align="center"
+ width="120"
label="鍘熸潗鏂欐楠岀紪鍙�"
show-overflow-tooltip
></el-table-column>
@@ -318,8 +316,8 @@
<el-table border height="90" :data="conclusionTable" ref="conclusion" v-model="conclusion"
:header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}"
:cell-style="{textAlign:'center'}">
- <el-table-column prop="code" label="鐗╂枡缂栧彿"></el-table-column>
- <el-table-column prop="name" label="鐗╂枡鍚嶇О"></el-table-column>
+ <el-table-column prop="code" width="150" show-overflow-tooltip label="鐗╂枡缂栧彿"></el-table-column>
+ <el-table-column prop="name" width="150" show-overflow-tooltip label="鐗╂枡鍚嶇О"></el-table-column>
<el-table-column prop="userName" label="妫�楠屽憳"></el-table-column>
<el-table-column prop="judgeState" label="妫�楠岀粨璁�">
<template slot-scope="scope">
@@ -388,11 +386,13 @@
updateRawInsProduct,
updateRawInspectsById,
getProcessConfigFiles,
+ downloadProcessConfigFile,
deleteProcessConfigFile,
updateDeviceById, chooseIFS} from '@/api/quality/rawMaterial'
import rawMaterialPartDialog from '@/views/common/rawMaterial-part'
import { getStore } from '@/util/store'
import qrCodeApp from '@/views/common/qrCodeApp'
+ import transformImage from '@/util/fileTransform'
export default {
components:{
rawMaterialPartDialog,
@@ -491,6 +491,10 @@
methods:{
tabsClick(tab,even){
if(tab.index == 1){
+ if(this.dataForm.rawInsNo==null){
+ this.$message.error("璇峰厛淇濆瓨鍘熸潗鏂欐楠屼俊鎭�")
+ return
+ }
this.getConfigFiles();
}
},
@@ -504,11 +508,11 @@
})
},
downloadProcessConfigFile(row) {
- // downloadProcessConfigFile(
- // row.fileName,
- // row.bucketName,
- // row.originalFileName
- // )
+ downloadProcessConfigFile({
+ bucket: row.bucketName,
+ fileName: row.fileName,
+ originalFileName: row.originalFileName
+ })
},
delProcessConfigFile(row) {
this.$confirm('鏄惁鍒犻櫎璇ラ檮浠�', '鎻愮ず', {
@@ -516,13 +520,11 @@
cancelButtonText: '鍙栨秷',
type: 'warning',
closeOnClickModal: false
+ }).then(function() {
+ return deleteProcessConfigFile(row.id)
+ }).then((data) => {
+ this.getConfigFiles()
})
- .then(function() {
- return deleteProcessConfigFile(row.id)
- })
- .then((data) => {
- this.getConfigFiles()
- })
},
submitUpload() {
this.paramData.rawInsNo = this.dataForm.rawInsNo
@@ -537,7 +539,6 @@
this.deviceCode = false
},
getDeviceResultInfo(val){
- console.log("鎵弿鍚庢暟鎹�",val);
let id=val.split("id@")[1]
if(id!=undefined&&id!=''&&id!=null){
let filterData=this.deviceList.filter(item=>{
@@ -554,7 +555,7 @@
}
},
codeDevice(row,index){
- this.row=row
+ this.row=row
console.log("row",row);
this.deviceCode =true
this.$refs.codeDeviceCompont.openCamera()
@@ -563,19 +564,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'
});
}
@@ -585,9 +585,9 @@
},
// 鎵撳紑鐩告満
Turnonthecamera() {
- this.qrcode = true
- this.$refs.codeCompont.openCamera()
- },
+ this.qrcode = true
+ this.$refs.codeCompont.openCamera()
+ },
// 纭鍥炶皟
selectPart(param, nodePart, index) {
if (typeof param !== 'undefined') {
@@ -824,16 +824,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,
@@ -970,7 +976,7 @@
.rawMaterial-basic {
background-color: #fff;
- height: 155px;
+ height: 170px;
display: flex;
flex-wrap: wrap;
padding: 10px 20px;
--
Gitblit v1.9.3