From d98942fd0d8b9097e5a5ed4e4f2b3161a0174661 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 09 十一月 2023 19:01:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/quality/finishedProductInspection/finishedProduct-form.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/views/quality/finishedProductInspection/finishedProduct-form.vue b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
index e806b33..e13c447 100644
--- a/src/views/quality/finishedProductInspection/finishedProduct-form.vue
+++ b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
@@ -8,7 +8,7 @@
<h2 v-else>缂栬緫-浜у搧妫�楠屽崟</h2>
</div>
<div class="btn-group header-right">
- <el-button @click="addTestProject" v-if="processInspectVo.id==null">鐢熸垚妫�楠岄」鐩�</el-button>
+ <el-button @click="addTestProject" type="primary" v-if="processInspectVo.id==null">鐢熸垚妫�楠岄」鐩�</el-button>
</div>
</div>
<div class="page-main">
@@ -154,7 +154,7 @@
class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�" placement="top-start">
<el-input :disabled="scope.row.eId == null"
v-model="scope.row.inote"
- @blur="changeState(scope.row, index)" placeholder="璇疯緭鍏ユ楠屾弿杩�"></el-input>
+ @blur="changeState(scope.row, index)" placeholder="璇疯緭鍏ユ娴嬪��"></el-input>
<!-- <el-select style="width: 100%;" @change="changeState(scope.row, index)" :disabled="scope.row.eId == null" v-model="scope.row.inote" placeholder="璇烽�夋嫨">
<el-option v-for="item in dataVal" :key="item.value" :label="item.label"
:value="item.value">
@@ -276,7 +276,7 @@
this.init()
},
methods: {
-
+
submitSave(){
let pro = 0
this.inspectionItems.forEach(item => {
@@ -390,7 +390,7 @@
})
},
updateDevice(row,index){
- updateDeviceById({deviceId:row.eId,fpid:row.iId}).then(res=>{
+ updateDeviceById({equiomentId:row.eId,fpid:row.iId}).then(res=>{
this.inspectionItems.forEach(obj=>{
if(obj.children){
obj.children[index-1].inspectionValue = ''
@@ -425,7 +425,7 @@
return
}
let obj = {
- deviceId: row.eId,
+ equiomentId: row.eId,
fpid: row.iid,
inspectionValue: str,
note : row.inote
--
Gitblit v1.9.3