Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

yusijie

2024-05-07 1ba2d912e2e7faef6c47d91a9a4f779bf1a48d23

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

 WebTM/Properties/PublishProfiles/JFTM.pubxml.user

@@ -1583,6 +1583,9 @@
    <File Include="views/PlateBinding.html">
      <publishTime>04/28/2024 08:36:23</publishTime>
    </File>
    <File Include="views/PlateBinding.html">
      <publishTime>04/26/2024 12:59:07</publishTime>
    </File>
    <File Include="views/PublicPage/AreaInformation.html">
      <publishTime>08/27/2021 14:42:06</publishTime>
    </File>
@@ -1973,6 +1976,12 @@
    <File Include="views/WMS扫码模块/生产补料/Kf_MateReplenishOutBill_PDA.html">
      <publishTime>04/28/2024 08:36:23</publishTime>
    </File>
    <File Include="views/WMS扫码模块/生产补料/Kf_MateReplenishOutBillList_PDA.html">
      <publishTime>04/26/2024 12:59:07</publishTime>
    </File>
    <File Include="views/WMS扫码模块/生产补料/Kf_MateReplenishOutBill_PDA.html">
      <publishTime>04/26/2024 12:59:07</publishTime>
    </File>
    <File Include="views/WMS扫码模块/生产调拨/Kf_MoveStockBillList_PDA.html">
      <publishTime>04/28/2024 08:42:16</publishTime>
    </File>
@@ -2164,6 +2173,9 @@
    </File>
    <File Include="views/仓存管理/生产入库单/Kf_ProductInBillList.html">
      <publishTime>04/28/2024 08:36:23</publishTime>
    </File>
    <File Include="views/仓存管理/生产入库单/Kf_ProductInBillList.html">
      <publishTime>04/26/2024 12:59:07</publishTime>
    </File>
    <File Include="views/公共页面/Kf_BarCodeEditDlg.html">
      <publishTime>04/15/2024 13:00:47</publishTime>
@@ -5339,6 +5351,12 @@
    <File Include="views/车间管理/工序出站汇报单/Cj_StationOutBill_CurrentWork.html">
      <publishTime>04/28/2024 08:36:24</publishTime>
    </File>
    <File Include="views/车间管理/工序出站汇报单/Cj_StationOutBill_CodingReport.html">
      <publishTime>04/26/2024 12:59:07</publishTime>
    </File>
    <File Include="views/车间管理/工序出站汇报单/Cj_StationOutBill_CurrentWork.html">
      <publishTime>04/26/2024 12:59:07</publishTime>
    </File>
    <File Include="views/车间管理/工序出站汇报单/Cj_StationOutBill_QiaoYi.html">
      <publishTime>04/15/2024 13:00:49</publishTime>
    </File>
@@ -5951,6 +5969,18 @@
    <File Include="views/项目管理/基础建模/Add_Edit_Gy_TaskClass.html">
      <publishTime>04/28/2024 08:36:24</publishTime>
    </File>
    <File Include="views/项目管理/基础建模/Add_Edit_Gy_ProjectClass.html">
      <publishTime>04/26/2024 12:59:07</publishTime>
    </File>
    <File Include="views/项目管理/基础建模/Add_Edit_Gy_TaskClass.html">
      <publishTime>04/26/2024 12:59:07</publishTime>
    </File>
    <File Include="views/项目管理/基础建模/Gy_ProjectClass.html">
      <publishTime>04/26/2024 12:59:07</publishTime>
    </File>
    <File Include="views/项目管理/基础建模/Gy_TaskClass.html">
      <publishTime>04/26/2024 12:59:07</publishTime>
    </File>
    <File Include="views/项目管理/工作任务/PM_WorkTaskBill.html">
      <publishTime>04/15/2024 13:00:49</publishTime>
    </File>

 WebTM/WebTM.csproj

@@ -1757,6 +1757,8 @@
    <Content Include="views\项目管理\周计划\PM_WorkReportWeekBillMainList.html" />
    <Content Include="views\项目管理\周计划\PM_WorkTaskWeekBillList.html" />
    <Content Include="views\项目管理\周计划\PM_WorkTaskWeekBill.html" />
    <Content Include="views\项目管理\基础建模\Gy_ProjectClass.html" />
    <Content Include="views\项目管理\基础建模\Gy_TaskClass.html" />
    <Content Include="views\项目管理\工作任务\PM_WorkTaskMoneyBillList.html" />
    <Content Include="views\项目管理\工作任务\PM_WorkTaskMoneyBill.html" />
    <Content Include="views\项目管理\工作任务\PM_WorkTaskReportBillList.html" />

 WebTM/WebTM.csproj.user

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\智云迈思\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\智云迈思\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort />
@@ -16,8 +16,9 @@
    <VisualStudio>
      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
        <WebProjectProperties>
          <StartPageUrl>views/user/login.html</StartPageUrl>
          <StartAction>SpecificPage</StartAction>
          <StartPageUrl>
          </StartPageUrl>
          <StartAction>CurrentPage</StartAction>
          <AspNetDebugging>True</AspNetDebugging>
          <SilverlightDebugging>False</SilverlightDebugging>
          <NativeDebugging>False</NativeDebugging>
@@ -31,7 +32,7 @@
          <StartWorkingDirectory>
          </StartWorkingDirectory>
          <EnableENC>True</EnableENC>
          <AlwaysStartWebServerOnDebug>True</AlwaysStartWebServerOnDebug>
          <AlwaysStartWebServerOnDebug>False</AlwaysStartWebServerOnDebug>
        </WebProjectProperties>
      </FlavorProperties>
    </VisualStudio>

 WebTM/views/²Ö´æ¹ÜÀí/·Ö²½Ê½µ÷Èëµ¥/Fb_StepFoldinBillEdit.html

