From 2ef6ca3c8309ae7413c58693552fcc5228ff129f Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 30 十一月 2022 15:29:13 +0800
Subject: [PATCH] 销售订单

---
 WebTM/views/销售管理/销售订单/Xs_SeOrderBillList.html          |    4 
 WebTM/views/Baseset/基础资料/Gy_SettleStyle.html           |  103 ++++++++++
 WebTM/views/销售管理/销售订单/Add_Edit_Xs_SeOrderBillList.html |  387 +++++++++++++++++++++++++++++++-------
 WebTM/views/Baseset/基础资料/Gy_SellStyle.html             |  103 ++++++++++
 WebTM/WebTM.csproj                                     |    2 
 5 files changed, 520 insertions(+), 79 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 19b78ed..c0a8679 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -111,6 +111,8 @@
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_QCCheckProjectListView.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_RoutingBillList.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_RoutingGroup.html" />
+    <Content Include="views\Baseset\鍩虹璧勬枡\Gy_SellStyle.html" />
+    <Content Include="views\Baseset\鍩虹璧勬枡\Gy_SettleStyle.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_TechnologyParameterList.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_TechParameterUnitList.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_StockPlaceListNew.html" />
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SellStyle.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SellStyle.html"
new file mode 100644
index 0000000..6326bdd
--- /dev/null
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SellStyle.html"
@@ -0,0 +1,103 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>閿�鍞柟寮忓垪琛�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-card">
+            <!--<div class="layui-card-header"></div>-->
+            <div class="layui-card-body" style="padding: 15px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">杩囨护鍒�</label>
+                            <div class="layui-input-inline">
+                                <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
+                            </div>
+                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button>
+                            <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>-->
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <table class="layui-hide" id="mainTable"></table>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script>
+        layui.use(['table', 'form', 'layer'], function () {
+            var table = layui.table
+            , form = layui.form
+            , layer = layui.layer;
+
+            form.on('submit(HQuery)', function () {//閫夋嫨浠撳簱
+                //var sMainStr = JSON.stringify(table.cache['mainTable']);
+                RoadQuery($('#Value').val());
+            });
+            form.on('submit(FH)', function () {//閫夋嫨浠撳簱
+                //var sMainStr = JSON.stringify(table.cache['mainTable']);
+                var checkStatus = table.checkStatus('mainTable')
+                 , data = checkStatus.data;
+                parent.GetSellStyleValue(data);
+                var index = parent.layer.getFrameIndex(window.name);
+                parent.layer.close(index);
+            });
+            RoadQuery($('#Value').val());
+            table.render({
+                elem: '#mainTable'
+                // , url: '/demo/table/user/'
+               , data: []
+              , cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+              , cols: [[
+                  { type: 'radio' }
+                , { field: 'HItemID', title: '閿�鍞柟寮廔D', hide: true }
+                , { field: 'HNumber', title: '閿�鍞柟寮忎唬鐮�' }
+                , { field: 'HName', title: '閿�鍞柟寮忓悕绉�', sort: true }
+              ]]
+              , page: true
+            });
+            ///鍔犺浇鏄剧ず鏁版嵁
+            function RoadQuery(Where) {
+                var Value = Where;
+                if (Value == null) {
+                    Value = '';
+                }
+                $.ajax({
+                    type: "get",
+                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetDepartmentList_Json",
+                    url: GetWEBURL() + "/Web/GetSellStyleList_Json",
+                    async: true,
+                    data: { "SellStyle": Value },
+                    //data: { "Value": Value },
+                    success: function (result) {
+                        ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
+                        table.reload('mainTable', {
+                            data: ajaxReturnData
+                            , height: 'full-10'
+                            , loading: false
+                            , done: function (index, res) {
+
+                            }
+                        });
+                    },
+                    error: function (result) {
+                        console.log(result);
+                        //layer.msg('鑾峰彇閲囪喘璁㈠崟鍑虹幇寮傚父', { icon: 2, time: 2000 });
+                    }
+                });
+            };
+        });
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SettleStyle.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SettleStyle.html"
new file mode 100644
index 0000000..99a088e
--- /dev/null
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SettleStyle.html"
@@ -0,0 +1,103 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>缁撶畻鏂瑰紡鍒楄〃</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-card">
+            <!--<div class="layui-card-header"></div>-->
+            <div class="layui-card-body" style="padding: 15px;">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">杩囨护鍒�</label>
+                            <div class="layui-input-inline">
+                                <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
+                            </div>
+                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button>
+                            <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>-->
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <table class="layui-hide" id="mainTable"></table>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script>
+        layui.use(['table', 'form', 'layer'], function () {
+            var table = layui.table
+            , form = layui.form
+            , layer = layui.layer;
+
+            form.on('submit(HQuery)', function () {//閫夋嫨浠撳簱
+                //var sMainStr = JSON.stringify(table.cache['mainTable']);
+                RoadQuery($('#Value').val());
+            });
+            form.on('submit(FH)', function () {//閫夋嫨浠撳簱
+                //var sMainStr = JSON.stringify(table.cache['mainTable']);
+                var checkStatus = table.checkStatus('mainTable')
+                 , data = checkStatus.data;
+                parent.GetSettleStyleValue(data);
+                var index = parent.layer.getFrameIndex(window.name);
+                parent.layer.close(index);
+            });
+            RoadQuery($('#Value').val());
+            table.render({
+                elem: '#mainTable'
+                // , url: '/demo/table/user/'
+               , data: []
+              , cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
+              , cols: [[
+                  { type: 'radio' }
+                , { field: 'HItemID', title: '缁撶畻鏂瑰紡ID', hide: true }
+                , { field: 'HNumber', title: '缁撶畻鏂瑰紡浠g爜' }
+                , { field: 'HName', title: '缁撶畻鏂瑰紡鍚嶇О', sort: true }
+              ]]
+              , page: true
+            });
+            ///鍔犺浇鏄剧ず鏁版嵁
+            function RoadQuery(Where) {
+                var Value = Where;
+                if (Value == null) {
+                    Value = '';
+                }
+                $.ajax({
+                    type: "get",
+                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetDepartmentList_Json",
+                    url: GetWEBURL() + "/Web/GetSettleStyleList_Json",
+                    async: true,
+                    data: { "SettleStyle": Value },
+                    //data: { "Value": Value },
+                    success: function (result) {
+                        ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
+                        table.reload('mainTable', {
+                            data: ajaxReturnData
+                            , height: 'full-10'
+                            , loading: false
+                            , done: function (index, res) {
+
+                            }
+                        });
+                    },
+                    error: function (result) {
+                        console.log(result);
+                        //layer.msg('鑾峰彇閲囪喘璁㈠崟鍑虹幇寮傚父', { icon: 2, time: 2000 });
+                    }
+                });
+            };
+        });
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
index 0378ef0..01810da 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Add_Edit_Xs_SeOrderBillList.html"
@@ -76,10 +76,10 @@
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">杈呭姪瀛楁</label>
                                             <div class="layui-input-inline">
