From 6ca81c89d606b5be26c8b8526b191ae8e773167b Mon Sep 17 00:00:00 2001
From: fcx <2246384483@qq.com>
Date: 星期五, 12 十二月 2025 16:00:15 +0800
Subject: [PATCH] 解决1、一致性核对，没有维护的情况下不要求必填
---
pages/QC/SJ/detail.vue | 7 +++
pages/QC/SJ/yzxFrom.vue | 4 ++
pages/QC/SJ/ScanCode.vue | 5 ++
pages/QC/SJ/Add.vue | 49 ++++++++++++++++++------
4 files changed, 51 insertions(+), 14 deletions(-)
diff --git a/pages/QC/SJ/Add.vue b/pages/QC/SJ/Add.vue
index f5ad192..c1cb9e1 100644
--- a/pages/QC/SJ/Add.vue
+++ b/pages/QC/SJ/Add.vue
@@ -253,22 +253,44 @@
},
submit() {
- // 妫�鏌ユ槸鍚﹀凡瀹屾垚涓�鑷存�ф牳瀵�
+ // 妫�鏌ユ槸鍚﹂渶瑕佷竴鑷存�ф牳瀵�
if (this.current && !this.formData.yzxChecked) {
- uni.showModal({
- title: "鎻愮ず",
- content: "璇峰厛瀹屾垚涓�鑷存�ф牳瀵瑰悗鍐嶆彁浜ゆ楠�",
- confirmText: "鍘绘牳瀵�",
- cancelText: "鍙栨秷",
- success: (res) => {
- if (res.confirm) {
- this.toYzxSubmitFrom(this.formData.billNo);
- }
+ // 鍏堟鏌ヨ鐗╂枡鏄惁缁存姢浜嗕竴鑷存�ф牳瀵归」鐩�
+ this.$post({
+ url: "/SJ/getYzxItem",
+ data: {
+ id: this.formData.id
}
+ }).then(res => {
+ // 濡傛灉缁存姢浜嗕竴鑷存�ф牳瀵归」鐩�(components.length > 0),鍒欒姹傚畬鎴愭牳瀵�
+ if (res.data && res.data.length > 0) {
+ uni.showModal({
+ title: "鎻愮ず",
+ content: "璇峰厛瀹屾垚涓�鑷存�ф牳瀵瑰悗鍐嶆彁浜ゆ楠�",
+ confirmText: "鍘绘牳瀵�",
+ cancelText: "鍙栨秷",
+ success: (modalRes) => {
+ if (modalRes.confirm) {
+ this.toYzxSubmitFrom(this.formData.billNo);
+ }
+ }
+ });
+ } else {
+ // 鏈淮鎶や竴鑷存�ф牳瀵归」鐩�,鍏佽鐩存帴鎻愪氦
+ this.submitInspection();
+ }
+ }).catch(() => {
+ // 鎺ュ彛寮傚父,鍏佽鎻愪氦
+ this.submitInspection();
});
return;
}
+ // 宸插畬鎴愪竴鑷存�ф牳瀵规垨涓嶉渶瑕佹牳瀵�,鐩存帴鎻愪氦
+ this.submitInspection();
+ },
+
+ submitInspection() {
this.$post({
url: "/SJ/SJQaSubmit",
data: {
@@ -299,7 +321,7 @@
}
}).catch(err => {
console.log("鎻愪氦鍑洪敊:", err);
- this.$showMessage("鎻愪氦澶辫触锛岃閲嶈瘯");
+ this.$showMessage("鎻愪氦澶辫触,璇烽噸璇�");
})
},
@@ -600,8 +622,9 @@
}
},
onShow() {
- //姣忔杩涘叆椤甸潰閮戒細鎵ц鐨勬柟娉�
- this.init();
+ // 姣忔杩涘叆椤甸潰閮戒細鎵ц鐨勬柟娉�
+ // 娉ㄩ噴鎺塱nit()璋冪敤,閬垮厤瑕嗙洊涓�鑷存�ф牳瀵圭姸鎬�
+ // this.init();
}
};
</script>
diff --git a/pages/QC/SJ/ScanCode.vue b/pages/QC/SJ/ScanCode.vue
index dee1588..06a08c6 100644
--- a/pages/QC/SJ/ScanCode.vue
+++ b/pages/QC/SJ/ScanCode.vue
@@ -100,7 +100,7 @@
// #ifdef MP-WEIXIN
uni.scanCode({
- success(res) {
+ success(res){
self.scanItems[index].snNo = res.result;
},
fail(err) {
@@ -118,7 +118,10 @@
// #ifdef APP-PLUS
uni.scanCode({
+ scanType: ['barCode'], // 鏂板杩欎竴琛�
+ autoDecodeCharset: true, // 鑷姩瑙ｇ爜瀛楃闆�
success(res) {
+ console.log(res)
self.scanItems[index].snNo = res.result;
},
});
diff --git a/pages/QC/SJ/detail.vue b/pages/QC/SJ/detail.vue
index 2754d7e..b418228 100644
--- a/pages/QC/SJ/detail.vue
+++ b/pages/QC/SJ/detail.vue
@@ -245,6 +245,13 @@
return 0;
}
});
+
+ // 鎺掑簭鍚庤嚜鍔ㄨ烦杞埌绗竴涓爣绛�
+ this.currentTab = 0;
+ if (this.tabs.length > 0) {
+ this.id = this.tabs[0].id;
+ this.refreshResult();
+ }
} else {
// 娌℃湁椤圭洰鏃惰嚦灏戞坊鍔犲綋鍓嶉」鐩埌鏍囩
this.tabs = [{id: this.id, projName: this.formData.projName || '褰撳墠椤圭洰'}];
diff --git a/pages/QC/SJ/yzxFrom.vue b/pages/QC/SJ/yzxFrom.vue
index 285449f..fe978d1 100644
--- a/pages/QC/SJ/yzxFrom.vue
+++ b/pages/QC/SJ/yzxFrom.vue
@@ -168,6 +168,10 @@
prevPage.$vm.formData.yzxChecked = true;
}
}
+ // 鑷姩杩斿洖涓婁竴椤� 澧炲姞鐨�
+ setTimeout(() => {
+ uni.navigateBack();
+ }, 1500);
}else{
uni.showModal({
title: "鎻愮ず",
--
Gitblit v1.9.3