From 9b18523c852a24806937ebb4de3a231abef9173d Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 08 五月 2024 14:56:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/quality/finishedProductInspection/finishedProduct-form.vue | 55 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 34 insertions(+), 21 deletions(-)
diff --git a/src/views/quality/finishedProductInspection/finishedProduct-form.vue b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
index c504af6..e3a41b4 100644
--- a/src/views/quality/finishedProductInspection/finishedProduct-form.vue
+++ b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
@@ -620,22 +620,31 @@
result: this.inspectionResultForm[0].result
}
if (pro > 0) {
- this.$prompt('璇疯緭鍏ヤ笉鍚堟牸鏁伴噺', '涓嶅悎鏍兼暟閲�', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- inputPattern: /^\d+$/,
- inputErrorMessage: '璇疯緭鍏ユ纭暟瀛楁牸寮�'
- }).then(({ value }) => {
- obj.number = value
- updateFinishedInspectById(obj).then(res => {
- if(res.data.data.indexOf("鎴愬姛") > 0){
- this.$message.success("涓婃姤鎴愬姛");
- this.checkTestState()
- }else{
- this.$message.warning(res.data.data)
- }
- });
- }).catch(() => {});
+ obj.number = 1;
+ updateFinishedInspectById(obj).then(res => {
+ if(res.data.data.indexOf("鎴愬姛") > 0){
+ this.$message.success("涓婃姤鎴愬姛");
+ this.checkTestState()
+ }else{
+ this.$message.warning(res.data.data)
+ }
+ });
+ // this.$prompt('璇疯緭鍏ヤ笉鍚堟牸鏁伴噺', '涓嶅悎鏍兼暟閲�', {
+ // confirmButtonText: '纭畾',
+ // cancelButtonText: '鍙栨秷',
+ // inputPattern: /^\d+$/,
+ // inputErrorMessage: '璇疯緭鍏ユ纭暟瀛楁牸寮�'
+ // }).then(({ value }) => {
+ // obj.number = value
+ // updateFinishedInspectById(obj).then(res => {
+ // if(res.data.data.indexOf("鎴愬姛") > 0){
+ // this.$message.success("涓婃姤鎴愬姛");
+ // this.checkTestState()
+ // }else{
+ // this.$message.warning(res.data.data)
+ // }
+ // });
+ // }).catch(() => {});
}else{
updateFinishedInspectById(obj).then(res => {
if(res.data.data.indexOf("鎴愬姛") > 0){
@@ -696,10 +705,14 @@
if(obj.inspectionValue){
arr = obj.inspectionValue.split(",")
}
- obj.empiricalValueAddss = arr
+ this.$set(obj,'empiricalValueAddss',arr)
+ // obj.empiricalValueAddss = arr
if(obj.note){
- snote=obj.inote
- }
+ // obj.inote=obj.note
+ this.$set(obj,'inote',obj.note)
+ }else{
+ this.$set(obj,'inote',null)
+ }
if(arr.length > this.empiricalValueAdd){
this.empiricalValueAdd = arr.length
}
@@ -864,7 +877,7 @@
arr.splice((arr.length-1),1)
let obj = {
devideId: i.eId,
- fpid: row.iid,
+ fpid: i.iid,
inspectionValue: arr.join(","),
note : i.inote
}
@@ -885,7 +898,7 @@
} else {
if (this.empiricalValueAddMaxNumber != this.empiricalValueAdd - 1) {
this.empiricalValueAdd = this.empiricalValueAdd - 1;
- // this.changeRowResult()
+ this.changeRowResult()
this.inspectionItems.forEach(i => {
i.empiricalValueAddss.splice(this.empiricalValueAdd, 1);
});
--
Gitblit v1.9.3