From f980b32cd6d51f2208e07d44014fe6b605533b23 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 11 四月 2024 14:30:10 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before into master
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index f75804b..074517c 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -129,6 +129,9 @@
<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="resultVal==null || dataForm.id==null" size="small"
+ type="primary"
+ @click="saveTable()">淇濆瓨</el-button>
<el-button v-if="dataForm.id==null" size="small" @click="clickAddLine()">娣诲姞妫�楠岄」鐩�</el-button>
<el-button class="pad-addcol-btn" v-if="resultVal==null || dataForm.id==null" size="small" @click="addTeatValueColumn()">娣诲姞妫�娴嬪�煎垪</el-button>
<el-button v-if="resultVal==null || dataForm.id==null" size="small" @click="delTeatValueColumn()">鍒犻櫎妫�娴嬪�煎垪</el-button>
@@ -146,6 +149,8 @@
height="400"
row-key="iid"
default-expand-all
+ highlight-current-row
+ @row-click="handleTable"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}">
<el-table-column type="index" prop="parentIndex" label="搴忓彿" width="60">
<template scope="scope">
@@ -490,6 +495,7 @@
// startTime: [{ required: true, message: '璇烽�夋嫨鎶ユ鏃ユ湡', trigger: 'blur' }]
},
deviceList: [],
+ currentTable:null
}
},
beforeUpdate(){
@@ -698,6 +704,7 @@
if(res.data.code == 0 && (res.data.data=='1'|| res.data.data=='0')){
sessionStorage.setItem("raw-resultVal-"+this.dataForm.id,res.data.data)
this.$message.success("涓婃姤鎴愬姛");
+ this.$router.go(-1)
}else{
this.$message.error("涓婃姤澶辫触锛�",res.data.data);
}
@@ -926,7 +933,7 @@
if(!isTrue){
return
}
- this.changeState(row)
+ // this.changeState(row)
}
},
changeState(row) {
@@ -1021,6 +1028,14 @@
this.deviceList = res.data.data
})
},
+ handleTable(row){
+ this.currentTable = row
+ },
+ saveTable(){
+ if(this.currentTable){}else{
+ this.$message.error("璇烽�夋嫨涓�涓」鐩�")
+ }
+ }
},
}
</script>
--
Gitblit v1.9.3