From 226b08b8a5f3ecab663d6b0e02b48c3e16e644e0 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 26 六月 2025 14:34:49 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_QCCheckClass.html |  220 ++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 187 insertions(+), 33 deletions(-)

diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_QCCheckClass.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_QCCheckClass.html"
index df96f47..b1aa636 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_QCCheckClass.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_QCCheckClass.html"
@@ -8,6 +8,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <style type="text/css">
         .layui-form-label {
             width: 85px;
@@ -23,17 +24,18 @@
                     <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
                         <div class="layui-card-header">
                             <div class="layui-btn-group">
-
                                 <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
                                 <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
-
-
                             </div>
-
                         </div>
                         <div class="layui-card-body">
                             <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                                <ul class="layui-tab-title" lay-filter="tab-all">
+                                    <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                                    <li>鍏朵粬淇℃伅</li>
+                                </ul>
                                 <div class="layui-tab-content">
+                                    <!--鍩烘湰淇℃伅-->
                                     <div class="layui-tab-item layui-show">
                                         <div class="layui-form-item">
                                             <div class="layui-inline">
@@ -57,26 +59,108 @@
                                                 </div>
                                             </div>
                                             <!--<div class="layui-inline">
-                                                <label class="layui-form-label">妫�楠岄」鐩被鍒被鍒�</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HQCCheckClassName" id="HQCCheckClassName" class="layui-input" value="0" style="float:left;width:150px;">
-                                                    <input type="hidden" name="HQCCheckClassID" id="HQCCheckClassID" class="layui-input" value="0" style="float:left;width:150px;">
-                                                    <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HQCCheckClassList" style="width:40px;">
-                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                    </button>
+            <label class="layui-form-label">妫�楠岄」鐩被鍒被鍒�</label>
+            <div class="layui-input-inline">
+                <input type="text" name="HQCCheckClassName" id="HQCCheckClassName" class="layui-input" value="0" style="float:left;width:150px;">
+                <input type="hidden" name="HQCCheckClassID" id="HQCCheckClassID" class="layui-input" value="0" style="float:left;width:150px;">
+                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HQCCheckClassList" style="width:40px;">
+                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                </button>
+            </div>
+        </div>-->
+                                           
+                                        </div>
+                                        <div class="layui-row">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 85px;">浣跨敤缁勭粐</label>
+                                                <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                                    <input type="hidden" class="layui-input" lay-verify="HCREATEORGID" name="HCREATEORGID" id="HCREATEORGID">
+                                                    <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+                                                        <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                    </select>
                                                 </div>
-                                            </div>-->
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 85px;">浣跨敤鏍囧織</label>
+                                                <div class="layui-input-block" style="margin-left: 130px; width: 190px;">
+                                                    <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag">
+                                                        <option value="鏈娇鐢�" selected="selected">鏈娇鐢�</option>
+                                                        <option value="宸蹭娇鐢�">宸蹭娇鐢�</option>
+                                                        <option value="鏈娴�">鏈娴�</option>
+                                                    </select>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-row">
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">澶囨敞</label>
                                                 <div class="layui-input-inline">
                                                     <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
                                                 </div>
                                             </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">绂佺敤鏍囧織</label>
+                                                <div class="layui-input-block">
+                                                    <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="">
+                                                </div>
+                                            </div>
                                         </div>
+                                    </div>
+                                    <!--鍏朵粬淇℃伅-->
+                                    <div class="layui-tab-item">
                                         <div class="layui-form-item">
-                                            <label class="layui-form-label">绂佺敤鏍囧織</label>
-                                            <div class="layui-input-block">
-                                                <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" checked="">
+                                            <div class="layui-row">
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 85px;">鍒涘缓浜�</label>
+                                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                                        <input type="text" class="layui-input" name="HMakeEmp" id="HMakeEmp" style="background-color:#efefef4d;" readonly>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 85px;">淇敼浜�</label>
+                                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                                        <input type="text" class="layui-input" name="HModifyEmp" id="HModifyEmp" style="background-color:#efefef4d;" readonly>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 85px;">绂佺敤浜�</label>
+                                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                                        <input type="text" class="layui-input" name="HStopEmp" id="HStopEmp" style="background-color:#efefef4d;" readonly>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 85px;">瀹℃牳浜�</label>
+                                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                                        <input type="text" class="layui-input" name="HCheckEmp" id="HCheckEmp" style="background-color:#efefef4d;" readonly>
+                                                    </div>
+                                                </div>
+
+                                            </div>
+                                            <div class="layui-row">
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 85px;">鍒涘缓鏃ユ湡</label>
+                                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                                        <input type="text" class="layui-input" name="HMakeTime" id="HMakeTime" style="background-color:#efefef4d;" readonly>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 85px;">淇敼鏃ユ湡</label>
+                                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                                        <input type="text" class="layui-input" name="HModifyTime" id="HModifyTime" style="background-color:#efefef4d;" readonly>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 85px;">绂佺敤鏃ユ湡</label>
+                                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                                        <input type="text" class="layui-input" name="HStopTime" id="HStopTime" style="background-color:#efefef4d;" readonly>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label" style="width: 85px;">瀹℃牳鏃ユ湡</label>
+                                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                                        <input type="text" class="layui-input" name="HCheckTime" id="HCheckTime" style="background-color:#efefef4d;" readonly>
+                                                    </div>
+                                                </div>
                                             </div>
                                         </div>
                                     </div>
@@ -93,8 +177,9 @@
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
     <script>
-//鑾峰彇鍙傛暟
+        //鑾峰彇鍙傛暟
         function getUrlVars() {
             var vars = [], hash;
             var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
@@ -106,11 +191,9 @@
             return vars;
         }
 
-
-
         var params = getUrlVars();
         var hID = params[params[0]];//缂栬緫鏌ョ湅
-        var HType = params[params[1]];    //鍗曟嵁鐘舵��
+        var OperationType = params[params[1]];    //鍗曟嵁鐘舵��
         var TagParentId = params[params[2]];  //鐖剁骇ID
 
         layui.config({
@@ -127,6 +210,34 @@
                 , element = layui.element;
 
             //甯歌鐢ㄦ硶
+            Organ();
+            $("#HStopflag").attr("disabled", true);
+            $("#HUseFlag").attr("disabled", true);
+            layui.form.render('checkbox');
+
+
+            if (OperationType == 1) {   //鏂板
+                hID = 0;
+                $("#HMakeEmp").val(sessionStorage["HUserName"]);
+
+            } else if (OperationType == 2) {
+                RoadBillMain(hID);
+                $("#HMakeEmp").val(sessionStorage["HUserName"]);
+                $("#HModifyEmp").val("");
+                $("#HStopEmp").val("");
+                $("#HCheckEmp").val("");
+                $("#HMakeTime").val("");
+                $("#HModifyTime").val("");
+                $("#HStopTime").val("");
+                $("#HCheckTime").val("");
+                $("#HNumber").val("");
+                $("#HItemID").val(0);
+                hID = 0;
+            } else if (OperationType == 3) {
+                RoadBillMain(hID);
+
+            }
+
 
             //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
             //if (sessionStorage.login != "login") {
@@ -135,31 +246,31 @@
             //    }, function () { window.location.href = "../../user/login.html"; });
             //}
 
+            //#region 澶撮儴宸ュ叿鏍忎簨浠�
 
-
+            //娓呴櫎
             form.on('submit(Cancel)', function () {
                 //sessionStorage["SourceFlag"] = false;
                 parent.location.href = "../../../views/index.html"
                 //window.close();//鍏抽棴褰撳墠椤�
             })
-
-
-
+            //淇濆瓨
             form.on('submit(Saver)', function (data) {//淇濆瓨
                 //debugger;
-                var ModRightNameAdd = 'Gy_RepairType_Edit';
+                var ModRightNameAdd = 'Gy_QCCheckClass_Edit';
                 var user = sessionStorage["HUserName"];
                 var arr = new Array();
                 var isEndCheck = document.getElementById("HStopflag").checked;
                 data.field.HStopflag = isEndCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
 
+                hID = hID == "" ? 0 : hID;
                 data.field.HItemID = hID == "" ? 0 : hID;
 
                 data.field.HParentID = TagParentId == "" ? 0 : TagParentId;
 
                 var oMain = JSON.stringify(data.field)
                 var sMainSub = oMain + ';' + hID + ';' + user + ';' + ModRightNameAdd;
-                if (HType == "Modify") {
+                if (OperationType == "3") {
 
                     $.ajax(
                         {
@@ -185,7 +296,7 @@
                             },
                             error: function (err) {
 
-                                f_alert("閿欒:" + err);
+                                f_alert("閿欒:" + err.responseText);
                                 console.log("Reason" + sMainStr);
                             }
                         });
@@ -196,7 +307,7 @@
                             type: "POST",
                             url: GetWEBURL() + "/Gy_QCCheckClass/AddBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
                             async: true,
-                            data: { "oMain": oMain },
+                            data: { "oMain": sMainSub },
                             dataType: "json",
                             success: function (data) {
                                 if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -215,24 +326,54 @@
                             },
                             error: function (err) {
 
-                                f_alert("閿欒:" + err);
+                                f_alert("閿欒:" + err.responseText);
                                 console.log("Reason" + sMainStr);
                             }
                         });
                 }
             });
+            //閫�鍑烘寜閽�
+            form.on('submit(Exit)', function () {
+                Pub_Close(1);
+            })
+            //#endregion
+
             function f_alert(sMsg) {
                 layer.alert(sMsg, { icon: 5 });
 
             }
 
-            if (HType == "Modify") {
+            //鑾峰彇缁勭粐
+            function Organ() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                var Organization = '';
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    async: false,
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HUSEORGID").append(Organization);
+                            $("#HUSEORGID").val(sessionStorage["OrganizationID"])
+                            $("#HCREATEORGID").val(sessionStorage["OrganizationID"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+
+            function RoadBillMain(linterid) {
                 $.ajax({
                     url: GetWEBURL() + "/Gy_QCCheckClass/xg",
-                    //url: "http://localhost:12761/Gy_Department/xg",
                     type: "GET",
+                    async: false,
                     data: {
-                        "HInterID": hID
+                        "HInterID": linterid
                     },
                     success: function (d) {
                         console.log(d);
@@ -243,6 +384,18 @@
                         $("#HQCCheckClassID").val(d.data[0].HQCCheckClassID);
                         $("#HQCCheckClassName").val(d.data[0].HQCCheckClassName);
                         $("#HRemark").val(d.data[0].HRemark);
+
+                        $("#HUSEORGID").val(d.data[0].HUSEORGID);
+                        $("#HMakeEmp").val(d.data[0].HMakeEmp);
+                        $("#HMakeTime").val(d.data[0].HMakeTime == null ? "" : Format(new Date(d.data[0].HMakeTime), "yyyy-MM-dd"));
+                        $("#HCheckEmp").val(d.data[0].HCheckEmp);
+                        $("#HCheckTime").val(d.data[0].HCheckTime == null ? "" : Format(new Date(d.data[0].HCheckTime), "yyyy-MM-dd"));
+                        $("#HModifyEmp").val(d.data[0].HModifyEmp);
+                        $("#HModifyTime").val(d.data[0].HModifyTime == null ? "" : Format(new Date(d.data[0].HModifyTime), "yyyy-MM-dd"));
+                        $("#HStopEmp").val(d.data[0].HStopEmp);
+                        $("#HStopTime").val(d.data[0].HStopTime == null ? "" : Format(new Date(d.data[0].HStopTime), "yyyy-MM-dd"));
+                        $("#HUseFlag").val(d.data[0].HUseFlag);
+
                         $("input[name='HStopflag']").prop("checked", d.data[0].HStopflag);//true:閫変腑 false:涓嶉�変腑
                         layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
                         $("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
@@ -254,8 +407,6 @@
                 });
             }
 
-
-
             //鐩戝惉鎻愪氦
             form.verify({
                 numberOrEmpty: function (value, item) {
@@ -266,6 +417,7 @@
                     //}
                 }
             });
+
 
             //妫�楠岄」鐩被鍒被鍒脊绐�
             form.on('submit(HQCCheckClassList)', function () {
@@ -304,6 +456,8 @@
                     }
                 });
             });
+
+           
         });
     </script>
 </body>

--
Gitblit v1.9.1