出站单列表增加多选审核功能，增加判断条件，反审核人和审核人必须是同一个

yangle

2023-06-05 577d524f4b59d7434f2403061477d37159dfd1c0

出站单列表增加多选审核功能，增加判断条件，反审核人和审核人必须是同一个

 WebTM/views/index.html

@@ -304,7 +304,70 @@
                                        <dd><a lay-href="计划管理/工艺路线/Gy_RoutingBillimport.html">工艺路线数据导入</a></dd>
                                    </dl>
                                <dd>
                                <dd><a lay-href="计划管理/工艺路线大类/Gy_RoutingGroupList.html">工艺路线大类</a></dd>
                                <dd>
                                    <a>工艺路线大类</a>
                                    <dl class="layui-nav-child">
                                        <dd><a lay-href="计划管理/工艺路线大类/Gy_RoutingGroupList.html">工艺路线大类</a></dd>
                                    </dl>
                                <dd>
                                <dd>
                                    <a>日计划平台</a>
                                    <dl class="layui-nav-child">
                                        <dd>
                                            <a>生产计划平台</a>
                                            <dl class="layui-nav-child">
                                                <dd><a lay-href="生产管理/生产计划平台/JIT_DayPlanPlatForm.html" style="margin: 0 0 0 13px;">生产计划平台</a></dd>
                                                <!--<dd><a lay-href="生产管理/生产计划平台/JIT_DayPlanPlatFormImport.html" style="margin: 0 0 0 13px;">导入</a></dd>-->
                                                <dd><a lay-href="生产管理/齐套分析/JIT_CompleteDetailList.html" style="margin: 0 0 0 13px;">齐套分析信息明细列表</a></dd>
                                                <dd><a lay-href="生产管理/生产计划平台/Sc_ICMOSortBillList.html" style="margin: 0 0 0 13px;">生产日计划查询</a></dd>
                                            </dl>
                                        </dd>
                                        <dd>
                                            <a>日计划工单</a>
                                            <dl class="layui-nav-child">
                                                <dd><a lay-href="生产管理/生产日计划工单/JIT_DayPlanBillList.html" style="margin: 0 0 0 13px;">日计划工单列表</a></dd>
                                                <!--<dd><a lay-href="生产管理/生产日计划工单/JIT_DayPlanBillEdit.html" style="margin: 0 0 0 13px;">日计划工单</a></dd>-->
                                            </dl>
                                        </dd>
                                        <dd>
                                            <a>要料计划</a>
                                            <dl class="layui-nav-child">
                                                <dd><a lay-href="生产管理/要料计划/JIT_NeedMaterPlanBillList.html" style="margin: 0 0 0 13px;">要料计划单列表</a></dd>
                                                <dd><a lay-href="生产管理/要料计划/JIT_NeedMaterPlanBillEdit.html" style="margin: 0 0 0 13px;">要料计划单</a></dd>
                                            </dl>
                                        </dd>
                                        <dd>
                                            <a>提料计划</a>
                                            <dl class="layui-nav-child">
                                                <dd><a lay-href="生产管理/提料计划/JIT_LiftMaterPlaBillnList.html" style="margin: 0 0 0 13px;">提料计划单列表</a></dd>
                                                <dd><a lay-href="生产管理/提料计划/JIT_LiftMaterPlanBillEdit.html" style="margin: 0 0 0 13px;">提料计划单</a></dd>
                                            </dl>
                                        </dd>
                                        <dd>
                                            <a>基础资料</a>
                                            <dl class="layui-nav-child">
                                                <dd><a lay-href="生产管理/日计划基础资料/Gy_WorkWarehouseBillList.html" style="margin: 0 0 0 13px;">车间仓库对照列表</a></dd>
                                                <dd><a lay-href="生产管理/日计划基础资料/Cg_PODemandPlanConfigBillList.html" style="margin: 0 0 0 13px;">提料计划信息列表</a></dd>
                                                <dd><a lay-href="生产管理/日计划基础资料/JIT_NeedMaterPlanConfigBillList.html" style="margin: 0 0 0 13px;">要料计划信息列表</a></dd>
                                            </dl>
                                        </dd>
                                        <dd>
                                            <a>即时库存</a>
                                            <dl class="layui-nav-child">
                                                <dd><a lay-href="生产管理/即时库存/JIT_InventoryList.html" style="margin: 0 0 0 13px;">即时库存列表</a></dd>
                                            </dl>
                                        </dd>
                                        <dd>
                                            <a>报表</a>
                                            <dl class="layui-nav-child">
                                                <dd><a lay-href="生产管理/日计划报表/ReportPODemandPlanBillList.html" style="margin: 0 0 0 13px;">提料计划报表(采购订单维度)</a></dd>
                                                <dd><a lay-href="生产管理/日计划报表/ReportPODemandPlanBillList_S.html" style="margin: 0 0 0 13px;">提料计划报表</a></dd>
                                                <dd><a lay-href="生产管理/日计划报表/ReportWorkDemandPlanBillList.html" style="margin: 0 0 0 13px;">要料计划报表</a></dd>
                                                <dd><a lay-href="生产管理/日计划报表/ReportMOMaterReadysBillList.html" style="margin: 0 0 0 13px;">齐套报表</a></dd>
                                            </dl>
                                        </dd>
                                    </dl>
                                </dd>
                            </dl>
                        </li>
                        <!-- ç”Ÿäº§ç®¡ç† -->