@@ -651,7 +651,30 @@
            //#region ä¿å­˜æ–¹æ³•
            function set_SaveBill(data) {


                if ($("#HSupID").val() == 0) {
                    layer.msg("请选择供应商！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HEmpID").val() == 0) {
                    layer.msg("请选择仓管员！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HManagerID").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 ($("#HDeptID").val() == 0) {
                    layer.msg("请选择部门！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HWHID").val() == 0) {
                    layer.msg("请选择调入仓库！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
@@ -759,9 +782,7 @@
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                    //if (OptionData.length>0) {
                                    //    OptionData = [];
                                    //}
                                    if (OptionData.length > 0) {
                                    obj.update({
                                        "HMaterID": OptionData.HItemID
                                        , "物料代码": OptionData.物料代码
@@ -770,6 +791,9 @@
                                        , "HUnitID": OptionData.HUnitID
                                        , "计量单位": OptionData.计量单位名称
                                    })
                                        OptionData = [];
                                    }
                                   
                                    
                                }
                            })
@@ -880,13 +904,14 @@
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                    //if (OptionData.length > 0) {
                                    //    OptionData = [];
                                    //}
                                    if (OptionData.length > 0) {
                                    obj.update({
                                        "HWHID": OptionData.HItemID
                                        , "调入仓库": OptionData.仓库名称
                                    })
                                        OptionData = [];
                                    }
                                    
                                
                            }
                            })
@@ -919,13 +944,14 @@
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                    //if (OptionData.length > 0) {
                                    //    OptionData = [];
                                    //}
                                    if (optiondata.length > 0) {
                                    obj.update({
                                        "HSCWHID": OptionData.HItemID
                                        , "调出仓库": OptionData.仓库名称
                                    })
                                        optiondata = [];
                                    }
                                   
                               
                            }
                            })

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/xmlLBM_Xs_SeOrderBill.aspx

@@ -15,7 +15,7 @@

        //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
        //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
        SqlXMLReportData.GenOneRecordset(this, "select * from h_v_IF_SeOrderBillList where hmainid=" + Request.Params["linterid"]);
        SqlXMLReportData.GenOneRecordset(this, "select * from h_v_IF_SeOrderBillList where hmainid=" + Request.Params["linterid"] + " order by hsubid asc");
    }
</script>
</head>

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillList.html

@@ -700,6 +700,9 @@
                        , { field: 'HWidth', title: '门幅', sort: true }
                        , { field: '规格型号', title: '规格型号', sort: true }
                        , { field: '生产任务单数量', title: '生产订单数量', totalRow: true, sort: true, totalRow: true }
                        , { field: '流转卡数量', title: '流转卡数量', totalRow: true, sort: true, totalRow: true }
                        , { field: '生产入库数量', title: '生产入库数量', totalRow: true, sort: true, totalRow: true }
                        , { field: '报废数量', title: '报废数量', totalRow: true, sort: true, totalRow: true }
                        , { field: '计量单位', title: '计量单位', sort: true }
                        , { field: '是否下推生成流转卡', title: '是否下推生成流转卡', sort: true }
                        , { field: '是否取库存', title: '是否取库存', sort: true }

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/MES_ColorRecordBillList.html

@@ -250,7 +250,7 @@

            //加载网格
            function get_Display(sWhere) {
                sWhere += " order by æ—¥æœŸ desc ";
                sWhere += " order by åˆ¶å•æ—¥æœŸ desc ";
                //动态列-缓存列表
                $.ajax({
                    url: GetWEBURL() + "/ColorRecord/ColorRecordList",

 WebTM/views/²É¹º¹ÜÀí/²É¹º¶©µ¥/Cg_POOrderBillEdit.html

@@ -406,7 +406,7 @@
                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
                            }
                            $("#HOrgID").append(Organization);
                            if (OperationType == 1 || OperationType == 4) {
                            if (OperationType == 1 || OperationType == 4 || OperationType == null) {
                                HOrgIDBar = sessionStorage["OrganizationID"];
                            }
                            $("#HOrgID").val(HOrgIDBar);
@@ -414,7 +414,7 @@
                        }
                        layer.closeAll("loading");
                    }
                })
                }
            }
            //#endregion

@@ -422,6 +422,7 @@
            //判断是否新增
            if (linterid == null || linterid == 0) {
                //获取最大单据号 new
                OptionData = 1;
                $("#HMaker").val(sessionStorage["HUserName"]);
                $("#HInterID").val("0");
                $("#HBillNo").val("");

 WebTM/views/ÏúÊÛ¹ÜÀí/Ó¦ÊÕÍË¿îµ¥/YS_ReceiveBackBill.html

@@ -575,8 +575,11 @@
                    var HSumMoney = newHSumMoney * 1;                       //金额
                    var HDiscountRate = $("#HDiscountRate").val() * 1;      //整单折扣
                    var HRelSumMoney = HSumMoney * HDiscountRate * 0.01;    //折扣后金额
                    HRelSumMoney = dealDoubleToFixed(HRelSumMoney, 2);

                    var HGiftRate = $("#HGiftRate").val() * 1;              //赠送比例
                    var HGiftMoney = HSumMoney * HGiftRate * 0.01;
                    HGiftMoney = dealDoubleToFixed(HGiftMoney, 2);

                    $("#HSumMoney").val(HSumMoney);
                    $("#HDiscountRate").val(HDiscountRate);
@@ -605,6 +608,7 @@
                    var HSumMoney = $("#HSumMoney").val() * 1;                   //金额
                    var HDiscountRate = newHDiscountRate * 1;                      //整单折扣
                    var HRelSumMoney = HSumMoney * HDiscountRate * 0.01;        //折扣后金额
                    HRelSumMoney = dealDoubleToFixed(HRelSumMoney, 2);

                    $("#HSumMoney").val(HSumMoney);
                    $("#HDiscountRate").val(HDiscountRate);
@@ -620,6 +624,7 @@
                var HSumMoney = $("#HSumMoney").val() * 1;                       //金额
                var HGiftRate = $("#HGiftRate").val() * 1;              //赠送比例
                var HGiftMoney = HSumMoney * HGiftRate * 0.01;
                HGiftMoney = dealDoubleToFixed(HGiftMoney, 2);

                $("#HGiftMoney").val(HGiftMoney);
            });
