From b742f00aac8e1e1bb628232383c35e67f4a41e4e Mon Sep 17 00:00:00 2001
From: cwjbxqmz <1134865194@qq.com>
Date: 星期五, 26 一月 2024 15:21:28 +0800
Subject: [PATCH] 1

---
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdInBillEdit.html |  281 +++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 175 insertions(+), 106 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html"
index cc5dfb8..c061171 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html"
@@ -14,7 +14,6 @@
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../../layuiadmin/PubCustom.js"></script>
     <style type="text/css">
-
         /*begin 姝ゆ牱寮忕敤浜庢秷闄よ鍏冪礌涓竷灞�瀹藉害涓嶅鐨勯棶棰�*/
         .layui-form-item .layui-inline {
             margin-top: 5px;
@@ -22,7 +21,31 @@
             margin-right: 0px;
         }
         /*end*/
-
+        /*椤甸潰杈撳叆妗嗛棿璺濅紭鍖�*/
+        .layui-card .layui-tab-brief .layui-tab-content {
+            padding: 10px;
+        }
+        /*琛ㄥ崟鍏冪礌灞呬笅澶氬皯鍍忕礌*/
+        .layui-form-item {
+            margin-bottom: 0px;
+        }
+        /* 琛ㄥ崟妗嗛珮搴�*/
+        .layui-input, .layui-select, .layui-textarea {
+            height: 32px;
+        }
+        /*琛ㄥ崟鎸夐挳楂樺害銆佽楂�*/
+        .layui-btn {
+            height: 31px;
+            line-height: 31px;
+        }
+        /*琛ㄥ崟鏍囩鍚嶅唴闂磋窛(涓婁笅闂磋窛銆佸乏鍙抽棿璺�)*/
+        .layui-form-label {
+            padding: 6px 15px; 
+        }
+        /*鏁翠釜椤甸潰鎵�鏈夎緭鍏ユ銆侀潰鏉跨瓑杈规棰滆壊*/
+        .layui-badge-rim, .layui-border, .layui-colla-content, .layui-colla-item, .layui-collapse, .layui-elem-field, .layui-form-pane .layui-form-item[pane], .layui-form-pane .layui-form-label, .layui-input, .layui-layedit, .layui-layedit-tool, .layui-panel, .layui-quote-nm, .layui-select, .layui-tab-bar, .layui-tab-card, .layui-tab-title, .layui-tab-title .layui-this:after, .layui-textarea {
+            border-color: #dbd8d8;
+        }
     </style>
 </head>
 <body>
@@ -34,8 +57,8 @@
                         <div class="layui-card-header">
                             <div class="layui-btn-group">
 
-                                <button type="button" id="copy-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">澶嶅埗</button>
-                                <button type="button" id="addnew-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">鏂板</button>
+                                <button type="button" id="copy-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Copy">澶嶅埗</button>
+                                <button type="button" id="addnew-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Add">鏂板</button>
                                 <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>
                                 <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="planview">棰勮</button>
@@ -44,12 +67,9 @@
                             </div>
 
                         </div>
+                        
                         <div class="layui-card-body">
                             <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
-                                <!--<ul class="layui-tab-title">
-                                <li class="layui-this">鍩烘湰淇℃伅</li>-->
-                                <!--<li>鍏朵粬淇℃伅</li>-->
-                                <!--</ul>-->
                                 <h1 style="text-align:center;"><b>鍣ㄥ叿閲囪喘鍏ュ簱鍗�</b></h1>
                                 <div class="layui-tab-content">
                                     <div class="layui-tab-item layui-show">
@@ -75,9 +95,9 @@
                                                 </div>
                                             </div>
                                             <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">
-                                                    <input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <input type="text" name="HWHName" id="HWHName" readonly class="layui-input" value="" style="float:left;width:150px;">
                                                     <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="" style="float:left;width:150px;">
                                                     <button type="button" lay-submit="" class="layui-btn" lay-filter="WareHouse" style="width:40px;">
                                                         <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -87,9 +107,9 @@
                                         </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">
-                                                    <input type="text" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <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;">
                                                     <button type="button" lay-submit="" class="layui-btn" lay-filter="HSecManagerList" style="width:40px;">
                                                         <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -97,9 +117,9 @@
                                                 </div>
                                             </div>
                                             <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">
-                                                    <input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <input type="text" name="HKeeperName" id="HKeeperName" readonly class="layui-input" value="" style="float:left;width:150px;">
                                                     <input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;">
                                                     <button type="button" lay-submit="" class="layui-btn" lay-filter="HKeeperList" style="width:40px;">
                                                         <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -107,9 +127,9 @@
                                                 </div>
                                             </div>
                                             <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">
