From df3e719955cc93b4e762ac75fbb61737fbf3b7a8 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 16 六月 2025 08:38:12 +0800
Subject: [PATCH] 1

---
 WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckOtherill.html |   34 +++++++++++++++++++---------------
 1 files changed, 19 insertions(+), 15 deletions(-)

diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html"
index 84706eb..e9f3cdb 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html"
@@ -1134,7 +1134,7 @@
             //鏂板鎸夐挳
             form.on('submit(btn-AddNew)', function (data) {
                 layer.confirm('鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
-                    location.replace('QC_Add_Edit_FirstPieceCheckBill.html?OperationType=1&linterid=&HSouceBillType=0&closeType=2');
+                    location.replace('/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=1&linterid=&HSouceBillType=0&closeType=2');
                 });
             });
 
@@ -1271,7 +1271,7 @@
                                 shift: 2,
                                 area: ['90%', '90%'],
                                 maxmin: true,
-                                content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckItem.html', 'yes'],
+                                content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckItem.html?openType=2', 'yes'],
                                 btn: ['纭畾', '鍙栨秷']
                                 , btn1: function (index, layero) {
 
@@ -1311,7 +1311,7 @@
                                 shift: 2,
                                 area: ['90%', '90%'],
                                 maxmin: true,
-                                content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectInstruMent.html', 'yes'],
+                                content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectInstruMent.html?openType=2', 'yes'],
                                 btn: ['纭畾', '鍙栨秷']
                                 , btn1: function (index, layero) {
 
@@ -1362,7 +1362,7 @@
                                 shift: 2,
                                 area: ['90%', '90%'],
                                 maxmin: true,
-                                content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectValue.html', 'yes'],
+                                content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectValue.html?openType=2', 'yes'],
                                 btn: ['纭畾', '鍙栨秷']
                                 , btn1: function (index, layero) {
 
@@ -2102,7 +2102,7 @@
                     shift: 2,
                     area: ['90%', '90%'],
                     maxmin: true,
-                    content: ['../../../views/Baseset/鍩虹璧勬枡/Sc_ProcessExchangeBillListView.html', 'yes'],
+                    content: ['../../杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList.html?openType=2', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -2141,7 +2141,7 @@
                     shift: 2,
                     area: ['90%', '90%'],
                     maxmin: true,
-                    content: ['../../鐢熶骇绠$悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html', 'yes'],
+                    content: ['../../鐢熶骇绠$悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html?openType=2', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -2219,7 +2219,7 @@
                     shift: 2,
                     area: ['90%', '90%'],
                     maxmin: true,
-                    content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes'],
+                    content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html?Htype=&openType=2', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -2260,7 +2260,7 @@
                     shift: 2,
                     area: ['90%', '90%'],
                     maxmin: true,
-                    content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes'],
+                    content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html?openType=2', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -2302,7 +2302,7 @@
                     shift: 2,
                     area: ['90%', '90%'],
                     maxmin: true,
-                    content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_WorkShiftList.html?type=HWorkShifts&OperationType=2', 'yes'],
+                    content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_WorkShiftList.html?type=HWorkShifts', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -2340,7 +2340,7 @@
                     shift: 2,
                     area: ['90%', '90%'],
                     maxmin: true,
-                    content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes'],
+                    content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -2373,6 +2373,7 @@
             //琛ㄥご淇℃伅妫�楠屾柟妗堝脊绐�
             form.on('submit(btnSearchQCScheme)', function () {
                 var HName = $("#HMaterName").val();
+                var HProcName = $("#HProcName").val();
                 //椤甸潰灞�-鑷畾涔�
                 layer.open({
                     type: 2,
@@ -2382,7 +2383,7 @@
                     shift: 2,
                     area: ['90%', '90%'],
                     maxmin: true,
-                    content: ['../../璐ㄩ噺绠$悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html?OperationType=1&HName=' + HName + '', 'yes'],
+                    content: ['../../璐ㄩ噺绠$悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html?OperationType=1&HName=' + HName + '&HProcName=' + HProcName + '', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -3520,8 +3521,10 @@
                     data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                     success: function (result) {
                         if (result.count == 1) {
-                            $("#HTakeSampleCheckBillID").val(result.data[0]["hmainid"]);
-                            $("#HTakeSampleCheckBillNo").val(result.data[0]["鍗曟嵁鍙�"]);
+                            if (result.data.length > 0) {
+                                $("#HTakeSampleCheckBillID").val(result.data[0]["hmainid"]);
+                                $("#HTakeSampleCheckBillNo").val(result.data[0]["鍗曟嵁鍙�"]);
+                            }
                         }
                     },
                     error: function (err) {
@@ -3964,16 +3967,17 @@
             }
             //#endregion
 
-            //鑷姩甯﹀嚭妫�楠岄」鐩�
+            //鑷姩甯﹀嚭妫�楠屾柟妗�
             function GetCheckItemID() {
                 var HName = $("#HMaterName").val();
                 var HProName = $("#HProcName").val();
+                var HSourceID = $("#HSourceID").val();
                 if (HName != '' && HName != undefined && HProName != '' && HProName != undefined) {
                     $.ajax({
                         url: GetWEBURL() + "/Web/GetCheckItemID",
                         type: "GET",
                         async: false,
-                        data: { "HName": HName, "HProName": HProName },
+                        data: { "HName": HName, "HProName": HProName, "HSourceID": HSourceID },
                         success: function (result) {
                             if (result.code == 1) {
                                 $("#HQCSchemeID").val(result.data[0].hmainid);

--
Gitblit v1.9.1