From 5f9c6a14b55836e12a8a6b5262e334a9d829cbfb Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 10 三月 2025 19:16:40 +0800
Subject: [PATCH] 1

---
 WebTM/views/验收入库/外购入库/Kf_POStockInBackBill_Add_Up.html |  185 +++++++++++++++++++++++++++-------------------
 1 files changed, 108 insertions(+), 77 deletions(-)

diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBill_Add_Up.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBill_Add_Up.html"
index dd41307..6feba38 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBill_Add_Up.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBackBill_Add_Up.html"
@@ -171,50 +171,47 @@
                                             </button>
                                         </div>
                                     </div>
-                                        <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">璐熻矗浜�</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
-                                                <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value=0 style="float:left;width:150px;">
-                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-
-
-                                    </div>
-                                    <div class="layui-row">
-
-                                        <div class="layui-col-xs7 layui-inline">
-                                            <label class="layui-form-label">鎽樿</label>
-                                            <div class="layui-input-block">
-                                                <input class="layui-input" name="HExplanation" id="HExplanation" autocomplete="off">
-                                            </div>
+                                    <div class="layui-col-xs4 layui-inline">
+                                        <label class="layui-form-label">璐熻矗浜�</label>
+                                        <div class="layui-input-inline">
+                                            <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
+                                            <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value=0 style="float:left;width:150px;">
+                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
+                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                            </button>
                                         </div>
                                     </div>
-                                    <div class="layui-row">
-                                        <div class="layui-col-xs7 layui-inline">
-                                            <label class="layui-form-label">澶囨敞</label>
-                                            <div class="layui-input-block">
-                                                <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
-                                            </div>
+
+
+                                </div>
+                                <div class="layui-row">
+
+                                    <div class="layui-col-xs7 layui-inline">
+                                        <label class="layui-form-label">鎽樿</label>
+                                        <div class="layui-input-block">
+                                            <input class="layui-input" name="HExplanation" id="HExplanation" autocomplete="off">
                                         </div>
                                     </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
-                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
-                                                <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
-                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
-                                                </select>
-                                            </div>
+                                </div>
+                                <div class="layui-row">
+                                    <div class="layui-col-xs7 layui-inline">
+                                        <label class="layui-form-label">澶囨敞</label>
+                                        <div class="layui-input-block">
+                                            <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-row">
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+                                        <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                            <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
+                                                <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                            </select>
                                         </div>
                                     </div>
                                 </div>
                             </div>
-
-
                             <!--鍒跺崟淇℃伅-->
                             <div class="layui-tab-item">
                                 <div class="layui-form-item">
@@ -240,20 +237,6 @@
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">淇敼浜�</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">浣滃簾浜�</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
-                                                <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-inline">
                                             <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
                                                 <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
@@ -271,24 +254,42 @@
                                                 <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-inline">
+                                            <label class="layui-form-label" style="width: 85px;">淇敼浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浣滃簾浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <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-inline">
                                             <label class="layui-form-label" style="width: 85px;">淇敼鏃ユ湡</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
                                                 <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
-                                        <div class="layui-row">
-                                            <div class="layui-inline">
-                                                <label class="layui-form-label" style="width: 85px;">浣滃簾鏃ユ湡</label>
-                                                <div class="layui-input-block" style="margin-left: 120px;">
-                                                    <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
-                                                </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浣滃簾鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <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">
@@ -869,11 +870,11 @@
                                 , "HMaker": data.鍒跺崟浜�
                                 , "HChecker": data.瀹℃牳浜�
                                 , "HCloseMan": data.鍏抽棴浜�
-                                , "HMakeDate": data.鍒跺崟鏃ユ湡
-                                , "HCheckDate": data.瀹℃牳鏃ユ湡
-                                , "HCloseDate": data.鍏抽棴鏃ユ湡
-                                , "HUpDateDate": data.淇敼鏃ユ湡
-                                , "HDeleteDate": data.浣滃簾鏃ユ湡
+                                , "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : Pub_Format(data.鍒跺崟鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+                                , "HCheckDate": data.瀹℃牳鏃ユ湡 == null ? "" : Pub_Format(data.瀹℃牳鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+                                , "HCloseDate": data.鍏抽棴鏃ユ湡 == null ? "" : Pub_Format(data.鍏抽棴鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+                                , "HUpDateDate": data.淇敼鏃ユ湡 == null ? "" : Pub_Format(data.淇敼鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+                                , "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : Pub_Format(data.浣滃簾鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
 
                             });
                             //瀛愯〃  璧嬪��
@@ -1010,16 +1011,16 @@
                         , "HDeptName": dataArray[0].閮ㄩ棬
                         , "HManagerID": dataArray[0].HManagerID
                         , "HManagerName": dataArray[0].涓荤
-                        , "HWHID": dataArray[0].HWHID
-                        , "HWHName": dataArray[0].浠撳簱
+                        , "HWHID": dataArray[0].涓昏〃浠撳簱ID == null ? 0 : dataArray[0].涓昏〃浠撳簱ID
+                        , "HWHName": dataArray[0].涓昏〃浠撳簱
                         , "HEmpID": dataArray[0].HEmpID
                         , "HEmpName": dataArray[0].涓氬姟鍛�
                         , "HSupID": dataArray[0].HSupID
                         , "HSupName": dataArray[0].渚涘簲鍟�
-                        , "HSecManagerID": dataArray[0].HSecManagerID
-                        , "HSecManagerName": dataArray[0].楠屾敹鍛�
-                        , "HKeeperID": dataArray[0].HKeeperID
-                        , "HKeeperName": dataArray[0].淇濈鍛�
+                        //, "HSecManagerID": dataArray[0].HSecManagerID
+                        //, "HSecManagerName": dataArray[0].楠屾敹鍛�
+                        //, "HKeeperID": dataArray[0].HKeeperID
+                        //, "HKeeperName": dataArray[0].淇濈鍛�
                         , "HCurID": dataArray[0].HCurID
                         , "HCurName": dataArray[0].甯佸埆
                         , "HExRate": dataArray[0].姹囩巼
@@ -1046,6 +1047,7 @@
                                 , "HSecUnitID": dataArray[i].HSecUnitID
                                 , "杈呭姪鍗曚綅": dataArray[i].杈呭姪鍗曚綅
                                 , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
+                                , "HQtyMust": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
                                 , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
                                 , 'HDiscountRate': dataArray[i].鎶樻墸鐜�                                                    //
                                 , 'HRelTaxPrice': "0"
@@ -1097,14 +1099,14 @@
                     layer.msg("璇烽�夋嫨浠撳簱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return;
                 }
