From 8a36bbee40f5e1069b15a98b1e64ac9719ee8a46 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 23 四月 2024 17:17:13 +0800
Subject: [PATCH] 1.销售出库单 增加 反写源单 销售订单和发货通知单   超出 关联数量  关闭源单 2.应收单 增加  反写源单 销售出库单 和 销售订单  超出关联数量  关闭源单 3.动态获取源单增加参数 Num 0蓝单   1红单  2全部 4.销售流程的测试并完善功能; 销售订单-》发货通知单-》销售出库单-》应收单 (注意: 源单类型的下拉框 需要 根据数据库 表动态加载, 关联数量 要准确 , 审核 且 未关闭 未行关闭的行 才能下推 ,关联数量超额后,要 反写 关闭 源单 )

---
 WebTM/views/基础资料/公用基础资料/Gy_Employee_Add_Edit_.html |  365 ++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 283 insertions(+), 82 deletions(-)

diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Employee_Add_Edit_.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Employee_Add_Edit_.html"
index edc58bb..0074bc5 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Employee_Add_Edit_.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Employee_Add_Edit_.html"
@@ -13,6 +13,8 @@
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+
     <style>
         .layui-form-item .layui-inline {
             margin-top: 5px;
@@ -48,30 +50,33 @@
                                 <div class="layui-form-item">
                                     <div class="layui-row">
                                         <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">鑱屽憳浠g爜</label>
+                                            <label class="layui-form-label">鑱屽憳浠g爜*</label>
                                             <div class="layui-input-inline">
                                                 <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
                                                 <input id="HItemID" name="HItemID" type="hidden" />
                                             </div>
                                         </div>
-                                        <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">鑱屽姟</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" name="HDutyName" id="HDutyName" readonly class="layui-input" value="" style="float:left;width:150px;">
-                                                <input type="hidden" name="HDutyID" id="HDutyID" value="0">
-                                                <input type="hidden" name="HDutyNumber" id="HDutyNumber" value="">
-                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HDutyID-BT" 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>
+                                            <label class="layui-form-label">鑱屽憳鍚嶇О*</label>
                                             <div class="layui-input-inline">
                                                 <input class="layui-input" name="HName" id="HName" autocomplete="off">
                                             </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" readonly id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HDeptID" id="HDeptID" value="0">
+                                                <input type="hidden" name="HDepNumber" id="HDepNumber" value="">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptID-BT" 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">
                                         <div class="layui-col-xs4 layui-inline">
@@ -91,7 +96,8 @@
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">鍑虹敓骞存湀</label>
                                             <div class="layui-input-inline">
-                                                <input class="layui-input" name="HBirthDay" id="HBirthDay" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+                                                <!--<input class="layui-input" name="HBirthDay" id="HBirthDay" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">-->
+                                                <input type="date" class="layui-input" name="HBirthDay" id="HBirthDay" style="width:190px;">
                                             </div>
                                         </div>
                                         <div class="layui-col-xs4 layui-inline">
@@ -100,7 +106,6 @@
                                                 <input type="text" name="HAge" id="HAge" lay-verify="HAge" autocomplete="off" class="layui-input">
                                             </div>
                                         </div>
-
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-col-xs4 layui-inline">
@@ -212,7 +217,7 @@
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">姣曚笟鏃堕棿</label>
                                             <div class="layui-input-inline">
-                                                <input class="layui-input" name="HGradDate" id="HGradDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+                                                <input type="date" class="layui-input" name="HGradDate" id="HGradDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                             </div>
                                         </div>
                                         <div class="layui-col-xs4 layui-inline">
@@ -346,13 +351,13 @@
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">杩涘巶鏃ユ湡</label>
                                             <div class="layui-input-inline">
-                                                <input class="layui-input" name="HInComDate" id="HInComDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+                                                <input type="date" class="layui-input" name="HInComDate" id="HInComDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                             </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="HRelDate" id="HRelDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+                                                <input type="date" class="layui-input" name="HRelDate" id="HRelDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                             </div>
                                         </div>
                                         <div class="layui-col-xs4 layui-inline">
@@ -379,13 +384,13 @@
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">鍙備繚鏃ユ湡</label>
                                             <div class="layui-input-inline">
-                                                <input class="layui-input" name="HInsuranceDate" id="HInsuranceDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+                                                <input type="date" class="layui-input" name="HInsuranceDate" id="HInsuranceDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                             </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="HContractEDate" id="HContractEDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+                                                <input type="date" class="layui-input" name="HContractEDate" id="HContractEDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                             </div>
                                         </div>
                                     </div>
@@ -393,7 +398,7 @@
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">鍚堝悓寮�濮嬫棩鏈�</label>
                                             <div class="layui-input-inline">
-                                                <input class="layui-input" name="HContractBDate" id="HContractBDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+                                                <input type="date" class="layui-input" name="HContractBDate" id="HContractBDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                             </div>
                                         </div>
                                         <div class="layui-col-xs4 layui-inline">
@@ -405,7 +410,7 @@
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">绂昏亴鏃ユ湡</label>
                                             <div class="layui-input-inline">
-                                                <input class="layui-input" name="HDimissionDate" id="HDimissionDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+                                                <input type="date" class="layui-input" name="HDimissionDate" id="HDimissionDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                             </div>
                                         </div>
                                     </div>
@@ -413,7 +418,7 @@
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">鏆備綇璇佸埌鏈熸棩</label>
                                             <div class="layui-input-inline">
-                                                <input class="layui-input" name="HStayCardEDate" id="HStayCardEDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+                                                <input type="date" class="layui-input" name="HStayCardEDate" id="HStayCardEDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                             </div>
                                         </div>
                                         <div class="layui-col-xs4 layui-inline">
@@ -434,17 +439,7 @@
                                         </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" readonly id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
-                                                <input type="hidden" name="HDeptID" id="HDeptID" value="0">
-                                                <input type="hidden" name="HDepNumber" id="HDepNumber" value="">
-                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptID-BT" 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">
@@ -456,8 +451,17 @@
                                                 </button>
                                             </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="HDutyName" id="HDutyName" readonly class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HDutyID" id="HDutyID" value="0">
+                                                <input type="hidden" name="HDutyNumber" id="HDutyNumber" value="">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HDutyID-BT" 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">
@@ -469,17 +473,20 @@
                                                 </button>
                                             </div>
                                         </div>
-                                        <div class="layui-col-xs4 layui-inline">
+                                    </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="BSTDeptName" id="BSTDeptName" class="layui-input" value="" style="float:left;width:150px;">
                                                 <input type="hidden" name="BSTDeptID" id="BSTDeptID" value="0">
                                                 <input type="hidden" name="BSTDeptNumber" id="BSTDeptNumber" value="">
-                                                <button type="button" lay-submit="" class="layui-btn" lay-filter=" " style="width:40px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter=" " style="width:40px;background-color:#CDCDCD">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                 </button>
                                             </div>
-                                        </div>
+                                        </div>-->
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-col-xs8 layui-inline">
@@ -528,7 +535,7 @@
                                         <div class="layui-col-xs8 layui-inline">
                                             <label class="layui-form-label" style="width: 12.5%;">韬唤璇�</label>
                                             <div class="layui-input-block">
-                                                <input class="layui-input" name="HIDCard" id="HIDCard" autocomplete="off" style=" width: 75%;">
+                                                <input class="layui-input" name="HIDCard" id="HIDCard"  autocomplete="off" style=" width: 75%;">
                                             </div>
                                         </div>
                                     </div>
@@ -574,7 +581,7 @@
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">杞彮璋冧紤鏍囧織</label>
                                             <div class="layui-input-inline">
-                                                <input type="checkbox" name="checkboxHShiftFlag" id="checkboxHShiftFlag" lay-skin="primary" lay-filter="checkboxHShiftFlag" value="true" title="鏄惁璋冧紤">
+                                                <input type="checkbox" name="checkboxHShiftFlag" id="checkboxHShiftFlag" lay-skin="primary" lay-filter="checkboxHShiftFlag" value="true" title="鏄惁杞彮璋冧紤">
                                                 <input type="hidden" value="false" name="HShiftFlag" id="HShiftFlag">
                                             </div>
                                         </div>
@@ -612,20 +619,6 @@
                                             <label class="layui-form-label" style="width: 12.5%;">鍖荤枟淇濋櫓</label>
                                             <div class="layui-input-block">
                                                 <input class="layui-input" name="HMedicare" id="HMedicare" autocomplete="off" style=" width: 75%;">
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-col-xs6 layui-inline">
-                                            <label class="layui-form-label" style="width: 12.5%;">鍏昏�佷繚闄�</label>
-                                            <div class="layui-input-block">
-                                                <input class="layui-input" name="HInsurance" id="HInsurance" autocomplete="off" style=" width: 75%;">
-                                            </div>
-                                        </div>
-                                        <div class="layui-col-xs6 layui-inline">
-                                            <label class="layui-form-label" style="width: 12.5%;">澶变笟淇濋櫓</label>
-                                            <div class="layui-input-block">
-                                                <input class="layui-input" name="HDrydock" id="HDrydock" autocomplete="off" style=" width: 75%;">
                                             </div>
                                         </div>
                                     </div>
@@ -766,7 +759,17 @@
             else {
                 layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
             }
+            //$("#HGradDate").val(Format(2022-11-06, "yyyy-MM-dd"));
 
+            $("#HAge").val(0);
+            $("#HGradDate").val(Format(9999-13-01, "yyyy-MM-dd"));
+            $("#HInComDate").val(Format(9999-13-01, "yyyy-MM-dd"));
+            $("#HInsuranceDate").val(Format(9999-13-01, "yyyy-MM-dd"));
+            $("#HContractEDate").val(Format(9999-13-01, "yyyy-MM-dd"));
+            $("#HContractBDate").val(Format(9999-13-01, "yyyy-MM-dd"));
+            $("#HContractYear").val(0);
+            $("#HDimissionDate").val(Format(9999-13-01, "yyyy-MM-dd"));
+            $("#HStayCardEDate").val(Format(9999-13-01, "yyyy-MM-dd"));
         //#endregion
 
 
@@ -852,7 +855,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '鑱屽姟鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DutyList.html', 'yes']
+                    , content: ['../../../views/绯荤粺绠$悊/缁勭粐鏋舵瀯璁剧疆/Gy_DutyList.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -860,9 +863,9 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HDutyName").val(checkStatus.data[0].HName);
-                        $("#HDutyID").val(checkStatus.data[0].HItemID);
-                        $("#HDutyNumber").val(checkStatus.data[0].HNumber);
+                        $("#HDutyName").val(checkStatus.data[0].鑱屽姟);
+                        $("#HDutyID").val(checkStatus.data[0].hitemid);
+                        $("#HDutyNumber").val(checkStatus.data[0].缁勭粐鏋舵瀯浠g爜);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) { }
@@ -903,7 +906,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '宸ョ鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WorkTypeList.html', 'yes']
+                    , content: ['../../../views/鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_WorkTypeList.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -911,9 +914,9 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HWorkTypeName").val(checkStatus.data[0].HName);
+                        $("#HWorkTypeName").val(checkStatus.data[0].宸ョ鍚嶇О);
                         $("#HWorkTypeID").val(checkStatus.data[0].HItemID);
-                        $("#HWorkTypeNumber").val(checkStatus.data[0].HNumber);
+                        $("#HWorkTypeNumber").val(checkStatus.data[0].宸ョ浠g爜);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) { }
@@ -928,7 +931,8 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '鏍哥畻鏂瑰紡鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ClassTimePrjGroupList.html', 'yes']
+                    , content: ['../../../views/鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_ClassTimePrjList.html', 'yes']
+                    //, content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ClassTimePrjGroupList.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -936,9 +940,9 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HCTPrjName").val(checkStatus.data[0].HName);
+                        $("#HCTPrjName").val(checkStatus.data[0].鏍哥畻鏂瑰紡鍚嶇О);
                         $("#HCTPrjID").val(checkStatus.data[0].HItemID);
