Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

wtt

2024-12-23 06582aadfbda68c5683dfd19d80449b71ab14afe

 WebTM/views/ÖÊÁ¿¹ÜÀí/¼ìÑé·½°¸µ¥/QC_CheckProjectList.html

@@ -33,15 +33,21 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">检验方案名称</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HQCCheckProjectName" id="HQCCheckProjectName">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">开始日期</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HDate1" id="HDate1">
                                        <input type="date" class="layui-input" name="HDate1" id="HDate1">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">结束日期</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HDate2" id="HDate2">
                                        <input type="date" class="layui-input" name="HDate2" id="HDate2">
                                    </div>
                                </div>
                                <div class="layui-inline">
@@ -84,7 +90,10 @@
        //获取页面跳转参数  //单据编辑状态： 1.无源单新增  Â 2.有源单新增  Â 3.编辑  4.浏览  5.变更
        var params = get_UrlVars();
        if (typeof (params[params[0]]) == "undefined") {
            var OperationType = 1;//操作类型
            var OperationType = 1;//操作类型          
        } else {
            var OperationType = params[params[0]];//操作类型
            var HName = decodeURI(params[params[1]]);//物料名称
        }
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
@@ -137,7 +146,7 @@
                        break;
                    //删除按钮
                    case 'btn-Delete': set_DeleteBill();
                        break;                   
                        break;
                    //列设置
                    case 'set_HideColumn': get_HideColumn();
                        break;
@@ -208,7 +217,13 @@
                //初始化表格
                set_InitGrid();
                //查询
                get_Display(sWhere);
                if (HName=="") {
                    get_Display(sWhere);
                } else {
                    sWhere += " and ç‰©æ–™åç§° = '" + HName + "'";
                    get_Display(sWhere);
                }
                
            }

            //初始化网格
@@ -271,7 +286,7 @@
                var ajaxLoad = layer.load();
                //进入页面显示的缓存列表
                $.ajax({
                    url: GetWEBURL() + "/QC_Management/MES_QC_CheckProjectList_Json",
                    url: GetWEBURL() + "/QC_Management/MES_QC_CheckProjectList_Json_Main",
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
                    success: function (result) {
@@ -295,6 +310,10 @@
                var HBillNo = $("#HBillNo").val();
                var HDate1 = $("#HDate1").val();
                var HDate2 = $("#HDate2").val();
                var HQCCheckProjectName = $("#HQCCheckProjectName").val();
                if (HQCCheckProjectName) {
                    sWhere += " and æ£€éªŒæ–¹æ¡ˆåç§° like '%" + HQCCheckProjectName + "%'";
                }
                if (HBillNo) {
                    sWhere += " and å•æ®å· like '%" + HBillNo + "%'";
                }
@@ -338,7 +357,7 @@
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].hmainid.toString();
                    var HBillStatus = data[0].HBillStatus.toString();
                  

                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({
                        type: 2
@@ -371,7 +390,7 @@
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].hmainid.toString();
                    var HBillStatus = data[0].HBillStatus.toString();
                

                    //逻辑删除方法
                    layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {
                        $.ajax({