@@ -1414,6 +1419,42 @@
            });
        }
        //#endregion

        //#region å¤„理小数显示位数（data：需要处理的数据；num：数据的类型(如1:数量；2:金额；3:单价)）
        function dealDoubleToFixed(data, num) {
            //用于设置小数位数
            var dotLength = 0;

            if (num == 1) {                                    //当数据为数量时，最多保留6位小数
                //设置最多保留6位小数
                dotLength = 6;
            } else if (num == 2) {                             //当数据为金额时，最多保留2位小数
                //设置最多保留2位小数
                dotLength = 2;
            } else if (num == 3) {                             //当数据为单价时，最多保留4位小数
                //设置最多保留4位小数
                dotLength = 4;
            }

            //判断是否存在小数点及其索引位置
            data = data + "";
            var index = data.indexOf(".");

            //处理数据并返回
            if (index < 0) {
                return data * 1;
            } else {
                //获取小数位数
                var length = data.length - index - 1;
                if (length <= dotLength) {
                    return data * 1;
                } else {
                    data = data * 1;
                    return data.toFixed(dotLength);
                }
            }
        }
                //#endregion
    </script>
</body>
</html>

 WebTM/views/ÏúÊÛ¹ÜÀí/ÊÕ¿îµ¥/YS_ReceiveBill.html

@@ -565,8 +565,11 @@
                    var HSumMoney = newHSumMoney * 1;                       //金额
                    var HDiscountRate = $("#HDiscountRate").val() * 1;      //整单折扣
                    var HRelSumMoney = HSumMoney * HDiscountRate * 0.01;    //折扣后金额
                    HRelSumMoney = dealDoubleToFixed(HRelSumMoney, 2);

                    var HGiftRate = $("#HGiftRate").val() * 1;              //赠送比例
                    var HGiftMoney = HSumMoney * HGiftRate * 0.01;
                    HGiftMoney = dealDoubleToFixed(HGiftMoney,2);

                    $("#HSumMoney").val(HSumMoney);
                    $("#HDiscountRate").val(HDiscountRate);
@@ -595,6 +598,7 @@
                    var HSumMoney = $("#HSumMoney").val() * 1;                   //金额
                    var HDiscountRate = newHDiscountRate * 1;                      //整单折扣
                    var HRelSumMoney = HSumMoney * HDiscountRate * 0.01;        //折扣后金额
                    HRelSumMoney = dealDoubleToFixed(HRelSumMoney, 2);

                    $("#HSumMoney").val(HSumMoney);
                    $("#HDiscountRate").val(HDiscountRate);
@@ -610,6 +614,7 @@
                var HSumMoney = $("#HSumMoney").val() * 1;                       //金额
                var HGiftRate = $("#HGiftRate").val() * 1;              //赠送比例
                var HGiftMoney = HSumMoney * HGiftRate * 0.01;
                HGiftMoney = dealDoubleToFixed(HGiftMoney,2);

                $("#HGiftMoney").val(HGiftMoney);
            });
@@ -1537,6 +1542,42 @@
            });
        }
        //#endregion

        //#region å¤„理小数显示位数（data：需要处理的数据；num：数据的类型(如1:数量；2:金额；3:单价)）
        function dealDoubleToFixed(data, num) {
            //用于设置小数位数
            var dotLength = 0;

            if (num == 1) {                                    //当数据为数量时，最多保留6位小数
                //设置最多保留6位小数
                dotLength = 6;
            } else if (num == 2) {                             //当数据为金额时，最多保留2位小数
                //设置最多保留2位小数
                dotLength = 2;
            } else if (num == 3) {                             //当数据为单价时，最多保留4位小数
                //设置最多保留4位小数
                dotLength = 4;
            }

            //判断是否存在小数点及其索引位置
            data = data + "";
            var index = data.indexOf(".");

            //处理数据并返回
            if (index < 0) {
                return data * 1;
            } else {
                //获取小数位数
                var length = data.length - index - 1;
                if (length <= dotLength) {
                    return data * 1;
                } else {
                    data = data * 1;
                    return data.toFixed(dotLength);
                }
            }
        }
                //#endregion
    </script>
</body>
</html>

 WebTM/views/ÏúÊÛ¹ÜÀí/ÏúÊÛ¶©µ¥/Add_Edit_Xs_SeOrderBillList.html

@@ -145,6 +145,8 @@
                                                </select>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">销售订单类型</label>
                                            <div class="layui-input-inline">
@@ -154,8 +156,6 @@
                                                </select>
                                            </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">
@@ -166,7 +166,7 @@
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                        <div class="layui-inline" style="display:none;">
                                            <label class="layui-form-label">销售方式</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HSellSName" id="HSellSName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
@@ -664,7 +664,7 @@
                    "规格型号": "",
                    "HUnitID": "0",
                    "计量单位": "",
                    "HWHID": "",
                    "HWHID": "0",
                    "仓库":"",
                    "HQty": "0",
                    "HPrice": "0",
