特批申请单：数据校验 销售订单：维护页面增加字段 销售出库关联数量、销售出库未关联数量、生产关联数量、生产未关联数量

duhe

2024-01-17 fc69a1e9655df3e8a01dc36ea2742c99f4a651ed

特批申请单：数据校验
销售订单：维护页面增加字段 销售出库关联数量、销售出库未关联数量、生产关联数量、生产未关联数量

 WebTM/Properties/PublishProfiles/JFTM.pubxml.user

@@ -18,10 +18,10 @@
      <publishTime>01/28/2016 14:22:24</publishTime>
    </File>
    <File Include="bin/WebTM.dll">
      <publishTime>01/16/2024 14:16:02</publishTime>
      <publishTime>01/17/2024 11:23:51</publishTime>
    </File>
    <File Include="bin/WebTM.pdb">
      <publishTime>01/16/2024 14:16:02</publishTime>
      <publishTime>01/17/2024 11:23:51</publishTime>
    </File>
    <File Include="HtmlPage1.html">
      <publishTime>04/11/2023 16:34:42</publishTime>
@@ -575,8 +575,11 @@
    <File Include="layuiadmin/layui/lay/modules/slider.js">
      <publishTime>04/11/2023 16:34:43</publishTime>
    </File>
    <File Include="layuiadmin/layui/lay/modules/table-副本.js">
      <publishTime>01/17/2024 10:26:59</publishTime>
    </File>
    <File Include="layuiadmin/layui/lay/modules/table.js">
      <publishTime>04/11/2023 16:34:43</publishTime>
      <publishTime>01/17/2024 10:26:59</publishTime>
    </File>
    <File Include="layuiadmin/layui/lay/modules/tree.js">
      <publishTime>04/11/2023 16:34:43</publishTime>
@@ -954,7 +957,7 @@
      <publishTime>07/21/2023 16:16:19</publishTime>
    </File>
    <File Include="views/Baseset/基础资料/Gy_QCCheckItemListView.html">
      <publishTime>07/21/2023 16:16:39</publishTime>
      <publishTime>01/17/2024 11:20:12</publishTime>
    </File>
    <File Include="views/Baseset/基础资料/Gy_QCCheckProjectListView.html">
      <publishTime>12/20/2023 10:55:06</publishTime>
@@ -2088,7 +2091,7 @@
      <publishTime>01/09/2024 17:04:29</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Add_Edit_Gy_CheckItem.html">
      <publishTime>11/28/2023 12:03:19</publishTime>
      <publishTime>01/17/2024 10:26:59</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Add_Edit_Gy_ClassTimePrj.html">
      <publishTime>12/22/2021 16:02:49</publishTime>
@@ -2271,7 +2274,7 @@
      <publishTime>04/11/2023 16:34:43</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Add_Edit_Gy_CheckItem.html">
      <publishTime>11/28/2023 12:03:19</publishTime>
      <publishTime>01/17/2024 10:26:59</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Add_Edit_Gy_Currency.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
@@ -2930,6 +2933,9 @@
    <File Include="views/基础资料/生产基础资料/Add_Edit_Gy_BadType.html">
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/基础资料/生产基础资料/Add_Edit_Gy_DisposeWay.html">
      <publishTime>01/17/2024 10:26:59</publishTime>
    </File>
    <File Include="views/基础资料/生产基础资料/Add_Edit_Gy_Post.html">
      <publishTime>01/05/2024 08:26:51</publishTime>
    </File>
@@ -2938,6 +2944,9 @@
    </File>
    <File Include="views/基础资料/生产基础资料/Add_Edit_Gy_Process.html">
      <publishTime>09/02/2023 18:53:25</publishTime>
    </File>
    <File Include="views/基础资料/生产基础资料/Add_Edit_Gy_ScrapReason.html">
      <publishTime>01/17/2024 10:26:59</publishTime>
    </File>
    <File Include="views/基础资料/生产基础资料/Add_Edit_Gy_Source.html">
      <publishTime>05/29/2023 16:33:45</publishTime>
@@ -2951,6 +2960,9 @@
    <File Include="views/基础资料/生产基础资料/Gy_BadType.html">
      <publishTime>01/03/2024 12:55:26</publishTime>
    </File>
    <File Include="views/基础资料/生产基础资料/Gy_DisposeWayList.html">
      <publishTime>01/17/2024 10:26:59</publishTime>
    </File>
    <File Include="views/基础资料/生产基础资料/Gy_Post.html">
      <publishTime>01/05/2024 08:26:51</publishTime>
    </File>