@@ -378,64 +441,7 @@
                                        <dd><a lay-href="生产管理/生产包装单/Sc_PackUnionBill.html">组托单维护</a></dd>
                                    </dl>
                                </dd>
                                <dd>
                                    <a>日计划平台</a>
                                    <dl class="layui-nav-child">
                                        <dd>
                                            <a>生产计划平台</a>
                                            <dl class="layui-nav-child">
                                                <dd><a lay-href="生产管理/生产计划平台/JIT_DayPlanPlatForm.html" style="margin: 0 0 0 13px;">生产计划平台</a></dd>
                                                <!--<dd><a lay-href="生产管理/生产计划平台/JIT_DayPlanPlatFormImport.html" style="margin: 0 0 0 13px;">导入</a></dd>-->
                                                <dd><a lay-href="生产管理/齐套分析/JIT_CompleteDetailList.html" style="margin: 0 0 0 13px;">齐套分析信息明细列表</a></dd>
                                                <dd><a lay-href="生产管理/生产计划平台/Sc_ICMOSortBillList.html" style="margin: 0 0 0 13px;">生产日计划查询</a></dd>
                                            </dl>
                                        </dd>
                                        <dd>
                                            <a>日计划工单</a>
                                            <dl class="layui-nav-child">
                                                <dd><a lay-href="生产管理/生产日计划工单/JIT_DayPlanBillList.html" style="margin: 0 0 0 13px;">日计划工单列表</a></dd>
                                                <!--<dd><a lay-href="生产管理/生产日计划工单/JIT_DayPlanBillEdit.html" style="margin: 0 0 0 13px;">日计划工单</a></dd>-->
                                            </dl>
                                        </dd>
                                        <dd>
                                            <a>要料计划</a>
                                            <dl class="layui-nav-child">
                                                <dd><a lay-href="生产管理/要料计划/JIT_NeedMaterPlanBillList.html" style="margin: 0 0 0 13px;">要料计划单列表</a></dd>
                                                <dd><a lay-href="生产管理/要料计划/JIT_NeedMaterPlanBillEdit.html" style="margin: 0 0 0 13px;">要料计划单</a></dd>
                                            </dl>
                                        </dd>
                                        <dd>
                                            <a>提料计划</a>
                                            <dl class="layui-nav-child">
                                                <dd><a lay-href="生产管理/提料计划/JIT_LiftMaterPlaBillnList.html" style="margin: 0 0 0 13px;">提料计划单列表</a></dd>
                                                <dd><a lay-href="生产管理/提料计划/JIT_LiftMaterPlanBillEdit.html" style="margin: 0 0 0 13px;">提料计划单</a></dd>
                                            </dl>
                                        </dd>
                                        <dd>
                                            <a>基础资料</a>
                                            <dl class="layui-nav-child">
                                                <dd><a lay-href="生产管理/日计划基础资料/Gy_WorkWarehouseBillList.html" style="margin: 0 0 0 13px;">车间仓库对照列表</a></dd>
                                                <dd><a lay-href="生产管理/日计划基础资料/Cg_PODemandPlanConfigBillList.html" style="margin: 0 0 0 13px;">提料计划信息列表</a></dd>
                                                <dd><a lay-href="生产管理/日计划基础资料/JIT_NeedMaterPlanConfigBillList.html" style="margin: 0 0 0 13px;">要料计划信息列表</a></dd>
                                            </dl>
                                        </dd>
                                        <dd>
                                            <a>即时库存</a>
                                            <dl class="layui-nav-child">
                                                <dd><a lay-href="生产管理/即时库存/JIT_InventoryList.html" style="margin: 0 0 0 13px;">即时库存列表</a></dd>
                                            </dl>
                                        </dd>
                                        <dd>
                                            <a>报表</a>
                                            <dl class="layui-nav-child">
                                                <dd><a lay-href="生产管理/日计划报表/ReportPODemandPlanBillList.html" style="margin: 0 0 0 13px;">提料计划报表(采购订单维度)</a></dd>
                                                <dd><a lay-href="生产管理/日计划报表/ReportPODemandPlanBillList_S.html" style="margin: 0 0 0 13px;">提料计划报表</a></dd>
                                                <dd><a lay-href="生产管理/日计划报表/ReportWorkDemandPlanBillList.html" style="margin: 0 0 0 13px;">要料计划报表</a></dd>
                                                <dd><a lay-href="生产管理/日计划报表/ReportMOMaterReadysBillList.html" style="margin: 0 0 0 13px;">齐套报表</a></dd>
                                            </dl>
                                        </dd>
                                    </dl>
                                </dd>
                               
                            </dl>
                        </li>-->
                        <!-- è½¦é—´ç®¡ç† -->

 WebTM/views/Éú²ú¹ÜÀí/Èռƻ®»ù´¡×ÊÁÏ/Gy_WorkWarehouseBill_Add.html

