From 860b467d074e8654c6b358dd22c12cd49a1c011f Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 17 十一月 2021 16:44:52 +0800
Subject: [PATCH] 生产领料单

---
 WebTM/views/领料发货/领料出库/Kf_MateOutBillLEdit.html |  177 +++++++++++++++++++++++---------------------
 WebTM/views/领料发货/领料出库/Kf_MateOutBillList.html  |   18 ++--
 2 files changed, 102 insertions(+), 93 deletions(-)

diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillLEdit.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillLEdit.html"
index 321f510..0f6ecd8 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillLEdit.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillLEdit.html"
@@ -68,12 +68,7 @@
                                                     <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                                 </div>
                                             </div>
-                                            <div class="layui-inline">
-                                                <label class="layui-form-label">鍐呴儴鍗曟嵁鍙�</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HInnerBillNo" id="HInnerBillNo" class="layui-input">
-                                                </div>
-                                            </div>
+                                            
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">浠撳簱<label style="color:red"> * </label></label>
                                                 <div class="layui-input-inline">
@@ -87,7 +82,7 @@
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">楠屾敹鍛�<label style="color:red"> * </label></label>
+                                                <label class="layui-form-label">棰嗘枡鍛�<label style="color:red"> * </label></label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HSecManagerName" id="HSecManagerName" readonly class="layui-input" value="" style="float:left;width:150px;">
                                                     <input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="" style="float:left;width:150px;">
@@ -116,49 +111,32 @@
                                                     </button>
                                                 </div>
                                             </div>
-                                            <div class="layui-inline">
-                                                <label class="layui-form-label">婧愬崟绫诲瀷</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HSourceBillType" id="HSourceBillType" class="layui-input" value="" style="float:left;width:150px;">
-                                                </div>
-                                            </div>
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">寰�鏉ョ被鍨�</label>
+                                                <label class="layui-form-label">涓荤<label style="color:red"> * </label></label>
                                                 <div class="layui-input-inline">
-                                                    <select name="HSupTypeID" id="HSupTypeID" lay-filter="HSupTypeID" class="layui-input" value="" style="float:left;width:150px">
-                                                        <option value="1">渚涘簲鍟�</option>
-                                                        <option value="2">瀹㈡埛</option>
-                                                        <option value="3">杞﹂棿閮ㄩ棬</option>
-                                                    </select>
-                                                </div>
-                                            </div>
-                                            <div class="layui-inline">
-                                                <label class="layui-form-label">寰�鏉ュ崟浣�<label style="color:red"> * </label></label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HSupName" id="HSupName" readonly class="layui-input" value="" style="float:left;width:150px;">
-                                                    <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;">
-                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
+                                                    <input type="text" name="HMangerName" id="HMangerName" readonly class="layui-input" value="" style="float:left;width:150px;">
+                                                    <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HManger" 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">
+                                                    <input type="text" name="HSourceBillType" id="HSourceBillType" class="layui-input" value="" style="float:left;">
+                                                </div>
+                                            </div>
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">閫夊崟鍙�</label>
                                                 <div class="layui-input-inline">
-                                                    <input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;">
                                                 </div>
                                             </div>
-                                            <div class="layui-inline">
-                                                <label class="layui-form-label">鎽樿</label>
-                                                <div class="layui-input-inline">
-                                                    <textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="HExplanation" id="HExplanation"></textarea>
-                                                </div>
-                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">澶囨敞</label>
                                                 <div class="layui-input-inline">
@@ -174,7 +152,7 @@
                         <div class="layui-tab layui-tab-card" lay-filter="TabTest">
                             <ul class="layui-tab-title">
                                 <li class="layui-this">鏄庣粏淇℃伅</li>
-                                <li>姹囨�讳俊鎭�</li>
+                                <!--<li>姹囨�讳俊鎭�</li>-->
                             </ul>
                             <div class="layui-tab-content">
                                 <div class="layui-tab-item layui-show">