-                        $("#HCTPrjNumber").val(checkStatus.data[0].HNumber);
+                        $("#HCTPrjNumber").val(checkStatus.data[0].鏍哥畻鏂瑰紡浠g爜);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) { }
@@ -954,7 +958,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '閮ㄩ棬鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../PublicPage/DeptInformation.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -962,9 +966,9 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HDeptName").val(checkStatus.data[0].HName);
+                        $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
                         $("#HDeptID").val(checkStatus.data[0].HItemID);
-                        $("#HDeptNumber").val(checkStatus.data[0].HNumber);
+                        $("#HDeptNumber").val(checkStatus.data[0].閮ㄩ棬浠g爜);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) { }
@@ -981,7 +985,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '宀椾綅鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_PostList.html', 'yes']
+                    , content: ['../../../views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Post.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -989,9 +993,9 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HPostName").val(checkStatus.data[0].HName);
+                        $("#HPostName").val(checkStatus.data[0].宀椾綅鍚嶇О);
                         $("#HPostID").val(checkStatus.data[0].HItemID);
-                        $("#HPostNumber").val(checkStatus.data[0].HNumber);
+                        $("#HPostNumber").val(checkStatus.data[0].宀椾綅浠g爜);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) { }
@@ -1007,7 +1011,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '鐝粍鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../PublicPage/GroupInformation.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -1015,9 +1019,9 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HGroupName").val(checkStatus.data[0].HName);
+                        $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);
                         $("#HGroupID").val(checkStatus.data[0].HItemID);
