条码生成添加客户物料字段；网页器具保养添加字段；PDA设备保养添加字段；首件检验单、工序检验单、巡检记录单列表查询和编辑查询接口分开

yusijie

2024-06-29 55bb31d5338d457a7653dc290a2cb3e244548068

条码生成添加客户物料字段；网页器具保养添加字段；PDA设备保养添加字段；首件检验单、工序检验单、巡检记录单列表查询和编辑查询接口分开

 WebTM/views/²Ö´æ¹ÜÀí/ÌõÂëÉú³É/Gy_BarCodeBill.html

@@ -213,7 +213,7 @@
            var sWhere = "";
            var sBillType = "3801";
            var HModName = "Gy_BarCodeBill";
            var titleData = ["物料ID", "源单主内码", "源单子内码", "辅助属性ID", "计量单位ID", "客户ID", "HItemID", "hmainid", "hsubid", "HinterID", "车间ID", "供应商ID", "HSTOCKORGID","操作员ID","班组ID"];//不需要显示的字段 å¯æ‰©å±•
            var titleData = ["物料ID", "源单主内码", "源单子内码", "辅助属性ID", "计量单位ID", "客户ID", "HItemID", "hmainid", "hsubid", "HinterID", "车间ID", "供应商ID", "HSTOCKORGID", "操作员ID", "班组ID", "外箱数", "钢卷捆包号", "炉号", "厂商", "客户代码", "客户名称", "销售订单号", "生产日期", "保质期至", "热处理", "辅助属性代码", "辅助属性名称", "辅单位数量", "是否启用保质期", "是否赠品","进料日期"];//不需要显示的字段 å¯æ‰©å±•

            var HMaterID = "";
            var HBatchNo = "";
@@ -267,7 +267,7 @@

            var rowdata = [{
                "HMaterID": 0, "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HBQty": 0, "HMinQty": 0, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
                "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "","HMTONo": ""
                "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": "", "HCusModel": "", "HCusMaterName": ""
            }];
            //初始化表格
            set_InitGrid();