@@ -680,6 +680,8 @@
                    "HisStockGoods": "false",
                    "HOutStockQty": "0",
                    "HInvoiceQty": "0",
                    "HRemark_TL": "",
                    "HRemark_SJG": "",
                    "HRemark": "",
                    "HCusMaterNumber": "",
                    "HCusModel": "",
@@ -1242,6 +1244,8 @@
                        , { field: '规格型号', title: '规格型号', width: 100, style: 'background-color:#efefef4d;' }
                        , { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
                        , { field: '计量单位', title: '计量单位', width: 100, style: 'background-color:#efefef4d;' }//f7
                        , { field: 'HRemark_TL', title: '投料', width: 100, edit: 'text' }
                        , { field: 'HRemark_SJG', title: '深加工', width: 100, edit: 'text' }
                        , { field: 'HWHID ', title: 'HWHID ', width: 100, hide: true }
                        , { field: '仓库', title: '仓库', width: 100, style: 'background-color:#efefef4d;' ,edit: 'text' ,event: "HWHID" }//f7
                        , { field: 'HisStockGoods', title: '是否取库存', width: 120, templet: '#HisStockGoods' }
@@ -1297,7 +1301,7 @@
                    "规格型号": "",
                    "HUnitID": "0",
                    "计量单位": "",
                    "HWHID": "",
                    "HWHID": "0",
                    "仓库":"",
                    "HQty": "0",
                    "HPrice": "0",
@@ -1313,6 +1317,8 @@
                    "HisStockGoods": "false",
                    "HOutStockQty": "0",
                    "HInvoiceQty": "0",
                    "HRemark_TL": "",
                    "HRemark_SJG": "",
                    "HRemark": "",
                    "HCusMaterNumber": "",
                    "HCusModel": "",
@@ -1461,6 +1467,8 @@
                                        "HDate": formatDate(result.data[i]["交货日期"]),
                                        "HOutStockQty": result.data[i]["出库数量"],
                                        "HInvoiceQty": result.data[i]["开票数量"],
                                        "HRemark_TL": result.data[i]["投料"],
                                        "HRemark_SJG": result.data[i]["深加工"],
                                        "HRemark": result.data[i]["表体备注"],
                                        "HCusMaterNumber": result.data[i]["客户物料编码"],
                                        "HCusModel": result.data[i]["客户规格型号"],
@@ -2175,7 +2183,7 @@
                                        "规格型号": "",
                                        "HUnitID": "0",
                                        "计量单位": "",
                                        "HWHID": "",
                                        "HWHID": "0",
                                        "仓库": "",
                                        "HQty": "0",
                                        "HPrice": "0",
@@ -2191,6 +2199,8 @@
                                        "HisStockGoods": "false",
                                        "HOutStockQty": "0",
                                        "HInvoiceQty": "0",
                                        "HRemark_TL": "",
                                        "HRemark_SJG": "",
                                        "HRemark": "",
                                        "HCusMaterNumber": "",
                                        "HCusModel": "",
@@ -2236,7 +2246,7 @@
                                    "规格型号": "",
                                    "HUnitID": "0",
                                    "计量单位": "",
                                    "HWHID": "",
                                    "HWHID": "0",
                                    "仓库": "",
                                    "HQty": "0",
                                    "HPrice": "0",
@@ -2252,6 +2262,8 @@
                                    "HisStockGoods": "false",
                                    "HOutStockQty": "0",
                                    "HInvoiceQty": "0",
                                    "HRemark_TL": "",
                                    "HRemark_SJG": "",
                                    "HRemark": "",
                                    "HCusMaterNumber": "",
                                    "HCusModel": "",

 WebTM/views/ÏúÊÛ¹ÜÀí/ÏúÊÛ¶©µ¥/Xs_SeOrderBillList.html

@@ -191,7 +191,7 @@
            //查询条件
            var sWhere = "";
            var option = [];
            var HModName = "Xs_SeOrderBill";
            var HModName = "Xs_SeOrderBillList";
            var HBillType = "1401";


@@ -504,6 +504,10 @@
                        , { field: '物料名称', title: '物料名称', sort: true }
                        , { field: '规格型号', title: '规格型号', sort: true }
                        , { field: '数量', title: '数量', sort: true, totalRow: true }
                        , { field: '生产入库数量', title: '生产入库数量', sort: true, totalRow: true }
                        , { field: '报废数量', title: '报废数量', sort: true, totalRow: true }
                        , { field: '剩余订金', title: '剩余订金', sort: true, totalRow: true }
                        , { field: '关联数量', title: '销售出库关联数量', sort: true, totalRow: true }
                        , { field: 'HUnitID', title: 'HUnitID', hide: true, sort: true }
                        //, { field: '计量单位代码', title: '计量单位代码', sort: true }
                        , { field: '计量单位', title: '计量单位', sort: true }
@@ -519,8 +523,8 @@
                        , { field: '金额', title: '金额', sort: true, totalRow: true }
                        , { field: '价税合计', title: '价税合计', sort: true, totalRow: true }
                        , { field: '表头备注', title: '表头备注', sort: true }
                        , { field: '剩余订金', title: '剩余订金', sort: true, totalRow: true }
                        , { field: '关联数量', title: '销售出库关联数量', sort: true, totalRow: true }
                        , { field: '投料', title: '投料', sort: true }
                        , { field: '深加工', title: '深加工', sort: true }
                        , { field: '未关联数量', title: '销售出库未关联数量', sort: true, totalRow: true }
                        , { field: '生产关联数量', title: '生产关联数量', sort: true, totalRow: true }
                        , { field: '生产未关联数量', title: '生产未关联数量', sort: true, totalRow: true }
@@ -544,19 +548,19 @@
                        //, { field: '结算方式代码', title: '结算方式代码', width: 125, sort: true }
                        //, { field: '结算方式', title: '结算方式', width: 125, sort: true }
                        //, { field: '结算日期', title: '结算日期', width: 170, sort: true }
                        , { field: 'HCurID', title: 'HCurID', hide: true, sort: true }
                        //, { field: '币别代码', title: '币别代码', sort: true }
                        , { field: '币别', title: '币别', hide: true, sort: true }
                        , { field: '汇率', title: '汇率', hide: true, sort: true }
                        , { field: 'HDeptID', title: 'HDeptID', hide: true, sort: true }
                        //, { field: '部门代码', title: '部门代码', width: 125, sort: true }
                        , { field: '部门', title: '部门', width: 125, hide: true,sort: true }
                        //, { field: '销售方式', title: '销售方式', sort: true }
                        , { field: 'HManagerID', title: 'HManagerID', hide: true, sort: true }
                        //, { field: '主管代码', title: '主管代码', sort: true }
                        , { field: '主管', title: '主管', hide: true, sort: true }
                        , { field: '主仓库id', title: '主仓库id', hide: true, sort: true }
                        , { field: '主仓库', title: '主仓库', hide: true, sort: true }
                        //, { field: 'HCurID', title: 'HCurID', hide: true, sort: true }
                        ////, { field: '币别代码', title: '币别代码', sort: true }
                        //, { field: '币别', title: '币别', hide: true, sort: true }
                        //, { field: '汇率', title: '汇率', hide: true, sort: true }
                        //, { field: 'HDeptID', title: 'HDeptID', hide: true, sort: true }
                        ////, { field: '部门代码', title: '部门代码', width: 125, sort: true }
                        //, { field: '部门', title: '部门', width: 125, hide: true,sort: true }
                        ////, { field: '销售方式', title: '销售方式', sort: true }
                        //, { field: 'HManagerID', title: 'HManagerID', hide: true, sort: true }
                        ////, { field: '主管代码', title: '主管代码', sort: true }
                        //, { field: '主管', title: '主管', hide: true, sort: true }
                        //, { field: '主仓库id', title: '主仓库id', hide: true, sort: true }
                        //, { field: '主仓库', title: '主仓库', hide: true, sort: true }
                        //, { field: '摘要', title: '摘要', sort: true }
                        //, { field: '批号', title: '批号', sort: true }
                        //, { field: '税额', title: '税额', sort: true }
@@ -1267,7 +1271,7 @@
                get_needClose_Bar = 1;

                //为过滤条件增加排序
                sWhere_Bak += " and å‰©ä½™è®¢é‡‘>0 and å‰©ä½™è®¢é‡‘<=500 and å…³é—­äºº='' and è¡Œå…³é—­äºº='' and çŠ¶æ€ = '已审核' order by å•æ®å· desc";
                sWhere_Bak += " and å‰©ä½™è®¢é‡‘>0 and å‰©ä½™è®¢é‡‘<=1000 and å…³é—­äºº='' and è¡Œå…³é—­äºº='' and çŠ¶æ€ = '已审核' order by å•æ®å· desc";

                //获取排序后的数据并重新渲染
                var ajaxLoad = layer.load();
@@ -1389,7 +1393,7 @@
                                    layer.close(index);
                                    //修改为功后刷新界面
                                    if (get_needClose_Bar == 0) {
                                        $("#btnSearch").trigger('click');
                                        //$("#btnSearch").trigger('click');
                                    } else if (get_needClose_Bar == 1) {
                                        $("#get_needClose").trigger('click');
                                    }
@@ -1430,7 +1434,7 @@
                                    layer.close(index);
                                    //修改为功后刷新界面
                                    if (get_needClose_Bar == 0) {
                                        $("#btnSearch").trigger('click');
                                        //$("#btnSearch").trigger('click');
                                    } else if (get_needClose_Bar == 1) {
                                        $("#get_needClose").trigger('click');
                                    }

 WebTM/views/ÏîÄ¿¹ÜÀí/»ù´¡½¨Ä£/Gy_TaskClass.html

@@ -357,6 +357,19 @@
            function get_Refresh() {
                $("#btnSearch").trigger('click');
            }

            //#region åŒå‡»è¿”回数据
            table.on('rowDouble(mainTable)', function (obj) {
                var data = [];
                data.push(obj.data);
                parent.GetTaskClassValue(data);
                var index = parent.layer.getFrameIndex(window.name);
                parent.layer.close(index);
            });

            //#endregion


            //新增
            function set_AddNew() {
                layer.open({

 WebTM/views/ÏîÄ¿¹ÜÀí/¹¤×÷ÈÎÎñ/PM_WorkTaskBill.html

@@ -206,6 +206,16 @@
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">任务类别<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" lay-verify="HTaskClassName" name="HTaskClassName" id="HTaskClassName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HTaskClassID" id="HTaskClassID" lay-verify="HTaskClassID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHTaskClass" id="btnSearchHTaskClass" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
@@ -572,6 +582,13 @@
                get_checkSearchHCopyEmp();
            });
            //#endregion

            //#region é€‰æ‹©æ´¾å•äººæŒ‰é’®
            form.on('submit(btnSearchHTaskClass)', function () {
                get_checkSearchHTaskClass();
            });
            //#endregion

            //#endregion


@@ -950,6 +967,33 @@
            }
            //#endregion

            //#region ä»»åŠ¡ç±»åˆ«é€‰æ‹©é¡µé¢
            function get_checkSearchHTaskClass() {
                layer.open({
                    type: 2//弹窗类型
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['90%', '90%']//大小
                    , title: '员工表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../项目管理/基础建模/Gy_TaskClass.html', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        //获取数据
                        $("#HTaskClassID").val(checkStatus.data[0].HItemID);
                        $("#HTaskClassName").val(checkStatus.data[0].任务类别名称);
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                    , end: function () { }
                })
            }
            //#endregion

            //#region æ–‡ä»¶ä¸Šä¼ 
            function PicUpload() {
                //多图片上传
@@ -1136,6 +1180,8 @@
                            , "HRemark": tableMain[0]["HRemark"]
                            , "HOrgID": tableMain[0]["HOrgID"]
                            , "HOrderLevID": tableMain[0]["HOrderLevID"]
                            , "HTaskClassID": tableMain[0]["HTaskClassID"]
                            , "HTaskClassName": tableMain[0]["HTaskClassName"]

                            , "HMainSourceInterID": tableMain[0]["HMainSourceInterID"]
                            , "HMainSourceEntryID": tableMain[0]["HMainSourceEntryID"]
@@ -1620,6 +1666,11 @@
        function GetHReceiveValue(obj) {
            $("#HReceiveEmp").val(obj[0].职员名称);//接收人名称
        }
        //任务类别
        function GetTaskClassValue(obj) {
            $("#HTaskClassID").val(obj[0].HItemID);
            $("#HTaskClassName").val(obj[0].任务类别名称);
        }
    </script>
</body>
</html>

 WebTM/views/ÏîÄ¿¹ÜÀí/¹¤×÷ÈÎÎñ/PM_WorkTaskMoneyBill.html

@@ -117,7 +117,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">客户</label>
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">客户<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" lay-verify="HCusName" name="HCusName" id="HCusName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HCusID" id="HCusID" lay-verify="HCusID" value="0">
@@ -405,7 +405,7 @@
                //新增行表格数据

                var NewRow = {
                    "HProMoneyID": "", "HProMoneyName": "", "HQty": "0", "HPrice": "0", "HMoney": "0",
                    "HProMoneyID": "0", "HProMoneyName": "", "HQty": "0", "HPrice": "0", "HMoney": "0",
                    "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
                };
                switch (obj.event) {
@@ -771,16 +771,21 @@
                                    }
                                    //更新表格缓存的数据
                                    obj.update({
                                        "HProMoneyID": checkStatus.data[0].HItemID
                                        , "HProMoneyName": checkStatus.data[0].项目费用名称
                                        "HProMoneyID": checkStatus.data[0].HItemID,
                                        "HProMoneyName": checkStatus.data[0].项目费用名称
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                                , btn2: function (index, layero) { }
                                , end: function () {
                                    if (OptionData.length>0) {
                                    obj.update({
                                        "HProMoneyID": OptionData.HItemID
                                        , "HProMoneyName": OptionData.项目费用名称
                                            "HProMoneyID": OptionData.HItemID,
                                            "HProMoneyName": OptionData.项目费用名称
                                    })
                                        OptionData = [];
                                    }
                                  
                                }
                            })
                        }
@@ -942,7 +947,26 @@
                    layer.msg("日期不能为空!");
                    return false;
                }

                if ($("#HWorkTaskName").val() == "") {
                    layer.msg("任务名称不能为空!");
                    return false;
                }
                if ($("#HWorkTaskNumber").val() == "") {
                    layer.msg("任务代码不能为空!");
                    return false;
                }
                if ($("#HProNumber").val() == "") {
                    layer.msg("项目代码不能为空!");
                    return false;
                }
                if ($("#HProName").val() == "") {
                    layer.msg("项目名称不能为空!");
                    return false;
                }
                if ($("#HCusName").val() == "") {
                    layer.msg("客户不能为空!");
                    return false;
                }
                return true;
            }
            //#endregion

 WebTM/views/ÏîÄ¿¹ÜÀí/¹¤×÷ÈÎÎñ/PM_WorkTaskMoneyBillList.html