@@ -2959,6 +2971,9 @@
    </File>
    <File Include="views/基础资料/生产基础资料/Gy_Process.html">
      <publishTime>11/03/2023 21:45:51</publishTime>
    </File>
    <File Include="views/基础资料/生产基础资料/Gy_ScrapReasonList.html">
      <publishTime>01/17/2024 10:26:59</publishTime>
    </File>
    <File Include="views/基础资料/生产基础资料/Gy_SOPBill.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
@@ -3774,7 +3789,7 @@
      <publishTime>04/11/2023 16:34:43</publishTime>
    </File>
    <File Include="views/生产管理/报工台工序/不良采集/Sc_QualityReportStepBillList.html">
      <publishTime>11/03/2023 21:45:51</publishTime>
      <publishTime>01/17/2024 11:20:12</publishTime>
    </File>
    <File Include="views/生产管理/报工台工序/产量汇报/Sc_Add_ProductReportStepBillList.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
@@ -3789,7 +3804,7 @@
      <publishTime>04/11/2023 16:34:43</publishTime>
    </File>
    <File Include="views/生产管理/报工台工序/产量汇报/Sc_ProductReportStepBillList_Web.html">
      <publishTime>12/15/2023 16:23:31</publishTime>
      <publishTime>01/17/2024 10:26:59</publishTime>
    </File>
    <File Include="views/生产管理/报工台工序/停工/Sc_Add_MESStopStepWorkBillList.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
@@ -3906,7 +3921,7 @@
      <publishTime>04/11/2023 16:34:43</publishTime>
    </File>
    <File Include="views/生产管理/生产任务单/Sc_ICMOBillList.html">
      <publishTime>01/16/2024 10:14:11</publishTime>
      <publishTime>01/17/2024 10:26:59</publishTime>
    </File>
    <File Include="views/生产管理/生产任务单/Sc_ICMOBillList_LookDown.html">
      <publishTime>01/05/2024 13:27:32</publishTime>
@@ -4011,7 +4026,7 @@
      <publishTime>01/12/2024 13:12:21</publishTime>
    </File>
    <File Include="views/生产管理/生产汇报单/Sc_ICMOReportBillList.html">
      <publishTime>12/15/2023 16:23:31</publishTime>
      <publishTime>01/17/2024 11:20:12</publishTime>
    </File>
    <File Include="views/生产管理/生产汇报单/Sc_ICMOReportBill_FastNew.html">
      <publishTime>11/03/2023 21:45:51</publishTime>
@@ -4158,7 +4173,10 @@
      <publishTime>01/12/2024 13:12:21</publishTime>
    </File>
    <File Include="views/系统管理/用户管理/Gy_UserByWorkStation.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
      <publishTime>01/17/2024 10:26:59</publishTime>
    </File>
    <File Include="views/系统管理/用户管理/Gy_UserByWorkStationList.html">
      <publishTime>01/17/2024 10:26:59</publishTime>
    </File>
    <File Include="views/系统管理/用户管理/Gy_UserCustomer.html">
      <publishTime>01/03/2024 08:07:18</publishTime>
@@ -4239,16 +4257,16 @@
      <publishTime>07/17/2023 14:06:49</publishTime>
    </File>
    <File Include="views/系统管理/过滤方案设置/Xt_FastICScheme.html">
      <publishTime>01/16/2024 10:14:11</publishTime>
      <publishTime>01/17/2024 10:26:59</publishTime>
    </File>
    <File Include="views/系统管理/过滤方案设置/Xt_FastICSchemeList.html">
      <publishTime>01/16/2024 10:14:11</publishTime>
      <publishTime>01/17/2024 10:26:59</publishTime>
    </File>
    <File Include="views/系统管理/过滤方案设置/Xt_FastICScheme.html">
      <publishTime>01/16/2024 10:14:11</publishTime>
      <publishTime>01/17/2024 10:26:59</publishTime>
    </File>
    <File Include="views/系统管理/过滤方案设置/Xt_FastICSchemeList.html">
      <publishTime>01/16/2024 10:14:11</publishTime>
      <publishTime>01/17/2024 10:26:59</publishTime>
    </File>
    <File Include="views/组装单/Sc_AssemblyBill_Fast.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
@@ -4266,10 +4284,10 @@
      <publishTime>08/24/2023 08:50:29</publishTime>
    </File>
    <File Include="views/计划管理/工艺路线/Gy_RoutingBill.html">
      <publishTime>01/03/2024 12:55:26</publishTime>
      <publishTime>01/17/2024 10:26:59</publishTime>
    </File>
    <File Include="views/计划管理/工艺路线/Gy_RoutingBill.html">
      <publishTime>01/03/2024 12:55:26</publishTime>
      <publishTime>01/17/2024 10:26:59</publishTime>
    </File>
    <File Include="views/计划管理/工艺路线/Gy_RoutingBillimport.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