-                                                <input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off">
+                                                <input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off" readonly>
                                             </div>
                                         </div>
-                                       
+
 
                                     </div>
                                     <div class="layui-row">
@@ -93,7 +93,7 @@
                                             <label class="layui-form-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="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
                                                 <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" style="width:40px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                 </button>
@@ -103,13 +103,13 @@
                                             <label class="layui-form-label">瀹㈡埛</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HCusName" id="HCusName" class="layui-input" value="" style="float:left;width:150px;">
-                                                <input type="hidden" name="HCusID" id="HCusID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HCusID" id="HCusID" class="layui-input" value="0" style="float:left;width:150px;">
                                                 <button type="button" lay-submit="" class="layui-btn" lay-filter="HCusList" style="width:40px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                 </button>
                                             </div>
                                         </div>
-                                      
+
 
                                     </div>
                                     <div class="layui-row">
@@ -117,7 +117,7 @@
                                             <label class="layui-form-label">涓氬姟鍛�</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HEmpName" id="HEmpName" " class="layui-input" value="" style="float:left;width:150px;">
-                                                <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
                                                 <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                 </button>
@@ -127,7 +127,7 @@
                                             <label class="layui-form-label">甯佸埆</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HCurName" id="HCurName" class="layui-input" value="" style="float:left;width:150px;">
-                                                <input type="hidden" name="HCurID" id="HCurID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HCurID" id="HCurID" class="layui-input" value="0" style="float:left;width:150px;">
                                                 <button type="button" lay-submit="" class="layui-btn" lay-filter="HCurList" style="width:40px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                 </button>