-                                                    <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <input type="text" name="HDeptName" id="HDeptName" readonly class="layui-input" value="" style="float:left;width:150px;">
                                                     <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
                                                     <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
                                                         <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -119,7 +139,7 @@
                                             <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;">
+                                                    <input type="text" name="HSourceBillType" id="HSourceBillType" class="layui-input" value="" style="float:left;width:100%;">
                                                 </div>
                                             </div>
                                         </div>
@@ -127,7 +147,7 @@
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">寰�鏉ョ被鍨�</label>
                                                 <div class="layui-input-inline">
-                                                    <select name="HSupTypeID" id="HSupTypeID" class="layui-input" value="" style="float:left;width:150px">
+                                                    <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>
@@ -135,9 +155,9 @@
                                                 </div>
                                             </div>
                                             <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">
-                                                    <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <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;">
                                                         <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -150,7 +170,7 @@
                                             <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;width:100%;">
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
@@ -171,7 +191,21 @@
                             </div>
                         </div>
 
-                        <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                        <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+                            <ul class="layui-tab-title">
+                                <li class="layui-this">鏄庣粏淇℃伅</li>
+                                <li>姹囨�讳俊鎭�</li>
+                            </ul>
+                            <div class="layui-tab-content">
+                                <div class="layui-tab-item layui-show">
+                                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                                </div>
+                                <div class="layui-tab-item">
+                                    <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+                                </div>
+                            </div>
+                        </div>
+
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
 
@@ -199,6 +233,7 @@
             var OperationType = 1;//鎿嶄綔绫诲瀷
             var closeType = 2;  //鍏抽棴绫诲瀷
         } else {
+            debugger;
             var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
             var linterid = params[params[1]];//婧愬崟id
             var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
@@ -211,7 +246,7 @@
         }).extend({
             index: 'lib/index' //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
-            //#region 鍏叡鍙橀噺路
+            //#region 鍏叡鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
@@ -221,9 +256,9 @@
                 , element = layui.element;
             //鏌ヨ鏉′欢
             var option = [];
+            var option1 = [];
             var sWhere = "";
             var sBillType = "3801";
-            TabRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HRemark": "" };
             //#endregion
 
 
@@ -232,6 +267,7 @@
             set_InitFrom();
             //鍒濆鍖栬〃鏍�
             set_InitGrid();
+            set_CountGrid();
             //鍒ゆ柇鎿嶄綔绫诲瀷
             if (OperationType == 1) {//鏃犳簮鏂板
                 set_AddFNew();
@@ -244,14 +280,14 @@
             }
             //#endregion
 
-
             //#region 鐐瑰嚮浜嬩欢锛屽寘鎷琽n鍜宖orm浜嬩欢
             //澶村伐鍏锋爮
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;;
                 var AddRow = table.cache['mainTable'];
-                var NewRow = TabRow;
+                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) {
                     //鏂板涓�琛�
                     case 'btn-AddLine': btnAddLine(NewRow);
@@ -309,7 +345,7 @@
                 layer.open({
                     type: 2,
                     skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '浠撳簱鍒楄〃',
+                    title: '楠屾敹鍛樺垪琛�',
                     closeBtn: 1,
                     shift: 2,
                     area: ['80%', '80%'],
@@ -346,7 +382,7 @@
                 layer.open({
                     type: 2,
                     skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '浠撳簱鍒楄〃',
+                    title: '鎶ュ叧鍛樺垪琛�',
                     closeBtn: 1,
                     shift: 2,
                     area: ['80%', '80%'],
@@ -414,8 +450,33 @@
                     }
                 });
             });
+            //涓嬫媺妗嗕簨浠堕�夋嫨瑙﹀彂
+            form.on('select(HSupTypeID)', function (data) {
+                $("#HSupID").val("");
+                $("#HSupName").val("");
+            });
+
+            function getSupType() {
+                var type = $("#HSupTypeID").val();
+                console.log(type)
+                switch (type) {
+                    case '1':
+                        return "SupplierInformation";
+                        break;
+                    case '2':
+                        return "CustomerInformation";
+                        break;
+                    case '3':
+                        return "DeptInformation";
+                        break;
+                }
+            }
             //琛ㄥご淇℃伅寰�鏉ュ崟浣嶅脊绐�
             form.on('submit(HSupList)', function () {
+                debugger;
+                if ($("#HSupTypeID").val() == 0 || $("#HSupTypeID").val() == null) {
+                    return layer.msg('璇烽�夋嫨寰�鏉ョ被鍨�');
+                }
                 //椤甸潰灞�-鑷畾涔�
                 var url = '../../PublicPage/' + getSupType() + '.html';
                 //alert(url);
@@ -466,7 +527,7 @@
                 data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
                 var sMainStr = JSON.stringify(data.field);
                 var sSubStr = JSON.stringify(table.cache['mainTable']);
-                var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav;
+                var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ';' + sessionStorage["HUserName"];
 
                 if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
                 {
@@ -484,7 +545,7 @@
                                 layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
                                     $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
                                     var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                                    parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+                                    parent.layer.close(index); //鍐嶆墽琛屽叧闂�
                                 });
                             }
                             else {
@@ -503,18 +564,15 @@
             });
             //閫�鍑�
             form.on('submit(Exit)', function (data) {
-                if (OperationType == 1) {
-                    Pub_Close(closeType);//鐩存帴鏂板closeType鍊间负2锛屽垪琛ㄨ皟鏂板closeType鍊间粠鍒楄〃浼犻��
-                }
-                else if (OperationType == 3) {
-                    Pub_Close(closeType);
-                }
-                else {
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
                     Pub_Close(2);
                 }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
             });
