1

yangle

2023-06-25 050cdc4bfc4c08c37b39d6e7ea1867628a7f2404

1

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

@@ -819,10 +819,10 @@
                        $("#HQty").val(result.data[0]["计划数量"]);
                        $("#HProcBegName").val(result.data[0]["工序名称"]);
                        $("#HProcBegID").val(result.data[0]["HProcID"]);
                        $("#HProcEndName").val(result.data[1]["工序名称"]);
                        $("#HProcEndID").val(result.data[1]["HProcID"]);
                        $("#HProcEndName").val(result.data.length == 1 ? "" :result.data[1]["工序名称"]);
                        $("#HProcEndID").val(result.data.length==1?"0": result.data[1]["HProcID"]);
                        $("#HProcExchBegNO").val(result.data[0]["流水号"]);
                        $("#HProcExchEndNO").val(result.data[1]["流水号"]);
                        $("#HProcExchEndNO").val(result.data.length == 1 ? "9999" :result.data[1]["流水号"]);
                        $("#HPRDORGID").val(result.data[0]["HPRDORGID"]);
                        $("#HPRDORGName").val(result.data[0]["组织"]);
                        $("#HICMOBillNo").val(result.data[0]["任务单号"]);
@@ -916,20 +916,20 @@
                return false;
            }

            if ($("#HProcEndName").val() == "") {
                layer.msg("结束工序不能为空!");
                return false;
            }
            //if ($("#HProcEndName").val() == "") {
            //    layer.msg("结束工序不能为空!");
            //    return false;
            //}

            if ($("#HProcExchBegNO").val() == "") {
                layer.msg("开始流水号不能为空!");
                return false;
            }

            if ($("#HProcExchEndNO").val() == "") {
                layer.msg("结束流水号不能为空!");
                return false;
            }
            //if ($("#HProcExchEndNO").val() == "") {
            //    layer.msg("结束流水号不能为空!");
            //    return false;
            //}

            if ($("#HPRDORGName").val() == "") {
                layer.msg("生产组织不能为空!");

 WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/ProductionPlanReportList.html

@@ -115,6 +115,33 @@
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin: 10px 0 10px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
@@ -258,8 +285,8 @@
                        , { field: '生产订单号', title: '批号', width: 160 }
                        , { field: '物料名称', title: '物料名称', width: 160 }
                        , { field: '物料代码', title: '物料代码', width: 160 }
                        , { field: '开工日期', title: '下达日期', width: 160, templet: "<div>{{d.开工日期 ==null ?'':layui.util.toDateString(d.开工日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '要求完工', title: '要求完工', width: 160, templet: "<div>{{d.要求完工 ==null ?'':layui.util.toDateString(d.要求完工, 'yyyy-MM-dd')}}</div>" }
                        , { field: '开工日期', title: '下达日期', width: 160, templet: "<div>{{d.开工日期 ==null ?'':layui.util.toDateString(d.开工日期, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
                        , { field: '要求完工', title: '要求完工', width: 160, templet: "<div>{{d.要求完工 ==null ?'':layui.util.toDateString(d.要求完工, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
                        , { field: '包装标识', title: '包装标识', width: 200 }
                        , { field: '整批', title: '整批', width: 160, totalRow: true }
                        , { field: '报废数量', title: '报废', width: 160, totalRow: true}
@@ -318,6 +345,10 @@
                            //        }
                            //    }
                            //}

                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                                ColFilter();
                            }
                            table.render(option);
                            layer.close(wait);
                        } else {
@@ -344,6 +375,31 @@
                var HSTATUS = $("#HSTATUS").val();//生产订单状态
                var HOrgID = sessionStorage["OrganizationID"];
                var checkWRuku = $("input[name='checkWRuku']").prop("checked");//复选框
                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();
                var sWhere1 = "";
                if (ColName != 0 && Comparator != 0) {
                    var com = "";
                    switch (Comparator) {
                        case "7":
                            com = "like''%" + ColContent + "%''";
                            break;
                        case "8":
                            com = "like''%" + ColContent + "''";
                            break;
                        case "9":
                            com = "like''" + ColContent + "%''";
                            break;
                        case "10":
                            com = "not like''%" + ColContent + "%''";
                            break;
                        default:
                            com = "" + Comparator + "''" + ColContent + "''";
                            break;
                    }
                    sWhere1 += " and " + ColName + " " + com;
                }

                if (checkWRuku) {
                    checkWRuku = 1;
@@ -363,6 +419,7 @@
                    , IsTrue: checkWRuku
                    , HState: HState
                    , HSTATUS: HSTATUS
                    , sWhere1: sWhere1
                }

                get_Display(JSON.stringify(sWhere));
@@ -371,7 +428,7 @@
            }
            //重置过滤条件
            function set_ClearQuery() {
                $("#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 * 10), "yyyy-MM-dd"));//开始日期
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//结束日期
                $("#HICMOBillNo").val("");
                $("#HProcExchBillNo").val("");
@@ -380,6 +437,9 @@
                $("#HMaterNumber").val("");
                $("#F_BSV_WYID").val("");
                $("#HState").val("0")
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
                $("input[name='checkWRuku']").prop("checked", false);
                form.render()
                sWhere = "";
@@ -516,6 +576,19 @@
                })
            }

            //列明显示下拉框
            function ColFilter() {
                var Organization = '<option  value="0" selected="selected" ></option>';
                for (var i = 1; i < option.cols[0].length; i++) {
                    if (option.cols[0][i].hide != true) {
                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
                    }
                }
                $("#ColName").empty();
                $("#ColName").append(Organization);
                form.render('select');
            }


            //#endregion
        });