修改了扫码单据退出按钮功能

ch

2022-08-19 f8a627e504e7aef7a5046ed893903b9cdf6954bc

修改了扫码单据退出按钮功能

 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>07/31/2022 10:04:38</publishTime>
      <publishTime>08/04/2022 11:06:44</publishTime>
    </File>
    <File Include="bin/WebTM.pdb">
      <publishTime>07/31/2022 10:04:38</publishTime>
      <publishTime>08/04/2022 11:06:44</publishTime>
    </File>
    <File Include="HtmlPage1.html">
      <publishTime>03/14/2022 15:07:22</publishTime>
@@ -660,7 +660,7 @@
      <publishTime>12/23/2021 16:07:31</publishTime>
    </File>
    <File Include="layuiadmin/Scripts/webConfig.js">
      <publishTime>07/31/2022 10:15:54</publishTime>
      <publishTime>08/09/2022 19:21:26</publishTime>
    </File>
    <File Include="layuiadmin/style/admin.css">
      <publishTime>12/23/2021 16:07:32</publishTime>
@@ -846,7 +846,7 @@
      <publishTime>12/23/2021 16:07:32</publishTime>
    </File>
    <File Include="views/Baseset/基础资料/Gy_RoutingBillList.html">
      <publishTime>06/30/2022 10:10:00</publishTime>
      <publishTime>08/04/2022 11:04:35</publishTime>
    </File>
    <File Include="views/Baseset/基础资料/Gy_RoutingGroup.html">
      <publishTime>01/10/2022 08:46:46</publishTime>
@@ -1178,6 +1178,9 @@
    <File Include="views/grf/物料条码.grf">
      <publishTime>03/10/2022 14:55:22</publishTime>
    </File>
    <File Include="views/grf/瑞与祺江苏打印模板.grf">
      <publishTime>08/04/2022 11:04:35</publishTime>
    </File>
    <File Include="views/grf/生产单.grf">
      <publishTime>05/30/2022 13:35:03</publishTime>
    </File>
@@ -1233,13 +1236,13 @@
      <publishTime>12/23/2021 16:07:32</publishTime>
    </File>
    <File Include="views/index.html">
      <publishTime>07/29/2022 08:27:29</publishTime>
      <publishTime>08/04/2022 11:04:35</publishTime>
    </File>
    <File Include="views/indexMenu.html">
      <publishTime>03/10/2022 14:55:22</publishTime>
    </File>
    <File Include="views/index_Mobile.html">
      <publishTime>07/31/2022 09:55:47</publishTime>
      <publishTime>08/04/2022 11:04:35</publishTime>
    </File>
    <File Include="views/IpadIndex.html">
      <publishTime>12/23/2021 16:07:32</publishTime>
@@ -1470,7 +1473,7 @@
      <publishTime>12/23/2021 16:07:32</publishTime>
    </File>
    <File Include="views/user/login.html">
      <publishTime>05/07/2022 15:04:42</publishTime>
      <publishTime>08/04/2022 11:04:35</publishTime>
    </File>
    <File Include="views/user/reg.html">
      <publishTime>12/23/2021 16:07:32</publishTime>
@@ -1533,10 +1536,10 @@
      <publishTime>05/16/2022 13:49:35</publishTime>
    </File>
    <File Include="views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html">
      <publishTime>07/18/2022 18:14:15</publishTime>
      <publishTime>08/09/2022 20:22:37</publishTime>
    </File>
    <File Include="views/仓存管理/仓库调拨/Kf_MoveStockBill_FastList.html">
      <publishTime>07/18/2022 09:26:42</publishTime>
      <publishTime>08/04/2022 11:04:35</publishTime>
    </File>
    <File Include="views/仓存管理/仓库调拨/Kf_MoveStockOutBill_Fast.html">
      <publishTime>07/12/2022 11:19:28</publishTime>
@@ -2709,7 +2712,7 @@
      <publishTime>12/23/2021 16:07:32</publishTime>
    </File>
    <File Include="views/生产管理/产量汇报单/Sc_Add_ProductReportBillList.html">
      <publishTime>01/19/2022 08:47:47</publishTime>
      <publishTime>08/04/2022 11:04:35</publishTime>
    </File>
    <File Include="views/生产管理/产量汇报单/Sc_ProductReportBillList.html">
      <publishTime>12/23/2021 16:07:32</publishTime>
