生产质量汇报单增加字段 HBadPhenomenaID int --不良现象

zrg

2024-12-26 14b0abe22ae4cdfc1177eeff18fb310520ed850d

生产质量汇报单增加字段 HBadPhenomenaID int --不良现象

 WebTM/WebTM.csproj

@@ -97,6 +97,10 @@
    <Content Include="layuiadmin\ckou.js" />
    <Content Include="layuiadmin\echarts.min.js" />
    <Content Include="layuiadmin\grwebapp.js" />
    <Content Include="layuiadmin\resize\ResizeUpDow.css" />
    <Content Include="layuiadmin\resize\ResizeUpDow.js" />
    <Content Include="layuiadmin\resize\ResizeLeftRight.css" />
    <Content Include="layuiadmin\resize\ResizeLeftRight.js" />
    <Content Include="layuiadmin\QueryScheme.js" />
    <Content Include="layuiadmin\SetColumn.js" />
    <Content Include="layuiadmin\modules\tableFilter2.js" />

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -9,7 +9,7 @@
    var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    //var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    //var WEBURL = "http://47.96.97.237/API/";          //智云服务器
    var WEBURL = "http://localhost:8082/LuBaoAPI/";  //余思杰本地配置
  /*  var WEBURL = "http://localhost:8082/LuBaoAPI/";  //余思杰本地配置*/
    //var WEBURL = "http://localhost:8088/ARAPI/";      //余思杰本地配置(安瑞)
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";  //奥邦
    //var WEBURL = "http://10.1.4.155/API/";            //江丰客户NEW

 WebTM/layuiadmin/resize/ResizeLeftRight.css

New file
@@ -0,0 +1,35 @@
.box {
    width: 100%;
    height: 1000px;
    display: flex;
}
/*左侧div样式*/
.left {
    width: calc(30% - 5px); /*左侧初始化宽度*/
    height: 100%;
    /*  background: #36cfc9;*/
    float: left;
}
/*拖拽区div样式*/
.resize {
    cursor: col-resize;
    position: relative;
    background-color: yellow;
    width: 5px;
    height: 300px;
    background-size: cover;
    background-position: center;
    font-size: 32px;
    float: left;
}
    /*拖拽区鼠标悬停样式*/
    .resize:hover {
        background-color: #444444;
    }
/*右侧div'样式*/
.mid {
    float: left;
    width: 70%; /*右侧初始化宽度*/
    height: 100%;
    /*background-color: #b7eb8f;*/
}

 WebTM/layuiadmin/resize/ResizeLeftRight.js

New file
@@ -0,0 +1,52 @@
(function () {
    // èŽ·å–相关DOM元素
    let resize = document.getElementById('resize');
    let left = document.getElementById('left');
    let mid = document.getElementById('right');
    let box = document.getElementById('box');

    // é¼ æ ‡æŒ‰ä¸‹äº‹ä»¶
    resize.onmousedown = function (e) {
        // è®°å½•åæ ‡èµ·å§‹ä½ç½®
        let startX = e.clientX;

        // å·¦è¾¹å…ƒç´ èµ·å§‹å®½åº¦
        left.left = left.offsetWidth;

        // é¼ æ ‡æ‹–动事件
        document.onmousemove = function (e) {
            // é¼ æ ‡æ‹–动的终止位置
            let endX = e.clientX;

            // è®¡ç®—移动的距离
            let moveLen = left.left + (endX - startX);

            // èŽ·å–容器的最大宽度（排除拖拽条宽度）
            let maxWidth = box.clientWidth - resize.offsetWidth;

            // é™åˆ¶å·¦è¾¹åŒºåŸŸçš„最小宽度为30px
            if (moveLen < 300) moveLen = 300;

            // é™åˆ¶å·¦è¾¹åŒºåŸŸçš„最大宽度为最大宽度 - å³ä¾§æœ€å°å®½åº¦
            if (moveLen > maxWidth - 420) moveLen = maxWidth - 420;

            // è®¾ç½®å·¦è¾¹åŒºåŸŸçš„宽度
            left.style.width = moveLen + 'px';

            // è®¾ç½®å³è¾¹åŒºåŸŸçš„宽度
            mid.style.width = (maxWidth - moveLen) + 'px';
        };

        // é¼ æ ‡æ¾å¼€äº‹ä»¶
        document.onmouseup = function (evt) {
            document.onmousemove = null;
            document.onmouseup = null;
            resize.releaseCapture && resize.releaseCapture(); // é‡Šæ”¾é¼ æ ‡æ•èŽ·
        };

        // è®¾ç½®é¼ æ ‡æ•èŽ·
        resize.setCapture && resize.setCapture();

        return false; // é˜»æ­¢é»˜è®¤äº‹ä»¶
    };
})();

 WebTM/layuiadmin/resize/ResizeUpDow.css

