From e288d3d5138b9b7e69716d1a4e5cdbb0e0be3462 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期五, 10 十二月 2021 17:39:11 +0800
Subject: [PATCH] 返工单

---
 WebTM/views/模治具管理/模治具管理/Sc_Add_MouldMaintainPlanBillList.html   |    6 
 WebTM/views/生产管理/报工台工序/返工/Sc_MESReturnStepWorkBillList.html     |    6 
 WebTM/views/生产管理/报工台工序/返工/Sc_Add_MESReturnStepWorkBillList.html |  169 ++++++++++++++++++------------------------
 3 files changed, 78 insertions(+), 103 deletions(-)

diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainPlanBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainPlanBillList.html"
index 535c15d..2d4221c 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainPlanBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainPlanBillList.html"
@@ -197,7 +197,7 @@
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;;
                 var AddRow = table.cache['mainTable'];
-                var NewRow = { "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": "0 ", "HUnitNumber": "","HUnitName":"", "HQty": "0   ", "HQtyMust": "0", "HRemark": "  " };
+                var NewRow = { "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": "0 ", "HUnitNumber": "","HUnitName":"", "HQty": "0   ", "HQtyMust": "0", "HRemark": " " };
                 switch (obj.event) {
                     //鏂板涓�琛�
                     case 'btn-AddLine': btnAddLine(NewRow);
@@ -420,7 +420,7 @@
             function set_AddFNew() {
                 //鑾峰彇鏈�澶у崟鎹彿
                 get_MAXNum();
-                option.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": "0 ", "HUnitNumber": "", "HUnitName": "", "HQty": "0   ", "HQtyMust": "0", "HRemark" }];
+                option.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": "0 ", "HUnitNumber": "", "HUnitName": "", "HQty": "0   ", "HQtyMust": "0", "HRemark":"" }];
                 table.render(option);
             }
 
@@ -428,7 +428,7 @@
             function set_EditFromGrid() {
                 set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
                 set_EditGrid(linterid);  //缂栬緫鑾峰彇琛ㄤ綋
-                option.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": "0 ", "HUnitNumber": "", "HUnitName": "", "HQty": "0   ", "HQtyMust": "0", "HRemark"}];
+                option.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": "0 ", "HUnitNumber": "", "HUnitName": "", "HQty": "0   ", "HQtyMust": "0", "HRemark":""}];
                 table.render(option);
             }
 
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\350\277\224\345\267\245/Sc_Add_MESReturnStepWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\350\277\224\345\267\245/Sc_Add_MESReturnStepWorkBillList.html"
index d6c69bc..be5f3ef 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\350\277\224\345\267\245/Sc_Add_MESReturnStepWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\350\277\224\345\267\245/Sc_Add_MESReturnStepWorkBillList.html"
@@ -118,13 +118,14 @@
                                                         </div>
                                                     </div>
                                                     <div class="layui-inline">
-                                                        <label class="layui-form-label">浠诲姟鍗曞彿:</label>
+                                                        <label class="layui-form-label">浠诲姟鍗曞彿</label>
                                                         <div class="layui-input-inline">
-                                                            <input class="layui-input" name="HSourceBillNo" lay-verify="HSourceBillNo" id="HSourceBillNo" disabled autocomplete="off">
-                                                            <input id="HSourceInterID" name="HSourceInterID" type="hidden" />
-                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HSourceBillList" id="HSourceBillList" style="width:40px;">
+                                                            <input type="text" name="HICMOBillNo" id="HICMOBillNo" class="layui-input" value="" style="float:left;width:150px;" readonly="readonly">
+                                                            <input type="hidden" name="HICMOInterID" id="HICMOInterID" class="layui-input" value="" style="float:left;width:150px;">
+                                                            <input type="hidden" name="HICMOEntryID" id="HICMOEntryID" class="layui-input" value="" style="float:left;width:150px;">
+                                                            <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HICMOBillList" id="HICMOBillList" style="width:40px;">
                                                                 <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                            </button>
+                                                            </button>-->
                                                         </div>
                                                     </div>
                                                 </div>
@@ -132,7 +133,7 @@
                                                     <div class="layui-inline">
                                                         <label class="layui-form-label">杩斿伐宸ュ簭</label>
                                                         <div class="layui-input-inline">
-                                                            <input type="text" name="HProcNo" id="HProcNo" class="layui-input" value="" style="float:left;width:150px;">
+                                                            <input type="text" name="HProcName" id="HProcName" class="layui-input" value="" style="float:left;width:150px;">
                                                             <input type="hidden" name="HProcID" id="HProcID" class="layui-input" value="" style="float:left;width:150px;">
                                                             <button type="button" lay-submit="" class="layui-btn" lay-filter="HProcList" id="HProcList" style="width:40px;">
                                                                 <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -166,13 +167,13 @@
                                                     <div class="layui-inline">
                                                         <label class="layui-form-label">浜у搧鍚嶇О:</label>
                                                         <div class="layui-input-inline">
-                                                            <input class="layui-input" name="HMaterName" lay-verify="HMaterName" id="HMaterName" autocomplete="off">
+                                                            <input class="layui-input" name="HMaterName" lay-verify="HMaterName" id="HMaterName" autocomplete="off" readonly="readonly">
                                                         </div>
                                                     </div>
                                                     <div class="layui-inline">
                                                         <label class="layui-form-label">浜у搧瑙勬牸:</label>
                                                         <div class="layui-input-inline">
-                                                            <input class="layui-input" name="HMaterSpec" lay-verify="HMaterSpec" id="HMaterSpec" autocomplete="off">
+                                                            <input class="layui-input" name="HMaterSpec" lay-verify="HMaterSpec" id="HMaterSpec" autocomplete="off" readonly="readonly">
                                                         </div>
                                                     </div>
                                                 </div>
@@ -202,9 +203,17 @@
                                                         <div class="layui-input-inline">
                                                             <input type="text" name="HWorkerName" id="HWorkerName" class="layui-input" value="" style="float:left;width:150px;">
                                                             <input type="hidden" name="HWorkerID" id="HWorkerID" class="layui-input" value="" style="float:left;width:150px;">
-                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" id="HEmpList" style="width:40px;">
+                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HWorkerList" id="HEmpList" 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-form-item">
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">杩斿伐鎻忚堪:</label>
+                                                        <div class="layui-input-inline">
+                                                            <textarea placeholder="璇疯緭鍏ヨ繑宸ユ弿杩�" class="layui-textarea" name="HRemark" id="HRemark" style="width:780px"></textarea>
                                                         </div>
                                                     </div>
                                                 </div>
@@ -398,23 +407,22 @@
                 $("#HPlanBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"))  //杩斿伐鏃ユ湡
                 $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //鍒跺崟鏃ユ湡
                 $("#HMaker").val(sessionStorage["HUserName"]);     //鍒跺崟浜�
-
                 //鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
 
+                $('#HICMOBillNo').attr("disabled", true);
+                $('#HICMOInterID').attr("disabled", true);
+                $('#HICMOBillList').addClass("layui-btn-disabled").attr("disabled", true);
                 $('#HMaterCode').attr("disabled", true);
                 $('#HMaterList').addClass("layui-btn-disabled").attr("disabled", true);
                 $('#HMaterName').attr("disabled", true);
                 $('#HMaterSpec').attr("disabled", true);
-                $('#HBeginDate').attr("disabled", true);
-                $('#HSourceName').attr("disabled", true);
-                $('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
-                $('#HMainSourceBillNo').attr("disabled", true);
-                $('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
+                $('#HProcID').attr("disabled", true);
+                $('#HProcName').attr("disabled", true);
+                $('#HProcList').addClass("layui-btn-disabled").attr("disabled", true);
+                $('#HPlanBeginDate').attr("disabled", true);
                 $('#HDeptName').attr("disabled", true);
                 $('#HDeptList').addClass("layui-btn-disabled").attr("disabled", true);
-                $('#SourceType').attr("disabled", true);
-                form.render('select');
-                $('#HICMOBillNo').attr("disabled", true);
+               
 
                 $.ajax(
                     {
@@ -432,23 +440,24 @@
                             if (data.count == 1)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
                             {
                                 var LoadData = data.data.h_p_JIT_GetInfoByICMOStatusInterID;
-                                $("#HProcID").val(LoadData[0].HProcID); //褰撳墠宸ュ簭ID
-                                $("#HProcName").val(LoadData[0].HProcName); //褰撳墠宸ュ簭
+                               
                                 $("#HMaterID").val(LoadData[0].HMaterID); //浜у搧ID
                                 $("#HMaterCode").val(LoadData[0].HMaterNumber); //浜у搧浠g爜
                                 $("#HMaterName").val(LoadData[0].HMaterName); //浜у搧鍚嶇О
                                 $("#HMaterSpec").val(LoadData[0].HModel); //浜у搧瑙勬牸
-                                $("#HSourceID").val(LoadData[0].HSourceID); //鐢熶骇璧勬簮ID
-                                $("#HSourceName").val(LoadData[0].HSourceName); //鐢熶骇璧勬簮
-                                $("#HMainSourceBillNo").val(LoadData[0].HICMOBillNo); //婧愬崟鍗曞彿锛堟殏鏃跺彇鍊艰鍗曠紪鍙凤級
-                                $("#HMainSourceInterID").val(LoadData[0].HSourceInterID); //婧愬崟涓诲唴鐮�(鍙栧�糎InterID)
-                                $("#HMainSourceEntryID").val(LoadData[0].HSourceEntryID); //婧愬崟瀛愬唴鐮�(婧愬崟琛屽彿)
-                                $("#HMainSourceBillType").val(HSourceBillType); //婧愬崟绫诲瀷
+                               
+                                $("#HICMOInterID").val(LoadData[0].HICMOInterID); //浠诲姟鍗曚富鍐呯爜ID
+                                $("#HICMOEntryID").val(LoadData[0].HICMOEntryID); //浠诲姟鍗曞瓙鍐呯爜ID
+                                $("#HICMOBillNo").val(LoadData[0].HICMOBillNo); //浠诲姟鍗曞彿
+                                $("#HSourceBillType").val(HSourceBillType); //婧愬崟绫诲瀷
+
+                                $("#HProcID").val(LoadData[0].HProcID); //杩斿伐宸ュ簭ID
+                                $("#HProcName").val(LoadData[0].HProcName); //杩斿伐宸ュ簭
+
                                 $("#HDeptID").val(LoadData[0].HDeptID); //杞﹂棿ID
                                 $("#HDeptName").val(LoadData[0].HDeptName); //杞﹂棿
-                                $("#HICMOInterID").val(LoadData[0].HICMOInterID); //鐢熶骇璁㈠崟ID
-                                $("#HICMOEntryID").val(LoadData[0].HICMOEntryID); //鐢熶骇璁㈠崟瀛怚D
-                                $("#HICMOBillNo").val(LoadData[0].HICMOBillNo); //鐢熶骇璁㈠崟
+                                
+                                
                             }
                             else {
                                 layer.alert(data.Message, { icon: 5 });
@@ -464,23 +473,23 @@
             //缂栬緫
             function set_EditFromGrid() {
                 refSav = "Update";
+
+                $('#HICMOBillNo').attr("disabled", true);
+                $('#HICMOInterID').attr("disabled", true);
+                $('#HICMOBillList').addClass("layui-btn-disabled").attr("disabled", true);
                 $('#HMaterCode').attr("disabled", true);
                 $('#HMaterList').addClass("layui-btn-disabled").attr("disabled", true);
                 $('#HMaterName').attr("disabled", true);
                 $('#HMaterSpec').attr("disabled", true);
-                $('#HBeginDate').attr("disabled", true);
-                $('#HSourceName').attr("disabled", true);
-                $('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
-                $('#HMainSourceBillNo').attr("disabled", true);
-                $('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
+                $('#HProcID').attr("disabled", true);
+                $('#HProcName').attr("disabled", true);
+                $('#HProcList').addClass("layui-btn-disabled").attr("disabled", true);
+                $('#HPlanBeginDate').attr("disabled", true);
                 $('#HDeptName').attr("disabled", true);
                 $('#HDeptList').addClass("layui-btn-disabled").attr("disabled", true);
-                $('#SourceType').attr("disabled", true);
-                form.render('select');
-                $('#HICMOBillNo').attr("disabled", true);
 
                 $.ajax({
-                    url: GetWEBURL() + "Sc_MESBeginStepWorkBill/Sc_MESBeginStepWorkBillListCheckDetai",
+                    url: GetWEBURL() + "Sc_MESReturnStepWorkBill/Sc_MESReturnStepWorkBillListCheckDetai",
                     type: "GET",
                     data: {
                         "HID": linterid
@@ -488,33 +497,32 @@
                     success: function (result) {
 
                         if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            var data = result.data.h_v_Sc_MESBeginWorkBillList_NEW[0];
+                            var data = result.data.h_v_Sc_MESReturnWorkBillList[0];
                             form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
                                 "HInterID": data.hmainid
                                 , "HBillNo": data.鍗曟嵁鍙�
                                 , "HDate": formatDate(data.鏃ユ湡)
+                                , "HICMOInterID": data.HICMOInterID                       //鐢熶骇璁㈠崟涓籌D
+                                , "HICMOBillNo": data.浠诲姟鍗�                        //鐢熶骇璁㈠崟
+
                                 , "HProcID": data.HProcID
-                                , "HProcName": data.宸ュ簭鍚嶇О
+                                , "HProcName": data.杩斿伐宸ュ簭鍚嶇О
+                                , "HQty": data.杩斿伐鏁伴噺
+                                , "HPlanBeginDate": formatDate(data.杩斿伐鏃堕棿)
+
                                 , "HMaterID": data.HMaterID
                                 , "HMaterCode": data.浜у搧浠g爜
                                 , "HMaterName": data.浜у搧鍚嶇О
                                 , "HMaterSpec": data.瑙勬牸鍨嬪彿
-                                , "HBeginDate": data.寮�宸ユ椂闂�
-                                , "HSourceID": data.HSourceID              //璧勬簮ID
-                                , "HSourceName": data.璧勬簮鍚嶇О             //璧勬簮鍚嶇О
-                                , "HEmpID": data.HEmpID                   //鎿嶄綔鍛業D
-                                , "HEmpName": data.鐢宠寮�宸ヤ汉鍛�           //鎿嶄綔鍛�
-                                , "HMainSourceInterID": data.HMainSourceInterID                 //婧愬崟ID
-                                , "HMainSourceEntryID": data.HMainSourceEntryID                 //婧愬崟瀛怚D
-                                , "HMainSourceBillNo": data.HMainSourceBillNo                 //婧愬崟鍗曞彿
-                                , "HMainSourceBillType": data.HMainSourceBillType               //婧愬崟绫诲瀷
+
                                 , "HGroupID": data.HGroupID                //鐝粍ID
                                 , "HGroupName": data.鐝粍鍚嶇О              //鐝粍鍚嶇О
                                 , "HDeptID": data.HDeptID                  //閮ㄩ棬ID
                                 , "HDeptName": data.閮ㄩ棬鍚嶇О               //閮ㄩ棬鍚嶇О
-                                , "HICMOInterID": data.HICMOInterID                       //鐢熶骇璁㈠崟涓籌D
-                                , "HICMOEntryID": data.HICMOEntryID                        //鐢熶骇璁㈠崟瀛怚D
-                                , "HICMOBillNo": data.HICMOBillNo                        //鐢熶骇璁㈠崟
+
+                                , "HWorkerID": data.HWorkerID                   //鎿嶄綔鍛業D
+                                , "HWorkerName": data.鎿嶄綔鍛�           //鎿嶄綔鍛�
+
                                 , "HRemark": data.澶囨敞                    //澶囨敞
                                 , "HMaker": data.鍒跺崟浜�                            //鍒跺崟浜�
                                 , "HMakeDate": data.鍒跺崟鏃ユ湡                          //鍒跺崟鏃ユ湡
@@ -558,30 +566,7 @@
                 $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
             }
 
-            //鑾峰彇涓嬫媺閫変腑鍊�
-            form.on('select(SourceType)', function (data) {
-                Sctag = data.value;
-                form.render('select');
-                if (Sctag != "2")  //鏃犳簮鍗�
-                {
-                    $("#HMainSourceInterID").val("");
-                    $("#HMainSourceEntryID").val("");
-                    $("#HMainSourceBillNo").val("");
-                    $("#HMainSourceBillType").val("");
-                    $('#HMainSourceBillNo').attr("disabled", false);
-                    $('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
-                    OperationType = 1;
-                }
-                else {
-                    $('#HMainSourceBillNo').attr("disabled", true);
-                    $('#XDHList').removeClass("layui-btn-disabled").attr("disabled", false);
-                    OperationType = 2;
-                }
-            });
-
-
-
-
+            
 
             //淇濆瓨鎻愪氦
             form.on('submit(Saver)', function (data) {
@@ -594,7 +579,7 @@
                 }
                 $.ajax({
                     type: "POST",
-                    url: GetWEBURL() + "/Sc_MESBeginStepWorkBill/SaveGetMESBeginStepWorkFrom", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    url: GetWEBURL() + "/Sc_MESReturnStepWorkBill/SaveGetMESReturnStepWorkFrom", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
                     async: false,
                     data: { "msg": sMainSub },
                     dataType: "json",
@@ -708,17 +693,17 @@
             });
 
             //杩斿伐宸ュ簭
-            form.on('submit(HSourceList)', function () {
+            form.on('submit(HProcList)', function () {
                 //椤甸潰灞�-鑷畾涔�
                 layer.open({
                     type: 2,
                     skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '璧勬簮鍒楄〃',
+                    title: '宸ュ簭鍒楄〃',
                     closeBtn: 1,
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../../../PublicPage/SourceInformation.html', 'yes'],
+                    content: ['../../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html', 'yes'],
                     btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {
 
@@ -746,7 +731,7 @@
             });
 
             //鎿嶄綔鍛�
-            form.on('submit(HEmpList)', function () {
+            form.on('submit(HWorkerList)', function () {
                 //椤甸潰灞�-鑷畾涔�
                 layer.open({
                     type: 2,
@@ -766,8 +751,8 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HEmpName").val(checkStatus.data[0].HName);
-                        $("#HEmpID").val(checkStatus.data[0].HItemID);
+                        $("#HWorkerName").val(checkStatus.data[0].HName);
+                        $("#HWorkerID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) {
@@ -879,15 +864,11 @@
                 layer.msg("浜у搧缂栫爜涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return Result = false;
             }
-            if ($("#HBeginDate").val() == '' || $("#HBeginDate").val() == null) {
-                layer.msg("寮�宸ユ椂闂翠笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            if ($("#HPlanBeginDate").val() == '' || $("#HPlanBeginDate").val() == null) {
+                layer.msg("杩斿伐鏃堕棿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return Result = false;
             }
-            if ($("#HSourceID").val() == '' || $("#HSourceID").val() == null) {
-                layer.msg("鐢熶骇璧勬簮涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return Result = false;
-            }
-            if ($("#HEmpID").val() == '' || $("#HEmpID").val() == null) {
+            if ($("#HWorkerID").val() == '' || $("#HWorkerID").val() == null) {
                 layer.msg("鎿嶄綔鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return Result = false;
             }
@@ -896,14 +877,8 @@
                 return Result = false;
             }
             if ($("#HDeptID").val() == '' || $("#HDeptID").val() == null) {
-                layer.msg("杞﹂棿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                layer.msg("閮ㄩ棬涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return Result = false;
-            }
-            if (OperationType == "2") {
-                if ($("#HICMOInterID").val() == '' || $("#HICMOInterID").val() == null) {
-                    layer.msg("鐢熶骇璁㈠崟涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return Result = false;
-                }
             }
             return Result;
         }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\350\277\224\345\267\245/Sc_MESReturnStepWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\350\277\224\345\267\245/Sc_MESReturnStepWorkBillList.html"
index 0e8091c..ab74c8c 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\350\277\224\345\267\245/Sc_MESReturnStepWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\350\277\224\345\267\245/Sc_MESReturnStepWorkBillList.html"
@@ -64,7 +64,7 @@
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
                                 <button type="button" class="layui-btn layui-btn-sm layui-btn-disabled" lay-event="btn-Print"><i class="layui-icon layui-icon-print"></i>棰勮</button>
-                                <button type="button" class="layui-btn layui-btn-sm layui-btn-disabled" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
@@ -285,7 +285,7 @@
                     shift: 2,
                     area: ['100%', '100%'],
                     maxmin: true,
-                    content: '../杩斿伐/Sc_Add_MESReturnStepWorkBill.html?OperationType=1&linterid=&HSouceBillType=',
+                    content: '../杩斿伐/Sc_Add_MESReturnStepWorkBillList.html?OperationType=1&linterid=&HSouceBillType=',
                     end: function () {
                         //鍒锋柊椤甸潰,
                         location.reload();
@@ -318,7 +318,7 @@
                         , shade: 0.6 //閬僵閫忔槑搴�
                         , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                         , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: '../杩斿伐/Sc_Add_MESReturnStepWorkBill.html?OperationType=3&linterid=' + linterid+'&HSouceBillType='
+                        , content: '../杩斿伐/Sc_Add_MESReturnStepWorkBillList.html?OperationType=3&linterid=' + linterid+'&HSouceBillType='
                         ,resize: false,
                         end: function () {
                             //鍒锋柊椤甸潰,

--
Gitblit v1.9.1