@@ -4530,7 +4548,7 @@
      <publishTime>11/03/2023 21:45:51</publishTime>
    </File>
    <File Include="views/质量管理/工序检验单/QC_ProcessCheckBill.html">
      <publishTime>01/12/2024 13:12:21</publishTime>
      <publishTime>01/17/2024 11:20:12</publishTime>
    </File>
    <File Include="views/质量管理/工序检验单/QC_ProcessCheckBillList.html">
      <publishTime>01/12/2024 13:12:21</publishTime>
@@ -4599,7 +4617,7 @@
      <publishTime>07/20/2021 01:15:26</publishTime>
    </File>
    <File Include="views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html">
      <publishTime>01/12/2024 13:12:21</publishTime>
      <publishTime>01/17/2024 11:20:12</publishTime>
    </File>
    <File Include="views/质量管理/首件检验单/QC_FirstPieceCheckBillList.html">
      <publishTime>01/12/2024 13:12:21</publishTime>
@@ -4665,7 +4683,7 @@
      <publishTime>01/12/2024 13:12:21</publishTime>
    </File>
    <File Include="views/质量管理/工序检验单/QC_ProcessCheckBill.html">
      <publishTime>01/12/2024 13:12:21</publishTime>
      <publishTime>01/17/2024 11:20:12</publishTime>
    </File>
    <File Include="views/质量管理/工序检验单/QC_ProcessCheckBillList.html">
      <publishTime>01/12/2024 13:12:21</publishTime>
@@ -4683,7 +4701,7 @@
      <publishTime>11/03/2023 21:45:51</publishTime>
    </File>
    <File Include="views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html">
      <publishTime>01/12/2024 13:12:21</publishTime>
      <publishTime>01/17/2024 11:20:12</publishTime>
    </File>
    <File Include="views/质量管理/首件检验单/QC_FirstPieceCheckBillList.html">
      <publishTime>01/12/2024 13:12:21</publishTime>
@@ -4859,6 +4877,9 @@
    <File Include="views/车间管理/工序流转/MES_StationOutBill_PDA_QiaoYi.html">
      <publishTime>09/14/2023 13:59:10</publishTime>
    </File>
    <File Include="views/车间管理/工序流转卡/Gy_ProcessBatchReport.html">
      <publishTime>01/17/2024 11:20:12</publishTime>
    </File>
    <File Include="views/车间管理/工序流转卡/MES_ColorRecordBillList.html">
      <publishTime>11/03/2023 21:45:51</publishTime>
    </File>
@@ -4905,7 +4926,7 @@
      <publishTime>04/11/2023 16:34:43</publishTime>
    </File>
    <File Include="views/车间管理/工序流转卡/Sc_ProcessExchangeIssueBillList.html">
      <publishTime>08/03/2023 11:11:59</publishTime>
      <publishTime>01/17/2024 11:20:12</publishTime>
    </File>
    <File Include="views/车间管理/工序流转卡/Sc_ProcessExchangePlanDate.html">
      <publishTime>04/11/2023 16:34:43</publishTime>
@@ -5214,7 +5235,7 @@
      <publishTime>11/14/2023 15:34:20</publishTime>
    </File>
    <File Include="views/销售管理/特批申请单/Xs_ExceptiveCheckRequestBill.html">
      <publishTime>12/15/2023 16:19:50</publishTime>
      <publishTime>01/17/2024 12:30:36</publishTime>
    </File>
    <File Include="views/销售管理/特批申请单/Xs_ExceptiveCheckRequestBillList.html">
      <publishTime>12/07/2023 09:50:24</publishTime>
@@ -5235,7 +5256,7 @@
      <publishTime>04/11/2023 16:34:43</publishTime>
    </File>
    <File Include="views/销售管理/销售订单/Xs_SeOrderBillList.html">
      <publishTime>01/17/2024 09:20:59</publishTime>
      <publishTime>01/17/2024 12:44:48</publishTime>
    </File>
    <File Include="views/采购管理/委外订单/WW_EntrustOrderBillList.html">
      <publishTime>11/03/2023 21:45:51</publishTime>
@@ -5256,7 +5277,7 @@
      <publishTime>11/03/2023 21:45:51</publishTime>
    </File>
    <File Include="views/销售管理/销售订单/Xs_SeOrderBillList.html">
      <publishTime>01/17/2024 09:20:59</publishTime>
      <publishTime>01/17/2024 12:44:48</publishTime>
    </File>
    <File Include="views/销售管理/销售订单/Xs_SeOrderBill_LookDown.html">
      <publishTime>12/11/2023 16:22:03</publishTime>

 WebTM/views/ÏúÊÛ¹ÜÀí/ÌØÅúÉêÇëµ¥/Xs_ExceptiveCheckRequestBill.html