@@ -400,7 +400,7 @@
                                        //在下方添加新的表格数据
                                        for (var i = 0; i < num; i++) {
                                            option.data.push({
                                                "HWorkShopID": "", "HWorkShopNumber": "", "HWorkShopName": "", "HWHID": NumData[j]["HWHID"], "HWHNumber": NumData[j]["仓库代码"], "HWHName": NumData[j]["仓库名称"], "HRemark": ""
                                                "HWorkShopID": "", "HWorkShopNumber": "", "HWorkShopName": "", "HWHID": NumData[j]["HItemID"], "HWHNumber": NumData[j]["仓库代码"], "HWHName": NumData[j]["仓库名称"], "HRemark": ""
                                            })
                                            j++;
                                        }

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

@@ -570,22 +570,6 @@
                        //, { field: '单据类型', title: '单据类型', hide: true}
                        //, { field: '计划跟踪号', title: '计划跟踪号', hide: true}
                    ]]
                    , done: function (res, curr, count) {
                        var $data = $('div[lay-id="mainTable"]').find('.layui-table-body').find('tr').eq(0).find('td');
                        var $head = $('div[lay-id="mainTable"]').find('.layui-table-header').find('tr').eq(0).find('th');
                        var $total = $('div[lay-id="mainTable"]').find('.layui-table-total').find('tr').eq(0).find('td');
                        for (var i = 0; i < $data.length; i++) {
                            var l1 = $data.eq(i).find('div').width();
                            var l2 = $head.eq(i).find('div').width();
                            if (l1 > l2) {
                                $head.eq(i).find('div').width(l1);
                                $total.eq(i).find('div').width(l1);
                            } else {
                                $data.eq(i).find('div').width(l2);
                                $total.eq(i).find('div').width(l2);
                            }
                        }
                    }
                };
            }


 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBillList.html

