From a12e0abce941275b1d4295790546c673e556cd89 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 16 十二月 2025 17:01:39 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/views/质量管理/检验方案单/QC_Add_CheckProject.html |   25 ++++++++++++++++++++++++-
 1 files changed, 24 insertions(+), 1 deletions(-)

diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
index ade7e56..80f851b 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
@@ -872,6 +872,16 @@
                                             HQCCheckItemID: checkStatus.data[0].HItemID,
                                             HQCCheckItemNumber: checkStatus.data[0].浠g爜,
                                             HQCCheckItemName: checkStatus.data[0].鍚嶇О,
+                                            ////
+                                            HInspectMethodID: checkStatus.data[0].妫�楠屾柟娉旾D,
+                                            HInspectMethodName: checkStatus.data[0].妫�楠屾柟娉�,
+                                            HInspectInstruMentID: checkStatus.data[0].妫�楠屼华鍣↖D,
+                                            HInspectInstruMentName: checkStatus.data[0].妫�楠屼华鍣�,
+                                            HInspectBasisID: checkStatus.data[0].妫�楠屼緷鎹甀D,
+                                            HInspectBasisName: checkStatus.data[0].妫�楠屼緷鎹�,
+                                            HSampleSchemeID: checkStatus.data[0].鎶芥牱鏂规ID,
+                                            HSampleSchemeName: checkStatus.data[0].鎶芥牱鏂规,
+                                            HAnalysisMethod: checkStatus.data[0].鍒嗘瀽鏂规硶,
                                         });
                                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                                     }
@@ -907,13 +917,26 @@
                                     //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
                                 },
                                 end: function () {
-                                    if (OptionData[0].绂佺敤鏍囪 !='Y' || OptionData[0].瀹℃牳浜� != "") {
+                                    if (OptionData[0].瀹℃牳浜� != "") {
                                         //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                         obj.update({
                                             "HQCCheckItemID": OptionData[0].HItemID
                                             , "HQCCheckItemNumber": OptionData[0].浠g爜
                                             , "HQCCheckItemName": OptionData[0].鍚嶇О
+                                            , "HInspectBasisID": OptionData[0].妫�楠屼緷鎹�
+                                            , "HInspectBasisName": OptionData[0].妫�楠屼緷鎹�
+                                            , "HInspectMethodID": OptionData[0].妫�楠屾柟娉旾D
+                                            , "HInspectMethodName": OptionData[0].妫�楠屾柟娉�
+                                            , "HInspectInstruMentID": OptionData[0].妫�楠屼华鍣↖D
+                                            , "HInspectInstruMentName": OptionData[0].妫�楠屼华鍣�
+                                            , "HSampleSchemeID": OptionData[0].鎶芥牱鏂规ID
+                                            , "HSampleSchemeName": OptionData[0].鎶芥牱鏂规
+                                            , "HAnalysisMethod": OptionData[0].鍒嗘瀽鏂规硶
+
+
                                         })
+                                        $('#HAnalysisMethod').find("option[value='" + (OptionData[0].鍒嗘瀽鏂规硶) + "']").attr("selected", true);
+                                        form.render('select');
                                     } else {
                                         layer.msg("璇ユ楠岄」鐩凡绂佺敤鏈鏍革紝璇烽噸鏂伴�夋嫨!");
                                     }

--
Gitblit v1.9.1