New file
@@ -0,0 +1,33 @@
.box {
    width: 100%;
    height: 600px; /* è®¾ç½®çˆ¶å®¹å™¨çš„初始高度 */
    display: flex;
    flex-direction: column;
}

/* ä¸Šé¢éƒ¨åˆ† */
.top {
    background-color: #36cfc9;
    overflow: auto;
    flex-grow: 1;
}

/* åˆ†å‰²æ¡ */
.resize {
    cursor: ns-resize;
    height: 5px;
    background-color: yellow;
    width: 100%;
}

/* åº•éƒ¨éƒ¨åˆ† */
.bottom {
    background-color: #b7eb8f;
    overflow: auto;
    flex-grow: 1;
}

/* æ ‡ç­¾å†…容部分 */
.layui-tab-card {
    margin-top: 40px;
}

 WebTM/layuiadmin/resize/ResizeUpDow.js

New file
@@ -0,0 +1,47 @@
(function () {
    // èŽ·å–相关DOM元素
    let resize = document.getElementById('resize');
    let top = document.getElementById('top');
    let bottom = document.getElementById('bottom');
    let box = document.getElementById('box');

    // é¼ æ ‡æŒ‰ä¸‹äº‹ä»¶
    resize.onmousedown = function (e) {
        let startY = e.clientY;

        // è®°å½•èµ·å§‹é«˜åº¦
        let startTopHeight = top.offsetHeight;
        let startBottomHeight = bottom.offsetHeight;

        document.onmousemove = function (e) {
            let endY = e.clientY;
            let moveLen = startTopHeight + (endY - startY);  // è®¡ç®—新的顶部高度

            // èŽ·å–容器的最大高度（排除拖拽条的高度）
            let maxHeight = box.clientHeight - resize.offsetHeight;

            // é™åˆ¶ä¸Šæ–¹åŒºåŸŸæœ€å°é«˜åº¦
            if (moveLen < 30) moveLen = 30;

            // é™åˆ¶ä¸Šæ–¹åŒºåŸŸæœ€å¤§é«˜åº¦
            if (moveLen > maxHeight - 100) moveLen = maxHeight - 100;

            // è®¾ç½®ä¸Šæ–¹åŒºåŸŸçš„高度
            top.style.height = moveLen + 'px';

            // è®¾ç½®ä¸‹æ–¹åŒºåŸŸçš„高度
            bottom.style.height = (maxHeight - moveLen) + 'px';
        };

        document.onmouseup = function () {
            document.onmousemove = null;
            document.onmouseup = null;
            resize.releaseCapture && resize.releaseCapture(); // é‡Šæ”¾é¼ æ ‡æ•èŽ·
        };

        // è®¾ç½®é¼ æ ‡æ•èŽ·
        resize.setCapture && resize.setCapture();

        return false; // é˜»æ­¢é»˜è®¤äº‹ä»¶
    };
})();

 WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Gy_BadReason.html

@@ -481,6 +481,7 @@
                if (HProcName) {
                    sWhere += " and é»˜è®¤å·¥åº like '%" + HProcName + "%'";
                }
                sWhere += " order by ä¸è‰¯åŽŸå› ä»£ç ";
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/²»Á¼²É¼¯/Sc_QualityReportStepBill_New.html

