From 7df042662e1929abdd667cfd7b037f4e10e8c2ad Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 14 三月 2024 11:27:56 +0800
Subject: [PATCH] 其他应付单 增加子表保存,目录放到采购管理,其他入库单编辑模块 并完善 其他出库单 列表功能;( 常规 功能, 新增,修改,删除,审核,作废,关闭,自定义过滤,源单类型列表(源单 手工录入), 合计行,保存控制,审核控制,删除控制,关联数回填 等等 ) (注: 基础资料选择, 均用 基础资料列表 的方式)

---
 WebTM/views/销售管理/其他应收单/YS_ReceiveOtherBillMain.html |  302 ++++++++++++++++++++++++++------------------------
 1 files changed, 158 insertions(+), 144 deletions(-)

diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.html"
index 0d23316..bce8b7b 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\205\266\344\273\226\345\272\224\346\224\266\345\215\225/YS_ReceiveOtherBillMain.html"
@@ -65,26 +65,18 @@
                                                 <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="width:190px;">
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
+                                        <div class="layui-inline" style="display:none;">
                                             <label class="layui-form-label">鍐呴儴鍗曟嵁鍙�<label style="color:red"> * </label></label>
                                             <div class="layui-input-block">
                                                 <input type="text" class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label">鏀舵鏃ユ湡<label style="color:red"> * </label></label>
-                                            <div class="layui-input-block">
-                                                <input type="date" class="layui-input" lay-verify="HAccDate" name="HAccDate" id="HAccDate" style="width:190px;">
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label">瀹㈡埛<label style="color:red"> * </label></label>
+                                            <label class="layui-form-label">缁忔墜浜�<label style="color:red"> * </label></label>
                                             <div class="layui-input-inline">
-                                                <input type="text" name="HCusName" id="HCusName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
-                                                <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="HEmpName" id="HEmpName" class="layui-input" value="" style="float: left; width: 150px; " readonly>
+                                                <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>
@@ -95,6 +87,18 @@
                                                 <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
                                                 <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>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">瀹㈡埛<label style="color:red"> * </label></label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HCusName" id="HCusName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+                                                <input type="hidden" name="HCusID" id="HCusID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HCusList" style="width:40px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                 </button>
                                             </div>
@@ -115,9 +119,15 @@
                                                 <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" style="background-color: #efefef4d;" readonly>
                                             </div>
                                         </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鏀舵鏃ユ湡<label style="color:red"> * </label></label>
+                                            <div class="layui-input-block">
+                                                <input type="date" class="layui-input" lay-verify="HAccDate" name="HAccDate" id="HAccDate" style="width:190px;">
+                                            </div>
+                                        </div>
                                     </div>
                                     <div class="layui-row">
-                                        <div class="layui-inline">
+                                        <div class="layui-inline" style="display:none;">
                                             <label class="layui-form-label">椤圭洰璐圭敤<label style="color:red"> * </label></label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HProjectMoneyName" id="HProjectMoneyName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
@@ -127,7 +137,7 @@
                                                 </button>
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
+                                        <div class="layui-inline" style="display:none;">
                                             <label class="layui-form-label">鍙戠エ绫诲瀷<label style="color:red"> * </label></label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
                                                 <select name="HType" id="HType" lay-filter="HType" style="width:190px;">
@@ -142,32 +152,22 @@
                                         </div>
                                     </div>
                                     <div class="layui-row">
-                                        <div class="layui-inline">
+                                        <div class="layui-inline" style="display:none;">
                                             <label class="layui-form-label">涓嶅惈绋庨噾棰�<label style="color:red"> * </label></label>
                                             <div class="layui-input-inline">
                                                 <input type="text" class="layui-input" name="HMoney" id="HMoney" value="0" autocomplete="off">
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
+                                        <div class="layui-inline" style="display:none;">
                                             <label class="layui-form-label">绋庣巼<label style="color:red"> * </label></label>
                                             <div class="layui-input-inline">
                                                 <input type="text" class="layui-input" name="HTaxRate" id="HTaxRate" value="0" autocomplete="off">
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
+                                        <div class="layui-inline" style="display:none;">
                                             <label class="layui-form-label">鎬婚噾棰�<label style="color:red"> * </label></label>
                                             <div class="layui-input-inline">
                                                 <input type="text" class="layui-input" name="HSumMoney" id="HSumMoney" value="0" autocomplete="off">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label">缁忔墜浜�<label style="color:red"> * </label></label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float: left; width: 150px; " readonly>