@@ -299,7 +299,7 @@

                var NewRow = {
                    "HMaterID": 0, "HMaterCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HBQty": 0, "HMinQty": 0, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
                    "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": ""
                    "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": "", "HCusModel": "", "HCusMaterName": ""
                };
                //console.log(NewRow);
                switch (obj.event) {
@@ -626,7 +626,7 @@
                    $("#HDate").val(Format(new Date(), "yyyy-MM-dd")); //单据日期
                    $("#HSourceBillType").val('1'); //选择下拉框默认第一个选项
                    $("#HBarCodeType").val('0');
                        var arr = [{ HBillNo: '', HMaterNumber: '', HMaterName: '', HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: '', HUnitName: '', HBatchNo: '', HGiveAwayFlag: '0', HQty: '0', HMinQty: '0', HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '', HEmpID: 0, HEmpNumber: '', HEmpName: '', HGroupID: 0, HGroupNumber: '', HGroupName: '', HMTONo: ''}]
                    var arr = [{ HBillNo: '', HMaterNumber: '', HMaterName: '', HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: '', HUnitName: '', HBatchNo: '', HGiveAwayFlag: '0', HQty: '0', HMinQty: '0', HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '', HEmpID: 0, HEmpNumber: '', HEmpName: '', HGroupID: 0, HGroupNumber: '', HGroupName: '', HMTONo: '', HCusModel: "", HCusMaterName: "" }]
                    table.reload('mainTable', {
                        data: arr // è°ƒç”¨table.reload é‡æ–°æ¸²æŸ“显示加载追加了数据的表格
                    });
@@ -634,7 +634,7 @@
                        "HBarCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HAuxPropNumber": "", "HAuxPropName": ""
                        , "HGiveAwayFlag": "", "HUnitCode": "", "HUnitName": "", "HQty": 0, "HDate": "", "HCusNumber": "", "HCusName": ""
                        , "HSourceBillNo": "", "HSeOrderBillNo": "", "HRemark": "", "HMTONo": "", "HShowDate": "", "HInnerBillNo": "", "HMaker": ""
                        , "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": ""
                        , "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": "", "HCusModel": "", "HCusMaterName": ""
                    }]
                    table.reload('mainTable1', {
                        data: arr1 // è°ƒç”¨table.reload é‡æ–°æ¸²æŸ“显示加载追加了数据的表格
@@ -670,7 +670,7 @@
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        var arr = [{ HBillNo: '', HMaterNumber: checkStatus.data[0].物料代码, HMaterName: checkStatus.data[0].物料名称, HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: checkStatus.data[0].计量单位代码, HUnitName: checkStatus.data[0].计量单位, HBatchNo: '', HGiveAwayFlag: '0', HQty: checkStatus.data[0].数量.toString("#0.00"), HMinQty: checkStatus.data[0].最小包装数, HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '', HEmpID: 0, HEmpNumber: '', HEmpName: '', HGroupID: 0, HGroupNumber: '', HGroupName: '', HMTONo: '' }]
                        var arr = [{ HBillNo: '', HMaterNumber: checkStatus.data[0].物料代码, HMaterName: checkStatus.data[0].物料名称, HMaterModel: '', HAuxPropNumber: '', HAuxPropName: '', HUnitNumber: checkStatus.data[0].计量单位代码, HUnitName: checkStatus.data[0].计量单位, HBatchNo: '', HGiveAwayFlag: '0', HQty: checkStatus.data[0].数量.toString("#0.00"), HMinQty: checkStatus.data[0].最小包装数, HPackQty: '0', HBQty: '0', HDate: '', HCusNumber: '', HCusName: '', HSeOrderBillNo: '', HRemark: '', HEmpID: 0, HEmpNumber: '', HEmpName: '', HGroupID: 0, HGroupNumber: '', HGroupName: '', HMTONo: '', "HCusModel": "", "HCusMaterName": "" }]
                        //同步更新表格和缓存对应的值
                        table.reload('mainTable', {
                            data: arr // è°ƒç”¨table.reload é‡æ–°æ¸²æŸ“显示加载追加了数据的表格
@@ -833,9 +833,11 @@
                    , { field: 'HMaterNumber', title: '物料代码', edit: 'text', event: 'HMaterNumber', width: 200 }
                    , { field: 'HMaterName', title: '物料名称', width: 200 }
                    , { field: 'HMaterModel', title: '规格型号', width: 200 }
                    , { field: 'HCusModel', title: '客户规格型号', edit: 'text', width: 200 }
                    , { field: 'HCusMaterName', title: '客户物料名称', edit: 'text', width: 200 }
                    , { field: 'HEmpID', title: '操作员ID', width: 100, hide: true }
                    , { field: 'HEmpNumber', title: '操作员代码', edit: 'text', width: 200, event: 'HEmpNumber'}
                    , { field: 'HEmpName', title: '操作员', width: 200 }
                    , { field: 'HEmpNumber', title: '操作员代码', edit: 'text', width: 200, event: 'HEmpNumber' }
                    , { field: 'HEmpName', title: '操作员', width: 200 }                   
                    , { field: 'HGroupID', title: '班组ID', width: 100, hide: true }
                    , { field: 'HGroupNumber', title: '班组代码', edit: 'text', width: 200, event: 'HGroupNumber' }
                    , { field: 'HGroupName', title: '班组名称', width: 200 }
@@ -999,7 +1001,7 @@
                    , "HAuxPropID": 0, "HAuxPropNumber": "", "HAuxPropName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HBatchNo": "", "HGiveAwayFlag": 0
                    , "HQty": 0, "HMinQty": '', "HBQty": 0, "HPackQty": 0, "HDate": "", "HCusID": 0, "HCusNumber": "", "HCusName": "", "HSeOrderBillNo": "", "HRemark": ""
                    , "HCoilNO": "", "HFurnaceNO": "", "HFactory": "",
                    "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": ""
                    "HAuxQty": 0, "HheatNO": "", "HProduceDate": Format(new Date(), "yyyy-MM-dd"), "HExpiryDate": Format(new Date(), "yyyy-MM-dd"), "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": "", "HCusModel": "", "HCusMaterName": ""
                }];
                table.render(option);
                //刷新表格数据
@@ -1013,7 +1015,7 @@
                    "HBarCode": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HAuxPropNumber": "", "HAuxPropName": ""
                    , "HGiveAwayFlag": "", "HUnitCode": "", "HUnitName": "", "HQty": 0, "HDate": "", "HCusNumber": "", "HCusName": ""
                    , "HSourceBillNo": "", "HSeOrderBillNo": "", "HRemark": "", "HMTONo": "", "HShowDate": "", "HInnerBillNo": "", "HMaker": ""
                    , "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": ""
                    , "HExpirationDateFlag": 0, "HEmpID": 0, "HEmpNumber": "", "HEmpName": "", "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HCusModel": "", "HCusMaterName": ""
                }];
                table.render(option1);
                //刷新表格数据