@@ -443,6 +443,8 @@
                    "生产资源": "",

                    "HBadReasonID": "0",

                    "不良原因": "",

                    "HBadPhenomenaID": "0",

                    "不良现象": "",

                    "HBarCode": "",

                    "HReportType": "3",

                    "HRemark": "",

@@ -663,6 +665,8 @@
                        , { field: '生产资源', title: '生产资源', width: 150, event: "HSource", edit: 'text' }

                        , { field: 'HBadReasonID', title: 'HBadReasonID', width: 100, style: "background-color:#efefef4d;", hide: true }

                        , { field: '不良原因', title: '不良原因', width: 150, event: "HBadReason", edit: 'text' }

                        , { field: 'HBadPhenomenaID', title: 'HBadPhenomenaID', width: 100, style: "background-color:#efefef4d;", hide: true }

                        , { field: '不良现象', title: '不良现象', width: 150, event: "HBadPhenomena", edit: 'text' }

                        , { field: 'HRemark', title: '备注', width: 100, edit: 'text' }



                        , { field: 'HICMOInterID', title: '生产订单主内码', hide: true, style: 'background-color: #f9f9f9;' }     //f7

@@ -723,6 +727,8 @@
                    "生产资源": "",

                    "HBadReasonID": "0",

                    "不良原因": "",

                    "HBadPhenomenaID": "0",

                    "不良现象": "",

                    "HBarCode": "",

                    "HReportType": "3",

                    "HRemark": "",

@@ -837,6 +843,8 @@
                                        "生产资源": data.生产资源,

                                        "HBadReasonID": data.HBadReasonID,

                                        "不良原因": data.不良原因,

                                        "HBadPhenomenaID": data.HBadPhenomenaID,

                                        "不良现象": data.不良现象,

                                        "HBarCode": data.HBarCode,

                                        "HReportType": data.HReportType,

                                        "HRemark": data.备注,

@@ -952,6 +960,8 @@
                                        "责任工序": "",

                                        "HBadReasonID": "0",

                                        "不良原因": "",

                                        "HBadPhenomenaID": "0",

                                        "不良现象": "",

                                        "HBarCode": "",

                                        "HReportType": "3",

                                        "HAddr": "",

@@ -1044,6 +1054,8 @@
                                        "检验员": "",

                                        "HBadReasonID": "0",

                                        "不良原因": "",

                                        "HBadPhenomenaID": "0",

                                        "不良现象": "",

                                        "HBarCode": "",

                                        "HReportType": "3",

                                        "HAddr": "",

@@ -1134,6 +1146,8 @@
                                        "检验员": "",

                                        "HBadReasonID": "0",

                                        "不良原因": "",

                                        "HBadPhenomenaID": "0",

                                        "不良现象": "",

                                        "HBarCode": "",

                                        "HReportType": "3",

                                        "HAddr": "",