-
-
             //棰勮
             form.on("submit(planview)", function (data) {
                 if (linterid != "" || linterid != null) {
@@ -533,7 +591,6 @@
                     layer.msg('褰撳墠鍗曟嵁ID涓虹┖锛�');
                 }
             });
-
             //鎵撳嵃
             form.on("submit(print)", function (data) {
                 if (linterid != "" || linterid != null) {
@@ -640,7 +697,7 @@
                     elem: '#HDate'
                 });
             }
-            //鍒濆鍖栬〃鏍�
+            //鍒濆鍖栨槑缁嗚〃鏍�
             function set_InitGrid() {
                 columns = [
                     { type: 'checkbox', fixed: 'left' }
@@ -650,6 +707,9 @@
                     , { 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 }
@@ -658,12 +718,14 @@
                     , { 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: 100 }
-                    , { field: 'HWHName', title: '鏀舵枡浠撳簱鍚嶇О', edit: 'text', width: 100 }
+                    , { 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: 100 }
-                    , { field: 'HSPName', title: '鏀舵枡浠撲綅鍚嶇О', edit: 'text', width: 100 }
+                    , { 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: 'HRemark', title: '澶囨敞', edit: 'text', width: 100 }
+                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
                 ];
                 option = {
                     id: 'mainTable'
@@ -678,11 +740,42 @@
                     }
                 };
             }
+            //鍒濆姹囨�讳俊鎭�
+            function set_CountGrid() {
+                //琛ㄥご
+                columns = [
+                    { type: 'checkbox', fixed: 'left' }
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', edit: 'text', event: 'HMaterCode', width: 100 }
+                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', edit: 'text', width: 100 }
+                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
+                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', edit: 'text', width: 100 }
+                    , { field: '鎵规', title: '鎵规', edit: 'text', width: 100 }
+                    , { field: '瀹炴敹鏁伴噺', title: '瀹炴敹鏁伴噺', edit: 'text', width: 100 }
+                    , { field: 'hwhid1', title: 'HWHID', edit: 'text', width: 100, hide: true }
+                    , { field: '鏀舵枡浠撳簱浠g爜', title: '鏀舵枡浠撳簱浠g爜', edit: 'text', event: 'HWHCode', width: 120 }
+                    , { field: '鏀舵枡浠撳簱', title: '鏀舵枡浠撳簱鍚嶇О', edit: 'text', width: 120 }
+                    , { field: '琛ㄤ綋澶囨敞', title: '澶囨敞', edit: 'text', width: 100 }
+                ];
+                option1 = {
+                    id: 'mainTable1'
+                    , elem: '#mainTable1'
+                    , height: 500
+                    , page: true
+                    , limit: 500
+                    , cellMinWidth: 120
+                    , height: 500
+                    , cols: [columns]
+                    , done: function (res, curr, count) {
+                    }
+                };
+            }
+
             //鏃犳簮鍗曟柊澧�
             function set_AddFNew() {
                 //鑾峰彇鏈�澶у崟鎹彿
                 get_MAXNum();
-                option.data = [TabRow];
+                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": "" }];
                 table.render(option);
             }
             //鑾峰彇鏈�澶у崟鎹彿
@@ -706,7 +799,7 @@
             function set_EditFromGrid(linterid) {
                 set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
                 set_EditGrid(linterid);  //缂栬緫鑾峰彇琛ㄤ綋
-                option.data = [TabRow];
+                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": "" }];
                 table.render(option);
             }
             //缂栬緫鑾峰彇琛ㄥご
@@ -737,6 +830,9 @@
                                 , "XDH": ""                               //閫夊崟鍙�
                                 , "HExplanation": data.鎽樿              //鎽樿
                                 , "HRemark": data.琛ㄥご澶囨敞                    //澶囨敞
