From 1ecd9476b211106fde42f3089e7519722f2aa524 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 04 一月 2024 15:25:35 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/quality/finishedProductInspection/finishedProduct-form.vue | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/views/quality/finishedProductInspection/finishedProduct-form.vue b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
index 0ca060a..02dc40e 100644
--- a/src/views/quality/finishedProductInspection/finishedProduct-form.vue
+++ b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
@@ -182,7 +182,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)" placeholder="璇疯緭鍏ユ娴嬪��"></el-input>
+ @blur="changeState(scope.row)" placeholder="璇疯緭鍏ユ楠屾弿杩�"></el-input>
<span v-if="resultVal != null && processInspectVo.id != null"
v-text="scope.row.inote"></span>
</el-tooltip>
@@ -303,7 +303,6 @@
documentId: null,
outBatchNo: null,
locName: null,
- productNo: null,
},
inspectionItems: [], // 鏂板妫�楠岄」鐩〃鏍�
inspectionResultForm: [],
@@ -350,7 +349,7 @@
}
},
codeDevice(row,index){
- this.row=row
+ this.row=row
console.log("row",row);
this.deviceCode =true
this.$refs.codeDeviceCompont.openCamera()
@@ -441,7 +440,6 @@
this.processInspectVo.documentId = result.documentId
this.processInspectVo.outBatchNo = result.outBatchNo
this.processInspectVo.locName = result.locName
- this.processInspectVo.productNo = result.productNo
let userList = []
result.children.forEach(item=>{
item.iid = Math.random()
@@ -628,7 +626,7 @@
updateFinishedInsProduct(obj).then(res => {
if (res.data.code == 0) {
this.init()
- }
+ }
})
}
})
--
Gitblit v1.9.3