@@ -1740,6 +1754,34 @@
                                }

                            })

                        }

                        if (obj.event == "HBadPhenomena") {                          
                            layer.open({

                                type: 2

                                , skin: "layui-layer-rim"                           //加上边框

                                , title: "不良现象"                             //标题

                                , closeBtn: 1                                       //窗体右上角关闭 çš„ æ ·å¼

                                , shift: 2                                          //弹出动画

                                , area: ["90%", "90%"]                              //窗体大小

                                , maxmin: true                                      //设置最大最小按钮是否显示

                                , content: ['../../../基础资料/公用基础资料/Gy_BadPhenomena.html', "yes"]

                                , btn: ["确定", "取消"]

                                , btn1: function (index, laero) {

                                    //按钮一  çš„回调

                                    var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面

                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据



                                    if (checkStatus.data.length != 1) {

                                        return layer.msg("请选择一条数据");

                                    }

                                    obj.update({

                                        "HBadPhenomenaID": checkStatus.data[0].HItemID

                                        , "不良现象": checkStatus.data[0].不良现象名称

                                    })

                                    layer.close(index);//关闭弹窗

                                }

                                , btn2: function (index, layero) { }

                            })

                        }

                        //责任工序列表

                        if (obj.event == "HBadProcID") {

                            layer.open({


 WebTM/views/Éú²ú¹ÜÀí/ÖÊÁ¿»ã±¨µ¥/Sc_QualityReportBillSumSave.html

@@ -358,7 +358,9 @@
            //#region æ“ä½œæŒ‰é’®è§¦å‘事件
            //#region ä¿å­˜æäº¤
            form.on('submit(btnSave)', function (data) {//提交
                set_AddNew(data);
                if (AllowLoadData(data)) {
                    set_AddNew(data);
                }             
            });
            //#endregion

@@ -390,9 +392,11 @@
                    "HMaterName": $("#HMaterName").val(),
                    "HUnitID": $("#HUnitID").val(),
                    "HUnitName": $("#HUnitName").val(),
                    "HBadReasonID": "",
                    "HBadReasonNumber": "",
                    "HBadReasonID": "0",
                    "HBadReasonNumber": "",                  
                    "HBadReasonHName": "",
                    "HBadPhenomenaID": "0",
                    "HBadPhenomenaName": "",
                    "HEmpID": sessionStorage["HEmpID"],
                    "HCheckMan": $("#HMaker").val(),
                    "HGroupID": $("#HGroupID").val(),
@@ -543,6 +547,8 @@
                        , { field: 'HBadReasonID', title: '不良原因id', hide: true }
                        , { field: 'HBadReasonNumber', title: '不良原因代码', edit: 'text' , event: "HBadReasonNumber"}
                        , { field: 'HBadReasonHName', title: '不良原因', style: 'background-color: #f9f9f9;' }
                        , { field: 'HBadPhenomenaID', title: '不良现象id', hide: true }
                        , { field: 'HBadPhenomenaName', title: '不良现象', edit: 'text', event: "HBadPhenomenaName" }
                        , { field: 'HEmpID', title: '检验员id', hide: true }
                        , { field: 'HCheckMan', title: '检验员', event: "HCheckMan" }
                        , { field: 'HGroupID', title: '班组id', hide: true }
@@ -576,9 +582,11 @@
                        "HMaterName": $("#HMaterName").val(),
                        "HUnitID": $("#HUnitID").val(),
                        "HUnitName": $("#HUnitName").val(),
                        "HBadReasonID": "",
                        "HBadReasonID": "0",
                        "HBadReasonNumber": "",
                        "HBadReasonHName": "",
                        "HBadPhenomenaID": "0",
                        "HBadPhenomenaName": "",
                        "HEmpID": sessionStorage["HEmpID"],
                        "HCheckMan": $("#HMaker").val(),
                        "HGroupID": $("#HGroupID").val(),
@@ -606,6 +614,27 @@
            }
            //#endregion

            //#region æ•°æ®æ ¡éªŒ
            function AllowLoadData(data) {
                //数值格式校验工具
                var ref = /^\d+(\.\d+)?$/;          //非负数正则表达式
                var temp = "";
                             
                for (var i = 0; i < option.data.length; i++) {
                    //数量格式校验                  
                    if (option.data[i]["HBadReasonID"] == 0 || option.data[i]["HBadReasonID"] == undefined || option.data[i]["HBadReasonID"] == null) {
                        layer.msg("第" + (i + 1) + "行：不良原因不能为空！");
                        return false;
                    }
                    if (option.data[i]["HQty"] == 0 || option.data[i]["HQty"] == undefined || option.data[i]["HQty"] == null) {
                        layer.msg("第" + (i + 1) + "行：数量不能为0！");
                        return false;
                    }
                }
                //#endregion
                return true;
            }
            //#endregion
           

            //#region ä¿å­˜HMaker
@@ -618,7 +647,6 @@
                        num.push(table.cache["mainTable"][i])
                    }
                }


                //获取操作方式
                var refSav = "";