@@ -2822,6 +2825,9 @@
    <File Include="views/生产管理/日计划基础资料/JIT_NeedMaterPlanConfigBill_Add.html">
      <publishTime>05/30/2022 13:35:03</publishTime>
    </File>
    <File Include="views/生产管理/日计划报表/ReportMOMaterReadysBillList.html">
      <publishTime>08/04/2022 11:04:35</publishTime>
    </File>
    <File Include="views/生产管理/日计划报表/ReportPODemandPlanBillList.html">
      <publishTime>06/30/2022 10:10:01</publishTime>
    </File>
@@ -2829,7 +2835,7 @@
      <publishTime>06/30/2022 10:10:01</publishTime>
    </File>
    <File Include="views/生产管理/日计划报表/ReportWorkDemandPlanBillList.html">
      <publishTime>06/30/2022 10:10:01</publishTime>
      <publishTime>08/04/2022 11:04:35</publishTime>
    </File>
    <File Include="views/生产管理/生产上料单/Sc_MaterToSourceBillList - å¤åˆ¶.html">
      <publishTime>12/23/2021 16:07:32</publishTime>
@@ -2973,7 +2979,7 @@
      <publishTime>04/14/2022 09:22:30</publishTime>
    </File>
    <File Include="views/生产管理/齐套分析/JIT_CompleteDetailList.html">
      <publishTime>07/29/2022 08:27:29</publishTime>
      <publishTime>08/04/2022 11:04:35</publishTime>
    </File>
    <File Include="views/生产管理/齐套分析/JIT_CompleteMaterialDetailList.html">
      <publishTime>05/07/2022 15:04:42</publishTime>
@@ -3027,7 +3033,7 @@
      <publishTime>07/29/2022 08:27:29</publishTime>
    </File>
    <File Include="views/组装单/Sc_PCruxBindingPDA.html">
      <publishTime>07/31/2022 09:55:47</publishTime>
      <publishTime>08/04/2022 11:04:35</publishTime>
    </File>
    <File Include="views/计划管理/工艺路线/Gy_RoutingBill.html">
      <publishTime>06/30/2022 10:10:01</publishTime>
@@ -3318,7 +3324,7 @@
      <publishTime>03/10/2022 14:55:23</publishTime>
    </File>
    <File Include="views/车间管理/工序出站汇报单/Cj_StationOutBill.html">
      <publishTime>07/31/2022 12:26:05</publishTime>
      <publishTime>08/04/2022 11:04:35</publishTime>
    </File>
    <File Include="views/车间管理/工序出站汇报单/Cj_StationOutBillList.html">
      <publishTime>07/31/2022 12:36:39</publishTime>
@@ -3351,22 +3357,22 @@
      <publishTime>03/10/2022 14:55:23</publishTime>
    </File>
    <File Include="views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html">
      <publishTime>07/31/2022 16:34:08</publishTime>
      <publishTime>08/04/2022 11:04:35</publishTime>
    </File>
    <File Include="views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html">
      <publishTime>07/31/2022 12:45:46</publishTime>
      <publishTime>08/04/2022 11:04:35</publishTime>
    </File>
    <File Include="views/车间管理/工序流转卡/Sc_ProcessExchangeBill_loser.html">
      <publishTime>05/17/2021 19:07:00</publishTime>
    </File>
    <File Include="views/车间管理/工序进站接收单/Cj_StationInBill.html">
      <publishTime>07/31/2022 12:26:06</publishTime>
      <publishTime>08/04/2022 11:04:35</publishTime>
    </File>
    <File Include="views/车间管理/工序进站接收单/Cj_StationInBillList.html">
      <publishTime>07/31/2022 12:36:39</publishTime>
    </File>
    <File Include="views/车间管理/工序进站接收单/Cj_StationInBill.html">
      <publishTime>07/31/2022 12:26:06</publishTime>
      <publishTime>08/04/2022 11:04:35</publishTime>
    </File>
    <File Include="views/车间管理/工序进站接收单/Cj_StationInBillList.html">
      <publishTime>07/31/2022 12:36:39</publishTime>
@@ -3492,7 +3498,7 @@
      <publishTime>07/12/2022 11:19:28</publishTime>
    </File>
    <File Include="views/领料发货/其他出库/Kf_OtherOutBill_FastList.html">
      <publishTime>07/06/2022 10:43:43</publishTime>
      <publishTime>08/04/2022 11:04:35</publishTime>
    </File>
    <File Include="views/领料发货/分步式调出单/Fb_StepFoldOutBillList.html">
      <publishTime>03/10/2022 14:55:23</publishTime>
