From 1177e0550f0e80e759664d98d83b2bcef5a6acc0 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期一, 25 十二月 2023 17:24:09 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index fa62b76..b9aa4b5 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>
@@ -241,6 +241,7 @@
element-loading-text="璇风◢绛夛紝鏂囦欢涓婁紶涓�"
>
<el-upload
+ :disabled="dataForm.rawInsNo==null"
drag
ref="upload"
action="/mes/rawInsProduct/upload"
@@ -493,6 +494,10 @@
methods:{
tabsClick(tab,even){
if(tab.index == 1){
+ if(this.dataForm.rawInsNo==null){
+ this.$message.error("璇峰厛淇濆瓨鍘熸潗鏂欐楠屼俊鎭�")
+ return
+ }
this.getConfigFiles();
}
},
@@ -518,13 +523,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
@@ -539,7 +542,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=>{
--
Gitblit v1.9.3