1
duhe
2025-03-05 9b3a0ec8536bdef78aba9803271246b66437f53a
1
5个文件已修改
87 ■■■■ 已修改文件
WebTM/Properties/PublishProfiles/JFTM.pubxml.user 40 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/付款单/YF_PayMentBill.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/应付单/Cg_PayableBill.html 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/领料出库/Kf_MateOutBillList.html 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -787,7 +787,7 @@
      <publishTime>04/11/2023 16:34:42</publishTime>
    </File>
    <File Include="layuiadmin/Scripts/webConfig.js">
      <publishTime>03/03/2025 08:47:22</publishTime>
      <publishTime>03/03/2025 10:06:39</publishTime>
    </File>
    <File Include="layuiadmin/Scripts/webConfig2.js">
      <publishTime>07/15/2024 09:58:59</publishTime>
@@ -2392,10 +2392,10 @@
      <publishTime>04/11/2023 16:34:43</publishTime>
    </File>
    <File Include="views/仓存管理/仓库调拨/Kf_MoveStockBillList.html">
      <publishTime>11/26/2024 08:33:01</publishTime>
      <publishTime>03/03/2025 10:06:04</publishTime>
    </File>
    <File Include="views/仓存管理/仓库调拨/Kf_MoveStockBillList.html">
      <publishTime>11/26/2024 08:33:01</publishTime>
      <publishTime>03/03/2025 10:06:04</publishTime>
    </File>
    <File Include="views/仓存管理/仓库调拨/Kf_MoveStockBill_CheckList_New.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
@@ -5293,7 +5293,7 @@
      <publishTime>02/11/2025 09:07:34</publishTime>
    </File>
    <File Include="views/生产管理/生产计划平台/JIT_DayPlanPlatFormImport.html">
      <publishTime>12/18/2024 09:58:22</publishTime>
      <publishTime>03/03/2025 10:06:04</publishTime>
    </File>
    <File Include="views/生产管理/生产计划平台/JIT_DayPlanPlatForm_BCP.html">
      <publishTime>06/07/2024 15:42:08</publishTime>
@@ -7078,7 +7078,7 @@
      <publishTime>07/15/2024 09:58:59</publishTime>
    </File>
    <File Include="views/采购管理/付款单/YF_PayMentBill.html">
      <publishTime>12/05/2024 08:36:48</publishTime>
      <publishTime>03/03/2025 11:01:35</publishTime>
    </File>
    <File Include="views/采购管理/付款单/YF_PayMentBillList.html">
      <publishTime>12/11/2024 22:26:36</publishTime>
@@ -7102,7 +7102,7 @@
      <publishTime>07/31/2024 13:38:19</publishTime>
    </File>
    <File Include="views/采购管理/应付单/Cg_PayableBill.html">
      <publishTime>03/03/2025 08:46:28</publishTime>
      <publishTime>03/03/2025 11:01:04</publishTime>
    </File>
    <File Include="views/采购管理/应付单/Cg_PayableBillCheckQuery.html">
      <publishTime>12/11/2024 22:26:36</publishTime>
@@ -7129,7 +7129,7 @@
      <publishTime>03/03/2025 09:49:26</publishTime>
    </File>
    <File Include="views/采购管理/收料通知单/Cg_POInStockBillList.html">
      <publishTime>03/03/2025 09:52:15</publishTime>
      <publishTime>03/03/2025 10:06:30</publishTime>
    </File>
    <File Include="views/采购管理/收料通知单/Cg_POInStockBillQuery.html">
      <publishTime>03/03/2025 08:46:28</publishTime>
@@ -7189,7 +7189,7 @@
      <publishTime>03/03/2025 09:22:17</publishTime>
    </File>
    <File Include="views/采购管理/采购订单/Cg_POOrderBillList.html">
      <publishTime>12/31/2024 10:12:45</publishTime>
      <publishTime>03/03/2025 10:02:15</publishTime>
    </File>
    <File Include="views/采购管理/采购订单/Cg_POOrderBillList1111.html">
      <publishTime>10/19/2021 16:08:25</publishTime>
@@ -7345,13 +7345,13 @@
      <publishTime>07/31/2024 13:38:19</publishTime>
    </File>
    <File Include="views/采购管理/收料通知单/Cg_POInStockBillList.html">
      <publishTime>03/03/2025 09:52:15</publishTime>
      <publishTime>03/03/2025 10:06:30</publishTime>
    </File>
    <File Include="views/采购管理/退料通知单/Cg_POInStockBackBillList.html">
      <publishTime>03/03/2025 08:46:28</publishTime>
    </File>
    <File Include="views/采购管理/采购订单/Cg_POOrderBillList.html">
      <publishTime>12/31/2024 10:12:45</publishTime>
      <publishTime>03/03/2025 10:02:15</publishTime>
    </File>
    <File Include="views/销售管理/发货通知单/Xs_SeOutStockBillList.html">
      <publishTime>12/31/2024 10:12:45</publishTime>