@@ -1156,7 +1158,7 @@
                            for (var i = 0; i < option.cols[0].length - 2; i++) {
                                if (dataCol[i]) {
                                    var dataCols = dataCol[i].split('|');
                                }                                
                                }
                                //隐藏列
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_Add_MouldMaintainBillList.html

@@ -12,6 +12,17 @@
        .layui-form-label {
            width: 85px;
        }

        /* é˜²æ­¢ä¸‹æ‹‰æ¡†çš„下拉列表被隐藏---必须设置--- */
        .layui-table-cell {
            overflow: visible !important;
        }
        /* ä½¿å¾—下拉框与单元格刚好合适 */
        td .layui-form-select {
            margin-top: -10px;
            margin-left: -15px;
            margin-right: -15px;
        }
    </style>
</head>
<body>
@@ -76,7 +87,7 @@
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                    </button>
                                                </div>
                                            </div>                                            
                                            </div>
                                        </div>
                                        <div class="layui-form-item">
                                            <div class="layui-inline">
@@ -110,7 +121,7 @@
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                    </button>
                                                </div>
                                            </div>                                            
                                            </div>
                                        </div>
                                        <div class="layui-form-item">
                                            <div class="layui-inline">
@@ -124,7 +135,14 @@
                                                <div class="layui-input-inline">
                                                    <textarea placeholder="请输入维备注" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
                                                </div>
                                            </div>                                            
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">最终结论</label>
                                                <div class="layui-input-inline">
                                                    <input type="radio" name="HLastResult" id="HLastResult" value="OK" title="OK" checked>
                                                    <input type="radio" name="HLastResult" id="HLastResult" value="NG" title="NG">
                                                </div>
                                            </div>
                                        </div>
                                    </div>
                                </div>
@@ -179,6 +197,14 @@
        <!--<a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>-->
        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del1">删除</a>
    </script>
    <!--行下拉选择(保养结果)-->
    <script type="text/html" id="HMaintainResult">
        <select name="HMaintainResult" lay-filter="HMaintainResult" id="HMaintainResult{{d.LAY_TABLE_INDEX+1}}">
            <!--<option value="">请选择</option>-->
            <option value="Y" selected>Y</option>
            <option value="X">X</option>
        </select>
    </script>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
