From 5881cf33d6410528f713f8b49c708d83cff27c11 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期二, 26 十二月 2023 14:33:34 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 42 +++++++++++++++++++++++-------------------
1 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 5b45117..5a05f43 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>
@@ -115,14 +115,14 @@
<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-col :sm="12" :lg="18"></el-col>
+ <el-col :sm="4" :lg="2" 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-col :sm="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-col :sm="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>
@@ -241,6 +241,7 @@
element-loading-text="璇风◢绛夛紝鏂囦欢涓婁紶涓�"
>
<el-upload
+ :disabled="dataForm.rawInsNo==null"
drag
ref="upload"
action="/mes/rawInsProduct/upload"
@@ -388,11 +389,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 +494,10 @@
methods:{
tabsClick(tab,even){
if(tab.index == 1){
+ if(this.dataForm.rawInsNo==null){
+ this.$message.error("璇峰厛淇濆瓨鍘熸潗鏂欐楠屼俊鎭�")
+ return
+ }
this.getConfigFiles();
}
},
@@ -504,11 +511,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 +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
@@ -537,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