@@ -7588,10 +7588,10 @@
      <publishTime>04/11/2023 16:34:43</publishTime>
    </File>
    <File Include="views/领料发货/其他出库/Kf_OtherOutBillList.html">
      <publishTime>07/31/2024 13:38:19</publishTime>
      <publishTime>03/03/2025 10:06:04</publishTime>
    </File>
    <File Include="views/领料发货/其他出库/Kf_OtherOutBillList.html">
      <publishTime>07/31/2024 13:38:19</publishTime>
      <publishTime>03/03/2025 10:06:04</publishTime>
    </File>
    <File Include="views/领料发货/其他出库/Kf_OtherOutBill_Check.html">
      <publishTime>11/03/2023 21:45:51</publishTime>
@@ -7711,13 +7711,13 @@
      <publishTime>08/16/2021 17:24:30</publishTime>
    </File>
    <File Include="views/领料发货/领料出库/Kf_MateOutBillLEdit.html">
      <publishTime>03/03/2025 08:46:28</publishTime>
      <publishTime>03/03/2025 10:06:04</publishTime>
    </File>
    <File Include="views/领料发货/领料出库/Kf_MateOutBillList.html">
      <publishTime>09/13/2024 15:42:13</publishTime>
      <publishTime>03/03/2025 11:38:17</publishTime>
    </File>
    <File Include="views/领料发货/领料出库/Kf_MateOutBillList.html">
      <publishTime>09/13/2024 15:42:13</publishTime>
      <publishTime>03/03/2025 11:38:17</publishTime>
    </File>
    <File Include="views/领料发货/领料出库/Kf_MateOutBill_CheckList_New.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
@@ -7786,10 +7786,10 @@
      <publishTime>04/11/2023 16:34:43</publishTime>
    </File>
    <File Include="views/验收入库/其他入库/Kf_OtherInBillList.html">
      <publishTime>07/31/2024 13:38:19</publishTime>
      <publishTime>03/03/2025 10:06:04</publishTime>
    </File>
    <File Include="views/验收入库/其他入库/Kf_OtherInBillList.html">
      <publishTime>07/31/2024 13:38:19</publishTime>
      <publishTime>03/03/2025 10:06:04</publishTime>
    </File>
    <File Include="views/验收入库/其他入库/Kf_OtherInBill_Fast.html">
      <publishTime>08/21/2024 16:35:21</publishTime>
@@ -7810,7 +7810,7 @@
      <publishTime>03/07/2024 09:59:11</publishTime>
    </File>
    <File Include="views/验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html">
      <publishTime>01/10/2025 16:18:06</publishTime>
      <publishTime>03/03/2025 10:21:53</publishTime>
    </File>
    <File Include="views/验收入库/外购入库/Kf_POStockInBackBill.html">
      <publishTime>11/03/2023 21:45:51</publishTime>
@@ -7822,10 +7822,10 @@
      <publishTime>03/03/2025 08:46:28</publishTime>
    </File>
    <File Include="views/验收入库/外购入库/Kf_POStockInBillList.html">
      <publishTime>12/31/2024 10:12:45</publishTime>
      <publishTime>03/03/2025 10:06:04</publishTime>
    </File>
    <File Include="views/验收入库/外购入库/Kf_POStockInBillList.html">
      <publishTime>12/31/2024 10:12:45</publishTime>
      <publishTime>03/03/2025 10:06:04</publishTime>
    </File>
    <File Include="views/验收入库/外购入库/Kf_POStockInBillListQuery.html">
      <publishTime>12/05/2024 08:36:48</publishTime>
WebTM/views/²É¹º¹ÜÀí/¸¶¿îµ¥/YF_PayMentBill.html
@@ -1085,9 +1085,11 @@
                    , "HAccSupID": dataArray[0].HSupID
                    , "HAccSupName": dataArray[0].供应商
                    , "HSumMoney": dataArray[0].金额
                    , "HRelSumMoney": (dataArray[0].金额 * 1) * ($("#HDiscountRate").val()* 0.01)
                    , "HProjectID": dataArray[0].HProjectID
                    , "HProjectName": dataArray[0].项目名称
                    , "HProjectNumber": dataArray[0].项目代码
                    , "HInvoiceBillNo": dataArray[0].发票编号
                });
                //子表  èµ‹å€¼
WebTM/views/²É¹º¹ÜÀí/Ó¦¸¶µ¥/Cg_PayableBill.html
@@ -67,7 +67,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label">单据编号</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;">
                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="HInterID" id="HInterID" value="0">
                                            </div>
                                        </div>