@@ -213,7 +239,7 @@
            var option;
            var option2;
            var sBillType = "3807";
            var TabRow = { "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " };
            var TabRow = { "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " ", "HMaintainResult": "Y" };
            var TabRow1 = { "HMaterID": 0, "HMaterNumber": " ", "HMaterName": " ", "HMaterSpec": " ", "HUnitID": "0", "HUnitNumber": " ", "HUnitName": " ", "HQty": "0", "HQtyMust": "0", "HRemark": " " };
            //#endregion

@@ -257,7 +283,7 @@
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;;
                var AddRow = table.cache['mainTable'];
                var NewRow = { "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " };
                var NewRow = { "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " ", "HMaintainResult": "Y" };
                switch (obj.event) {
                    //新增一行
                    case 'btn-AddLine': btnAddLine(NewRow);
@@ -295,6 +321,35 @@
            table.on('tool(mainTable1)', function (obj) {
                set_GridDelete1(obj);   //行内删除
                set_GridCellCheck1(obj); //行内快捷键筛选
            });

            //行选择处理（点检结果）
            form.on('select(HMaintainResult)', function (data) {
                //获取下拉框选中的值
                var elem = data.othis.parents('tr');
                var dataindex = elem.attr("data-index");
                $.each(option.data, function (index, value) {
                    if (value.LAY_TABLE_INDEX == dataindex) {
                        value.HMaintainResult = data.value;//把选中下拉框id值赋值给表格缓存
                    }
                });

                console.log(table.cache['mainTable']);

                var HQty = 0;//表体行不合格数量
                for (let i = 0; i < table.cache['mainTable'].length; i++) {
                    if (table.cache['mainTable'][i].HMaintainResult == "X") {
                        HQty++;
                    }
                }
                if (HQty > 0) {
                    document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //删除选择属性
                    $("input:radio[name=HLastResult][value=" + "NG" + "]").attr("checked", "true"); //添加选择属性
                } else {
                    document.querySelectorAll("[name='HLastResult']")[1].removeAttribute('checked'); //删除选择属性
                    $("input:radio[name=HLastResult][value=" + "OK" + "]").attr("checked", "true"); //添加选择属性
                }
                form.render('radio');
            });

            //表头信息保养计划源单弹窗
@@ -483,7 +538,7 @@
                                var PJData = result.list[1];//配件
                                var rowdate1 = layui.table.cache["mainTable"];
                                var rowdate2 = layui.table.cache["mainTable1"];
                                option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
                                option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " ", "HMaintainResult": "Y"}];
                                option2.data = [{ "HMaterID": 0, "HMaterNumber": " ", "HMaterName": " ", "HMaterSpec": " ", "HUnitID": "0", "HUnitNumber": " ", "HUnitName": " ", "HQty": "0", "HQtyMust": "0", "HRemark": " " }];
                                table.render(option);
                                table.render(option2);
@@ -498,7 +553,7 @@
                                        var checkrow = {
                                            "HMaintainItemID": BYData[i].HMaintainItemID, "HMaintainItemNumber": BYData[i].HMaintainItemNumber, "HMaintainItem": BYData[i].HMaintainItem,
                                            "HMaintainPart": BYData[i].HMaintainPart, "HManagerID": BYData[i].HManagerID, "HManagerNumber": BYData[i].HManagerNumber,
                                            "HManagerName": BYData[i].HManagerName, "HClaim": BYData[i].HClaim, "HRemark": BYData[i].HRemark
                                            "HManagerName": BYData[i].HManagerName, "HClaim": BYData[i].HClaim, "HRemark": BYData[i].HRemark, "HMaintainResult": "Y"
                                        };
                                        buttonArr.push(checkrow);  //将之前的数据存储
                                    }
@@ -549,7 +604,7 @@
                                var PJData = result.data[1];//配件
                                var rowdate1 = layui.table.cache["mainTable"];
                                var rowdate2 = layui.table.cache["mainTable1"];
                                option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
                                option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " ", "HMaintainResult": "Y" }];
                                option2.data = [{ "HMaterID": 0, "HMaterNumber": " ", "HMaterName": " ", "HMaterSpec": " ", "HUnitID": "0", "HUnitNumber": " ", "HUnitName": " ", "HQty": "0", "HQtyMust": "0", "HRemark": " " }];
                                table.render(option);
                                table.render(option2);
