From 04b01688f21d62fcaa4c7afe4ffe7002bff38fb7 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期四, 07 九月 2023 13:13:48 +0800
Subject: [PATCH] 1

---
 WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckBill.html |   33 ++++++++++++++++++---------------
 1 files changed, 18 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_PatrolProcCheckBill.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_PatrolProcCheckBill.html"
index 1ed6d9a..aa4f271 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_PatrolProcCheckBill.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_PatrolProcCheckBill.html"
@@ -281,11 +281,11 @@
         var params = getUrlVars();
         if (typeof (params[params[0]]) == "undefined") {
             var OperationType = 1;//鎿嶄綔绫诲瀷
+            var closeType = 2;  //鍏抽棴绫诲瀷
         } else {
             var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
             var linterid = params[params[1]];//婧愬崟id
-            var HEntryID = params[params[2]];//婧愬崟瀛恑d
-            var HSouceBillType = params[params[3]];//婧愬崟绫诲瀷
+            var closeType = params[params[3]];  //鍏抽棴绫诲瀷
         }
 
         layui.config({
@@ -320,7 +320,7 @@
                     , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 75 }
                     , { field: '妫�楠岄」鐩垎绫�', title: '妫�楠岄」鐩垎绫�', event: "", width: 120 }
                     , { field: 'HQCCheckItemID', title: '妫�楠岄」鐩甀D', edit: 'text', hide: true }
-                    , { field: 'HQCCheckItemName', title: '妫�楠岄」鐩悕绉�', edit: 'text', width: 120 }
+                    , { field: 'HQCCheckItemName', title: '妫�楠岄」鐩悕绉�', edit: 'text', width: 480 }
                     , { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text', event: "", width: 95, hide: true }
                     , { field: 'HQCNote1', title: '妫�楠岃褰�1(08:00--12:00)', width: 185, templet: '#HQCNote1' }
                     , { field: 'HQCNote2', title: '妫�楠岃褰�2(13:00--17:00)', width: 185, templet: '#HQCNote2' }
@@ -1018,7 +1018,7 @@
             form.on('submit(HMainProcNumber-BT)', function () {
                 layer.open({
                     type: 2
-                    , area: ['80%', '80%']
+                    , area: ['95%', '95%']
                     , title: '宸ュ簭鍒楄〃'
                     , shade: 0.6 //閬僵閫忔槑搴�
                     //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
@@ -1038,12 +1038,12 @@
                         $("#HMainProcNumber").val(checkStatus.data[0].宸ュ簭浠g爜);
                         $("#HMainProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);
 
-                        var HQCSchemeID_Proc = checkStatus.data[0].HQCSchemeID_Proc;
+                        var HQCSchemeID_Patrol = checkStatus.data[0].HQCSchemeID_Patrol;
 
                         $.ajax({
                             url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
                             type: "GET",
-                            data: { "CheckProjectID": HQCSchemeID_Proc },
+                            data: { "CheckProjectID": HQCSchemeID_Patrol },
                             success: function (result) {
                                 if (result.code == 1) {
                                     var rowdata = [];
@@ -1259,15 +1259,18 @@
 
 
             form.on('submit(Cancel)', function () {
-                //sessionStorage["SourceFlag"] = false;
-                if (linterid == null || linterid == 0) {
-                    parent.location.href = "../../../views/index.html"
-                }
-                else {
-                    var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                    parent.layer.close(index); //鍐嶆墽琛屽叧闂�
-                }
-                //window.close();//鍏抽棴褰撳墠椤�
+                layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    if (OperationType == 1) {
+                        Pub_Close(closeType);
+                    } else if (OperationType == 3) {
+                        Pub_Close(1);
+                    } else if (OperationType == 4) {
+                        Pub_Close(1);
+                    }
+                    else if (OperationType == 2) {
+                        Pub_Close(1);
+                    }
+                });             
             })
 
             form.on('submit(Saver)', function (data) {//淇濆瓨

--
Gitblit v1.9.1