-                                                <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>
@@ -282,7 +282,7 @@
                     </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="1" style="padding:1px;" class="layui-this">璐圭敤椤圭洰</li>
                         </ul>
                         <div class="layui-tab-content">
                             <!--瀛愯〃-->
@@ -454,7 +454,10 @@
                     , "HTypeSub": ""
                     , "HMoney": "0"
                     , "HTaxRate": "0"
+                    , "HQty": "0"
+                    , "HPrice": "0"
                     , "HSumMoney": "0"
+                    ,"HRemark":""
                 };
                 switch (obj.event) {
                     case 'btn-AddLine':
@@ -517,116 +520,94 @@
 
 
                 switch (field) {
-                    case "HMoney":                   //涓嶅惈绋庨噾棰�
+                    case "HQty":                   //鏁伴噺
                         //鏁版嵁鏍煎紡鏍¢獙
                         temp = value + "";
                         if (!ref.test(temp) || temp == 0) {
                             //鎭㈠鏁版嵁鍒扮紪杈戝墠
                             obj.update({
-                                HMoney: oldText
+                                HQty: oldText
                             });
                             table.render(option);
                          
-                            layer.msg("涓嶅惈绋庨噾棰濊杈撳叆澶т簬0鐨勬暟瀛�!");
+                            layer.msg("鏁伴噺璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
                             return;
                         }
 
 
                         //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
-                        var HMoney = value * 1;                           //涓嶅惈绋庨噾棰�
+                        var HQty = value * 1;                           //鏁伴噺
+                        var HPrice = obj.data.HPrice * 1;           //鍗曚环
                         var HTaxRate = obj.data.HTaxRate * 1;           //绋庣巼
-                        var HSumMoney = HMoney * (1 + (HTaxRate * 0.01));    //鎬婚噾棰�=涓嶅惈绋庨噾棰�*(1+(绋庣巼*0.01))
+                        var HSumMoney = HQty * HPrice * (1 + (HTaxRate * 0.01));    //鎬婚噾棰�=鏁伴噺*鍗曚环*(1+(绋庣巼*0.01))
 
+                        var HMoney = HQty * HPrice; //涓嶅惈绋庨噾棰�=鏁伴噺*鍗曟嵁
 
                         //璁剧疆鏁版嵁灏忔暟浣嶆暟
                         HMoney = dealDoubleToFixed(HMoney, 2);
 
+                        HQty = dealDoubleToFixed(HQty, 2);;
                         HTaxRate = HTaxRate;
+                        HPrice = dealDoubleToFixed(HPrice, 2);;
                         HSumMoney = dealDoubleToFixed(HSumMoney, 2);
 
 
                         //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
                         obj.update({
-                            HMoney: HMoney
+                            HQty: HQty
+                            , HPrice: HPrice
+                            ,HMoney: HMoney
                             , HTaxRate: HTaxRate
                             , HSumMoney: HSumMoney
                         });
                         break;
-                    case "HTaxRate":                                                       //鍗曚环
+                    case "HPrice":                                                       //鍗曚环
                         //鏁版嵁鏍煎紡鏍¢獙
                         temp = value + "";
                         if (!ref.test(temp) || temp == 0) {
                             //鎭㈠鏁版嵁鍒扮紪杈戝墠
                             obj.update({
-                                HTaxRate: oldText
+                                HPrice: oldText
                             });
                             table.render(option);
                             
-                            layer.msg("绋庣巼璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+                            layer.msg("鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
                             return;
                         }
 
 
                         //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
-                        var HTaxRate = value * 1;                           //绋庣巼
-                        var HMoney = obj.data.HMoney * 1;           //涓嶅惈绋庨噾棰�
-                        var HSumMoney = HMoney * (1 + (HTaxRate * 0.01));    //鎬婚噾棰�=涓嶅惈绋庨噾棰�*(1+(绋庣巼*0.01))
+                        var HPrice = value * 1;                  //鍗曚环         
+                        var HQty = obj.data.HQty * 1;           //鏁伴噺
+                        var HTaxRate = obj.data.HTaxRate * 1;           //绋庣巼
+                        var HSumMoney = HPrice * HQty * (1 + (HTaxRate * 0.01));    //鎬婚噾棰�=鍗曚环*鏁伴噺*(1+(绋庣巼*0.01))
 
+                        var HMoney = HQty * HPrice; //涓嶅惈绋庨噾棰�=鏁伴噺*鍗曟嵁
 
                         //璁剧疆鏁版嵁灏忔暟浣嶆暟
                         HMoney = dealDoubleToFixed(HMoney, 2);
 
+                        HQty = dealDoubleToFixed(HQty, 2);;
                         HTaxRate = HTaxRate;
+                        HPrice = dealDoubleToFixed(HPrice, 2);;
                         HSumMoney = dealDoubleToFixed(HSumMoney, 2);
+
 
 
                         //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
                         obj.update({
-                            HMoney: HMoney
+                            HQty: HQty
+                            , HPrice: HPrice
+                            , HMoney: HMoney
                             , HTaxRate: HTaxRate
                             , HSumMoney: HSumMoney
                         });
                         break;
-                    case "HSumMoney":                                                       //鏁伴噺
-                        //鏁版嵁鏍煎紡鏍¢獙
-                        temp = value + "";
-                        if (!ref.test(temp)) {
-                            //鎭㈠鏁版嵁鍒扮紪杈戝墠
-                            obj.update({
-                                HSumMoney: oldText
-                            });
-                            layer.msg("绋庣巼璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
-                            return;
-                        }
-
-
-                        //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
-                        var HSumMoney = value * 1;                           //鎬婚噾棰�
-
-                        var HTaxRate = obj.data.HTaxRate * 1;           //绋庣巼
-                        var HMoney = HSumMoney / (1 + (HTaxRate * 0.01));
-
-
-
-
-                        //璁剧疆鏁版嵁灏忔暟浣嶆暟
-                        HMoney = dealDoubleToFixed(HMoney, 2);
-
-                        HTaxRate = HTaxRate;
-                        HSumMoney = dealDoubleToFixed(HSumMoney, 2);
-
-                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
-                        obj.update({
-                            HMoney: HMoney
-                            , HTaxRate: HTaxRate
-                            , HSumMoney: HSumMoney
-                        });
-                    default:
                 }
             });
             //#endregion
 
-            //#region 琛ㄦ牸琛岄�夋嫨澶勭悊锛堟槸鍚﹀彇搴撳瓨锛�
+            //#region 琛ㄦ牸琛岄�夋嫨澶勭悊
             form.on('select(HTypeSub)', function (data) {
                 //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
                 var elem = data.othis.parents('tr');
@@ -882,10 +863,13 @@
                         , { type: 'numbers', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
                         , { field: 'HProjectMoneyID', title: '璐圭敤椤圭洰ID', hide: true, style: 'background-color: #f9f9f9;' }
                         , { field: 'HPMoneyName', title: '璐圭敤椤圭洰鍚嶇О', edit: 'text', event: "HPMoneyName",style: 'background-color: #f9f9f9;' }     //f7
-                        , { field: 'HTypeSub', title: '鍙戠エ绫诲瀷', templet: '#HTypeSub' }
-                        , { field: 'HMoney', title: '涓嶅惈绋庨噾棰�', edit: 'text', style: 'background-color: #f9f9f9;' }
-                        , { field: 'HTaxRate', title: '绋庣巼', edit: 'text', style: 'background-color: #f9f9f9;' }
-                        , { field: 'HSumMoney', title: '鎬婚噾棰�', edit: 'text', style: 'background-color: #f9f9f9;' }
+                        , { field: 'HTypeSub', title: '鍙戠エ绫诲瀷', hide: true, templet: '#HTypeSub' }
+                        , { field: 'HMoney', title: '涓嶅惈绋庨噾棰�', hide: true, edit: 'text', style: 'background-color: #f9f9f9;' }
+                        , { field: 'HTaxRate', title: '绋庣巼', hide: true, edit: 'text', style: 'background-color: #f9f9f9;' }
+                        , { field: 'HQty', title: '鏁伴噺',  edit: 'text', style: 'background-color: #f9f9f9;' }
+                        , { field: 'HPrice', title: '鍗曚环', edit: 'text', style: 'background-color: #f9f9f9;' }
+                        , { field: 'HSumMoney', title: '鎬婚噾棰�', style: 'background-color: #f9f9f9;' }
+                        , { field: 'HRemark', title: '瀛愯〃澶囨敞', edit: 'text', style: 'background-color: #f9f9f9;' }
                         , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
                     ]]
                 }
@@ -897,7 +881,10 @@
                         , "HTypeSub": ""
                         , "HMoney": "0"
                         , "HTaxRate": "0"
+                        , "HQty": "0"
+                        , "HPrice": "0"
                         , "HSumMoney": "0"
+                        ,"HRemark":""
                     }
                 ];
                 option.data = rowdata;