@@ -482,14 +482,17 @@
            function set_CheckBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].hmainid.toString();
                if (checkStatus.data.length > 0) {
                    var InterID = [];
                    for (var i = 0; i < data.length; i++) {
                        InterID.push(data[i].hmainid.toString());
                    }
                    //逻辑审核方法
                    var wait = layer.load();
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Cj_StationOutBill/set_CheckBill", //方法所在页面和方法名
                        data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"] },
                        data: { "HInterID": InterID.toString(), "CurUserName": sessionStorage["HUserName"] },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { icon: 1 });
@@ -505,7 +508,7 @@
                    });
                }
                else {
                    layer.msg('请选择一行数据审核！');
                    layer.msg('请选择至少一行数据审核！');
                }
            }

@@ -513,14 +516,17 @@
            function set_AbandonCheck() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].hmainid.toString();
                if (checkStatus.data.length > 0) {
                    var InterID = [];
                    for (var i = 0; i < data.length; i++) {
                        InterID.push(data[i].hmainid.toString());
                    }
                    //逻辑审核方法
                    var wait = layer.load();
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Cj_StationOutBill/set_AbandonCheck", //方法所在页面和方法名
                        data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"] },
                          data: { "HInterID": InterID.toString(), "CurUserName": sessionStorage["HUserName"] },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { icon: 1 });
@@ -536,7 +542,7 @@
                    });
                }
                else {
                    layer.msg('请选择一行数据审核！');
                    layer.msg('请选择至少一行数据审核！');
                }
            }

@@ -626,7 +632,7 @@
            function set_ClearQuery() {
                $("#HWorkBillNo").val("");
                $("#HBillNo").val("");
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HProcExchBillNo").val("");
                $("#ColContent").val("");

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

@@ -1740,7 +1740,8 @@
                                    "HSupID": data[i].HSupID, "HSupNumber": data[i].供应商代码, "HSupName": data[i].供应商, "HSupFlag": data[i].委外标记 == 0 ? "false" : "true",
                                    "HQty": HLZQty, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
                                    "HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
                                    "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": data[i].工艺参数, "HPicNum": data[i].图纸编号, "HProcCheckNote": data[i].本工序确认记录
                                    "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": data[i].工艺参数, "HPicNum": data[i].图纸编号, "HProcCheckNote": data[i].本工序确认记录,
                                    "HRelationQty_OutBad":"0"
                                });
                            }
                            option.data = Tablerow;

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

@@ -387,7 +387,7 @@

            //#region æœ¬é¡µé¢æ‰€æœ‰è¢«è°ƒç”¨çš„方法
            function set_ClearBill() {
                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//开始日期
                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));//开始日期
                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));//结束日期
                //初始化主表列表
                set_InitGrid();
@@ -408,7 +408,7 @@
                $("#SHPrintQty").val("");//打印状态
                $("input[type='checkbox'][name='wybj']").prop('checked', false);
                form.render("checkbox");//委外标记
                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//开始日期
                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));//开始日期
                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));//结束日期
                $("#HOrderProcNO").val("");//订单跟踪号
                $("#SHname").val("");//物料|子件名称|子件规格

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò½øÕ¾½ÓÊÕµ¥/Cj_StationInBillList.html

@@ -341,7 +341,7 @@

            //初始化表格
            function set_InitGrid() {
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                option = {
                    elem: '#mainTable'
@@ -437,7 +437,7 @@
                                , toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data
                                , height: 550
                                , height: 'full-50'
                                , page: true
                                , cellMinWidth: 90
                                , limit: 50
@@ -547,7 +547,7 @@
                $("#HWorkBillNo").val("");
                $("#HBillNo").val("");
                $("#工序流转卡号").val("");
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#ColContent").val("");
                $("#ColName").val("0");