@@ -136,19 +136,16 @@
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">姹囩巼</label>
                                             <div class="layui-input-inline">
-                                                <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off">
+                                                <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0">
                                             </div>
                                         </div>
-                                    
-
                                     </div>
-
                                     <div class="layui-row">
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">涓荤</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HManagerName" id="HManagerName" 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;">
+                                                <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="0" style="float:left;width:150px;">
                                                 <button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                 </button>
@@ -158,7 +155,7 @@
                                             <label class="layui-form-label">閿�鍞柟寮�</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HSellSName" id="HSellSName" class="layui-input" value="" style="float:left;width:150px;">
-                                                <input type="hidden" name="HSellSID" id="HSellSID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HSellSID" id="HSellSID" class="layui-input" value="0" style="float:left;width:150px;">
                                                 <button type="button" lay-submit="" class="layui-btn" lay-filter="HSellSList" style="width:40px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                 </button>
@@ -168,21 +165,14 @@
                                             <label class="layui-form-label">缁撶畻鏂瑰紡</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HSSName" id="HSSName" class="layui-input" value="" style="float:left;width:150px;">
-                                                <input type="hidden" name="HSSID" id="HSSID" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HSSID" id="HSSID" class="layui-input" value="0" style="float:left;width:150px;">
                                                 <button type="button" lay-submit="" class="layui-btn" lay-filter="HSSList" style="width:40px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                 </button>
                                             </div>
                                         </div>
-                                        <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">缁撶畻鏃ユ湡</label>
-                                            <div class="layui-input-inline">
-                                                <input class="layui-input" name="HSSDate" id="HSSDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
-                                            </div>
-                                        </div>
-                                       
                                     </div>
-                                    <div class="layui-row">
+                                    <!--<div class="layui-row">
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">鑱旂郴浜�</label>
                                             <div class="layui-input-inline">
@@ -196,8 +186,14 @@
                                                 <input class="layui-input" name="HLinkPhone" id="HLinkPhone" autocomplete="off">
                                             </div>
                                         </div>
-                                    </div>
+                                    </div>-->
                                     <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">缁撶畻鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HSSDate" id="HSSDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+                                            </div>
+                                        </div>
                                         <div class="layui-col-xs7 layui-inline">
                                             <label class="layui-form-label">澶囨敞</label>
                                             <div class="layui-input-block">
@@ -287,13 +283,13 @@
 
                     <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                     <script type="text/html" id="toolbarDemo">
-                        <!--<div class="layui-btn-container">
-
+                        <div class="layui-btn-container">
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
-
-                        </div>-->
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                        </div>
                     </script>
+
                     <script type="text/html" id="xuhao">
                         {{d.LAY_TABLE_INDEX+1}}
                     </script>
@@ -301,6 +297,9 @@
             </div>
         </div>
     </div>
+    <script type="text/html" id="barDemo">
+        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+    </script>
 
     <script>
         //#region 鎶樺彔娉ㄩ噴
@@ -324,6 +323,7 @@
             var month = date.getMonth() + 1;
             var year = date.getFullYear();
             var shijian = year + "-" + month + "-" + day;
+            var allVal;
             //#endregion
 
 
@@ -334,31 +334,9 @@
 
             //鑾峰彇椤甸潰璺宠浆鍙傛暟
             var params = get_UrlVars();
-            if (typeof (params[params[0]]) == "undefined") {
-                var OperationType = 1;//鎿嶄綔绫诲瀷
-            } else {
-                var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
-                var linterid = params[params[1]];//婧愬崟id
-                var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
-            }
-            //鍒ゆ柇鎿嶄綔绫诲瀷
-            if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
-                $("#HItemID").val(0);
-            }
-            else if (OperationType == 3) {//缂栬緫
-                $("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
-                //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
-                RoadBillMain(linterid);
-            }
-            else if (OperationType == 4) {//娴忚
-                $("#HItemID").val(linterid);//
-                //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
-                RoadBillMain(linterid);
-                $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
-            }
-            else {
-                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
-            }
+            var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  1娣诲姞 淇濆瓨  2澶嶅埗  3 缂栬緫
+            var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+            
             $("#HUSEORGID").val(sessionStorage["OrganizationID"]);
 
             //鍒ゆ柇鏄惁鏂板
@@ -373,18 +351,67 @@
                     success: function (d) {
                         //console.log(d.data);
                         $("#HBillNo").val(d.data[0].HBillNo);
-                        $("#HDate").val(shijian);
+                        $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                         $("#HInterID").val(d.data[0].HInterID);
-                        $("#HSSDate").val(shijian);
+                        $("#HSSDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撶畻鏂瑰紡
                     }
                 });
