From 14eef8148285afa1562fcdfeaccd0cd7f3238f54 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期日, 03 十月 2021 18:03:19 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

---
 WebTM/views/基础资料/工资基础资料/Gy_ProcPriceList.html     |    6 
 WebTM/views/基础资料/工资基础资料/Gy_ProcPrice.html         |  753 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 WebTM/views/index.html                            |    3 
 WebTM/WebTM.csproj                                |    1 
 WebTM/views/工资管理/工资结算单(个人)/Pay_SingleBalBill.html |    2 
 5 files changed, 760 insertions(+), 5 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 5b4c8fb..5e3e572 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -525,6 +525,7 @@
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_DepartmentList.html" />
     <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcPriceList.html" />
     <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_Group_Add_Edit.html" />
+    <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcPrice.html" />
     <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Add_Edit_Gy_Process.html" />
     <Content Include="views\鍩虹璧勬枡\閲囪喘鍩虹璧勬枡\Gy_Supplier_Edit.html" />
     <Content Include="views\鍩虹璧勬枡\閿�鍞熀纭�璧勬枡\Gy_Customer_Edit.html" />
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 3e91315..dcf81d1 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -752,7 +752,8 @@
                                 <dd>
                                     <a>宸ヨ祫鍩虹璧勬枡</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_ProcPriceList.html">宸ュ簭宸ヤ环璧勬枡</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_ProcPrice.html">宸ュ簭宸ヤ环璧勬枡</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_ProcPriceList.html">宸ュ簭宸ヤ环璧勬枡缁存姢</a></dd>
                                     </dl>
                                 </dd>
                             </dl>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPrice.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPrice.html"