+                                , "HSupTypeID": data.寰�鏉ョ被鍨�                             //閫夊崟鍙�
+                                , "HSupName": data.寰�鏉ュ崟浣�              //鎽樿
+                                , "HSupID": data.HSupID                    //澶囨敞
                             });
 
                         } else {
@@ -757,8 +853,10 @@
                     data: { "sqlWhere": "and hmainid=" + linterid },
                     success: function (result) {
                         if (result.count == 1) {
-                            option.data = result.data;
+                            option.data = result.list[0];
                             table.render(option);
+                            option1.data = result.list[1];
+                            table.render(option1);
 
                         } else {
                             layer.alert(result.code + result.Message, { icon: 5 });
@@ -783,9 +881,21 @@
             }
             //澧炲姞涓�琛�
             function btnAddLine(NewRow) {
+                //var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
+                //buttonArr = [];//娓呯┖鏁扮粍
+                //for (var i = 0; i < tableBak.length; i++) {
+                //    buttonArr.push(tableBak[i]);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+                //}
+                //buttonArr.push(NewRow);  //鍦ㄥ熬閮ㄥ姞涓�琛�
+                //table.reload("mainTable", {
+                //    data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+                //})
+                //table.cache["mainTable"].push(AddRow[rows]);
                 table.cache["mainTable"].push(NewRow);
                 option.data = table.cache["mainTable"];
                 table.render(option);
+                rows++;
+                layer.msg('澧炲姞涓�琛屾寜閽紒')
             }
             //澶嶅埗涓�琛�
             function btnCopyLine(data) {
@@ -850,7 +960,7 @@
                                     if (checkStatus.data.length === 0) {
                                         return layer.msg('璇烽�夋嫨鏁版嵁');
                                     }
-
+                                    //console.log(obj.data);
                                     //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
                                     obj.update({
                                         HMaterID: checkStatus.data[0].HItemID,
@@ -916,47 +1026,7 @@
                                 }
                             });
                         }
-                        //杈呭姪璁¢噺鍗曚綅浠g爜
-                        if (obj.event === 'HSecUnitCode')  //杈呭姪璁¢噺鍗曚綅浠g爜
-                        {
-                            //椤甸潰灞�-鑷畾涔�
-                            layer.open({
-                                type: 2,
-                                skin: 'layui-layer-rim', //鍔犱笂杈规
-                                title: '杈呭姪璁¢噺鍗曚綅鍒楄〃',
-                                closeBtn: 1,
-                                shift: 2,
-                                area: ['80%', '80%'],
-                                maxmin: true,
-                                content: ['../../PublicPage/UnitInformation.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('璇烽�夋嫨鏁版嵁');
-                                    }
-
-                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
-                                    obj.update({
-                                        HSecUnitID: checkStatus.data[0].HItemID,
-                                        HSecUnitCode: checkStatus.data[0].HNumber,
-                                        HSecUnitName: checkStatus.data[0].HName,
-                                    });
-
-                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                                }
-                                , btn2: function (index, layero) {
-                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
-                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
-                                },
-                                end: function () {
-
-                                }
-                            });
-                        }
+                       
                         //璁¢噺鍗曚綅浠g爜
                         if (obj.event === 'HUnitCode')  //璁¢噺鍗曚綅浠g爜
                         {
@@ -1026,8 +1096,16 @@
                                         HWHID: checkStatus.data[0].HItemID,
                                         HWHCode: checkStatus.data[0].HNumber,
                                         HWHName: checkStatus.data[0].HName,
-                                    });
+                                        HSPID: "0",
+                                        HSPCode: "",
+                                        HSPName: "",
 
+                                    });
+                                    ////琛ㄥご浠撳簱涓虹┖鏃� 缁戝畾鏄庣粏琛屼粨搴撲俊鎭�
+                                    //if ($("#HWHID").val() == '' || $("#HWHID").val() == null) {
+                                    //    $("#HWHName").val(checkStatus.data[0].HName);
+                                    //    $("#HWHID").val(checkStatus.data[0].HItemID);
+                                    //}
                                     layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                                 }
                                 , btn2: function (index, layero) {
@@ -1121,6 +1199,10 @@
                             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: "娓╅Θ鎻愮ず" });
                             return Result = false;
@@ -1132,22 +1214,9 @@
                 }
                 return Result;
             }
+
             //#endregion
-            function getSupType() {
-                var type = $("#HSupTypeID").val();
-                console.log(type)
-                switch (type) {
-                    case '1':
-                        return "SupplierInformation";
-                        break;
-                    case '2':
-                        return "CustomerInformation";
-                        break;
-                    case '3':
-                        return "DeptInformation";
-                        break;
-                }
-            }
+
 
         });
     </script>

--
Gitblit v1.9.1