-            }
-            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
-                RoadBillMain(HInterID);
-                /* RoadBillSub(linterid);*/
+            } else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+                $("#HInterID").val(linterid);
+                RoadBillMain(linterid);
             }
             //#endregion
 
+            var rowdata = [{
+                "HMaterID": 0, "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁¢噺鍗曚綅": "", "鏁伴噺": "", "HRemark": ""
+                , "HPrice": "0", "HTaxPrice": "0", "HMoney": "0", "HDiscountRate": "0", "HRelTaxPrice": "0", "HTaxRate": "0", "HTaxMoney": "0", "HlineTotal": "0", "HlineTotalBB": "0"
+            }];
+
+             // 鍒濆鍖栫晫
+            set_InitGrid();
+
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                //鏂板琛岃〃鏍兼暟鎹�
+                var NewRow = {
+                    "HMaterID": 0, "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁¢噺鍗曚綅": "", "鏁伴噺": "", "HRemark": ""
+                    , "HPrice": "0", "HTaxPrice": "0", "HMoney": "0", "HDiscountRate": "0", "HRelTaxPrice": "0", "HTaxRate": "0", "HTaxMoney": "0", "HlineTotal": "0", "HlineTotalBB": "0"
+                };
+                switch (obj.event) {
+                    case 'btn-AddLine':
+                        table.cache["mainTable"].push(NewRow);
+                        option.data = table.cache["mainTable"];
+
+                        table.render(option);
+                        //鍒锋柊澶嶉�夋
+                        //checkRefresh();
+                        break;
+                    case 'btn-CopyLine':
+                        var copydata = JSON.stringify(data);
+                        if (data.length <= 0) {
+                            layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+                        }
+                        else if (data.length > 1) {
+                            layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+                        }
+                        else {
+                            var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+                            var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+                            table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                            //鍒锋柊澶嶉�夋
+                            //checkRefresh();
+                        }
+                        break;
+                    ////鍒楄缃�
+                    //case 'set_HideColumn':
+                    //    get_HideColumn();
+                    //    break;
+                }
+            });
 
             //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
 
@@ -424,10 +451,16 @@
                 get_checkManager();
             });
 
-          
+
             //淇濆瓨鎸夐挳
             form.on('submit(set_SaveBill)', function (data) {
                 set_SaveBill(data);
+            });
+
+            //琛屽唴浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                set_GridDelete(obj);   //琛屽唴鍒犻櫎
+                set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
             });
 
             //#endregion