@@ -3516,10 +3522,10 @@
      <publishTime>01/02/2022 22:16:06</publishTime>
    </File>
    <File Include="views/领料发货/收料入库/Kf_ReciveBill_Check.html">
      <publishTime>07/06/2022 10:43:43</publishTime>
      <publishTime>08/04/2022 11:04:35</publishTime>
    </File>
    <File Include="views/领料发货/收料入库/Kf_ReciveBill_Fast.html">
      <publishTime>12/23/2021 16:07:32</publishTime>
      <publishTime>08/04/2022 11:04:35</publishTime>
    </File>
    <File Include="views/领料发货/销售出库/Kf_SellOutBackBill_Fast.html">
      <publishTime>07/12/2022 11:19:28</publishTime>
@@ -3534,10 +3540,10 @@
      <publishTime>03/10/2022 14:55:23</publishTime>
    </File>
    <File Include="views/领料发货/销售出库/Kf_SellOutBill_Fast.html">
      <publishTime>07/18/2022 18:14:15</publishTime>
      <publishTime>08/09/2022 20:17:48</publishTime>
    </File>
    <File Include="views/领料发货/销售出库/Kf_SellOutBill_FastList.html">
      <publishTime>07/18/2022 09:26:42</publishTime>
      <publishTime>08/08/2022 21:23:27</publishTime>
    </File>
    <File Include="views/领料发货/领料出库/Kf_MateOutBackBillEdit.html">
      <publishTime>06/30/2022 10:10:01</publishTime>
@@ -3567,13 +3573,13 @@
      <publishTime>05/10/2022 14:18:08</publishTime>
    </File>
    <File Include="views/领料发货/领料出库/Kf_MateOutBill_Fast.html">
      <publishTime>07/12/2022 11:19:28</publishTime>
      <publishTime>08/04/2022 11:04:35</publishTime>
    </File>
    <File Include="views/领料发货/领料出库/Kf_MateOutBill_FastCheck.html">
      <publishTime>04/28/2022 16:51:10</publishTime>
    </File>
    <File Include="views/领料发货/领料出库/Kf_MateOutBill_FastList.html">
      <publishTime>07/06/2022 10:43:43</publishTime>
      <publishTime>08/08/2022 21:23:51</publishTime>
    </File>
    <File Include="views/验收入库/产品入库/Kf_ProductInBackBill.html">
      <publishTime>07/12/2022 11:19:28</publishTime>
@@ -3588,10 +3594,10 @@
      <publishTime>03/10/2022 14:55:23</publishTime>
    </File>
    <File Include="views/验收入库/产品入库/Kf_ProductInBill_Fast.html">
      <publishTime>07/12/2022 11:19:28</publishTime>
      <publishTime>08/09/2022 19:28:24</publishTime>
    </File>
    <File Include="views/验收入库/产品入库/Kf_ProductInBill_FastList.html">
      <publishTime>07/06/2022 10:43:43</publishTime>
      <publishTime>08/08/2022 21:22:37</publishTime>
    </File>
    <File Include="views/验收入库/产品入库/Xs_SeOrderPickUp_New.html">
      <publishTime>12/23/2021 16:07:32</publishTime>
@@ -3609,10 +3615,10 @@
      <publishTime>03/10/2022 14:55:23</publishTime>
    </File>
    <File Include="views/验收入库/其他入库/Kf_OtherInBill_Fast.html">
      <publishTime>07/18/2022 17:45:10</publishTime>
      <publishTime>08/04/2022 11:04:35</publishTime>
    </File>
    <File Include="views/验收入库/其他入库/Kf_OtherInBill_FastList.html">
      <publishTime>07/18/2022 17:46:03</publishTime>
      <publishTime>08/04/2022 11:04:36</publishTime>
    </File>
    <File Include="views/验收入库/其他入库/Kf_OtherOutBill_CheckList_New.html">
      <publishTime>04/08/2022 13:12:51</publishTime>
@@ -3642,7 +3648,7 @@
      <publishTime>07/12/2022 11:19:28</publishTime>
    </File>
    <File Include="views/验收入库/外购入库/Kf_POStockInBill_FastList.html">
      <publishTime>07/06/2022 10:43:43</publishTime>
      <publishTime>08/08/2022 21:22:56</publishTime>
    </File>
    <File Include="views/验收入库/外购入库/qrscan.js">
      <publishTime>12/23/2021 16:07:32</publishTime>

 WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Kf_MoveStockBill_Fast.html

@@ -845,11 +845,7 @@

            //退出按钮
            form.on('submit(Cancel)', function () {
                //parent.location.href = "../../../views/index.html"
                //window.close();//关闭当前页
                layer.confirm('您确定要退出吗？', { icon: 3, title: '提示' }, function (index) {
                    window.close();
                });
                parent.location.href = "../../../views/index.html"
            })

            //提交