new file mode 100644
index 0000000..d663985
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPrice.html"
@@ -0,0 +1,753 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta 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">
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <style>
+        .layui-form-item .layui-inline {
+            margin-right: 0;
+        }
+
+        html {
+            background-color: white;
+            color: white;
+        }
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+                    <div style="padding: 10px;">
+                        <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn-AddNew" id="btn-AddNew">鏂板</button>
+                        <!--<button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>-->
+                        <button type="button" class="layui-btn layui-btn-sm" lay-submit="" lay-filter="btn-Exit" id="btn-Exit">閫�鍑�</button>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                            <li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鍥哄畾椤圭洰</label>
+                                            <div class="layui-input-block">
+                                                <input type="radio" name="HSelectCus" id="HSelectCus" value="true" title="宸ュ簭">
+                                                <input type="radio" name="HSelectMater" id="HSelectMater" value="false" title="鐗╂枡">
+                                                <input type="radio" name="HSelectCusNone" id="HSelectCusNone" value="false" title="鑷敱" checked>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">宸ュ簭浠g爜</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HProcNumber" id="HProcNumber" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <input type="hidden" name="HProcID" id="HProcID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" 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" class="layui-input" name="HProcName" id="HProcName" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鐗╂枡浠g爜</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <input type="hidden" name="HMaterID" id="HMaterID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" 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" class="layui-input" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
+                                            </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" class="layui-input" name="HDeptName" id="HDeptName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <input type="hidden" name="HDeptID" id="HDeptID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchDept" id="btnSearchDept" style="width: 40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--鍒跺崟淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item">
+                                    <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" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">瀹℃牳浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍏抽棴浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+                                            </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" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">瀹℃牳鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍏抽棴鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+                                            </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" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">浣滃簾浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+                                            </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" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">浣滃簾鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                    <script type="text/html" id="toolbarDemo">
+                        <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>
+                    </script>
+                </form>
+            </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 type="text/html" id="HCostFlagCol">
+        <select name="HCostFlagCol" lay-filter="HCostFlagCol" id="HCostFlagCol{{d.LAY_TABLE_INDEX+1}}">
+            <option value="鍚�">鍚�</option>
+            <option value="鏄�">鏄�</option>
+        </select>
+    </script>
+    <script type="text/html" id="HFlowFlagCol">
+        <select name="HFlowFlagCol" lay-filter="HFlowFlagCol" id="HFlowFlagCol{{d.LAY_TABLE_INDEX+1}}">
+            <option value="鍚�">鍚�</option>
+            <option value="鏄�">鏄�</option>
+        </select>
+    </script>
+    <script type="text/html" id="HPayFlagCol">
+        <select name="HPayFlagCol" lay-filter="HPayFlagCol" id="HPayFlagCol{{d.LAY_TABLE_INDEX+1}}">
+            <option value="鍚�">鍚�</option>
+            <option value="鏄�">鏄�</option>
+        </select>
+    </script>
+
+    <script>
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , laydate = layui.laydate
+                , element = layui.element;
+            //鍏敤鍙橀噺
+            var rowdata;
+            var option = [];
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            //if (sessionStorage.login != "login") {
+            //    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+            //        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            //    }, function () { window.location.href = "../../user/login.html"; });
+            //}
+
+            var params = get_UrlVars();
+            if (typeof (params[params[0]]) == "undefined") {
+                var OperationType = 1.2;//鎿嶄綔绫诲瀷
+            } else {
+                var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+                var linterid = params[params[1]];//婧愬崟id
+                var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+                var HICMOEntryID = params[params[3]];//婧愬崟瀛恑d
+            }
+
+            //鍒ゆ柇鏄惁鏂板
+            if (OperationType == 1.1) {
+
+            }
+            else if (OperationType == 2) {
+
+            }
+            else if (OperationType == 3) {
+
+            }
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+
+
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                //鏂板琛岃〃鏍兼暟鎹�
+                var NewRow = {
+                    "HMaterIDCol": "", "HMaterNumberCol": "", "HMaterNameCol": "", "HMaterModelCol": "", "HProcIDCol": "",
+                    "HProcNumberCol": "", "HProcNameCol": "", "HSourceNumberCol": "", "HSourceNameCol": "", "HPriceCol": "",
+                    "HBeginDateCol": "", "HEndDateCol": "", "HCostFlagCol": "", "HFlowFlagCol": "", "HPayFlagCol": "",
+                    "HRemarkCol": ""
+                };
+                switch (obj.event) {
+                    case 'btn-AddLine':
+                        table.cache["mainTable"].push(NewRow);
+                        option.data = table.cache["mainTable"];
+                        table.render(option);
+                        for (var i = 1; i <= option.data.length; i++) {
+                            $('#HCostFlagCol' + i + '').find("option[value='" + option.data[i - 1].HCostFlagCol + "']").attr("selected", true);
+                            $('#HFlowFlagCol' + i + '').find("option[value='" + option.data[i - 1].HFlowFlagCol + "']").attr("selected", true);
+                            $('#HPayFlagCol' + i + '').find("option[value='" + option.data[i - 1].HPayFlagCol + "']").attr("selected", true);
+                        }
+                        form.render('select');
+                        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);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                            for (var i = 1; i <= option.data.length; i++) {
+                                $('#HCostFlagCol' + i + '').find("option[value='" + option.data[i - 1].HCostFlagCol + "']").attr("selected", true);
+                                $('#HFlowFlagCol' + i + '').find("option[value='" + option.data[i - 1].HFlowFlagCol + "']").attr("selected", true);
+                                $('#HPayFlagCol' + i + '').find("option[value='" + option.data[i - 1].HPayFlagCol + "']").attr("selected", true);
+                            }
+                            form.render('select');
+                        }
+                        break;
+                }
+            });
+
+            //閫�鍑烘寜閽�
+            form.on('submit(btn-Exit)', function (data) {
+                get_Exit();
+            });
+
+            //鏂板鎸夐挳
+            form.on('submit(btn-AddNew)', function (data) {
+                window.location.reload();
+            });
+
+
+            //閫�鍑�
+            function get_Exit() {
+                if (OperationType == 1.1) {
+                    Pub_Close(1);
+                } else if (OperationType == 1.2) {
+                    Pub_Close(2);
+                } else if (OperationType == 2) {
+                    var index = parent.layer.getFrameIndex(window.name);
+                    parent.layer.close(index);
+                } else if (OperationType == 3) {
+                    var index = parent.layer.getFrameIndex(window.name);
+                    parent.layer.close(index);
+                }
+            }
+
+            //琛屽唴浜嬩欢
+            table.on('tool(mainTable)', function (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);
+                        }
+                    });
+                }
+
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    if (event.key == "F7") {
+                        if (obj.event == 'HMaterCheck')
+                        {
+                            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, layero) {
+                                    var iframeWindow = window['layui-layer-iframe' + index]  
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    obj.update({
+                                        HMaterIDCol: checkStatus.data[0].HItemID
+                                        , HMaterNumberCol: checkStatus.data[0].HNumber
+                                        , HMaterNameCol: checkStatus.data[0].HName
+                                        , HMaterModelCol: checkStatus.data[0].HModel
+                                    });
+                                    layer.close(layer.index);
+                                }
+                                , btn2: function (index, layero) {
+                                },
+                                end: function () {
+                                }
+                            });
+                        }
+                        if (obj.event == 'HProcCheck')  
+                        {
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', 
+                                title: '鐗╂枡鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true,
+                                content: ['../../Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes'],
+                                btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+                                    var iframeWindow = window['layui-layer-iframe' + index] 
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    obj.update({
+                                        HProcIDCol: checkStatus.data[0].HItemID
+                                        , HProcNumberCol: checkStatus.data[0].宸ュ簭浠g爜
+                                        , HProcNameCol: checkStatus.data[0].宸ュ簭
+                                    });
+                                    layer.close(layer.index); 
+                                }
+                                , btn2: function (index, layero) {
+                                },
+                                end: function () {
+                                }
+                            });
+                        }
+                        if (obj.event == 'HSourceCheck') {
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim',
+                                title: '璧勬簮鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true,
+                                content: ['../../PublicPage/SourceInformation.html', 'yes'],
+                                btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+                                    var iframeWindow = window['layui-layer-iframe' + index]
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    obj.update({
+                                        HSourceNumberCol: checkStatus.data[0].HNumber
+                                        , HSourceNameCol: checkStatus.data[0].HName
+                                    });
+                                    layer.close(layer.index);
+                                }
+                                , btn2: function (index, layero) {
+                                },
+                                end: function () {
+                                }
+                            });
+                        }
+                        
+                        obj.event = "";
+                        return false;
+
+                    }
+                })
+            });
+
+            //淇濆瓨鎸夐挳
+            form.on('submit(btnSave)', function (data) {
+                set_SaveBill(data);
+            });
+
+            //淇濆瓨
+            function set_SaveBill(data) {
+                if ($("#HICMOQty").val() == "" || $("#HICMOQty").val() <= 0) {
+                    layer.msg("浠诲姟鍗曟暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if ($("#HProcExchQty").val() == "" || $("#HProcExchQty").val() <= 0) {
+                    layer.msg("娴佽浆鍗℃暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if ($("#HFirstCheckEmp").val() == 0) {
+                    layer.msg("妫�楠屽憳鏈�夋嫨锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                var sSubTable = table.cache['mainTable'];
+                for (var i = 0; i < sSubTable.length; i++) {
+                    if (!sSubTable[i].HQCCheckItemID) {
+                        var indexRow = i + 1;
+                        layer.msg("绗�" + indexRow + "琛岋紝妫�楠岄」鐩笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return;
+                    }
+                }
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = JSON.stringify(table.cache['mainTable']);
+                var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType;
+                var index = layer.load();
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/QC_FirstPieceCheckBill/set_SaveBill",
+                    async: true,
+                    data: { "sMainSub": sMainSub },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) {
+                            //layer.confirm(data.Message, {
+                            //    icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
+                            //    btn2: function () {
+                            //        //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
+                            //        //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
+                            //        parent.location.href = "../../../views/index.html"
+                            //    }//鍏抽棴
+                            //}, function () { window.location.reload(); });//鏂板
+                            layer.close(index);
+                            layer.msg("鎻愪氦鎴愬姛");
+                            $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳
+                        }
+                        else {
+                            layer.close(index);
+                            layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.close(index);
+                        layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+
+
+            //琛ㄥご淇℃伅宸ュ簭寮圭獥
+            form.on('submit(btnSearchProc)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '宸ュ簭鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    maxmin: true,
+                    content: ['../../Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HProcID").val(checkStatus.data[0].HItemID);
+                        $("#HProcNumber").val(checkStatus.data[0].宸ュ簭浠g爜);
+                        $("#HProcName").val(checkStatus.data[0].宸ュ簭);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //琛ㄥご淇℃伅浜у搧寮圭獥
+            form.on('submit(btnSearchMater)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                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, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HMaterID").val(checkStatus.data[0].HItemID);
+                        $("#HMaterNumber").val(checkStatus.data[0].HNumber);
+                        $("#HMaterName").val(checkStatus.data[0].HName);
+                        $("#HMaterModel").val(checkStatus.data[0].HModel);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //琛ㄥご淇℃伅閮ㄩ棬寮圭獥
+            form.on('submit(btnSearchDept)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '閮ㄩ棬鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    maxmin: true,
+                    content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HDeptID").val(checkStatus.data[0].HItemID);
+                        $("#HDeptName").val(checkStatus.data[0].HName);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HMaker").val(sessionStorage["HUserName"]);
+                rowdata = [{
+                    "HMaterIDCol": "", "HMaterNumberCol": "", "HMaterNameCol": "", "HMaterModelCol": "", "HProcIDCol": "",
+                    "HProcNumberCol": "", "HProcNameCol": "", "HSourceNumberCol": "", "HSourceNameCol": "", "HPriceCol": "",
+                    "HBeginDateCol": "", "HEndDateCol": "", "HCostFlagCol": "", "HFlowFlagCol": "", "HPayFlagCol": "",
+                    "HRemarkCol": ""
+                }];
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , limit: 500 
+                    , height: 'full-250'
+                    , cellMinWidth: 90
+                    , cols: [[ 
+                        { type: 'checkbox' }
+                        , { field: 'HMaterIDCol', title: '鐗╂枡ID', edit: 'text', hide: true }
+                        , { field: 'HMaterNumberCol', title: '鐗╂枡浠g爜', edit: 'text', event: "HMaterCheck", width: 200 }
+                        , { field: 'HMaterNameCol', title: '鐗╂枡鍚嶇О', width:200 }
+                        , { field: 'HMaterModelCol', title: '瑙勬牸鍨嬪彿', width: 200 }
+                        , { field: 'HProcIDCol', title: '宸ュ簭ID', edit: 'text', hide: true }
+                        , { field: 'HProcNumberCol', title: '宸ュ簭浠g爜', edit: 'text', event: "HProcCheck" }
+                        , { field: 'HProcNameCol', title: '宸ュ簭鍚嶇О' }
+                        , { field: 'HSourceNumberCol', title: '璧勬簮浠g爜', edit: 'text', event: "HSourceCheck" }
+                        , { field: 'HSourceNameCol', title: '璧勬簮鍚嶇О' }
+                        , { field: 'HPriceCol', title: '鍗曚环', edit: 'text' }
+                        , { field: 'HBeginDateCol', title: '寮�濮嬫棩鏈�', edit: 'text' }
+                        , { field: 'HEndDateCol', title: '缁撴潫鏃ユ湡', edit: 'text' }
+                        , { field: 'HCostFlagCol', title: '鎴愭湰蹇呴��', templet: '#HCostFlagCol' }
+                        , { field: 'HFlowFlagCol', title: '娴佽浆榛樿', templet: '#HFlowFlagCol' }
+                        , { field: 'HPayFlagCol', title: '宸ヨ祫榛樿', templet: '#HPayFlagCol' }
+                        , { field: 'HRemarkCol', title: '澶囨敞', edit: 'text' }
+                        , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+                    ]]
+                    , done: function (res, curr, count) {
+                        option.data = res.data;
+                        $('.layui-form-select').find('input').unbind("blur");
+                        $('tr').each(function (e) {
+                            var $cr = $(this);
+                            var dataIndex = $cr.attr("data-index");
+                            $.each(option.data, function (index, value) {
+                                if (value.LAY_TNDEX == dataIndex) {
+                                    $cr.find('input').val(value.HCostFlagCol);
+                                    $cr.find('input').val(value.HFlowFlagCol);
+                                    $cr.find('input').val(value.HPayFlagCol);
+                                }
+                            });
+                        });
+                    }
+                    , text: {
+                        none: '鏃犳暟鎹紒'
+                    }
+                };
+                option.data = rowdata;
+                table.render(option);
+            }
+
+            form.on('select(HCostFlagCol)', function (data) {
+                var elem = data.othis.parents('tr');
+                var dataindex = elem.attr("data-index");
+                $.each(option.data, function (index, value) {
+                    if (value.LAY_TABLE_INDEX == dataindex) {
+                        value.HCostFlagCol = data.value;
+                    }
+                });
+            });
+
+            form.on('select(HFlowFlagCol)', function (data) {
+                var elem = data.othis.parents('tr');
+                var dataindex = elem.attr("data-index");
+                $.each(option.data, function (index, value) {
+                    if (value.LAY_TABLE_INDEX == dataindex) {
+                        value.HFlowFlagCol = data.value;
+                    }
+                });
+            });
+
+            form.on('select(HPayFlagCol)', function (data) {
+                var elem = data.othis.parents('tr');
+                var dataindex = elem.attr("data-index");
+                $.each(option.data, function (index, value) {
+                    if (value.LAY_TABLE_INDEX == dataindex) {
+                        value.HPayFlagCol = data.value;
+                    }
+                });
+            });
+
+
+            //浠ヤ笂涓簂ayui妯″潡
+        });
+
+
+
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPriceList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPriceList.html"
index 153289a..d862d00 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPriceList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPriceList.html"
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>宸ュ簭宸ヤ环璧勬枡</title>
+    <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, maximum-scale=1">
@@ -105,7 +105,7 @@
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
-                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
                                 <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>-->
                                 <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
@@ -327,7 +327,7 @@
                     , area: ['100%', '100%']
                     , title: '鐢熶骇璧勬簮-鏂板'
                     , shift: 0//寮瑰嚭鍔ㄧ敾
-                    , content: '../宸ヨ祫鍩虹璧勬枡/Gy_Group_Add_Edit.html?OperationType=1&linterid=&HSouceBillType='
+                    , content: '../宸ヨ祫鍩虹璧勬枡/Gy_ProcPrice.html?OperationType=1.1&linterid=&HSouceBillType='
                 })
             }
             //#endregion
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBill.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBill.html"
index 1e4fe25..fba9c7d 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBill.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBill.html"
@@ -52,7 +52,7 @@
                                                 </div>
                                             </div>
                                             <div class="layui-col-xs3 layui-inline">
-                                                <label class="layui-form-label">鏃ユ湡</label
+                                                <label class="layui-form-label">鏃ユ湡</label>
                                                 <div class="layui-input-inline">
                                                     <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                                 </div>

--
Gitblit v1.9.1