@@ -912,15 +899,15 @@
                 var rowIndex = $(obj.tr).attr("data-index");
                 if (obj.event === 'del') {
                     layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
-                        if (rowIndex === '0') {
-                            layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
-                        } else {
+                        //if (rowIndex === '0') {
+                        //    layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                        //} else {
                             var oldData = table.cache["mainTable"];
                             oldData.splice(obj.tr.data('index'), 1)
                             option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
                             table.render(option);
                             layer.close(index);
-                        }
+                        /*}*/
                     });
                 }
             }
@@ -973,19 +960,19 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '閿�鍞儴闂ㄥ垪琛�'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
-                    //, btn: ['纭畾', '鍙栨秷']
-                    //, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
-                    //    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
-                    //    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
-                    //    if (checkStatus.data.length === 0) {
-                    //        return layer.msg('璇烽�夋嫨鏁版嵁');
-                    //    }
-                    //    $("#HDeptName").val(checkStatus.data[0].HName);
-                    //    $("#HDeptID").val(checkStatus.data[0].HItemID);
-                    //    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                    //}
-                    //, btn2: function (index, layero) { }
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
+                        $("#HDeptID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
                 })
             }
             //#endregion
@@ -998,19 +985,19 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '閿�鍞憳鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes']
-                    //, btn: ['纭畾', '鍙栨秷']
-                    //, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
-                    //    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
-                    //    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
-                    //    if (checkStatus.data.length === 0) {
-                    //        return layer.msg('璇烽�夋嫨鏁版嵁');
-                    //    }
-                    //    $("#HEmpName").val(checkStatus.data[0].HName);
-                    //    $("#HEmpID").val(checkStatus.data[0].HItemID);
-                    //    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                    //}
-                    //, btn2: function (index, layero) { }
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+                        $("#HEmpID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
                 })
             }
             //#endregion