@@ -1059,7 +1055,7 @@
                            type: "Get",
                            url: GetWEBURL() + "/ProductIn/Delete_Json",
                            async: true,
                            data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": sBillType, "HBarCode": sBarCode },
                            data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": '1207', "HBarCode": sBarCode },
                            dataType: "json",
                            success: function (data) {
                                if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†
@@ -1137,7 +1133,7 @@
                    $.ajax({
                        url: GetWEBURL() + "/MoveStockBill/get_InfoByBarCode_Source_Json",//37181
                        type: "GET",
                        data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": HBillType, "sBillNo": sBillNo, "sMaker": sMaker, "WhID": WhID, "SPID": SPID, "HSCWhID": HSCWhID, "HSCSPID": HSCSPID, "sQty": sQty, "SourceFlag": sessionStorage["SourceFlag"], "sSourceBillNo": sSourceBillNo, "sHSourceBillType": sHBillType, "HStockInOrgID": HStockInOrgID, "HStockOutOrgID": HStockOutOrgID, "HScanStyle": HScanStyle},
                        data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": HBillType, "sBillNo": sBillNo, "sMaker": sMaker, "WhID": WhID, "SPID": SPID, "HSCWhID": HSCWhID, "HSCSPID": HSCSPID, "sQty": sQty, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sHSourceBillType": sHBillType, "HStockInOrgID": HStockInOrgID, "HStockOutOrgID": HStockOutOrgID, "HScanStyle": HScanStyle},
                        success: function (result) {
                            if (result.count == 1) {
                                sessionStorage["SourceFlag"] = true;
@@ -1276,8 +1272,8 @@
                                $("#HStockOutOrgName").val(result.data[0].HSTOCKOUTORGName);
                            }

                            $("#HDeptID").val(result.data[0].HDeptID);
                            $("#HDeptName").val(result.data[0].HDeptName);
                            //$("#HDeptID").val(result.data[0].HDeptID);
                            //$("#HDeptName").val(result.data[0].HDeptName);


                            $("#HWHID").val(result.data[0].HWhID);

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

@@ -78,7 +78,7 @@
                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">扫描类型</label>
                                        </div>
                                        <div class="layui-col-xs8">
                                            <select name=" HScanStyle" id="HScanStyle">
                                            <select name=" HScanStyle" id="HScanStyle" disabled:"disabled">
                                                <option value="整托扫码">整托扫码</option>
                                                <option value="单个拆码">单个拆码</option>
                                                <option value="反向拆码">反向拆码</option>
@@ -97,7 +97,7 @@
                                            <input type="hidden" name="HWHID_FIFO" id="HWHID_FIFO" lay-verify="HWHID_FIFO" value="0" autocomplete="off" class="layui-input">
                                        </div>
                                        <div class="layui-col-xs3">
                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HWHID_FIFO-BT">...</button>
                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HWHID_FIFO-BT" disabled:"disabled">...</button>
                                        </div>
                                    </div>
                                </div>
@@ -585,7 +585,7 @@
                $("#HInterID").val("");
                $("#HBillNo").val(""); 
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNumPDA",
                    url: GetWEBURL() + "/Web/GetMAXNum",
                    type: "GET",
                    data: { "HBillType": '1205' },
                    success: function (d) {
@@ -602,7 +602,6 @@
                RoadBillMain(linterid);
                RoadBillSub(linterid);
            }


            form.on('submit(HWHID-BT)', function () {//选择仓库
                layer.open({
@@ -759,12 +758,7 @@
            });

            form.on('submit(Cancel)', function () {
                //sessionStorage["SourceFlag"] = false;
                //parent.location.href = "../../../views/index.html"
                //window.close();//关闭当前页
                layer.confirm('您确定要退出吗？', { icon: 3, title: '提示' }, function (index) {
                    window.location.href = "http://localhost:8082/LuBaoUi/views/index_Mobile.html"
                });
                parent.location.href = "../../../views/index.html"
            })

            //编辑
@@ -1411,7 +1405,7 @@
                                $.ajax({
                                    url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_New_Json1',
                                    type: "GET",
                                    data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: HBillType, sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
                                    data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: sBillType, sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
                                    success: function (result) {
                                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                            listOption.data = result.data.list;

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

@@ -206,8 +206,16 @@
        });
        //撤销功能
        form.on('submit(cmdRescind)', function () {
            var checkStatus = table.checkStatus('yd-table')
                , data = checkStatus.data;
            var checkStatus = table.checkStatus('yd-table');
            var checkStatus2 = table.checkStatus('sy-table');
            var data = "";
            if (checkStatus.data.length != 0) {
                data = checkStatus.data;
            } else if (checkStatus2.data.length != 0) {
                data = checkStatus2.data;
            } else {
                return layer.msg("请选择一条数据");
            }
            var sInterID = data[0].HInterID
            var sBillNo = data[0].HBillNo
            var sBillType = '1205'

 WebTM/views/ÁìÁÏ·¢»õ/ÁìÁϳö¿â/Kf_MateOutBill_FastList.html

@@ -233,8 +233,16 @@

        //撤销功能
        form.on('submit(cmdRescind)', function () {
            var checkStatus = table.checkStatus('yd-table')
                , data = checkStatus.data;
            var checkStatus = table.checkStatus('yd-table');
            var checkStatus2 = table.checkStatus('sy-table');
            var data = "";
            if (checkStatus.data.length != 0) {
                data = checkStatus.data;
            } else if (checkStatus2.data.length != 0) {
                data = checkStatus2.data;
            } else {
                return layer.msg("请选择一条数据");
            }
            var sInterID = data[0].HInterID
            var sBillNo = data[0].HBillNo
            var sBillType = '1204'

 WebTM/views/ÑéÊÕÈë¿â/²úÆ·Èë¿â/Kf_ProductInBill_Fast.html

@@ -96,9 +96,9 @@
                                        <div class="layui-col-xs8">
                                            <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" autocomplete="off" class="layui-input">
                                        </div>
                                        <div class="layui-col-xs2">
                                        <!--<div class="layui-col-xs2">
                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin2">确定</button>
                                        </div>
                                        </div>-->
                                    </div>
                                </div>
                            </div>
@@ -421,6 +421,7 @@
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HBillType").val(d.data[0].HSourceBillType);
                        $("#HSourceBillNo").val(d.data[0].HSourceBillNo);
                        $("#HSourceBillNo").attr("disabled", "true");
                        //$("#HWHID").val(d.data[0].HWhID);
                        //$("#HStockPlaceID").val(d.data[0].HSPID);
                        //$("#HKeeperID").val(d.data[0].HKeeperID);
@@ -759,12 +760,7 @@
            });

            form.on('submit(Cancel)', function () {
                //sessionStorage["SourceFlag"] = false;
                //parent.location.href = "../../../views/index.html"
                //window.close();//关闭当前页
                layer.confirm('您确定要退出吗？', { icon: 3, title: '提示' }, function (index) {
                    window.close();
                });
                parent.location.href = "../../../views/index.html"
            })

            ////删除

 WebTM/views/ÑéÊÕÈë¿â/²úÆ·Èë¿â/Kf_ProductInBill_FastList.html

@@ -310,8 +310,16 @@

            //撤销功能
            form.on('submit(cmdRescind)', function () {
                var checkStatus = table.checkStatus('yd-table')
                    , data = checkStatus.data;
                var checkStatus = table.checkStatus('yd-table');
                var checkStatus2 = table.checkStatus('sy-table');
                var data = "";
                if (checkStatus.data.length != 0) {
                    data = checkStatus.data;
                } else if (checkStatus2.data.length != 0) {
                    data = checkStatus2.data;
                } else {
                    return layer.msg("请选择一条数据");
                }
                var sInterID = data[0].HInterID
                var sBillNo = data[0].HBillNo
                var sBillType = '1202'

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

@@ -662,12 +662,7 @@

            //退出
            form.on('submit(Cancel)', function () {
                sessionStorage["SourceFlag"] = false;
                //parent.location.href = "../../../views/index.html"
                //window.close();//关闭当前页
                layer.confirm('您确定要退出吗？', { icon: 3, title: '提示' }, function (index) {
                    window.close();
                });
                parent.location.href = "../../../views/index.html"
            })
            //编辑
            form.on('submit(cmdModify)', function () {

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

@@ -209,8 +209,16 @@
        });
        //撤销功能
        form.on('submit(cmdRescind)', function () {
            var checkStatus = table.checkStatus('yd-table')
                , data = checkStatus.data;
            var checkStatus = table.checkStatus('yd-table');
            var checkStatus2 = table.checkStatus('sy-table');
            var data = "";
            if (checkStatus.data.length != 0) {
                data = checkStatus.data;
            } else if (checkStatus2.data.length != 0) {
                data = checkStatus2.data;
            } else {
                return layer.msg("请选择一条数据");
            }
            var sInterID = data[0].HInterID
            var sBillNo = data[0].HBillNo
            var sBillType = '1201'