-                        $("#HGroupNumber").val(checkStatus.data[0].HNumber);
+                        $("#HGroupNumber").val(checkStatus.data[0].鐝粍浠g爜);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) { }
@@ -1188,12 +1192,194 @@
             }
             //#region 淇濆瓨鏂规硶
             function set_SaveBill(data) {
+                data.field.HUseOrgID = sessionStorage["OrganizationID"];
                 var sMainStr = JSON.stringify(data.field);
                 var sSubStr = "";
                 if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
                 {
                     return false;
                 }
+                if ($("#HNumber").val() == "") {
+                    layer.msg("璇疯緭鍏ヨ亴鍛樹唬鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if ($("#HName").val() == "") {
+                    layer.msg("璇疯緭鍏ヨ亴鍛樺悕绉帮紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if ($("#HDeptName").val() == 0) {
+                    layer.msg("璇烽�夋嫨閮ㄩ棬锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+
+                var HAge = $('#HAge').val();
+                if (HAge.substring(HAge.length - 1, HAge.length) == ".") {
+                    layer.msg("骞撮緞鐨勭粨灏句笉鑳芥槸.锛�");
+                    return;
+                } else {
+                    var ref = /^[0-9]+$/;
+                    if (!ref.test(HAge)) {
+                        layer.msg("骞撮緞璇疯緭姝g‘鍏ユ暟瀛楋紒");
+                        return;
+                    }
+                }
+
+                var HContractYear = $('#HContractYear').val();
+                if (HContractYear.substring(HContractYear.length - 1, HContractYear.length) == ".") {
+                    layer.msg("鍚堝悓鏈熼檺鐨勭粨灏句笉鑳芥槸.锛�");
+                    return;
+                } else {
+                    var ref = /^[0-9]+$/;
+                    if (!ref.test(HContractYear)) {
+                        layer.msg("鍚堝悓鏈熼檺璇疯緭姝g‘鍏ユ暟瀛楋紒");
+                        return;
+                    }
+                }
+
+                //var HInsuranceSubsidy = $('#HInsuranceSubsidy').val();
+                //if (HInsuranceSubsidy.substring(HInsuranceSubsidy.length - 1, HInsuranceSubsidy.length) == ".") {
+                //    layer.msg("淇濋櫓琛ヨ创鐨勭粨灏句笉鑳芥槸.锛�");
+                //    return;
+                //} else {
+                //    var ref = /^[0-9]+\.?[0-9]*$/;
+                //    if (!ref.test(HInsuranceSubsidy)) {
+                //        layer.msg("淇濋櫓琛ヨ创璇疯緭姝g‘鍏ユ暟瀛楋紒");
+                //        return;
+                //    }
+                //}
+
+                //var HOtherDeduct3 = $('#HOtherDeduct3').val();
+                //if (HOtherDeduct3.substring(HOtherDeduct3.length - 1, HOtherDeduct3.length) == ".") {
+                //    layer.msg("鍏朵粬鎵f3鐨勭粨灏句笉鑳芥槸.锛�");
+                //    return;
+                //} else {
+                //    var ref = /^[0-9]+\.?[0-9]*$/;
+                //    if (!ref.test(HOtherDeduct3)) {
+                //        layer.msg("鍏朵粬鎵f3璇疯緭姝g‘鍏ユ暟瀛楋紒");
+                //        return;
+                //    }
+                //}
+
+                //var HMedicare = $('#HMedicare').val();
+                //if (HMedicare.substring(HMedicare.length - 1, HMedicare.length) == ".") {
+                //    layer.msg("鍖荤枟淇濋櫓鐨勭粨灏句笉鑳芥槸.锛�");
+                //    return;
+                //} else {
+                //    var ref = /^[0-9]+\.?[0-9]*$/;
+                //    if (!ref.test(HMedicare)) {
+                //        layer.msg("鍖荤枟淇濋櫓璇疯緭姝g‘鍏ユ暟瀛楋紒");
+                //        return;
+                //    }
+                //}
+
+                //var HInsurance = $('#HInsurance').val();
+                //if (HInsurance.substring(HInsurance.length - 1, HInsurance.length) == ".") {
+                //    layer.msg("鍏昏�佷繚闄╃殑缁撳熬涓嶈兘鏄�.锛�");
+                //    return;
+                //} else {
+                //    var ref = /^[0-9]+\.?[0-9]*$/;
+                //    if (!ref.test(HMedicare)) {
+                //        layer.msg("鍖荤枟淇濋櫓璇疯緭姝g‘鍏ユ暟瀛楋紒");
+                //        return;
+                //    }
+                //}
+
+                //var HDrydock = $('#HDrydock').val();
+                //if (HDrydock.substring(HDrydock.length - 1, HDrydock.length) == ".") {
+                //    layer.msg("澶变笟淇濋櫓鐨勭粨灏句笉鑳芥槸.锛�");
+                //    return;
+                //} else {
+                //    var ref = /^[0-9]+\.?[0-9]*$/;
+                //    if (!ref.test(HDrydock)) {
+                //        layer.msg("澶变笟淇濋櫓璇疯緭姝g‘鍏ユ暟瀛楋紒");
+                //        return;
+                //    }
+                //}
+
+                //var HBasePay = $('#HBasePay').val();
+                //if (HBasePay.substring(HBasePay.length - 1, HBasePay.length) == ".") {
+                //    layer.msg("鍩烘湰宸ヨ祫鐨勭粨灏句笉鑳芥槸.锛�");
+                //    return;
+                //} else {
+                //    var ref = /^[0-9]+\.?[0-9]*$/;
+                //    if (!ref.test(HDrydock)) {
+                //        layer.msg("鍩烘湰宸ヨ祫璇疯緭姝g‘鍏ユ暟瀛楋紒");
+                //        return;
+                //    }
+                //}
+
+                //var HExamLevPostMoney = $('#HExamLevPostMoney').val();
+                //if (HExamLevPostMoney.substring(HExamLevPostMoney.length - 1, HExamLevPostMoney.length) == ".") {
+                //    layer.msg("鑱屽姟鑰冩牳宸ヨ祫鐨勭粨灏句笉鑳芥槸.锛�");
+                //    return;
+                //} else {
+                //    var ref = /^[0-9]+\.?[0-9]*$/;
+                //    if (!ref.test(HExamLevPostMoney)) {
+                //        layer.msg("鑱屽姟鑰冩牳宸ヨ祫璇疯緭姝g‘鍏ユ暟瀛楋紒");
+                //        return;
+                //    }
+                //}
+
+                //var HExamRate = $('#HExamRate').val();
+                //if (HExamRate.substring(HExamRate.length - 1, HExamRate.length) == ".") {
+                //    layer.msg("甯︾彮绯绘暟鐨勭粨灏句笉鑳芥槸.锛�");
+                //    return;
+                //} else {
+                //    var ref = /^[0-9]+\.?[0-9]*$/;
+                //    if (!ref.test(HExamRate)) {
+                //        layer.msg("甯︾彮绯绘暟璇疯緭姝g‘鍏ユ暟瀛楋紒");
+                //        return;
+                //    }
+                //}
+
+                //var HHighestPay = $('#HHighestPay').val();
+                //if (HHighestPay.substring(HHighestPay.length - 1, HHighestPay.length) == ".") {
+                //    layer.msg("鏈�楂樺伐璧勭殑缁撳熬涓嶈兘鏄�.锛�");
+                //    return;
+                //} else {
+                //    var ref = /^[0-9]+\.?[0-9]*$/;
+                //    if (!ref.test(HHighestPay)) {
+                //        layer.msg("鏈�楂樺伐璧勮杈撴纭叆鏁板瓧锛�");
+                //        return;
+                //    }
+                //}
+
+                //var HOverPayRate = $('#HOverPayRate').val();
+                //if (HOverPayRate.substring(HOverPayRate.length - 1, HOverPayRate.length) == ".") {
+                //    layer.msg("瓒呴姣旂巼鐨勭粨灏句笉鑳芥槸.锛�");
+                //    return;
+                //} else {
+                //    var ref = /^[0-9]+\.?[0-9]*$/;
+                //    if (!ref.test(HOverPayRate)) {
+                //        layer.msg("瓒呴姣旂巼璇疯緭姝g‘鍏ユ暟瀛楋紒");
+                //        return;
+                //    }
+                //}
+
+                //var HLeftMoneyRate = $('#HLeftMoneyRate').val();
+                //if (HLeftMoneyRate.substring(HLeftMoneyRate.length - 1, HLeftMoneyRate.length) == ".") {
+                //    layer.msg("鍓╀綑宸ヨ祫鐨勭粨灏句笉鑳芥槸.锛�");
+                //    return;
+                //} else {
+                //    var ref = /^[0-9]+\.?[0-9]*$/;
+                //    if (!ref.test(HLeftMoneyRate)) {
+                //        layer.msg("鍓╀綑宸ヨ祫璇疯緭姝g‘鍏ユ暟瀛楋紒");
+                //        return;
+                //    }
+                //}
+
+                //if ($("#HGroupName").val() == 0) {
+                //    layer.msg("璇烽�夋嫨鐝粍锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    return;
+                //}
+                //if ($("#HCTPrjName").val() == 0) {
+                //    layer.msg("璇烽�夋嫨鏍哥畻鏂瑰紡锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    return;
+                //}
+                //if ($("#HName").val() =="") {
+                //    layer.msg("璇疯緭鍏ヨ亴鍛樺悕绉帮紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    return;
+                //}
                 $.ajax({
                     type: "POST",
                     url: GetWEBURL() + "Gy_Employee/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
@@ -1237,14 +1423,29 @@
                     layer.msg("閮ㄩ棬涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return Result = false;
                 }
-                if ($("#HGroupName").val() == '' || $("#HGroupName").val() == null) {
-                    layer.msg("鐝粍涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return Result = false;
-                }
-                if ($("#HCTPrjName").val() == '' || $("#HCTPrjName").val() == null) {
-                    layer.msg("鏍哥畻鏂瑰紡涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return Result = false;
-                }
+
+                //if ($("#HIDCard").val() == '' || $("#HIDCard").val() == null) {
+                //    layer.msg("韬唤璇佷笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    return Result = false;
+                //}
+
+                //if ($("#HBankAccount").val() == '' || $("#HBankAccount").val() == null) {
+                //    layer.msg("閾惰璐︽埛涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    return Result = false;
+                //}
+
+                
+
+
+                
+                //if ($("#HGroupName").val() == '' || $("#HGroupName").val() == null) {
+                //    layer.msg("鐝粍涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    return Result = false;
+                //}
+                //if ($("#HCTPrjName").val() == '' || $("#HCTPrjName").val() == null) {
+                //    layer.msg("鏍哥畻鏂瑰紡涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    return Result = false;
+                //}
                 return Result;
             }
 

--
Gitblit v1.9.1