@@ -729,6 +757,34 @@
                                , btn2: function (index, layero) { }                                
                            })
                        }
                        if (obj.event == "HBadPhenomenaName") {
                            layer.open({
                                type: 2
                                , skin: "layui-layer-rim"                           //加上边框
                                , title: "不良原因"                             //标题
                                , closeBtn: 1                                       //窗体右上角关闭 çš„ æ ·å¼
                                , shift: 2                                          //弹出动画
                                , area: ["90%", "90%"]                              //窗体大小
                                , maxmin: true                                      //设置最大最小按钮是否显示
                                , content: ['../../基础资料/公用基础资料/Gy_BadPhenomena.html', "yes"]
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调
                                    var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据

                                    if (checkStatus.data.length != 1) {
                                        return layer.msg("请选择一条数据");
                                    }
                                    obj.update({
                                        "HBadPhenomenaID": checkStatus.data[0].HItemID
                                        , "HBadPhenomenaName": checkStatus.data[0].不良现象名称
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                                , btn2: function (index, layero) { }
                            })
                        }
                        if (obj.event == "HCheckMan") {
                            layer.open({
                                type: 2//弹窗类型

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_FiveMenOneRingList.html

@@ -8,6 +8,7 @@
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <link href="../../../layuiadmin/resize/ResizeLeftRight.css" rel="stylesheet" />
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
@@ -17,22 +18,6 @@
    <script src="../../../layuiadmin/grwebapp.js"></script>
    <script src="../../../layuiadmin/HideButton.js"></script>
    <script src="../../../layuiadmin/soulTable.slim.js"></script>
    <style>
        .layui-tab-title .layui-this {
            background-color: #f1f1f1; /* é€‰ä¸­çš„页签背景色 */
            color: #333; /* é€‰ä¸­çš„页签文字颜色 */
        }
        .resize-handle {
            width: 5px;
            height: 100%;
            background-color: yellow;
            cursor: col-resize;
            position: relative;
            float: left;
        }

    </style>

</head>
<body>
    <div class="layui-fluid">
@@ -68,9 +53,9 @@
                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProcExch" id="btnHProcExch" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                    </button>
                                                </div>                                              
                                            </div>                                           
                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch"  style="padding: 0 10px;margin-left: 20px;">
                                                </div>
                                            </div>
                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch" style="padding: 0 10px;margin-left: 20px;">
                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn">查询</i>
                                            </button>
                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
@@ -120,15 +105,15 @@
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row" style="padding:10px 0" id="div">
                                        <div class="layui-inline layui-col-xs5 " style="margin-top:20px;" id="div1">
                                    <div class="box" style="padding:10px 0" id="box">
                                        <div class="left" id="left" style="margin-top:20px;">
                                            <div class="layui-tab-item layui-show">
                                                <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                                            </div>
                                        </div>
                                        <!-- æ·»åŠ ç”¨äºŽæ‹–拽的手柄元素 -->
                                        <div id="resize-handle" class="resize-handle"></div>
                                        <div class="layui-inline layui-col-xs7" style="margin-top:20px;" id="div3">
                                        <div id="resize" class="resize" title="收缩侧边栏"> </div>
                                        <div class="mid" id="right" style="margin-top:20px;">
                                            <div class="layui-tab layui-tab-card">
                                                <ul class="layui-tab-title">
                                                    <li class="layui-this">人</li>
@@ -209,48 +194,15 @@
                            </div>
                        </script>
                        <script type="text/html" id="toolbarDemo2">
                           

                        </script>
                    </form>
                </div>
            </div>
        </div>
    </div>
    <script src="../../../layuiadmin/resize/ResizeLeftRight.js"></script>
    <script>
        // èŽ·å–用于拖拽的手柄元素以及左右两个要调整大小的容器元素
        const resizeHandle = document.getElementById('resize-handle');
        const leftDiv = document.getElementById('div1');
        const rightDiv = document.getElementById('div3');

        let startX = 0;
        let isDragging = false;

        // ç»™æ‰‹æŸ„添加鼠标按下事件监听
        resizeHandle.addEventListener('mousedown', function (e) {
            startX = e.pageX;
            isDragging = true;
            document.addEventListener('mousemove', handleMouseMove);
            document.addEventListener('mouseup', handleMouseUp);
        });

        function handleMouseMove(e) {
            if (isDragging) {
                const offsetX = e.pageX - startX;
                const newWidthLeft = leftDiv.offsetWidth + offsetX;
                const newWidthRight = rightDiv.offsetWidth - offsetX;
                // é™åˆ¶æœ€å°å®½åº¦ç­‰æ¡ä»¶åˆ¤æ–­ï¼ˆå¯æ ¹æ®å®žé™…情况调整）
                if (newWidthLeft > 100 && newWidthRight > 100) {
                    leftDiv.style.width = newWidthLeft + 'px';
                    rightDiv.style.width = newWidthRight + 'px';
                }
            }
        }

        function handleMouseUp() {
            isDragging = false;
            document.removeEventListener('mousemove', handleMouseMove);
            document.removeEventListener('mouseup', handleMouseUp);
        }
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
@@ -279,6 +231,8 @@
            var option_HB_SN = ""; //黑白标
            var ins;
            //#endregion



            //#region è¿›å…¥é¡µé¢å³åŠ è½½

@@ -310,7 +264,7 @@

            //#region å¤´å·¥å…·æ äº‹ä»¶
            table.on('toolbar(mainTable_HB_SN)', function (obj) {
                switch (obj.event) {                  
                switch (obj.event) {
                    //导出按钮
                    case 'btn_Export': btn_Export();
                        break;
@@ -366,7 +320,7 @@
                }
            });
             //#endregion
        

            //#endregion

            //#region æœ¬é¡µé¢æ‰€æœ‰è¢«è°ƒç”¨çš„方法
@@ -395,15 +349,15 @@

            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery( ) {
               

                var SN = $("#SN").val();  //SN码
                var HProcHBillNo = $("#HProcHBillNo").val();//流转卡号            
                var HProcHBillNo = $("#HProcHBillNo").val();//流转卡号
                if (HProcHBillNo != "") {
                    get_Display_HProc(HProcHBillNo);
                } else {
                    get_Display(SN);
                }
                

                sWhere = "";//调用接口后清空sWhere缓存
            }
            //#endregion
@@ -417,19 +371,19 @@
                $("#HMaterName").val("");
                $("#HMaterModel").val("");
                $("#HProcExchBillNo").val("");
                $("#HICMOBillNo").val("");              
                $("#HICMOBillNo").val("");
                $("#HProcHBillNo").val("");
                var SN = "";
                get_Display(SN);
            }
            //#endregion     
            //#endregion

            //#region é»‘白标_快速过滤
            function get_FastQuery_HB() {

                var SN_HB = $("#SN_HB1").val();  //黑标
                var SN_BB = $("#SN_BB1").val();  //白标
              

                if (SN_HB) {
                    sWhere += " and é»‘标号 = '" + SN_HB + "'";
                }
@@ -445,7 +399,7 @@
            //#region é»‘白标_重置过滤条件方法
            function set_ClearQuery_HB() {
                $("#SN_HB1").val("");
                $("#SN_BB1").val("");                      
                $("#SN_BB1").val("");

                sWhere = "";
            }
@@ -457,7 +411,7 @@
            function set_InitGrid() {
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'                
                    , toolbar: '#toolbarDemo'
                    , totalRow: true
                    , height: 660
                    , cellMinWidth: 90
@@ -471,14 +425,14 @@
            function set_InitGrid_Man() {
                option_Man = {
                    elem: '#mainTable_Man'
                    , toolbar: '#toolbarDemo2'                    
                    , toolbar: '#toolbarDemo2'
                    , totalRow: true
                    , height: 600
                    , cellMinWidth: 90
                    , limit: Number.MAX_VALUE//默认显示全部
                    , cols: []
                    , data: []
                };                
                };
            }

            //初始化机列表
@@ -589,10 +543,10 @@
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/QC_CustomerAppealReport/Get_QC_FiveMenOneRingList',
                    type: "GET",                   
                    type: "GET",
                    data: { "SN": SN, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {                           
                        if (data1.count == 1) {
                            var Listcol = [];
                            for (var i = 0; i < data1.list.length; i++) {
                                var data = [];
@@ -605,7 +559,7 @@
                                for (var j = 0; j < data.length; j++) {
                                    if ($.inArray(data[j].name, titleData) > -1) {
                                        col.push({ field: data[j].id, title: data[j].name, align: 'center', hide: true }); //隐藏id列
                                    }                                   
                                    }
                                    else if (data[j].name == '流转卡') {//添加超链接
                                        col.push({
                                            field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200, event: '流转卡', templet: function (d) {
@@ -647,8 +601,8 @@
                                    }
                                }
                                Listcol.push(col);
                            }                          
                         
                            }

                            //动态显示列名
                            option = {
                                elem: '#mainTable'
@@ -667,7 +621,7 @@
                                , toolbar: '#toolbarDemo2'
                                , cols: [Listcol[1]]
                                , data: data1.data.h_p_QC_FiveMenOneRingList1
                                , height: 'full-80'                             
                                , height: 'full-80'
                                , cellMinWidth: 90
                            }
                            table.render(option_Man);
@@ -677,7 +631,7 @@
                                , toolbar: '#toolbarDemo2'
                                , cols: [Listcol[1]]
                                , data: data1.data.h_p_QC_FiveMenOneRingList1
                                , height: 'full-80'                               
                                , height: 'full-80'
                                , cellMinWidth: 90
                            }
                            table.render(option_Machine);
@@ -687,7 +641,7 @@
                                , toolbar: '#toolbarDemo2'
                                , cols: [Listcol[1]]
                                , data: data1.data.h_p_QC_FiveMenOneRingList1
                                , height: 'full-80'                               
                                , height: 'full-80'
                                , cellMinWidth: 90
                            }
                            table.render(option_Material);
@@ -697,7 +651,7 @@
                                , toolbar: '#toolbarDemo2'
                                , cols: [Listcol[1]]
                                , data: data1.data.h_p_QC_FiveMenOneRingList1
                                , height: 'full-80'                                
                                , height: 'full-80'
                                , cellMinWidth: 90
                            }
                            table.render(option_Method);
@@ -707,7 +661,7 @@
                                , toolbar: '#toolbarDemo2'
                                , cols: [Listcol[1]]
                                , data: data1.data.h_p_QC_FiveMenOneRingList1
                                , height: 'full-80'                              
                                , height: 'full-80'
                                , cellMinWidth: 90
                            }
                            table.render(option_Environments);
@@ -717,7 +671,7 @@
                                , toolbar: '#toolbarDemo2'
                                , cols: [Listcol[1]]
                                , data: data1.data.h_p_QC_FiveMenOneRingList1
                                , height: 'full-80'                              
                                , height: 'full-80'
                                , cellMinWidth: 90
                            }
                            table.render(option_Measure);
@@ -731,7 +685,7 @@
                                , cellMinWidth: 90
                            }
                            table.render(option_Message);
                                                                   

                            $("#HMaterNumber").val(data1.data.h_p_QC_FiveMenOneRingList[0].物料代码);
                            $("#HMaterName").val(data1.data.h_p_QC_FiveMenOneRingList[0].物料名称);
                            $("#HMaterModel").val(data1.data.h_p_QC_FiveMenOneRingList[0].规格型号);
@@ -740,7 +694,7 @@
                            $("#SN_BB").val(data1?.data?.h_p_QC_FiveMenOneRingList2?.[0]?.白标号);
                            $("#SN_HB").val(data1?.data?.h_p_QC_FiveMenOneRingList2?.[0]?.黑标号);
                            layer.close(ajaxLoad);
                           

                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -752,7 +706,7 @@
                });

            }
            //#endregion                 
            //#endregion

            //#region é»‘白标_查询
            function get_Display_HB(sWhere) {
@@ -797,7 +751,7 @@
                                Listcol.push(col);
                            }

                            //动态显示列名                           
                            //动态显示列名
                            option_HB_SN = {
                                elem: '#mainTable_HB_SN'
                                , toolbar: '#toolbarDemo1'
@@ -837,7 +791,7 @@
                    type: "GET",
                    data: { "HProcHBillNo": HProcHBillNo, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {                           
                        if (data1.count == 1) {
                            var linterid = data1.data[0].hmainid;
                            var SNs = ""; var HProcID = "";
                            getTable_Right(linterid, HProcID, SNs);
@@ -881,7 +835,7 @@
                    })
                } else {
                    layer.msg('请选择一行数据编辑！');
                }                
                }
            }
            //#endregion