@@ -571,7 +626,7 @@
                                        var checkrow = {
                                            "HMaintainItemID": BYData[i].HMaintainItemID == null ? 0 : BYData[i].HMaintainItemID, "HMaintainItemNumber": BYData[i].保养项目代码, "HMaintainItem": BYData[i].保养项目,
                                            "HMaintainPart": BYData[i].保养部位, "HManagerID": BYData[i].HEmployeeID == null ? 0 : BYData[i].HEmployeeID, "HManagerNumber": BYData[i].负责人代码,
                                            "HManagerName": BYData[i].负责人名称, "HClaim": BYData[i].具体要求, "HRemark": ""
                                            "HManagerName": BYData[i].负责人名称, "HClaim": BYData[i].具体要求, "HRemark": "", "HMaintainResult": "Y"
                                        };
                                        buttonArr.push(checkrow);  //将之前的数据存储
                                    }
@@ -620,7 +675,7 @@
                                var PJData = result.list[1];//配件
                                var rowdate1 = layui.table.cache["mainTable"];
                                var rowdate2 = layui.table.cache["mainTable1"];
                                option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
                                option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " ", "HMaintainResult": "Y" }];
                                option2.data = [{ "HMaterID": 0, "HMaterNumber": " ", "HMaterName": " ", "HMaterSpec": " ", "HUnitID": "0", "HUnitNumber": " ", "HUnitName": " ", "HQty": "0", "HQtyMust": "0", "HRemark": " " }];
                                table.render(option);
                                table.render(option2);
@@ -632,13 +687,12 @@
                                        var checkrow = {
                                            "HMaintainItemID": BYData[i].保养项目ID, "HMaintainItemNumber": BYData[i].保养项目代码, "HMaintainItem": BYData[i].保养项目,
                                            "HMaintainPart": BYData[i].保养部位, "HManagerID": BYData[i].负责人ID, "HManagerNumber": BYData[i].负责人代码,
                                            "HManagerName": BYData[i].负责人名称, "HClaim": BYData[i].具体要求, "HRemark": BYData[i].子备注2
                                            "HManagerName": BYData[i].负责人名称, "HClaim": BYData[i].具体要求, "HRemark": BYData[i].子备注2, "HMaintainResult": "Y"
                                        };
                                        buttonArr.push(checkrow);  //将之前的数据存储
                                    }
                                    table.reload("mainTable", {
                                        data: buttonArr    //将数据重新载入表格
                                    })
                                    option.data = buttonArr;
                                    table.render(option);
                                }


@@ -655,9 +709,8 @@
                                        };
                                        buttonArr.push(checkrow);  //将之前的数据存储
                                    }
                                    table.reload("mainTable1", {
                                        data: buttonArr    //将数据重新载入表格
                                    })
                                    option2.data = buttonArr;
                                    table.render(option2);
                                }

                            } else {
@@ -949,6 +1002,7 @@
                    , { field: 'HMaintainItemID', title: '保养项目ID', edit: 'text', hide: true }
                    , { field: 'HMaintainItemNumber', title: '保养项目代码', edit: 'text', event: 'HMaintainItemNumber' }
                    , { field: 'HMaintainItem', title: '保养项目' }
                    , { field: 'HMaintainResult', title: '保养结果', templet: '#HMaintainResult', event: 'HMaintainResult' }
                    , { field: 'HMaintainPart', title: '保养部位', edit: 'text' }
                    , { field: 'HClaim', title: '具体要求', edit: 'text' }
                    , { field: 'HManagerID', title: '负责人ID', edit: 'text', hide: true }
@@ -1009,7 +1063,7 @@
            function set_AddFNew() {
                //获取最大单据号
                get_MAXNum();
                option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
                option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " ", "HMaintainResult": "Y" }];
                option2.data = [{ "HMaterID": 0, "HMaterNumber": " ", "HMaterName": " ", "HMaterSpec": " ", "HUnitID": "0", "HUnitNumber": " ", "HUnitName": " ", "HQty": "0", "HQtyMust": "0", "HRemark": " " }];
                table.render(option);
                table.render(option2);