@@ -1049,7 +1036,7 @@
                     , area: ['90%', '90%']//澶у皬
                     , title: '涓氬姟瀹㈡埛鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_CustomerList.html', 'yes']
+                    , content: ['../../鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -1058,7 +1045,7 @@
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
 
-                        $("#HCusName").val(checkStatus.data[0].HName);
+                        $("#HCusName").val(checkStatus.data[0].瀹㈡埛鍚嶇О);
                         $("#HCusID").val(checkStatus.data[0].HItemID);
                         var HCusID = $("#HCusID").val();
                         getHTaxRateByCusID(HCusID);//鏍规嵁瀹㈡埛鑾峰彇瀹㈡埛瀵瑰簲绋庣巼
@@ -1116,6 +1103,11 @@
 
             //#region 闈炵┖楠岃瘉
             function AllowLoadData(data) {
+
+                //鏁板�兼牸寮忔牎楠屽伐鍏�
+                var ref = /^\d+(\.\d+)?$/;          //闈炶礋鏁版鍒欒〃杈惧紡
+                var temp = "";
+
                 //#region 琛ㄥご鏁版嵁妫�楠�
                 if ($("#HBillNo").val() == "") {
                     layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!");
@@ -1133,30 +1125,52 @@
                     layer.msg("瀹㈡埛涓嶈兘涓虹┖!");
                     return false;
                 }
-                if ($("#HProjectMoneyID").val() == "0") {
-                    layer.msg("璐圭敤椤圭洰鏈�夋嫨!");
-                    return false;
-                }
-                if ($("#HType").val() == "") {
-                    layer.msg("鍙戠エ绫诲瀷鏈�夋嫨!");
-                    return false;
-                }
+             
                 if ($("#HEmpID").val() == "0") {
                     layer.msg("缁忔墜浜烘湭閫夋嫨!");
                     return false;
                 }
-                if ($("#HMoney").val() == "0") {
-                    layer.msg("涓嶅惈绋庨噾棰濅笉鑳戒负闆�");
-                    return false;
+                //#region 瀛愯〃鏍¢獙
+                for (var i = 0; i < option.data.length; i++) {
+
+                  
+                    //璐圭敤椤圭洰鏍¢獙
+                    if (option.data[i].HProjectMoneyID == "0") {
+                        layer.msg("绗�" + (i+1) + "琛岋細璇烽�夋嫨璐圭敤椤圭洰锛�");
+                        return false;
+                    }
+
+                    //鏁伴噺鏍煎紡鏍¢獙
+                    temp = option.data[i]["HQty"] + "";
+                    if (temp == "0") {
+                        layer.msg("绗�" + (i + 1) + "琛岋細鏁伴噺涓嶈兘涓�0锛�");
+                        return false;
+                    } else if (!ref.test(temp)) {
+                        layer.msg("绗�" + (i + 1) + "琛岋細鏁伴噺璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+                        return false;
+                    }
+
+                    //鍗曚环鏍煎紡鏍¢獙
+                    temp = option.data[i]["HPrice"] + "";
+                    if (temp == "0") {
+                        layer.msg("绗�" + (i + 1) + "琛岋細鍗曚环涓嶈兘涓�0锛�");
+                        return false;
+                    } else if (!ref.test(temp)) {
+                        layer.msg("绗�" + (i + 1) + "琛岋細鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+                        return false;
+                    }
+
+                    //鎬婚噾棰濇牸寮忔牎楠�
+                    temp = option.data[i]["HSumMoney"] + "";
+                    if (temp == "0") {
+                        layer.msg("绗�" + (i+1) + "琛岋細鎬婚噾棰濅笉鑳戒负0锛�");
+                        return false;
+                    } else if (!ref.test(temp)) {
+                        layer.msg("绗�" + (i+1) + "琛岋細鎬婚噾棰濊杈撳叆澶т簬0鐨勬暟瀛楋紒");
+                        return false;
+                    }
                 }
-                if ($("#HTaxRate").val() == "") {
-                    layer.msg("绋庣巼涓嶈兘涓虹┖");
-                    return false;
-                }
-                if ($("#HSumMoney").val() == "0") {
-                    layer.msg("鎬婚噾棰濅笉鑳戒负闆�");
-                    return false;
-                }
+                //#endregion
                 return true;
             }
             //#endregion
@@ -1290,7 +1304,7 @@
                             for (var i = 0; i <data1.length; i++) {
 
 
-                                //寤惰繜鍘熷洜
+                                //鍙戠エ绫诲瀷
                                 $('#HTypeSub' + (i + 1)).find("option[value='" + data1[i].HTypeSub + "']").attr("selected", true);
                             }
                             form.render('select');
@@ -1427,17 +1441,17 @@
 
         });
 
-        function GetHDeptNameValue(obj)  //杩斿洖閮ㄩ棬
-        {
-            $("#HDeptName").val(obj[0].HName);
-            $("#HDeptID").val(obj[0].HItemID);
-        }
+        //function GetHDeptNameValue(obj)  //杩斿洖閮ㄩ棬
+        //{
+        //    $("#HDeptName").val(obj[0].HName);
+        //    $("#HDeptID").val(obj[0].HItemID);
+        //}
 
-        function GetHEmpValue(obj)  //杩斿洖缁忔墜浜�
-        {
-            $("#HEmpName").val(obj[0].HName);
-            $("#HEmpID").val(obj[0].HItemID);
-        }
+        //function GetHEmpValue(obj)  //杩斿洖缁忔墜浜�
+        //{
+        //    $("#HEmpName").val(obj[0].HName);
+        //    $("#HEmpID").val(obj[0].HItemID);
+        //}
 
                 //function GetHSupValue(obj)  //杩斿洖瀹㈡埛
                 //{

--
Gitblit v1.9.1