@@ -136,7 +136,7 @@
            var HModName = "PM_WorkTaskBillList";

            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["HInterID", "HBillStatus", "HProjectID", "HWorkTaskID", "HCusID", "HOrgID","HEntryID"];
            var titleData = ["HInterID", "HBillStatus", "HProjectID", "HWorkTaskID", "HCusID", "HOrgID", "HEntryID","HProMoneyID"];
            //#endregion

            //#region ã€è¿‡æ»¤æ–¹æ¡ˆã€‘

 WebTM/views/ÏîÄ¿¹ÜÀí/¹¤³ÌÏîÄ¿/PM_ProjectBeginBillMain.html

@@ -110,7 +110,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">客户</label>
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">客户<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" lay-verify="HCusName" name="HCusName" id="HCusName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HCusID" id="HCusID" lay-verify="HCusID" value="0">
@@ -134,7 +134,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">合同总金额</label>
                                            <label class="layui-form-label" style="width: 85px;">合同总金额<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" lay-verify="HSumMoney" name="HSumMoney" id="HSumMoney">
                                            </div>
@@ -149,13 +149,13 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">结算金额</label>
                                            <label class="layui-form-label" style="width: 85px;">结算金额<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" lay-verify="HMoney" name="HMoney" id="HMoney" value="0">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">合同预估人天</label>
                                            <label class="layui-form-label" style="width: 85px;">合同预估人天<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" lay-verify="HConWorkDays" name="HConWorkDays" id="HConWorkDays" value="0" style="width:190px;">
                                            </div>