@@ -1076,7 +1130,14 @@
                                , "HMaintainLevID": data.HMaintainLevID
                                , "HMaintainLevName": data.保养级别名称
                            });

                            if (data.最终结论 == "不合格") {
                                document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //删除选择属性
                                $("input:radio[name=HLastResult][value=" + "NG" + "]").attr("checked", "true"); //添加选择属性
                            } else {
                                document.querySelectorAll("[name='HLastResult']")[1].removeAttribute('checked'); //删除选择属性
                                $("input:radio[name=HLastResult][value=" + "OK" + "]").attr("checked", "true"); //添加选择属性
                            }
                            form.render('radio');
                        } else {
                            layer.alert(result.msg, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                        }
@@ -1110,10 +1171,21 @@
                    success: function (result) {
                        if (result.count == 1) {
                            option.data = result.list[0];
                            for (let i = 0; i < option.data.length; i++) {
                                if (option.data[i].HMaintainResult == "合格") {
                                    option.data[i].HMaintainResult = "Y";
                                } else {
                                    option.data[i].HMaintainResult = "X";
                                }
                            }
                            table.render(option);
                            option2.data = result.list[1];
                            table.render(option2);

                            for (let j = 0; j < result.list[0].length; j++) {
                                $("#HMaintainResult" + (j + 1)).val(result.list[0][j].HMaintainResult == "合格" ? 'Y' : (result.list[0][j].HMaintainResult == 'Y' ? 'Y' : 'X'))
                            }
                            form.render('select');
                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                        }
@@ -1129,6 +1201,11 @@
                table.cache["mainTable"].push(NewRow);
                option.data = table.cache["mainTable"];
                table.render(option);

                for (var i = 1; i <= option.data.length; i++) {
                    $('#HMaintainResult' + i + '').find("option[value='" + option.data[i - 1].HMaintainResult + "']").attr("selected", true);
                }
                form.render('select');
            }

            //增加一行
@@ -1153,6 +1230,11 @@
                    table.cache["mainTable"].push(JSON.parse(copyrow));//将复制的行强转成json追加到表格上
                    option.data = table.cache["mainTable"];//将数据绑定到data上
                    table.render(option);//将数据渲染到表格上

                    for (var i = 1; i <= option.data.length; i++) {
                        $('#HMaintainResult' + i + '').find("option[value='" + option.data[i - 1].HMaintainResult + "']").attr("selected", true);
                    }
                    form.render('select');
                }
            }


 WebTM/views/É豸¹ÜÀí/Sb_EquipMaintainBill_PDA.html

@@ -113,6 +113,13 @@
                                                <input type="datetime" name="HEndDate" class="layui-input LineHeight" id="HEndDate" placeholder="请选择日期" style="border-radius: 50px;">
                                            </td>
                                        </tr>
                                        <tr>
                                            <th>最终结论</th>
                                            <td class="bz_td">
                                                <input type="radio" name="HLastResult" value="OK" title="OK" checked="">
                                                <input type="radio" name="HLastResult" value="NG" title="NG">
                                            </td>
                                        </tr>
                                        <tr style="display:none;">
                                            <th>数&ensp;&ensp;&ensp;&ensp;量</th>
                                            <td class="bz_td">

 WebTM/views/ÖÊÁ¿¹ÜÀí/Ѳ¼ì¼Ç¼µ¥/QC_Add_Edit_PatrolProcCheckOtherill.html