@@ -213,7 +191,6 @@
             var OperationType = 1;//鎿嶄綔绫诲瀷
             var closeType = 2;  //鍏抽棴绫诲瀷
         } else {
-            debugger;
             var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
             var linterid = params[params[1]];//婧愬崟id
             var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
@@ -238,10 +215,8 @@
             var option = [];
             var option1 = [];
             var sWhere = "";
-            var sBillType = "3801";
+            var sBillType = "1204";
             //#endregion
-
-
             //#region 杩涘叆椤甸潰鏃㈠姞杞�
             //鍒濆鍖栬〃鍗曟彃浠�
             set_InitFrom();
@@ -266,7 +241,7 @@
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;;
                 var AddRow = table.cache['mainTable'];
-                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "","HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" };
+                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" };
                 console.log(NewRow);
                 switch (obj.event) {
                     //鏂板涓�琛�
@@ -356,6 +331,44 @@
                     }
                 });
             });
+            //涓荤
+            form.on('submit(HManger)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '楠屾敹鍛樺垪琛�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/UserInformation.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                          $("#HMangerName").val(checkStatus.data[0].HName);
+                        $("#HManagerID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+            
             //琛ㄥご淇℃伅淇濈鍛樺脊绐�
             form.on('submit(HKeeperList)', function () {
                 //椤甸潰灞�-鑷畾涔�
@@ -453,7 +466,6 @@
             }
             //琛ㄥご淇℃伅寰�鏉ュ崟浣嶅脊绐�
             form.on('submit(HSupList)', function () {
-                debugger;
                 if ($("#HSupTypeID").val() == 0 || $("#HSupTypeID").val() == null) {
                     return layer.msg('璇烽�夋嫨寰�鏉ョ被鍨�');
                 }
@@ -503,7 +515,6 @@
                 if (linterid != "" && linterid != null) {
                     refSav = "Update";
                 }
-                //debugger;
                 data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
                 var sMainStr = JSON.stringify(data.field);
                 var sSubStr = JSON.stringify(table.cache['mainTable']);
@@ -516,7 +527,7 @@
                 $.ajax(
                     {
                         type: "POST",
-                        url: GetWEBURL() + "/Sc_MouldProdInHouseBill/SaveGetMouldProdInHouseBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        url: GetWEBURL() + "/Kf_MateOutBill/SaveGetMateOutBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
                         async: true,
                         data: { "msg": sMainSub },
                         dataType: "json",
@@ -670,33 +681,28 @@
                     elem: '#HDate'
                 });
             }
+
+            
+
             //鍒濆鍖栨槑缁嗚〃鏍�
             function set_InitGrid() {
                 columns = [
                     { type: 'checkbox', fixed: 'left' }
                     , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
                     , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
-                    , { field: 'HMaterCode', title: '鍣ㄥ叿浠g爜', edit: 'text', event: 'HMaterCode', width: 100 }
-                    , { field: 'HMaterName', title: '鍣ㄥ叿鍚嶇О', edit: 'text', width: 100 }
+                    , { field: 'HMaterCode', title: '鐗╂枡浠g爜', edit: 'text', event: 'HMaterCode', width: 100 }
+                    , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', edit: 'text', width: 100 }
                     , { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
-                    , { field: 'HBatchNo', title: '鎵规', edit: 'text', width: 100 }
                     , { field: 'HUnitID', title: 'HUnitID', edit: 'text', width: 100, hide: true }
                     , { field: 'HUnitCode', title: '璁¢噺鍗曚綅浠g爜', edit: 'text', event: 'HUnitCode', width: 100 }
                     , { field: 'HUnitName', title: '璁¢噺鍗曚綅', edit: 'text', width: 100 }
-                    , { field: 'HDesignLife', title: '璁捐瀵垮懡', edit: 'text', width: 100 }
-                    , { field: 'HLeaveLife', title: '鍓╀綑瀵垮懡', edit: 'text', width: 100 }
-                    , { field: 'HUseLife', title: '浣跨敤瀵垮懡', edit: 'text', width: 100 }
-                    , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', edit: 'text', width: 100 }
-                    , { field: 'HQty', title: '瀹炴敹鏁伴噺', edit: 'text', width: 100 }
+                    , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', edit: 'text', width: 100 }
+                    , { field: 'HQty', title: '瀹炲彂鏁伴噺', edit: 'text', width: 100 }
                     , { field: 'HPrice', title: '鍗曚环', edit: 'text', width: 100 }
                     , { field: 'HMoney', title: '閲戦', edit: 'text', width: 100 }
                     , { field: 'HWHID', title: 'HWHID', edit: 'text', width: 100, hide: true }
-                    , { field: 'HWHCode', title: '鏀舵枡浠撳簱浠g爜', edit: 'text', event: 'HWHCode', width: 120 }
-                    , { field: 'HWHName', title: '鏀舵枡浠撳簱鍚嶇О', edit: 'text', width: 120 }
-                    , { field: 'HSPID', title: 'HSPID', edit: 'text', width: 100, hide: true }
-                    , { field: 'HSPCode', title: '鏀舵枡浠撲綅浠g爜', edit: 'text', event: 'HSPCode', width: 120 }
-                    , { field: 'HSPName', title: '鏀舵枡浠撲綅鍚嶇О', edit: 'text', width: 120 }
-                    , { field: 'HStockOrgID', title: 'HStockOrgID', width: 100, hide: true }
+                    , { field: 'HWHCode', title: '鍙戞枡浠撳簱浠g爜', edit: 'text', event: 'HWHCode', width: 120 }
+                    , { field: 'HWHName', title: '鍙戞枡浠撳簱鍚嶇О', edit: 'text', width: 120 }
                     , { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 100 }
                     , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
                 ];
@@ -748,7 +754,7 @@
             function set_AddFNew() {
                 //鑾峰彇鏈�澶у崟鎹彿
                 get_MAXNum();
-                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "","HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
+                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HRemark": "" }];
                 table.render(option);
             }
             //鑾峰彇鏈�澶у崟鎹彿
@@ -772,13 +778,13 @@
             function set_EditFromGrid(linterid) {
                 set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
                 set_EditGrid(linterid);  //缂栬緫鑾峰彇琛ㄤ綋
-                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "","HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
+                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HRemark": "" }];
                 table.render(option);
             }
             //缂栬緫鑾峰彇琛ㄥご
-            function set_EditForm(linterid) {
+            function set_EditForm(linterid){
                 $.ajax({
-                    url: GetWEBURL() + "Sc_MouldProdInBill/Sc_MouldProdInHouseBillListCheckDetai",
+                    url: GetWEBURL() + "Kf_MateOutBill/Kf_MateOutBillListCheckDetai",
                     type: "GET",
                     data: {
                         "HID": linterid
@@ -790,22 +796,20 @@
                             form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
                                 "HBillNo": data.鍗曟嵁鍙�
                                 , "HDate": formatDate(data.鏃ユ湡)
-                                , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
-                                , "HWHID": data.HWHID                    //浠撳簱ID
+                                //, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
+                                , "HWHID": data.HWHIDMain                    //浠撳簱ID
                                 , "HWHName": data.浠撳簱                   //浠撳簱鍚嶇О
                                 , "HSecManagerID": data.hsecmanagerid    //楠屾敹鍛業D
-                                , "HSecManagerName": data.楠屾敹鍛�         //楠屾敹鍛樺悕绉�
+                                , "HSecManagerName": data.棰嗘枡鍛�         //楠屾敹鍛樺悕绉�
                                 , "HKeeperID": data.hkeeperid            //淇濈鍛業D
                                 , "HKeeperName": data.淇濈鍛�             //淇濈鍛樺悕绉�
+                                , "HManagerID": data.hmanagerid             //淇濈鍛樺悕绉�
+                                , "HMangerName": data.涓荤             //淇濈鍛樺悕绉�
                                 , "HDeptID": data.HDeptID                 //閮ㄩ棬ID
                                 , "HDeptName": data.閮ㄩ棬                  //閮ㄩ棬鍚嶇О
                                 , "HSourceBillType": data.婧愬崟绫诲瀷        //婧愬崟绫诲瀷
                                 , "XDH": ""                               //閫夊崟鍙�
-                                , "HExplanation": data.鎽樿              //鎽樿
                                 , "HRemark": data.琛ㄥご澶囨敞                    //澶囨敞
-                                , "HSupTypeID": data.寰�鏉ョ被鍨�                             //閫夊崟鍙�
-                                , "HSupName": data.寰�鏉ュ崟浣�              //鎽樿
-                                , "HSupID": data.HSupID                    //澶囨敞
                             });
 
                         } else {
@@ -821,21 +825,21 @@
                 $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
                 //缂栬緫鍔犺浇鏁版嵁
                 $.ajax({
-                    url: GetWEBURL() + 'Sc_MouldProdInBill/Sc_MouldScrapInProdBillListProjectDetai',
+                    url: GetWEBURL() + 'Kf_MateOutBill/Kf_MateOutBillListProjectDetai',
                     type: "GET",
                     data: { "sqlWhere": "and hmainid=" + linterid },
                     success: function (result) {
                         if (result.count == 1) {
                             option.data = result.list[0];
                             table.render(option);
-                            option1.data = result.list[1];
-                            table.render(option1);
+                            //option1.data = result.list[1];
+                            //table.render(option1);
 
                         } else {
                             layer.alert(result.code + result.Message, { icon: 5 });
                         }
                     }, error: function () {
-                        layer.close(index0);
+                        layer.close();
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
@@ -918,12 +922,12 @@
                             layer.open({
                                 type: 2,
                                 skin: 'layui-layer-rim', //鍔犱笂杈规
-                                title: '鍣ㄥ叿鍒楄〃',
+                                title: '鐗╂枡鍒楄〃',
                                 closeBtn: 1,
                                 shift: 2,
                                 area: ['80%', '80%'],
                                 maxmin: true,
-                                content: ['../../PublicPage/MouldInformation.html', 'yes'],
+                                content: ['../../PublicPage/PartInformation.html', 'yes'],
                                 btn: ['纭畾', '鍙栨秷']
                                 , btn1: function (index, layero) {
 
@@ -999,7 +1003,7 @@
                                 }
                             });
                         }
-                       
+
                         //璁¢噺鍗曚綅浠g爜
                         if (obj.event === 'HUnitCode')  //璁¢噺鍗曚綅浠g爜
                         {
@@ -1149,7 +1153,7 @@
                     return Result = false;
                 }
                 if ($("#HSecManagerID").val() == '' || $("#HSecManagerID").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 ($("#HKeeperID").val() == '' || $("#HKeeperID").val() == null) {
@@ -1160,7 +1164,10 @@
                     layer.msg("閮ㄩ棬涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return Result = false;
                 }
-
+                if ($("#HManagerID").val() == '' || $("#HManagerID").val() == null) {
+                    layer.msg("涓荤涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
                 if (typeof (sSubStr) == "undefined" || sSubStr == "") {
                     layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return Result = false;
@@ -1168,16 +1175,16 @@
                 if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
                     sSubStr = JSON.parse(sSubStr);
                     for (var i = 0; i < sSubStr.length; i++) {
-                        if (sSubStr[i].HMaterID == "") {
-                            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鍣ㄥ叿淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            return Result = false;
-                        }
+                        //if (sSubStr[i].HMaterID == "") {
+                        //    layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐗╂枡淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        //    return Result = false;
+                        //}
                         if (sSubStr[i].HUnitID == "") {
                             layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璁¢噺鍗曚綅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                             return Result = false;
                         }
                         if (sSubStr[i].HWHID == "") {
-                            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鏀舵枡浠撳簱涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鍙戞枡浠撳簱涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                             return Result = false;
                         }
                     }
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillList.html"
index aa8258c..f032aeb 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillList.html"
@@ -112,11 +112,13 @@
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
                                 <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
 
                             </div>
@@ -209,13 +211,13 @@
                     , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
                     , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
                     , { field: '绾㈣摑鍗曟爣璁�', title: '绾㈣摑鍗曟爣璁�', width: 160 }
-                    , { field: 'HEmpID', title: 'HEmpID', width: 200, hide: true }
-                    , { field: '涓氬姟鍛�', title: '涓氬姟鍛�', width: 200 }
-                    , { field: 'hmanagerid', title: 'hmanagerid', width: 200, hide: true }
-                    , { field: '涓荤', title: '涓荤', width: 200 }
+                    , { field: '浠撳簱', title: '浠撳簱', width: 160 }
+                    , { field: 'hsecmanagerid', title: 'hsecmanagerid', width: 200, hide: true }
                     , { field: '棰嗘枡鍛�', title: '棰嗘枡鍛�', width: 200 }
                     , { field: 'hkeeperid', title: 'hkeeperid', width: 200, hide: true }
                     , { field: '淇濈鍛�', title: '淇濈鍛�', width: 160 }
+                    , { field: 'hmanagerid', title: 'hmanagerid', width: 200, hide: true }
+                    , { field: '涓荤', title: '涓荤', width: 200 }
                     , { field: 'HDeptID', title: 'HDeptID', width: 160, hide: true }
                     , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 160 }
                     , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }

--
Gitblit v1.9.1