@@ -459,12 +492,47 @@
             }
             //#endregion
 
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , limit: 500
+                    , height: 500
+                    , loading: false
+                    , cols: [[ //瀛愯〃
+                        { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                        , { type: 'numbers', title: '搴忓彿',width: 100, totalRow: true }
+                        , { field: 'HMaterID', title: 'HMaterID', width: 100,hide: true }
+                        , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 150,edit: 'text', event: "HMaterID" }//f7
+                        , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' ,width: 150,}
+                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100,}
+                        , { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true }
+                        , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 100,edit: 'text', event: "HUnitID" }//f7
+                        , { field: 'HQty', title: '鏁伴噺', width: 100,edit: 'text' }
+                        , { field: 'HPrice', title: '涓嶅惈绋庡崟浠�', width: 100,edit: 'text' }
+                        , { field: 'HTaxPrice', title: '鍚◣鍗曚环', width: 100, edit: 'text' }
+                        , { field: 'HMoney', title: '閲戦', width: 100,edit: 'text' }
+                        , { field: 'HDiscountRate', title: '鎶樻墸鐜�', width: 100, edit: 'text' }
+                        , { field: 'HRelTaxPrice', title: '瀹為檯鍚◣鍗曚环' ,width: 110,}
+                        , { field: 'HTaxRate', title: '绋庣巼', width: 100,edit: 'text' }
+                        , { field: 'HTaxMoney', title: '绋庨', width: 100, }
+                        , { field: 'HlineTotal', title: '浠风◣鍚堣', width: 100, }
+                        , { field: 'HlineTotalBB', title: '鏈綅甯佷环绋庡悎璁�', width: 120, }
+                        , { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
+                        , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
+                    ]]
+                }
+
+                option.data = rowdata;
+                table.render(option);
+            }
+
             //#region 鍔犺浇琛ㄥご
             function RoadBillMain(linterid) {
                 //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
                 var ajaxLoad = layer.load();
                 $.ajax({
-                    url: GetWEBURL() + "Xs_SeOrderBill/cx",
+                    url: GetWEBURL() + "/Xs_SeOrderBill/cx",
                     type: "GET",
                     data: {
                         "HInterID": linterid
@@ -472,12 +540,13 @@
                     success: function (result) {
                         if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                             var data = result.data[0];
+                            allVal = result.data[0];
                             form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
                                 "HBillNo": data.鍗曟嵁鍙�
                                 , "HDate": formatDate(data.鏃ユ湡)
                                 , "HSSDate": formatDate(data.缁撶畻鏃ユ湡)
                                 //, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
-                                , "HAddress": data.浜よ揣鍦扮偣
+                                , "HAddress": data.浜よ揣鍦板潃
                                 , "HDeptName": data.閮ㄩ棬
                                 , "HDeptID": data.HDeptID
                                 , "HCusID": data.HCusID
@@ -496,7 +565,7 @@
                                 , "HLinkMan": data.鑱旂郴浜�
                                 , "HLinkPhone": data.鑱旂郴鐢佃瘽
                                 , "HInnerBillNo": data.杈呭姪瀛楁
-                                , "HRemark": data.琛ㄥご澶囨敞            
+                                , "HRemark": data.琛ㄥご澶囨敞
                                 , "HMaker": data.鍒跺崟浜�
                                 , "HChecker": data.瀹℃牳浜�
                                 , "HCloseMan": data.鍏抽棴浜�
@@ -506,6 +575,25 @@
                                 , "HUpDateDate": data.淇敼鏃ユ湡
                                 , "HDeleteDate": data.浣滃簾鏃ユ湡
                             });
+
+                            //瀛愯〃  璧嬪��
+                            var rowdata = [];
+                            for (var i = 0; i < 1; i++) {
+                                rowdata.push(
+                                    {
+                                        "HMaterID": data.HMaterID, "鐗╂枡浠g爜": data.鐗╂枡浠g爜, "鐗╂枡鍚嶇О": data.鐗╂枡鍚嶇О
+                                        , "瑙勬牸鍨嬪彿": data.瑙勬牸鍨嬪彿, "HUnitID": data.HUnitID
+                                        , "璁¢噺鍗曚綅": data.璁¢噺鍗曚綅, "HQty": data.鏁伴噺, "HRemark": data.琛ㄤ綋澶囨敞
+                                        , "HPrice": data.鍗曚环, "HMoney": data.閲戦, "HTaxRate": data.绋庣巼
+                                        , "HTaxMoney": data.閲戦 * data.绋庣巼, "HlineTotal": data.閲戦 + data.绋庨, "HlineTotalBB": (data.閲戦 + data.绋庨)* data.姹囩巼
+                                        , "HTaxPrice": data.鍚◣鍗曚环, "HDiscountRate": data.鎶樻墸鐜�, "HRelTaxPrice": data.瀹為檯鍚◣鍗曚环
+                                    }
+                                )
+                            }
+                            option.data = rowdata;
+                            table.render(option);
+                            form.render('select');
+
                             layer.close(ajaxLoad);
                         } else {
                             layer.close(ajaxLoad);
@@ -518,27 +606,36 @@
                 });
             }
             //#endregion