@@ -163,7 +163,7 @@
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">交付方</label>
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">交付方<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" lay-verify="HPMTeamName" name="HPMTeamName" id="HPMTeamName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HPMTeamID" id="HPMTeamID" lay-verify="HPMTeamID" value="0">
@@ -447,7 +447,7 @@

            //#region é€‰æ‹©å®¢æˆ·æŒ‰é’®
            form.on('submit(btnSearchHCusID)', function () {
                get_checkSearchHSendEmp();
                get_checkSearchHCus();
            });
            //#endregion

@@ -712,7 +712,34 @@
                })
            }
            //#endregion
            //#region å®¢æˆ·é€‰æ‹©é¡µé¢
            function get_checkSearchHCus() {
                var HOrgID = $("#HOrgID").val();
                layer.open({
                    type: 2//弹窗类型
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['90%', '90%']//大小
                    , title: '客户表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/销售基础资料/Gy_Customer.html?openType=2&HOrgID=' + HOrgID, 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        //获取数据
                        $("#HCusID").val(checkStatus.data[0].HItemID);//客户id
                        $("#HCusName").val(checkStatus.data[0].客户名称);//客户名称

                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                    , end: function () { }
                })
            }
            //#endregion
            //#region äº¤ä»˜æ–¹é€‰æ‹©é¡µé¢
            function get_checkSearchHPMTeam() {
                var HOrgID = $("#HOrgID").val();
@@ -882,7 +909,7 @@
                    layer.msg("单据号不能为空!");
                    return false;
                }
                if ($("#HProID").val() == "0") {
                if ($("#HProjecID").val() == "0") {
                    layer.msg("项目代码没有选择!");
                    return false;
                }
@@ -890,7 +917,38 @@
                    layer.msg("日期不能为空!");
                    return false;
                }

                if ($("#HManagerID").val() == "0") {
                    layer.msg("管理员不能为空!");
                    return false;
                }
                if ($("#HWorkEmpID").val() == "0") {
                    layer.msg("实施担当不能为空!");
                    return false;
                }
                if ($("#HPMEmpID").val() == "0") {
                    layer.msg("项目经理不能为空!");
                    return false;
                }
                if ($("#HPMTeamID").val() == "0") {
                    layer.msg("交付方不能为空!");
                    return false;
                }
                if ($("#HCusID").val() == "0") {
                    layer.msg("客户不能为空!");
                    return false;
                }
                if ($("#HSumMoney").val() == "") {
                    layer.msg("合同总金额不能为空!");
                    return false;
                }
                if ($("#HMoney").val() == "") {
                    layer.msg("结算金额不能为空!");
                    return false;
                }
                if ($("#HConWorkDays").val() == "") {
                    layer.msg("合同预估人天不能为空!");
                    return false;
                }
                return true;
            }
            //#endregion

 WebTM/views/ÏîÄ¿¹ÜÀí/¹¤³ÌÏîÄ¿/PM_ProjectBill.html