@@ -95,7 +95,7 @@
                                                <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" class="layui-input" value="0" style="float:left;width:150px;">
                                                <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" class="layui-input" value="0" style="float:left;width:150px;">
                                                <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="text" name="HMainSourceBillNo" id="HMainSourceBillNo" class="layui-input" value="" style="float: left; width: 150px; ">
                                                <input type="text" name="HMainSourceBillNo" id="HMainSourceBillNo" class="layui-input" value="" style="float: left; width: 150px; " readonly>
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HMainSource" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
@@ -2171,15 +2171,15 @@
                                , "HInvoiceBillNo": data.发票编号
                                , "HMaker": data.制单人
                                , "HMakeDate": data.制单日期 == null ? "" : Format(new Date(data.制单日期), "yyyy-MM-dd HH:mm:ss")
                                , "HMakeDate": data.制单日期 == null ? "" : Format(new Date(data.制单日期), "yyyy-MM-dd hh:mm:ss")
                                , "HUpDater": data.修改人
                                , "HUpDateDate": data.修改日期 == null ? "" : Format(new Date(data.修改日期), "yyyy-MM-dd HH:mm:ss")
                                , "HUpDateDate": data.修改日期 == null ? "" : Format(new Date(data.修改日期), "yyyy-MM-dd hh:mm:ss")
                                , "HChecker": data.审核人
                                , "HCheckDate": data.审核日期 == null ? "" : Format(new Date(data.审核日期), "yyyy-MM-dd HH:mm:ss")
                                , "HCheckDate": data.审核日期 == null ? "" : Format(new Date(data.审核日期), "yyyy-MM-dd hh:mm:ss")
                                , "HCloseMan": data.关闭人
                                , "HCloseDate": data.关闭日期 == null ? "" : Format(new Date(data.关闭日期), "yyyy-MM-dd HH:mm:ss")
                                , "HCloseDate": data.关闭日期 == null ? "" : Format(new Date(data.关闭日期), "yyyy-MM-dd hh:mm:ss")
                                , "HDeleteMan": data.作废人
                                , "HDeleteDate": data.作废日期 == null ? "" : Format(new Date(data.作废日期), "yyyy-MM-dd HH:mm:ss")
                                , "HDeleteDate": data.作废日期 == null ? "" : Format(new Date(data.作废日期), "yyyy-MM-dd hh:mm:ss")
                            });
                            if (data.HMainSourceBillType != "") {
@@ -3379,9 +3379,9 @@
                    , "HEmpName": dataArray[0].业务员
                    , "HSupID": dataArray[0].HSupID
                    , "HSupName": dataArray[0].供应商
                    //, "HCurID": dataArray[0].HCurID
                    //, "HCurName": dataArray[0].币别
                    //, "HExRate": dataArray[0].汇率
                    , "HCurID": dataArray[0].HCurID
                    , "HCurName": dataArray[0].币别
                    , "HExRate": dataArray[0].汇率
                    , "HSSID": "0"
                    , "HSSName": ""
                    , "HPSStyleID": dataArray[0].HPSStyleID
WebTM/views/ÁìÁÏ·¢»õ/ÁìÁϳö¿â/Kf_MateOutBillList.html
@@ -1400,6 +1400,9 @@
                            dataCol = data1.data[0].HGridString.split(',');
                            for (var i = 0; i < option.cols[0].length - 1; i++) {
                                if (i >= dataCol.length) {
                                    continue;
                                }
                                var dataCols = dataCol[i].split('|');
                                //隐藏列
                                if (dataCols[1] == 1) {
WebTM/views/ÑéÊÕÈë¿â/Í⹺Èë¿â/Add_Edit_Kf_POStockInBillList.html
@@ -71,7 +71,7 @@
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">单据号<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;">
                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="HInterID" id="HInterID" value="0">
                                                <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID" value=0>
                                                <input type="hidden" name="HBillSubType" id="HBillSubType" value="">
@@ -80,13 +80,13 @@
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">日期<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                                <input type="date" class="layui-input" name="HDate" id="HDate" 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 style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;" readonly>
                                                <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value=0 style="float:left;width:150px;">
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -98,7 +98,7 @@
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">仓库<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;" readonly>
                                                <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value=0 style="float:left;width:150px;">
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HWHList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -108,7 +108,7 @@
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">验收员</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="text" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;" readonly>
                                                <input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="0" style="float:left;width:150px;">
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HSecManagerList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -118,7 +118,7 @@
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">保管员</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;" readonly>
                                                <input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="0" style="float:left;width:150px;">
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HKeeperList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -131,7 +131,7 @@
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">业务员</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="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>
@@ -149,7 +149,7 @@
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">选单号</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HSourceBillNo" id="HSourceBillNo" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="text" name="HSourceBillNo" id="HSourceBillNo" class="layui-input" value="" style="float:left;width:150px;" readonly>
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="XDHList" id="XDHList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -166,7 +166,7 @@
                                        <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="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;" readonly>
                                                <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>
@@ -195,7 +195,7 @@
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">部门<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;" 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>
@@ -1199,6 +1199,8 @@
                                , "HMaker": data.制单人
                                , "HChecker": data.审核人
                                , "HCloseMan": data.关闭人
                                , "HUpDater": data.修改人
                                , "HDeleteMan": 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")