-            var date = new Date();
-            var day = date.getDate();
-            var month = date.getMonth() + 1;
-            var year = date.getFullYear();
-            var shijian = year + "-" + month + "-" + day;
-            
+
             //#region 淇濆瓨鏂规硶
             function set_SaveBill(data) {
 
-                var sMainStr = JSON.stringify(data.field)+";" + sessionStorage["HUserName"];
-             
+                //var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
+                var num = [];
+                for (var i = 0; i < table.cache["mainTable"].length; i++) {
+                    if (table.cache["mainTable"][i] != "") {
+                        table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+                        num.push(table.cache["mainTable"][i])
+                    }
+                }
+
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = JSON.stringify(num);
+                var sAllStr = JSON.stringify(allVal);
+                //var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
+                var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"] + ";" + sAllStr;
+
                 $.ajax({
                     type: "POST",
-                    url: GetWEBURL() + "Gy_Warehouse/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    url: GetWEBURL() + "Xs_SeOrder/SeOrderBillEdit", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
                     async: true,
-                    data: { "oMain": sMainStr },
+                    data: { "sMainSub": sMainSub },
                     dataType: "json",
                     success: function (data) {
                         if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                             layer.msg(data.Message, { icon: 1 });
-                            $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
+
+                            $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
                             //淇濆瓨鍚庢祻瑙�
                             //ReRoadBillMain();
                         }
@@ -554,6 +651,96 @@
                 });
             }
             //#endregion
+
+            //琛屽唴蹇嵎閿瓫閫�
+            function set_GridCellCheck(obj) {
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    if (event.key == "F7") {
+                        //鐗╂枡
+                        if (obj.event == "HMaterID") {
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "鐗╂枡鍒楄〃"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+                                        "HMaterID": checkStatus.data[0].HItemID
+                                        , "鐗╂枡浠g爜": checkStatus.data[0].HNumber
+                                        , "鐗╂枡鍚嶇О": checkStatus.data[0].HName
+                                        , "瑙勬牸鍨嬪彿": checkStatus.data[0].HModel
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                            })
+                        }
+                        //璁¢噺鍗曚綅
+                        if (obj.event == "HUnitID") {
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "璁¢噺鍗曚綅鍒楄〃"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ['../../Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+                                        "璁¢噺鍗曚綅": checkStatus.data[0].HName
+                                        , "HUnitID": checkStatus.data[0].HItemID
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                            })
+                        }
+                        obj.event = "";
+                        return false;
+                    }
+                })
+            }
+
+            //琛屽唴鍒犻櫎
+            function set_GridDelete(obj) {
+                var data = obj.data;
+                var rowIndex = $(obj.tr).attr("data-index");
+                if (obj.event === 'del') {
+                    layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+                        console.log("绱㈠紩涓�:" + rowIndex);
+                        if (rowIndex === '0') {
+                            layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                        } else {
+                            obj.del();
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.reload(option);
+                            layer.close(index);
+                        }
+                    });
+                }
+            }
 
             function get_checkEmp() {
                 layer.open({
@@ -599,7 +786,7 @@
                     , btn2: function (index, layero) { }
                 })
             }
-           
+
             function get_checkCur() {
                 layer.open({
                     type: 2//寮圭獥绫诲瀷
@@ -615,14 +802,14 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HCurName").val(checkStatus.data[0].甯佸埆);
+                        $("#HCurName").val(checkStatus.data[0].璐у竵鍚嶇О);
                         $("#HCurID").val(checkStatus.data[0].HItemID);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) { }
                 })
             }
-         
+
             function get_checkDept() {
                 layer.open({
                     type: 2//寮圭獥绫诲瀷
@@ -645,7 +832,7 @@
                     , btn2: function (index, layero) { }
                 })
             }
-         
+
             function get_checkManager() {
                 layer.open({
                     type: 2//寮圭獥绫诲瀷
@@ -669,6 +856,52 @@
                 })
             }
 
+            function get_checkSellS() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '閿�鍞柟寮忓垪琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_SellStyle.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HSellSName").val(checkStatus.data[0].HName);
+                        $("#HSellSID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            
+            function get_checkSS() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '缁撶畻鏂瑰紡鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_SettleStyle.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HSSName").val(checkStatus.data[0].HName);
+                        $("#HSSID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+
             //#region 淇濆瓨鍚庢祻瑙堟柟娉�
             function ReRoadBillMain() {
                 location.replace('Add_Edit_Cg_POInStockBillList.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
index 15bb551..f33805c 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
@@ -360,8 +360,8 @@
                             layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
                                 $.ajax({
                                     type: "GET",
-                                    url: GetWEBURL() + "Cg_POInStockBill/DeltetPOInStockBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                                    data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
+                                    url: GetWEBURL() + "Xs_SeOrderBill/DeltetSeOrderBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                                    data: { "HInterID": InterID },
                                     success: function (result) {
                                         if (result.count == 1) {
                                             layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {

--
Gitblit v1.9.1