@@ -904,15 +858,15 @@
                    })
                } else {
                    layer.msg('请选择一行数据编辑！');
                }                
                }
            }
            //#endregion
            
            //#endregion  

            //#endregion

            //#region  ä¸»è¡¨æ ¼  æµè½¬å¡ç‚¹å‡»äº‹ä»¶
            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;             
                var data = obj.data;
                var linterid;
                var HProcID;
                var SNs = $("#SN").val();
@@ -927,7 +881,7 @@
                    getTable_Right(linterid, HProcID, SNs);
                }
            });
            //#endregion  
            //#endregion

            //#region  é»‘白标页签  æµè½¬å¡ç‚¹å‡»äº‹ä»¶
            table.on('tool(mainTable_HB_SN)', function (obj) {
@@ -937,7 +891,7 @@
                    $("#SN_BB1").val(data.白标号);
                    get_FastQuery_HB();
                }
                

            });
            //#endregion

@@ -962,7 +916,7 @@
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HProcHBillNo").val(checkStatus.data[0].单据号);                     
                        $("#HProcHBillNo").val(checkStatus.data[0].单据号);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
@@ -979,7 +933,7 @@
            });
            //#endregion

            //#region å‰¯è¡¨æ ¼  
            //#region å‰¯è¡¨æ ¼
            //人
            table.on('tool(mainTable_Man)', function (obj) {
                var data = obj.data;
@@ -1209,7 +1163,7 @@
                            , cancel: function () {
                            }
                        })
                    }                   
                    }
                } else if (obj.event == '职员') {
                    var HName = data.职员;
                    var HProcID = data.工序id;
@@ -1346,9 +1300,9 @@
                            , cancel: function () {
                            }
                        })
                    }                   
                    }
                }
                   

            });

            //环