@@ -1311,7 +1311,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '项目类别表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_ProjectClass.html', 'yes']
                    , content: ['../../项目管理/基础建模/Gy_ProjectClass.html', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面

 WebTM/views/ÏîÄ¿¹ÜÀí/¹¤³ÌÏîÄ¿/PM_ProjectEndBillMain.html

@@ -110,7 +110,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">客户</label>
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">客户<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" lay-verify="HCusName" name="HCusName" id="HCusName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HCusID" id="HCusID" lay-verify="HCusID" value="0">
@@ -177,7 +177,7 @@
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">交付方</label>
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">交付方<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" lay-verify="HPMTeamName" name="HPMTeamName" id="HPMTeamName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HPMTeamID" id="HPMTeamID" lay-verify="HPMTeamID" value="0">
@@ -187,7 +187,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">项目经理</label>
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">项目经理<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" lay-verify="HPMEmpName" name="HPMEmpName" id="HPMEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HPMEmpID" id="HPMEmpID" lay-verify="HPMEmpID" value="0">
@@ -197,7 +197,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">实施担当</label>
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">实施担当<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" lay-verify="HWorkEmpName" name="HWorkEmpName" id="HWorkEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HWorkEmpID" id="HWorkEmpID" lay-verify="HWorkEmpID" value="0">
@@ -910,7 +910,7 @@
                    layer.msg("单据号不能为空!");
                    return false;
                }
                if ($("#HProID").val() == "0") {
                if ($("#HProjecID").val() == "0") {
                    layer.msg("项目代码没有选择!");
                    return false;
                }
@@ -918,6 +918,26 @@
                    layer.msg("日期不能为空!");
                    return false;
                }
                if ($("#HManagerID").val() == "0") {
                    layer.msg("管理员不能为空!");
                    return false;
                }
                if ($("#HWorkEmpID").val() == "0") {
                    layer.msg("实施担当不能为空!");
                    return false;
                }
                if ($("#HPMEmpID").val() == "0") {
                    layer.msg("项目经理不能为空!");
                    return false;
                }
                if ($("#HPMTeamID").val() == "0") {
                    layer.msg("交付方不能为空!");
                    return false;
                }
                if ($("#HCusID").val() == "0") {
                    layer.msg("客户不能为空!");
                    return false;
                }

                return true;
            }

 WebTM/views/ÏîÄ¿¹ÜÀí/¹¤³ÌÏîÄ¿/PM_ProjectMoneyBillMain.html