-                if ($("#HKeeperID").val() == 0) {
-                    layer.msg("璇烽�夋嫨淇濈鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-                if ($("#HSecManagerID").val() == 0) {
-                    layer.msg("璇烽�夋嫨楠屾敹鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
+                //if ($("#HKeeperID").val() == 0) {
+                //    layer.msg("璇烽�夋嫨淇濈鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    return;
+                //}
+                //if ($("#HSecManagerID").val() == 0) {
+                //    layer.msg("璇烽�夋嫨楠屾敹鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    return;
+                //}
 
 
                 var num = [];
@@ -1710,6 +1712,35 @@
                         if (checkStatus.data.length == 0) {
                             return layer.msg("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�!");
                         }
+
+                        form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                            "HMainSourceInterID": "0"
+                            , "HMainSourceEntryID": "0"
+                            , "HMainSourceBillNo": ""
+                            , "HMainSourceBillType": $("#BillType").val()
+
+                            , "HDeptID": checkStatus.data[0].HDeptID
+                            , "HDeptName": checkStatus.data[0].閮ㄩ棬
+                            , "HManagerID": checkStatus.data[0].HManagerID
+                            , "HManagerName": checkStatus.data[0].涓荤
+                            , "HWHID": checkStatus.data[0].涓昏〃浠撳簱ID == null ? 0 : checkStatus.data[0].涓昏〃浠撳簱ID
+                            , "HWHName": checkStatus.data[0].涓昏〃浠撳簱
+                            , "HEmpID": checkStatus.data[0].HEmpID
+                            , "HEmpName": checkStatus.data[0].涓氬姟鍛�
+                            , "HSupID": checkStatus.data[0].HSupID
+                            , "HSupName": checkStatus.data[0].渚涘簲鍟�
+                            //, "HSecManagerID": checkStatus.data[0].HSecManagerID
+                            //, "HSecManagerName": checkStatus.data[0].楠屾敹鍛�
+                            //, "HKeeperID": checkStatus.data[0].HKeeperID
+                            //, "HKeeperName": checkStatus.data[0].淇濈鍛�
+                            , "HCurID": checkStatus.data[0].HCurID
+                            , "HCurName": checkStatus.data[0].甯佸埆
+                            , "HExRate": checkStatus.data[0].姹囩巼
+                            /*, "HAddress": data.浜よ揣鍦扮偣*/
+                            , "HRemark": checkStatus.data[0].琛ㄥご澶囨敞
+                            , "HInnerBillNo": checkStatus.data[0].鍐呴儴鍗曟嵁鍙�
+                        });
+
                         //layer.alert("浣犲凡閫夋嫨" + checkStatus.data.length + "鏉℃暟鎹�");
                         //鑾峰彇鏀舵枡閫氱煡鍗曚唬鐮�
                         var ProcessNumber = [];
@@ -1727,8 +1758,8 @@
                                 option.data.push({
                                     "HMaterID": checkStatus.data[j].HMaterID, "鐗╂枡浠g爜": checkStatus.data[j].鐗╂枡浠g爜, "鐗╂枡鍚嶇О": checkStatus.data[j].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": checkStatus.data[j].瑙勬牸鍨嬪彿,
                                     "HUnitID": checkStatus.data[j].HUnitID, "璁¢噺鍗曚綅": checkStatus.data[j].璁¢噺鍗曚綅, 
-                                    "HQty": checkStatus.data[j].鏁伴噺-checkStatus.data[j].鍏宠仈鏁伴噺,"HQtyMust": checkStatus.data[j].搴旀敹鏁伴噺, "HPrice": checkStatus.data[j].鍗曚环,
-                                    "HMoney": checkStatus.data[j].閲戦,  "HTaxRate": checkStatus.data[j].绋庣巼, "HTaxMoney": checkStatus.data[j].绋庨,"HWHID": checkStatus.data[j].HWHID,
+                                    "HQty": checkStatus.data[j].鏁伴噺 - checkStatus.data[j].鍏宠仈鏁伴噺, "HQtyMust": checkStatus.data[j].鏁伴噺 - checkStatus.data[j].鍏宠仈鏁伴噺, "HPrice": checkStatus.data[j].鍗曚环,
+                                    "HMoney": (checkStatus.data[j].鏁伴噺 - checkStatus.data[j].鍏宠仈鏁伴噺) * Number(checkStatus.data[j].鍗曚环), "HTaxRate": checkStatus.data[j].绋庣巼, "HTaxMoney": checkStatus.data[j].绋庨, "HWHID": checkStatus.data[j].HWHID,
                                     "鏀舵枡浠撳簱": checkStatus.data[j].鏀舵枡浠撳簱,"HSPID": checkStatus.data[j].HSPID,"浠撲綅鍚嶇О": checkStatus.data[j].浠撲綅鍚嶇О,"HSecUnitID": checkStatus.data[j].HSecUnitID,"杈呭姪鍗曚綅": checkStatus.data[j].杈呭姪鍗曚綅,
                                     "HSourceBillNo": checkStatus.data[j].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid
                                 })

--
Gitblit v1.9.1