From 0cfbf30cd6e85991172f65cf0a79291bc6546062 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 01 十二月 2022 15:46:48 +0800
Subject: [PATCH] 采购订单

---
 WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html          |   10 
 WebTM/views/销售管理/销售订单/Add_Edit_Xs_SeOrderBillList.html |    2 
 WebTM/views/采购管理/采购订单/Cg_POOrderBillEdit.html          |  183 +++++++++++++++++++-----------
 WebTM/views/Baseset/基础资料/Gy_SupplierList.html          |    8 
 WebTM/views/Baseset/基础资料/Gy_PoStockStyle.html          |  103 +++++++++++++++++
 WebTM/WebTM.csproj                                     |    1 
 6 files changed, 229 insertions(+), 78 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 8fa7e05..7e52913 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -108,6 +108,7 @@
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_MaterList.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_MouldList.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_OrganizationtList.html" />
+    <Content Include="views\Baseset\鍩虹璧勬枡\Gy_PoStockStyle.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_QCCheckProjectListView.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_RoutingBillList.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_RoutingGroup.html" />
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PoStockStyle.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PoStockStyle.html"
new file mode 100644
index 0000000..db82b60
--- /dev/null
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PoStockStyle.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.GetHStockNameValue(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/GetPoStockStyleList_Json",
+                    async: true,
+                    data: { "PoStockStyle": 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_SupplierList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SupplierList.html"
index a678a17..6b1257a 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SupplierList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SupplierList.html"
@@ -22,7 +22,7 @@
                                 <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>
+                            <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>-->
                         </div>
                     </div>
                 </form>
@@ -86,11 +86,11 @@
                 if (Value == null) {
                     Value = '';
                 }
-                if (HOrgID == null) {
-                    HOrgID = 0;
+                if (HOtherOrgID == null || HOtherOrgID == undefined) {
+                    HOtherOrgID = 0;
                 }
                 $.ajax({
-                    type: "get",
+                    type: "GET",
                     //url: "http://61.130.49.162:9090/WMSAPI///Web/GetSupplierList_Json",
                     url: GetWEBURL() + "/Web/GetSupplierList_Json",
                     async: true,
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
index 8a34bde..6e53bd5 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillEdit.html"
@@ -80,41 +80,7 @@
                                             </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="HDeptName" id="HDeptName" 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>
-                                            </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="HAddress" id="HAddress" autocomplete="off">
-                                            </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="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="HEmpName" id="HEmpName" " 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>
-                                            </div>
-                                        </div>
+                                    <div class="layui-row">                                        
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">甯佸埆</label>
                                             <div class="layui-input-inline">
@@ -126,11 +92,45 @@
                                             </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="HExRate" id="HExRate" autocomplete="off" value="0">
+                                            </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="HAddress" id="HAddress" autocomplete="off">
+                                            </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="HEmpName" id="HEmpName" 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>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <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="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>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
                                             <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="0" style="float:left;width:150px;">
-                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HCusList" style="width:40px;">
+                                                <input type="text" name="HSupName" id="HSupName" 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>
                                                 </button>
                                             </div>
@@ -150,9 +150,9 @@
                                         <div class="layui-col-xs4 layui-inline">
                                             <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="0" style="float:left;width:150px;">
-                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HSellSList" style="width:40px;">
+                                                <input type="text" name="HPSStyleName" id="HPSStyleName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HPSStyleID" id="HPSStyleID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HPSStyleList" style="width:40px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                 </button>
                                             </div>
@@ -311,6 +311,7 @@
                 , admin = layui.admin
                 , layer = layui.layer
                 , table = layui.table
+                , laydate = layui.laydate
                 , form = layui.form
                 , element = layui.element;
             var sWhere = "";
@@ -338,6 +339,7 @@
             //鍒ゆ柇鏄惁鏂板
             if (linterid == null || linterid == 0) {
                 //鑾峰彇鏈�澶у崟鎹彿 new
+                $("#HMaker").val(sessionStorage["HUserName"]);
                 $("#HInterID").val("0");
                 $("#HBillNo").val("");
                 $.ajax({
@@ -360,7 +362,7 @@
 
             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"
+                , "HPrice": "0", "HTaxPrice": "0", "HMoney": "0", "HDiscountRate": "0", "HRelTaxPrice": "0", "HTaxRate": "0", "HTaxMoney": "0", "HlineTotal": "0", "HlineTotalBB": "0","HDate":""
             }];
 
             // 鍒濆鍖栫晫
@@ -373,7 +375,7 @@
                 //鏂板琛岃〃鏍兼暟鎹�
                 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"
+                    , "HPrice": "0", "HTaxPrice": "0", "HMoney": "0", "HDiscountRate": "0", "HRelTaxPrice": "0", "HTaxRate": "0", "HTaxMoney": "0", "HlineTotal": "0", "HlineTotalBB": "0", "HDate": ""
                 };
                 switch (obj.event) {
                     case 'btn-AddLine':
@@ -421,12 +423,12 @@
                 get_checkEmp();
             });
             //閫夋嫨瀹㈡埛鎸夐挳
-            form.on('submit(HCusList)', function () {
-                get_checkCus();
+            form.on('submit(HSupList)', function () {
+                get_checkSup();
             });
             //閫夋嫨閿�鍞柟寮忔寜閽�
-            form.on('submit(HSellSList)', function () {
-                get_checkSellS();
+            form.on('submit(HPSStyleList)', function () {
+                get_checkPSStyle();
             });
             //閫夋嫨缁撶畻鎸夐挳
             form.on('submit(HSSList)', function () {
@@ -457,6 +459,23 @@
             table.on('tool(mainTable)', function (obj) {
                 set_GridDelete(obj);   //琛屽唴鍒犻櫎
                 set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+
+                var data = obj.data;
+                if (obj.event == 'HDate') {
+                    var field = $(this).data('field');
+                    laydate.render({
+                        elem: this.firstChild
+                        , show: true //鐩存帴鏄剧ず
+                        , closeStop: this
+                        , done: function (nowDate) {
+                            //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+                            data[field] = nowDate;
+                            obj.update(data);
+                            //鍒锋柊澶嶉�夋
+                            //checkRefresh();
+                        }
+                    });
+                }
             });
 
             //#endregion
@@ -505,15 +524,16 @@
                         , { 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: 'HPrice', title: '涓嶅惈绋庡崟浠�', width: 100, edit: 'text', hide: true }
                         , { field: 'HTaxPrice', title: '鍚◣鍗曚环', width: 100, edit: 'text' }
-                        , { field: 'HMoney', title: '閲戦', width: 100, edit: 'text' }
+                        , { field: 'HMoney', title: '閲戦', width: 100 }
                         , { 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: 'HlineTotal', title: '浠风◣鍚堣', width: 100, edit: 'text' }
                         , { field: 'HlineTotalBB', title: '鏈綅甯佷环绋庡悎璁�', width: 120, }
+                        , { field: 'HDate', title: '鍒拌揣鏃ユ湡', width: 120, event: 'HDate'}
                         , { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
                         , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
                     ]]
@@ -528,7 +548,7 @@
                 //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
                 var ajaxLoad = layer.load();
                 $.ajax({
-                    url: GetWEBURL() + "/Xs_SeOrderBill/cx",
+                    url: GetWEBURL() + "/Cg_POOrderBill/cx",
                     type: "GET",
                     data: {
                         "HInterID": linterid
@@ -542,11 +562,11 @@
                                 , "HDate": formatDate(data.鏃ユ湡)
                                 , "HSSDate": formatDate(data.缁撶畻鏃ユ湡)
                                 //, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
-                                , "HAddress": data.浜よ揣鍦板潃
+                                , "HAddress": data.浜よ揣鍦扮偣
                                 , "HDeptName": data.閮ㄩ棬
                                 , "HDeptID": data.HDeptID
-                                , "HCusID": data.HCusID
-                                , "HCusName": data.瀹㈡埛
+                                , "HSupID": data.HSupID
+                                , "HSupName": data.渚涘簲鍟�
                                 , "HEmpID": data.HEmpID
                                 , "HEmpName": data.涓氬姟鍛�
                                 , "HCurID": data.HCurID
@@ -554,8 +574,8 @@
                                 , "HExRate": data.姹囩巼
                                 , "HManagerName": data.涓荤
                                 , "HManagerID": data.HManagerID
-                                , "HSellSID": data.HSellSID
-                                , "HSellSName": data.閿�鍞柟寮�
+                                , "HPSStyleID": data.HPSStyleID
+                                , "HPSStyleName": data.閲囪喘鏂瑰紡
                                 , "HSSID": data.HSSID
                                 , "HSSName": data.缁撶畻鏂瑰紡
                                 , "HLinkMan": data.鑱旂郴浜�
@@ -583,6 +603,7 @@
                                         , "HPrice": data.鍗曚环, "HMoney": data.閲戦, "HTaxRate": data.绋庣巼
                                         , "HTaxMoney": data.閲戦 * data.绋庣巼, "HlineTotal": data.閲戦 + data.绋庨, "HlineTotalBB": (data.閲戦 + data.绋庨) * data.姹囩巼
                                         , "HTaxPrice": data.鍚◣鍗曚环, "HDiscountRate": data.鎶樻墸鐜�, "HRelTaxPrice": data.瀹為檯鍚◣鍗曚环
+                                        , "HDate": Format(new Date(data.浜よ揣鏃ユ湡), "yyyy-MM-dd")
                                     }
                                 )
                             }
@@ -606,7 +627,31 @@
             //#region 淇濆瓨鏂规硶
             function set_SaveBill(data) {
 
-                //var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
+                if ($("#HCurID").val() == 0) {
+                    layer.msg("璇烽�夋嫨甯佸埆锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if ($("#HExRate").val() == 0) {
+                    layer.msg("璇疯緭鍏ユ眹鐜囷紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if ($("#HEmpID").val() == 0) {
+                    layer.msg("璇烽�夋嫨閲囪喘鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if ($("#HDeptID").val() == 0) {
+                    layer.msg("璇烽�夋嫨閲囪喘閮ㄩ棬锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if ($("#HSupID").val() == 0) {
+                    layer.msg("璇烽�夋嫨渚涘簲鍟嗭紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if ($("#HPSStyleID").val() == 0) {
+                    layer.msg("璇烽�夋嫨閲囪喘鏂瑰紡锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+
                 var num = [];
                 for (var i = 0; i < table.cache["mainTable"].length; i++) {
                     if (table.cache["mainTable"][i] != "") {
@@ -623,7 +668,7 @@
 
                 $.ajax({
                     type: "POST",
-                    url: GetWEBURL() + "Xs_SeOrder/SeOrderBillEdit", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    url: GetWEBURL() + "Cg_POOrderBill/POOrderBillEdit", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
                     async: true,
                     data: { "sMainSub": sMainSub },
                     dataType: "json",
@@ -649,7 +694,7 @@
             //#endregion
 
             //琛屽唴蹇嵎閿瓫閫�
-            function set_GridCellCheck(obj) {
+            function set_GridCellCheck(obj) {               
                 $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                     if (event.key == "F7") {
                         //鐗╂枡
@@ -713,6 +758,7 @@
                                 }
                             })
                         }
+                        
                         obj.event = "";
                         return false;
                     }
@@ -761,14 +807,14 @@
                 })
             }
 
-            function get_checkCus() {
+            function get_checkSup() {
                 layer.open({
                     type: 2//寮圭獥绫诲瀷
                     , skin: 'layui-layer-rim' //鍔犱笂杈规
                     , area: ['90%', '90%']//澶у皬
                     , title: '渚涘簲鍟嗗垪琛�'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_SupplierList.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -776,8 +822,8 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HCusName").val(checkStatus.data[0].HName);
-                        $("#HCusID").val(checkStatus.data[0].HItemID);
+                        $("#HSupName").val(checkStatus.data[0].渚涘簲鍟嗗悕绉�);
+                        $("#HSupID").val(checkStatus.data[0].HItemID);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) { }
@@ -801,6 +847,7 @@
                         }
                         $("#HCurName").val(checkStatus.data[0].璐у竵鍚嶇О);
                         $("#HCurID").val(checkStatus.data[0].HItemID);
+                        $("#HExRate").val(checkStatus.data[0].姹囩巼)
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) { }
@@ -853,16 +900,14 @@
                 })
             }
 
-            //Gy_PoStockStyle
-
-            function get_checkSellS() {
+            function get_checkPSStyle() {
                 layer.open({
                     type: 2//寮圭獥绫诲瀷
                     , skin: 'layui-layer-rim' //鍔犱笂杈规
                     , area: ['90%', '90%']//澶у皬
                     , title: '閲囪喘鏂瑰紡鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_SellStyle.html', 'yes']
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_PoStockStyle.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -870,8 +915,8 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HSellSName").val(checkStatus.data[0].HName);
-                        $("#HSellSID").val(checkStatus.data[0].HItemID);
+                        $("#HPSStyleName").val(checkStatus.data[0].HName);
+                        $("#HPSStyleID").val(checkStatus.data[0].HItemID);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) { }
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
index 491c983..c7096f7 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
@@ -454,7 +454,7 @@
                     shift: 2,
                     area: ['100%', '100%'],
                     maxmin: true,
-                    content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdInBillEdit.html?OperationType=1&linterid=&HSouceBillType=0&closeType=1',
+                    content: './Cg_POOrderBillEdit.html?OperationType=1&linterid=&HSouceBillType=0&closeType=1',
                     end: function () {
                         //鍒锋柊椤甸潰,
                         get_FastQuery(table, option);
@@ -474,12 +474,12 @@
                     layer.open({
                         type: 2
                         , area: ['100%', '100%']
-                        , title: '缂栬緫鍣ㄥ叿閲囪喘鍏ュ簱鍗�'
+                        , title: '缂栬緫閲囪喘璁㈠崟'
                         , closeBtn: 1
                         , shade: 0.6 //閬僵閫忔槑搴�
                         , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                         , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdInBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
+                        , content: './Cg_POOrderBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
                         , resize: false,
                         end: function () {
                             get_FastQuery(table, option);
@@ -503,8 +503,8 @@
                         var wait = layer.load();
                         $.ajax({
                             type: "GET",
-                            url: GetWEBURL() + "/Sc_MouldProdInBill/set_DeleteBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                            data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
+                            url: GetWEBURL() + "/Cg_POOrderBill/DeltetCg_POOrderBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HInterID": InterID },
                             success: function (result) {
                                 if (result.count == 1) {
                                     layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
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 01810da..c359127 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"
@@ -342,6 +342,7 @@
             //鍒ゆ柇鏄惁鏂板
             if (linterid == null || linterid == 0) {
                 //鑾峰彇鏈�澶у崟鎹彿 new
+                $("#HMaker").val(sessionStorage["HUserName"]);
                 $("#HInterID").val("0");
                 $("#HBillNo").val("");
                 $.ajax({
@@ -804,6 +805,7 @@
                         }
                         $("#HCurName").val(checkStatus.data[0].璐у竵鍚嶇О);
                         $("#HCurID").val(checkStatus.data[0].HItemID);
+                        $("#HExRate").val(checkStatus.data[0].姹囩巼)
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) { }

--
Gitblit v1.9.1