@@ -1498,7 +1452,7 @@
                            , cancel: function () {
                            }
                        })
                    }                   
                    }
                } else if (obj.event == '职员') {
                    var HName = data.职员;
                    var HProcID = data.工序id;
@@ -1656,7 +1610,7 @@

            });

            //#endregion     
            //#endregion

            //#region æµè½¬å¡ç‚¹å‡»æŸ¥è¯¢ äººæœºæ–™æ³•çŽ¯
            function getTable_Right(linterid,HProcID,SNs) {
@@ -1838,7 +1792,7 @@
                                }
                                table.render(option);
                            }
                          

                            layer.close(ajaxLoad);
                        } else {
                            layer.close(ajaxLoad);
@@ -1850,7 +1804,7 @@
                    }
                });
            }
           //#endregion  
           //#endregion

            //#region ç‚¹å‡»è¡Œé€‰ä¸­é«˜äº®
            table.on('row(mainTable)', function (obj) {

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_QualityDailyReprot.html

@@ -83,6 +83,12 @@
                                            </select>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">ID号</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input ForFilteringSchemes" name="HBatchNo1" id="HBatchNo1" >
                                        </div>
                                    </div>
                                </div>                               
                                <div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
                                    <div class="layui-inline">
@@ -322,6 +328,7 @@
            var HBeginDate = $("#HBeginDate").val();
            var HEndDate = $("#HEndDate").val();
            var HBatchNo = $("#HBatchNo").val();
            var HBatchNo1 = $("#HBatchNo1").val();
            var HProject = $("#HProject").val();//项目号
            var HBatchWork = $("#HBatchWork").val();//是否量产
            var HDivisionName = $("#HDivisionName").val();//事业部
@@ -333,6 +340,7 @@
                HBeginDate: HBeginDate
                , HEndDate: HEndDate
                , HBatchNo: HBatchNo
                , HBatchNo1: HBatchNo1
                , HProject: HProject
                , HBatchWork: HBatchWork
                , HDivisionName: HDivisionName