@@ -108,7 +108,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">客户</label>
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">客户<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" lay-verify="HCusName" name="HCusName" id="HCusName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HCusID" id="HCusID" lay-verify="HCusID" value="0">
@@ -121,7 +121,7 @@

                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">交付方</label>
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">交付方<label style="color:red"> * </label></label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" lay-verify="HPMTeamName" name="HPMTeamName" id="HPMTeamName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HPMTeamID" id="HPMTeamID" lay-verify="HPMTeamID" value="0">
@@ -409,7 +409,7 @@

            //#region é€‰æ‹©å®¢æˆ·æŒ‰é’®
            form.on('submit(btnSearchHCusID)', function () {
                get_checkSearchHSendEmp();
                get_checkSearchHCus();
            });
            //#endregion

@@ -771,7 +771,34 @@
                })
            }
            //#endregion
            //#region å®¢æˆ·é€‰æ‹©é¡µé¢
            function get_checkSearchHCus() {
                var HOrgID = $("#HOrgID").val();
                layer.open({
                    type: 2//弹窗类型
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['90%', '90%']//大小
                    , title: '客户表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/销售基础资料/Gy_Customer.html?openType=2&HOrgID=' + HOrgID, 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        //获取数据
                        $("#HCusID").val(checkStatus.data[0].HItemID);//客户id
                        $("#HCusName").val(checkStatus.data[0].客户名称);//客户名称

                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                    , end: function () { }
                })
            }
            //#endregion
            //#region ç®¡ç†å‘˜é€‰æ‹©é¡µé¢
            function get_checkSearchHManager() {
                var HOrgID = $("#HOrgID").val();
@@ -867,10 +894,13 @@
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                    if (optiondata.length>0) {
                                    obj.update({
                                        "HProMoneyID": optiondata.HItemID
                                        , "HProMoneyName": optiondata.项目费用名称
                                    })
                                    }
                                    optiondata = [];
                                }
                            })
                        }
@@ -1026,7 +1056,7 @@
                    layer.msg("单据号不能为空!");
                    return false;
                }
                if ($("#HProID").val() == "0") {
                if ($("#HProjecID").val() == "0") {
                    layer.msg("项目代码没有选择!");
                    return false;
                }
@@ -1034,7 +1064,26 @@
                    layer.msg("日期不能为空!");
                    return false;
                }

                if($("#HManagerID").val() == "0") {
                    layer.msg("管理员不能为空!");
                    return false;
                }
                if ($("#HWorkEmpID").val() == "0") {
                    layer.msg("实施担当不能为空!");
                    return false;
                }
                if ($("#HPMEmpID").val() == "0") {
                    layer.msg("项目经理不能为空!");
                    return false;
                }
                if ($("#HPMTeamID").val() == "0") {
                    layer.msg("交付方不能为空!");
                    return false;
                }
                if ($("#HCusID").val() == "0") {
                    layer.msg("客户不能为空!");
                    return false;
                }
                return true;
            }
            //#endregion

 WebTM/views/ÁìÁÏ·¢»õ/·Ö²½Ê½µ÷³öµ¥/Fb_StepFoldOutBillEdit.html

@@ -753,6 +753,7 @@
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                    if (OptionData.length>0) {
                                    obj.update({
                                        "HMaterID": OptionData.HItemID
                                        , "物料代码": OptionData.物料代码
@@ -761,6 +762,9 @@
                                        , "HUnitID": OptionData.HUnitID
                                        , "计量单位": OptionData.计量单位名称
                                    })
                                        OptionData = [];
                                    }
                                   
                                   
                                }
                            })
@@ -871,13 +875,14 @@
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                    //if (OptionData.length > 0) {
                                    //    OptionData = [];
                                    //}
                                    if (OptionData.length > 0) {
                                    obj.update({
                                        "HWHID": OptionData.HItemID
                                        , "调入仓库": OptionData.仓库名称
                                    })
                                        OptionData = [];
                                    }
                                    
                                   
                                }
                            })
@@ -910,13 +915,14 @@
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {
                                    //if (OptionData.length > 0) {
                                    //    OptionData = [];
                                    //}
                                    if (OptionData.length > 0) {
                                    obj.update({
                                        "HSCWHID": OptionData.HItemID
                                        , "调出仓库": OptionData.仓库名称
                                    })
                                        OptionData = [];
                                    }
                                   

                                
                            }

 WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBill.html

@@ -1034,7 +1034,7 @@
                        }
                        //数据校验合格，重算记录
                        var HQty = obj.data.HQty * 1;                   //数量
                        var HTaxRate = obj.data.HTaxRate * 0.01;        //税率
                        var HTaxRate = (obj.data.HTaxRate !== undefined ? value * 0.01 : 0 ) * 0.01;        //税率
                        var HTaxPrice = value * 1;                          //含税单价=单价*(1+税率)
                        var HPrice = HTaxPrice / (1 + HTaxRate);        //单价=含税单据/(1+税率)


 WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBillList.html

@@ -405,7 +405,7 @@
                        , { field: '业务员', title: '业务员', width: 200, sort: true }
                        , { field: '件数', title: '件数', totalRow: true, width: 200, sort: true }
                        , { field: '数量', title: '数量', totalRow: true, width: 200, sort: true }
                        , { field: '已关联数量', title: '已关联数量', totalRow: true, width: 200, sort: true }
                        //, { field: '已关联数量', title: '已关联数量', totalRow: true, width: 200, sort: true }
                        , { field: '单价', title: '单价', width: 200, sort: true, totalRow: true}
                        , { field: '税率', title: '税率', width: 200, sort: true, totalRow: true }
                        , { field: '含税单价', title: '含税单价', width: 200, sort: true, totalRow: true }

 WebTM/views/ÑéÊÕÈë¿â/Í⹺Èë¿â/Kf_POStockInBackBill_Add_Up.html

@@ -289,7 +289,6 @@
                                </div>
                            </div>
                        </div>
                    </div>

                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                    <script type="text/html" id="toolbarDemo">