@@ -535,9 +535,9 @@
                //#endregion
                }
                
                //if (AllowLoadData(data)) {
                if (AllowLoadData(data)) {
                    set_AddNew(data);
                //}
                }
            });
            //#endregion

@@ -1150,52 +1150,68 @@
            }
            //#endregion

            //#region éžç©ºéªŒè¯
            //#region æ•°æ®æ ¡éªŒ
            function AllowLoadData(data) {
                //#region æ•°æ®æ ¡éªŒå·¥å…·
                var temp;                           //记录需要检验的属性的值，用于检验
                var ref = /^\d+(\.\d+)?$/;          //判断是否是非负浮点数
                var ref1 = /^\d+$/;                 //判断是否是非负整数
                var value1 = ["#HWantPay"];  //子表需要进行浮点数验证的属性清单
                var value1_ = ["期望薪水"];  ////子表需要进行浮点数验证的属性清单对应的列名清单
                var value2 = ["#HAge","#HContractYear"];  //子表需要整数检验的属性清单
                var value2_ = ["年龄","合同期限"]; //子表需要整数检验的属性清单对应的列名清单
                var value3 = [];       //子表需要进行非空检验的属性清单
                var value3_ = [];                                 //子表需要进行非空检验的属性清单对应的列名清单
                //#endregion
                //数值格式校验工具
                var ref = /^\d+(\.\d+)?$/;          //非负数正则表达式
                var temp = "";

                //#region è¡¨å¤´æ•°æ®æ£€éªŒ
                //非空检验
                for (var j = 0; j < value3.length; j++) {
                    temp = $(value3[j]).val() + "";
                    if (temp == "") {
                        layer.msg(value3_[j] + "不可为空!");
                        return false;
                    }
                if ($("#HBillNo").val() == "") {
                    layer.msg("单据编号不能为空!");
                    return false;
                }
                //整数检验
                for (var j = 0; j < value2.length; j++) {
                    temp = $(value2[j]).val() + "";
                    if (temp == "") {
                        layer.msg(value2_[j] + "不能为空!");
                        return false;
                    } else if (!ref1.test(temp)) {
                        layer.msg(value2_[j] + "请输入非负整数!");
                        return false;
                    }

                if ($("#HDate").val() == "") {
                    layer.msg("日期不能为空!");
                    return false;
                }
                //浮点数检验
                for (var j = 0; j < value1.length; j++) {
                    temp = $(value1[j]).val() + "";
                    if (temp == "") {
                        layer.msg(value1_[j] + "不能为空!");
                        return false;
                    } else if (!ref.test(temp)) {
                        layer.msg(value1_[j] + "请输入正确非负数字!");
                        return false;
                    }

                //if ($("#HDeptID").val() == "0") {
                //    layer.msg("销售部门未选择!");
                //    return false;
                //}

                //if ($("#HEmpID").val() == "0") {
                //    layer.msg("销售员未选择!");
                //    return false;
                //}

                if ($("#HCurID").val() == "0") {
                    layer.msg("销售币别未选择!");
                    return false;
                }

                temp = $("#HExRate").val() + "";
                if (temp == 0 || temp == "") {
                    layer.msg("汇率不能为0或空!");
                    return false;
                } else if (!ref.test(temp)) {
                    layer.msg("汇率请输入大于0的数字!");
                    return false;
                }

                if ($("#HCusID").val() == "0") {
                    layer.msg("客户未选择!");
                    return false;
                }

                if ($("#HSSID").val() == "0") {
                    layer.msg("结算方式未选择!");
                    return false;
                }

                //if ($("#HMangerID").val() == "0") {
                //    layer.msg("销售主管未选择!");
                //    return false;
                //}

                if ($("#HPlanPayDate").val() == "") {
                    layer.msg("承诺付款时间不可为空!");
                    return false;
                }
                //#endregion

                return true;
            }
            //#endregion

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

@@ -398,6 +398,10 @@
                        , { 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, totalRow: true }
                        , { field: '生产未关联数量', title: '生产未关联数量', sort: true, totalRow: true }
                        , { field: '制单人', title: '制单人', width: 125, sort: true }
                        , { field: '制单日期', title: '制单日期', width: 200, templet: "<div>{{d.制单日期 ==null ?'':layui.util.toDateString(d.制单日期, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
                        , { field: '审核人', title: '审核人', width: 125, sort: true }