@@ -867,6 +867,7 @@
                            $("#HQCSchemeName").val(data.检验方案名称);
                            $("#HQCSchemeID").val(data.检验方案ID);
                            $("#HProcName").val(data.当前工序);//
                            $("#HBatchNo").val(data.批号);
                            //获取表体检验项目信息
                            get_CheckItem();
                        } else {
@@ -1454,7 +1455,7 @@
                var ajaxLoad = layer.load();
                var sWhere = " and hmainid=" + linterid;
                $.ajax({
                    url: GetWEBURL() + "/QC_PatrolProcCheckOtherBill/QC_PatrolProcCheckOtherBillList",
                    url: GetWEBURL() + "/QC_PatrolProcCheckOtherBill/QC_PatrolProcCheckOtherBillList_Edit",
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (result) {

 WebTM/views/ÖÊÁ¿¹ÜÀí/¹¤Ðò¼ìÑéµ¥/QC_ProcessCheckBill.html

@@ -1390,7 +1390,7 @@
                var ajaxLoad = layer.load();
                var sWhere = " and hmainid=" + linterid;
                $.ajax({
                    url: GetWEBURL() + "/QC_ProcessCheckBill/QC_ProcessCheckBillList",
                    url: GetWEBURL() + "/QC_ProcessCheckBill/QC_ProcessCheckBill_Edit",
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (result) {

 WebTM/views/ÖÊÁ¿¹ÜÀí/¹¤Ðò¼ìÑéµ¥/QC_ProcessCheckBillList2.html

@@ -390,7 +390,7 @@
                var ajaxLoad = layer.load();
                $.ajax({
                    //h_v_QC_ProcessCheckBill
                    url: GetWEBURL() + '/QC_ProcessCheckBill/QC_ProcessCheckBillList',
                    url: GetWEBURL() + '/QC_ProcessCheckMainBill/QC_ProcessCheckMainBillList',
                    type: "GET",
                    async: true,
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },

 WebTM/views/ÖÊÁ¿¹ÜÀí/Ê×¼þ¼ìÑéµ¥/QC_Add_Edit_FirstPieceCheckBill.html

@@ -1495,7 +1495,7 @@
                var ajaxLoad = layer.load();
                var sWhere = " and hmainid=" + linterid;
                $.ajax({
                    url: GetWEBURL() + "/QC_FirstPieceCheckBill/QC_FirstPieceCheckBillList",
                    url: GetWEBURL() + "/QC_FirstPieceCheckBill/QC_FirstPieceCheckBill_Edit",
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (result) {

 WebTM/views/ÖÊÁ¿¹ÜÀí/Ê×¼þ¼ìÑéµ¥/QC_FirstPieceCheckBillList2.html

@@ -450,7 +450,7 @@
                var ajaxLoad = layer.load();
                $.ajax({
                    //h_v_QC_FirstPieceCheckBill
                    url: GetWEBURL() + '/QC_FirstPieceCheckBill/QC_FirstPieceCheckBillList',
                    url: GetWEBURL() + '/QC_FirstPieceCheckBillMain/QC_FirstPieceCheckBillMainList',
                    type: "GET",
                    async: false,
                    data: { "sWhere": sqlWhere, "user": sessionStorage["HUserName"] },

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

@@ -264,6 +264,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>读取方案</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_FirstPieceCheck" id="set_FirstPieceCheck"><i class="layui-icon layui-icon-form"></i>首检</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ProcessCheck" id="set_ProcessCheck"><i class="layui-icon layui-icon-form"></i>工序检</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_PatrolCheck" id="set_PatrolCheck"><i class="layui-icon layui-icon-form"></i>巡检</button>
                            </div>
                        </script>
                        <script type="text/html" id="toolbarDemo2">
@@ -477,6 +478,9 @@
                    //工序检
                    case 'set_ProcessCheck': set_ProcessCheck();
                        break;
                    //巡检
                    case 'set_PatrolCheck': set_PatrolCheck();
                        break;                        
                };
            });

@@ -2738,6 +2742,34 @@
                }
            }

            //巡检            
            function set_PatrolCheck() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].hmainid.toString();
                    var OperationType = 2;
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '巡检记录单-编辑'
                        , shade: 0.6
                        , maxmin: false
                        , anim: 0
                        , content: ['../../质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckOtherill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3772&HICMOEntryID=0', 'yes']
                        , resize: false
                        , cancel: function () {
                            btnIs();
                        }
                        , end: function () {
                            get_FastQuery();
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑！');
                }
            }

            //列明显示下拉框
            function ColFilter() {
                var Organization = '<option  value="0" selected="selected" ></option>';