pda 进出站 增加附件上传功能,检验仪器 基础资料增加附件上传,首巡末编辑页面 检验仪器代码 增加链接跳转,修复 异常反馈分析报表 导出数据格式问题

zrg

2024-12-03 f4b072b0ec592f8423c12b4297854c426b49af6c

pda  进出站 增加附件上传功能,检验仪器 基础资料增加附件上传,首巡末编辑页面 检验仪器代码 增加链接跳转,修复 异常反馈分析报表 导出数据格式问题

 WebTM/Files/SOP/ZYZD00000313/CMR-RD-SOP-P136-01ºæÁÏ-A2_20240112_ФˮÇå.pdf

Binary files differ

 WebTM/Files/SOP/ZYZD00000314/CMR-RD-SOP-P136-02×¢ËÜ-A5_20240423_ÖÜ·¼.pdf

Binary files differ

 WebTM/WebTM.csproj

@@ -2093,6 +2093,8 @@
    <Content Include="views\项目管理\周计划\PM_WorkReportWeekBillMainList.html" />
    <Content Include="views\项目管理\周计划\PM_WorkTaskWeekBillList.html" />
    <Content Include="views\项目管理\周计划\PM_WorkTaskWeekBill.html" />
    <Content Include="views\项目管理\基础建模\Gy_ProjectClass.html" />
    <Content Include="views\项目管理\基础建模\Gy_TaskClass.html" />
    <Content Include="views\项目管理\工作任务\PM_WorkTaskBill_AutoLoadBillMain.html" />
    <Content Include="views\项目管理\工程项目\PM_CustomerProInfoBillMainList.html" />
    <Content Include="views\项目管理\工作任务\PM_WorkTaskMoneyBOMBill.html" />

 WebTM/WebTM.csproj.user

@@ -2,7 +2,7 @@
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>D:\智云迈思\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\网站发布\后端代码\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\智云迈思\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Add_Edit_Gy_InspectInstruMent.html

@@ -27,22 +27,27 @@
                        </div>
                        <div class="layui-card-body">
                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
                             

                                <h1 style="text-align:center;"><b>检验仪器</b></h1>
                                <ul class="layui-tab-title" lay-filter="tab-all">
                                    <li lay-id="1" style="padding:1px;" class="layui-this">基本信息</li>
                                    <li lay-id="2" style="padding:1px;">附件信息</li>
                                </ul>
                                <div class="layui-tab-content">
                                    <!--基本信息-->
                                    <div class="layui-tab-item layui-show">
                                        <div class="layui-form-item">
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 120px">代码<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
                                                    <input type="text" class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">                                                 
                                                    <input name="HItemID" id="HItemID" autocomplete="off" type="hidden">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 120px">名称<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input class="layui-input" name="HName" id="HName" autocomplete="off">
                                                    <input  type="text"  class="layui-input" name="HName" id="HName" autocomplete="off">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
@@ -86,6 +91,31 @@
                                            </div>
                                        </div>
                                    </div>

                                    <!--附件信息-->
                                    <div class="layui-tab-item">
                                        <div class="layui-form-item" style="padding-top: 10px;">
                                            <div class="layui-upload">
                                                <button type="button" class="layui-btn" id="testList">选择文件</button><input class="layui-upload-file" type="file" accept="" name="file" multiple="">
                                                <div class="layui-upload-list">
                                                    <table class="layui-table" lay-filter="fileTable">
                                                        <thead>
                                                            <tr>
                                                                <th>文件名</th>
                                                                <th>图片</th>
                                                                <th>大小</th>
                                                                <th>状态</th>
                                                                <th>操作</th>
                                                            </tr>
                                                        </thead>
                                                        <tbody id="ProImgByList" class="ProImgByList">
                                                        </tbody>
                                                    </table>
                                                </div>
                                            </div>
                                        </div>
                                    </div>

                                </div>
                            </div>
                        </div>
@@ -115,13 +145,14 @@
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index' //主入口模块
        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
        }).use(['index', 'form', 'laydate', 'table', 'upload','element'], function () {
            //#region å…¬å…±å˜é‡
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , upload = layui.upload
                , laydate = layui.laydate
                , element = layui.element;
            //#endregion
@@ -189,7 +220,7 @@
                    Pub_Close(1);
                }
            });
           

            //监听提交
            form.verify({
                numberOrEmpty: function (value, item) {
@@ -213,11 +244,40 @@
            function set_AddFNew() {
                $("#HItemID").val("0");
                $("#HNumber").val("");

                // ç›‘听按钮点击事件，触发文件输入框的点击事件
                document.getElementById('testList').addEventListener('click', function () {
                    // è§¦å‘文件输入框的点击事件
                    document.getElementById('HNumber').click();
                    if ($("#HNumber").val() == "" || $("#HNumber").val() == null || $("#HNumber").val() == undefined) {
                        layer.msg('请先输入物料代码等信息后在上传文件！', { time: 3 * 1000, icon: 3 });
                    }
                });

                // ç›‘听文件输入框的change事件
                document.getElementById('HNumber').addEventListener('change', function () {
                    var inputHNumber = document.getElementById('HNumber');
                    var hNumberValue = inputHNumber.value.trim(); // èŽ·å–文本框的物料代码值并去除前后空格

                    if (hNumberValue == '') {
                        // ç‰©æ–™ä»£ç ä¸ºç©ºï¼Œç»™å‡ºæç¤ºå¹¶æ¸…除已选择的文件
                        layer.msg("物料代码为空,无法进行文件上传");
                        this.value = '';
                    } else {
                        // ç‰©æ–™ä»£ç ä¸ä¸ºç©ºï¼Œè°ƒç”¨æ–‡ä»¶ä¸Šä¼ æ–¹æ³•å¹¶ä¼ å…¥æ–‡ä»¶åˆ—表和物料代码
                        PicUpload();
                    }
                });


            }
            //编辑
            function set_EditFromGrid() {
                $("#HItemID").val(linterid);
                set_EditForm(linterid);  //编辑获取表头
                //文件选择初始化
                PicUpload();
                getFile();
            }
            //编辑加载表头
            function set_EditForm(linterid) {
@@ -225,6 +285,7 @@
                $.ajax({
                    url: GetWEBURL() + "GetGy_InspectInstruMentDetail",
                    type: "GET",
                    async: false,
                    data: {
                        "HID": linterid
                    },
@@ -249,13 +310,13 @@
                    }
                });
            }
            
            //

            //弹框提示信息
            function f_alert(sMsg) {
                layer.alert(sMsg, { icon: 5 });

            }
             //获取登录页组织列
            //获取登录页组织列
            function Organ() {
                var Organization = '';
                $.ajax({
@@ -294,9 +355,185 @@
                return true;
            }

            //#region æ–‡ä»¶ä¸Šä¼ 
            function PicUpload() {
                //多图片上传
                //多文件列表示例
                var ProImgByList = $('#ProImgByList')                    
                    , uploadListIns = upload.render({
                        elem: '#testList'
                        , url: GetWEBURL() + "/Gy_InspectInstruMent_UploadFile"
                        , accept: 'file'
                        , multiple: true
                        , auto: false
                        //, bindAction: '#testListAction' //按扭绑定
                        , data: { "HBillNo": $("#HNumber").val(), "HRemark": $("#HRemark").val(), "HUserName": sessionStorage["HUserName"] }
                        , choose: function (obj) {
                            var files = this.files = obj.pushFile(); //将每次选择的文件追加到文件队列
                            //读取本地文件
                            obj.preview(function (index, file, result) {
                                var tr = $(['<tr id="upload-' + index + '">'
                                    , '<td>' + file.name + '</td>'
                                    , '<td>' + '<img onclick=\"previewImg(this)\" id="showImg" class="ImgClass" style="width: 150px; margin:10px;cursor:pointer;"src="' + result + '" alt="' + file.name + '">' + '</td>'
                                    , '<td>' + (file.size / 1014).toFixed(1) + 'kb</td>'
                                    , '<td>等待上传</td>'
                                    , '<td>'
                                    , '<button class="layui-btn layui-btn-xs demo-reload ">上传</button>'
                                    , '<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete">删除</button>'
                                    , '</td>'
                                    , '</tr>'].join(''));


                                //单个重传
                                tr.find('.demo-reload').on('click', function () {
                                    obj.upload(index, file);
                                    return false;
                                });

                                //删除
                                tr.find('.demo-delete').on('click', function () {
                                    delete files[index]; //删除对应的文件
                                    tr.remove();
                                    uploadListIns.config.elem.next()[0].value = ''; //清空 input file å€¼ï¼Œä»¥å…åˆ é™¤åŽå‡ºçŽ°åŒåæ–‡ä»¶ä¸å¯é€‰
                                });

                                ProImgByList.append(tr);

                            });
                        }
                        , done: function (res, index, upload) {
                            if (res.code == 1) { //上传成功
                                var tr = ProImgByList.find('tr#upload-' + index)
                                    , tds = tr.children();
                                tds.eq(3).html('<span style="color: #5FB878;">上传成功</span>');
                                tds.eq(4).html(''); //清空操作

                                return delete this.files[index]; //删除文件队列已经上传成功的文件
                            }
                            this.error(index, upload);
                        }
                        , error: function (index, upload) {
                            var tr = ProImgByList.find('tr#upload-' + index)
                                , tds = tr.children();
                            tds.eq(2).html('<span style="color: #FF5722;">上传失败[检查文件名及文件格式]</span>');
                            tds.eq(3).find('.demo-reload').removeClass('layui-hide'); //显示上传
                        }
                    });
            }
            //#endregion

            //#region ç¼–辑时,获取已上传的文件列表
            function getFile() {
                var ProImgByList = $('#ProImgByList')
                $.ajax({
                    url: GetWEBURL() + '/Gy_InspectInstruMent_Filelist',
                    type: "GET",
                    data: { "HBillNo": $("#HNumber").val() },
                    success: function (data1) {
                        if (data1.count == 1) {
                            var index = 0;
                            for (var i = 0; i < data1.data.length; i++) {
                                var tr = $(['<tr id="upload-' + i + '">'
                                    , '<td style="display:none">' + data1.data[i].HItemID + '</td>'
                                    , '<td style="display:none">' + data1.data[i].HSourceBillNo + '</td>'
                                    , '<td>' + data1.data[i].HFileName + '</td>'
                                    , '<td>' + '<img onclick=\"previewImg(this)\" id="showImg' + i + '" class="ImgClass" style="width: 150px; margin:10px;cursor:pointer;"src="' + data1.data[i].HFilePath + '" alt="' + data1.data[i].HFileName + '">' + '</td>'
                                    , '<td>' + (data1.data[i].HFileSize / 1014).toFixed(1) + 'kb</td>'
                                    , '<td style="color: #5FB878;">上传成功</td>'
                                    , '<td style="display:none">' + data1.data[i].url + '</td>'
                                    , '<td>'
                                    , '<button class="layui-btn layui-btn-xs  demo-dowload" type="button" id="deltefile" onclick="javascript:dowload(this)"><i class="layui-icon layui-icon-download-circle layuiadmin-button-btn"></i>下载</button>'
                                    , '<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete" type="button" id="deltefile" onclick="javascript:toManager(this)"><i class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>'
                                    , '</td>'
                                    , '</tr>'].join(''));

                                $('#ProImgByList').append(tr);
                            }

                        } else {
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion

            //#endregion
        });

        function previewImg(obj) {
            var img = new Image();
            img.src = obj.src;
            var height = img.height * 1.2; //获取图片高度
            var width = img.width * 1.2; //获取图片宽度
            var imgHtml = "<img src='" + obj.src + "' width='100%' height='100%'/>";
            //弹出层
            layer.open({
                type: 1,
                shade: 0.8,
                offset: 'auto',
                area: ['80%', '80%'],
                shadeClose: true,
                scrollbar: false,
                title: "图片预览", //不显示标题
                content: imgHtml, //捕获的元素，注意：最好该指定的元素要存放在body最外层，否则可能被其它的相对元素所影响
                cancel: function () {
                    //layer.msg('捕获就是从页面已经存在的元素上，包裹layer的结构', { time: 5000, icon: 6 });
                }
            });
        }

        //#region ä¸‹è½½å·²ä¸Šä¼ çš„文件
        function dowload(r) {
            //得到当前所在行
            var rows = r.parentNode.parentNode.rowIndex;
            //得到所在行的第五列的内容:文件地址
            var url = $("#ProImgByList tr:eq(" + (rows - 1) + ") td:eq(6)").html();

            var a = document.createElement('a');
            a.href = url;
            a.download = url.split('/').pop(); // æ›¿æ¢ä¸ºå®žé™…文件名
            document.body.appendChild(a);
            a.click();
            document.body.removeChild(a);
        }
        //#endregion

        //#region åˆ é™¤å·²ä¸Šä¼ çš„文件
        function toManager(r) {
            //得到当前所在行
            var rows = r.parentNode.parentNode.rowIndex;
            //得到所在行的第一列的内容:主键ID
            var HItemID = $("#ProImgByList tr:eq(" + (rows - 1) + ") td:eq(0)").html();
            //得到所在行的第二列的内容:单据号
            var HSourceBillNo = $("#ProImgByList tr:eq(" + (rows - 1) + ") td:eq(1)").html();
            //得到所在行的第三列的内容:文件名称
            var HFileName = $("#ProImgByList tr:eq(" + (rows - 1) + ") td:eq(2)").html();
            layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {

                //删除已上传文件
                $.ajax({
                    url: GetWEBURL() + '/Gy_InspectInstruMent_DeleteFilelist',
                    type: "GET",
                    data: { "HItemID": HItemID, "HSourceBillNo": HSourceBillNo, "HFileName": HFileName },
                    success: function (data1) {
                        if (data1.count == 1) {
                            layer.alert(data1.Message, { icon: 1 });
                            $("#ProImgByList tr").eq((rows - 1)).remove();
                        }
                        else {
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            })
        }
        //#endregion

    </script>
</body>
</html>

 WebTM/views/Éú²ú¹ÜÀí/Òì³£·´À¡µ¥/Sc_Add_MESExecptFeedBackBillList.html

@@ -1170,7 +1170,7 @@
                            // å°†æ›´æ–°åŽçš„值设置回输入框
                            $("#HDescription").val(updatedValue);
                        } else if (OperationType == 4) {
                            $("#HDescription").val(generateString(Datetime, Person, HSourceName, HICMOBillNo, HType, EquipNumber));
                            $("#HDescription").val(generateString(Datetime, Person, $("#HSourceName").val(), HICMOBillNo, HType, EquipNumber));
                        }
                       
                    }
@@ -1587,6 +1587,8 @@
                        $("#HSourceName").val(checkStatus.data[0].生产资源名称);
                        $("#HSourceID").val(checkStatus.data[0].HItemID);
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                        set_EquipFile($("#HSourceName").val());
                        $("#HDescription").val(generateString(Datetime, Person, $("#HSourceName").val(), HICMOBillNo, HType, EquipNumber));
                    }
                    , cancel: function (index, layero) {
                    }

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

@@ -1013,7 +1013,7 @@
                    , data = checkStatus.data;
                //新增行表格数据
                var NewRow = {
                    "HQCCheckItemID": "", "检验项目": "", "HInspectInstruMentID": "0", "检验仪器": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
                    "HQCCheckItemID": "", "检验项目": "", "HInspectInstruMentID": "0", "检验仪器代码": "", "检验仪器": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
                    "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
                    "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
                    "HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "0",
@@ -1192,6 +1192,27 @@
                    });
                }

                var data = obj.data;
                if (obj.event == '检验仪器代码') {
                    var HNumber = data.检验仪器代码;
                    var linterid = data.HInspectInstruMentID;
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '查看检验仪器'
                        , closeBtn: 1
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../../基础资料/公用基础资料/Add_Edit_Gy_InspectInstruMent.html?OperationType=3&linterid=' + linterid + ''
                        , resize: false,
                        end: function () {
                        }
                        , cancel: function () {
                        }
                    })
                }

                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                    var rowIndex = Number($(obj.tr).attr("data-index")) + Number(1);
                    if (event.key == "F7") {
@@ -1259,6 +1280,7 @@
                                    //同步更新表格和缓存对应的值
                                    obj.update({
                                        æ£€éªŒä»ªå™¨: checkStatus.data[0].检验仪器名称
                                        ,检验仪器代码: checkStatus.data[0].检验仪器代码
                                        , HInspectInstruMentID: checkStatus.data[0].HItemID
                                    });
                                    layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
@@ -1578,7 +1600,7 @@
                            for (var i = 0; i < data.length; i++) {
                                rowdata.push(
                                    {
                                        "HQCCheckItemID": data[i].HQCCheckItemID, "检验项目代码": data[i].检验项目代码, "检验项目": data[i].检验项目名称, "HInspectInstruMentID": data[i].HInspectInstruMentID, "检验仪器": data[i].检验仪器名称, "HQCStd": data[i].检验标准,
                                        "HQCCheckItemID": data[i].HQCCheckItemID, "检验项目代码": data[i].检验项目代码, "检验项目": data[i].检验项目名称, "HInspectInstruMentID": data[i].HInspectInstruMentID, "检验仪器代码": data[i].检验仪器代码, "检验仪器": data[i].检验仪器名称, "HQCStd": data[i].检验标准,
                                        "HUnit": data[i].检验单位, "HQCNote": data[i].检验记录, "HResult": data[i].结论 == "合格" ? 1 : 2,
                                        "HMax": data[i].最大值, "HMin": data[i].最小值, "HAvg": data[i].平均值, "HRemark": data[i].表体备注,
                                        "HAnalysisMethod": data[i].分析方法 == "定性分析" ? 1 : (data[i].分析方法 == "定量分析" ? 2 : 3), "HKeyInspect": data[i].重点检查 == "否" ? false : true,
@@ -1903,7 +1925,7 @@
                                //子表  èµ‹å€¼
                                rowdata.push(
                                    {
                                        "HQCCheckItemID": data[i]["HQCCheckItemID"], "检验项目代码": data[i].检验项目代码, "检验项目": data[i]["检验项目"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "检验仪器": data[i]["检验仪器"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["单位名称"], "HQCNote": "", "HAnalysisMethod": data[i]["分析方法"], "HResult": data[i]["默认结论"],
                                        "HQCCheckItemID": data[i]["HQCCheckItemID"], "检验项目代码": data[i].检验项目代码, "检验项目": data[i]["检验项目"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "检验仪器代码": data[i]["检验仪器代码"],  "检验仪器": data[i]["检验仪器"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["单位名称"], "HQCNote": "", "HAnalysisMethod": data[i]["分析方法"], "HResult": data[i]["默认结论"],
                                        "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": data[i]["重点检查"] == 1 ? true : false, "HStatus": 0, "HSampleSchemeID": data[i]["HSampleSchemeID"] == null ? 0 : data[i]["HSampleSchemeID"], "HUnitID": data[i]["HUnitID"],
                                        "HInspectVal": '', "HTargetVal": '', "HUpLimit": + data[i].上限值, "HDownLimit": + data[i].下限值, "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
                                        "HSampleSchemeName": data[i].抽样方案名称, "HSampleQty": data[i].样本量, "HAcceptQty": data[i].允许数 == null ? 0 : data[i].允许数, "HInspectionLevel": data[i].检验水平, "HRejectQty": data[i].拒绝数 == null ? 0 : data[i].拒绝数,
@@ -2285,7 +2307,7 @@
                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
                //初始表格数据
                rowdata = [{
                    "HQCCheckItemID": "", "检验项目": "", "HInspectInstruMentID": "0", "检验仪器": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
                    "HQCCheckItemID": "", "检验项目": "", "HInspectInstruMentID": "0", "检验仪器代码": "", "检验仪器": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
                    "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
                    "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
                    "HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "0",
@@ -2305,6 +2327,8 @@
                        , { field: '检验项目代码', title: '检验项目代码' }
                        , { field: '检验项目', title: '检验项目', edit: 'text', event: 'HQCCheckItemID' }
                        , { field: 'HInspectInstruMentID', title: 'HInspectInstruMentID', hide: true }
                        , {field: '检验仪器代码', title: '检验仪器代码', totalRow: true, templet: function (d) {
                             return '<span style="color: blue;" lay-event="检验仪器代码">' + d.检验仪器代码 + '</span>';}, style: 'cursor: pointer;'}
                        , { field: '检验仪器', title: '检验仪器', edit: 'text', event: 'HInspectInstruMentID' }
                        , { field: 'HResult', title: '结论', templet: '#HResult', event: 'HResult' }
                        , { field: 'HAnalysisMethod', title: '分析方法', templet: '#HAnalysisMethod', event: 'HAnalysisMethod' }

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

@@ -986,7 +986,7 @@
                    , data = checkStatus.data;
                //新增行表格数据
                var NewRow = {
                     "HQCCheckItemID": "", "检验项目": "", "HInspectInstruMentID": 0, "检验仪器": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
                    "HQCCheckItemID": "", "检验项目": "", "HInspectInstruMentID": 0, "检验仪器代码": "","检验仪器": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
                    "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
                    "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
                    "HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
@@ -1182,6 +1182,7 @@

                                    //同步更新表格和缓存对应的值
                                    obj.update({
                                        æ£€éªŒä»ªå™¨ä»£ç : checkStatus.data[0].检验仪器代码,
                                        æ£€éªŒä»ªå™¨: checkStatus.data[0].检验仪器名称
                                        , HInspectInstruMentID: checkStatus.data[0].HItemID
                                    });
@@ -1539,7 +1540,7 @@
                            for (var i = 0; i < data.length; i++) {
                                rowdata.push(
                                    {
                                        "HQCCheckItemID": data[i].HQCCheckItemID, "检验项目代码": data[i].检验项目代码, "检验项目": data[i].检验项目名称, "HInspectInstruMentID": data[i].HInspectInstruMentID, "检验仪器": data[i].检验仪器, "HQCStd": data[i].检验标准,
                                        "HQCCheckItemID": data[i].HQCCheckItemID, "检验项目代码": data[i].检验项目代码, "检验项目": data[i].检验项目名称, "HInspectInstruMentID": data[i].HInspectInstruMentID, "检验仪器代码": data[i].检验仪器代码,"检验仪器": data[i].检验仪器, "HQCStd": data[i].检验标准,
                                        "HUnit": data[i].单位名称, "HQCNote": data[i].检验记录, "HResult": data[i].结论 == "合格" ? 1 : 2,
                                        "HMax": data[i].最大值, "HMin": data[i].最小值, "HAvg": data[i].平均值, "HRemark": data[i].表体备注,
                                        "HAnalysisMethod": data[i].分析方法 == "定性分析" ? 1 : (data[i].分析方法 == "定量分析" ? 2 : 3), "HKeyInspect": data[i].重点检查 == "否" ? false : true,
@@ -1944,7 +1945,7 @@
                                    //"HStrictness": "", "HSampleUnRightQty": "", "HAQL": "", "HSamplingType": ""
                                    //}
                                    {
                                        "HQCCheckItemID": data[i]["HQCCheckItemID"], "检验项目代码": data[i].检验项目代码, "检验项目": data[i]["检验项目"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "检验仪器": data[i]["检验仪器"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["单位名称"], "HQCNote": "", "HAnalysisMethod": data[i]["分析方法"], "HResult": data[i]["默认结论"],
                                        "HQCCheckItemID": data[i]["HQCCheckItemID"], "检验项目代码": data[i].检验项目代码, "检验项目": data[i]["检验项目"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "检验仪器代码": data[i]["检验仪器代码"], "检验仪器": data[i]["检验仪器"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["单位名称"], "HQCNote": "", "HAnalysisMethod": data[i]["分析方法"], "HResult": data[i]["默认结论"],
                                        "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": data[i]["重点检查"] == 1 ? true : false, "HStatus": 0, "HSampleSchemeID": data[i]["HSampleSchemeID"], "HUnitID": data[i]["HUnitID"],
                                        "HInspectVal": '', "HTargetVal": '', "HUpLimit": + data[i].上限值, "HDownLimit": + data[i].下限值, "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
                                        "HSampleSchemeName": data[i].抽样方案名称, "HSampleQty": data[i].样本量, "HAcceptQty": data[i].允许数, "HInspectionLevel": data[i].检验水平, "HRejectQty": data[i].拒绝数,
@@ -2239,7 +2240,7 @@
                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
                //初始表格数据
                rowdata = [{
                    "HQCCheckItemID": "", "检验项目": "", "HInspectInstruMentID": 0, "检验仪器": "","HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
                    "HQCCheckItemID": "", "检验项目": "", "HInspectInstruMentID": 0, "检验仪器代码": "","检验仪器": "","HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
                    "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
                    "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
                    "HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "", "HInspectionLevel": "", "HRejectQty": "",
@@ -2259,6 +2260,11 @@
                        , { field: '检验项目代码', title: '检验项目代码' }
                        , { field: '检验项目', title: '检验项目', edit: 'text', event: 'HQCCheckItemID' }
                        , { field: 'HInspectInstruMentID', title: 'HInspectInstruMentID', hide: true }
                        , {
                            field: '检验仪器代码', title: '检验仪器代码', totalRow: true, templet: function (d) {
                                return '<span style="color: blue;" lay-event="检验仪器代码">' + d.检验仪器代码 + '</span>';
                            }, style: 'cursor: pointer;'
                        }
                        , { field: '检验仪器', title: '检验仪器', edit: 'text', event: 'HInspectInstruMentID' }
                        , { field: 'HResult', title: '结论', templet: '#HResult' }
                        , { field: 'HAnalysisMethod', title: '分析方法', templet: '#HAnalysisMethod', event: 'HAnalysisMethod' }

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

@@ -522,14 +522,33 @@
        function get_Export() {
            var data = option.data
            data.forEach((item) => {
                // å¦‚果某个字段的值太长，需要去除换行符
                if (item.详细内容.length > 0) {  // å‡è®¾å­—段名为field
                    item.详细内容 = item.详细内容.replace(/[\r\n]+/g, '');  // å°†æ¢è¡Œç¬¦æ›¿æ¢ä¸ºç©ºå­—符串
                for (let itemobj in item) {
                    if (item[itemobj] == null) {
                        item[itemobj] = "";
                    }
                    if (item[itemobj].length > 0) {  // å‡è®¾å­—段名为field
                        item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, '');  // å°†æ¢è¡Œç¬¦æ›¿æ¢ä¸ºç©ºå­—符串
                    }

                    // æ ¼å¼åŒ–日期字段
                    if (itemobj === '制单日期' || itemobj === '日期' || itemobj === '签到时间' || itemobj === '处理时间' || itemobj === '验收时间') {  // æ ¹æ®ä½ çš„字段名来判断
                        let date = new Date(item[itemobj]);
                        if (!isNaN(date.getTime())) { // åˆ¤æ–­æ˜¯å¦æ˜¯æœ‰æ•ˆçš„日期
                            item[itemobj] = date.toISOString().slice(0, 10) + ' ' + date.toTimeString().slice(0, 5);  // æ ¼å¼åŒ–为 YYYY-MM-DD HH:mm
                        } else {
                            item[itemobj] = "";  // å¦‚果不是有效日期，清空该值
                        }
                    }

                    // å¤„理具体字段的替换
                    if (itemobj === '详细内容' || itemobj === '抄送人' || itemobj === '规格型号') {
                        item[itemobj] = item[itemobj].replace(/,/g, '，');  // æ›¿æ¢è‹±æ–‡é€—号为中文逗号
                    }
                }
            });
            table.exportFile(ins.config.id, data, "xls");
        }
            //#endregion
        //#endregion

        //隐藏列设置
        function get_HideColumn() {

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

@@ -126,6 +126,7 @@
                                                    <li>法</li>
                                                    <li>环</li>
                                                    <li>测</li>
                                                    <li>ä¿¡</li>
                                                </ul>
                                                <div class="layui-tab-content">
                                                    <div class="layui-tab-item layui-show">
@@ -151,6 +152,10 @@
                                                    <div class="layui-tab-item">
                                                        <!--测-->
                                                        <table class="layui-hide" id="mainTable_Measure" lay-filter="mainTable_Measure"></table>
                                                    </div>
                                                    <div class="layui-tab-item">
                                                        <!--ä¿¡-->
                                                        <table class="layui-hide" id="mainTable_Message" lay-filter="mainTable_Message"></table>
                                                    </div>
                                                </div>
                                            </div>
@@ -225,6 +230,7 @@
            var option_Method = "";  //法
            var option_Environments = ""; //环
            var option_Measure = ""; //测
            var option_Message = ""; //ä¿¡
            var option_HB_SN = ""; //黑白标
            var ins;
            //#endregion
@@ -334,6 +340,8 @@
                set_InitGrid_Environments();
                //初始化测列表
                set_InitGrid_Measure();
                //初始化信列表
                set_InitGrid_Message();
                //初始化黑白标列表
                set_InitGrid_HB_SN();
                //查询
@@ -500,6 +508,20 @@
                };
            }

            //初始化信列表
            function set_InitGrid_Message() {
                option_Man = {
                    elem: '#mainTable_Message'
                    , toolbar: '#toolbarDemo2'
                    , totalRow: true
                    , height: 600
                    , cellMinWidth: 90
                    , limit: Number.MAX_VALUE//默认显示全部
                    , cols: []
                    , data: []
                };
            }

            //初始化黑白标列表
            function set_InitGrid_HB_SN() {
                option_HB_SN = {
@@ -548,6 +570,13 @@
                                            }, style: 'cursor: pointer;'
                                        });
                                    }
                                    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) {
                                                return '<span style="color: blue;">' + d.工序 + '</span>'
                                            }, style: 'cursor: pointer;'
                                        });
                                    }
                                    else {
                                        switch (data[j].Type) {
                                            //int
@@ -572,7 +601,7 @@
                                , cellMinWidth: 90
                            }
                            table.render(option);

                            //人
                            option_Man = {
                                elem: '#mainTable_Man'
                                , toolbar: '#toolbarDemo2'
@@ -582,7 +611,7 @@
                                , cellMinWidth: 90
                            }
                            table.render(option_Man);

                            //机
                            option_Machine = {
                                elem: '#mainTable_Machine'
                                , toolbar: '#toolbarDemo2'
@@ -592,7 +621,7 @@
                                , cellMinWidth: 90
                            }
                            table.render(option_Machine);

                            //料
                            option_Material = {
                                elem: '#mainTable_Material'
                                , toolbar: '#toolbarDemo2'
@@ -602,7 +631,7 @@
                                , cellMinWidth: 90
                            }
                            table.render(option_Material);

                            //法
                            option_Method = {
                                elem: '#mainTable_Method'
                                , toolbar: '#toolbarDemo2'
@@ -612,7 +641,7 @@
                                , cellMinWidth: 90
                            }
                            table.render(option_Method);

                            //环
                            option_Environments = {
                                elem: '#mainTable_Environments'
                                , toolbar: '#toolbarDemo2'
@@ -622,7 +651,7 @@
                                , cellMinWidth: 90
                            }
                            table.render(option_Environments);

                            //测
                            option_Measure = {
                                elem: '#mainTable_Measure'
                                , toolbar: '#toolbarDemo2'
@@ -632,6 +661,16 @@
                                , cellMinWidth: 90
                            }
                            table.render(option_Measure);
                            //ä¿¡
                            option_Message = {
                                elem: '#mainTable_Message'
                                , toolbar: '#toolbarDemo2'
                                , cols: [Listcol[1]]
                                , data: data1.data.h_p_QC_FiveMenOneRingList1
                                , height: 'full-80'
                                , cellMinWidth: 90
                            }
                            table.render(option_Message);
                                                                   
                            $("#HMaterNumber").val(data1.data.h_p_QC_FiveMenOneRingList[0].物料代码);
                            $("#HMaterName").val(data1.data.h_p_QC_FiveMenOneRingList[0].物料名称);
@@ -740,8 +779,8 @@
                    success: function (data1) {
                        if (data1.count == 1) {                           
                            var linterid = data1.data[0].hmainid;
                            var SNs = "";
                            getTable_Right(linterid, SNs);
                            var SNs = ""; var HProcID = "";
                            getTable_Right(linterid, HProcID, SNs);
                            layer.close(ajaxLoad);

                        } else {
@@ -815,12 +854,18 @@
            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;             
                var linterid;
                var HProcID;
                var SNs = $("#SN").val();
                //单据号超链接
                if (obj.event == '流转卡') {                  //检查 obj.event æ˜¯å¦ç­‰äºŽå­—符串 '单据号'。如果等于，则执行if循环
                    linterid = data.流转卡id;
                    getTable_Right(linterid, SNs);
                }                 
                    HProcID = data.工序id;
                    getTable_Right(linterid, HProcID, SNs);
                } else if (obj.event == '工序') {                  //检查 obj.event æ˜¯å¦ç­‰äºŽå­—符串 '单据号'。如果等于，则执行if循环
                    linterid = data.流转卡id;
                    HProcID = data.工序id;
                    getTable_Right(linterid, HProcID, SNs);
                }
            });
            //#endregion  

@@ -878,118 +923,7 @@
            //人
            table.on('tool(mainTable_Man)', function (obj) {
                var data = obj.data;
                if (obj.event == '单据号') {
                    if (data.单据类型=="汇报单") {
                        var linterid = data.单据主id;
                        var HBillNo = data.单据号;
                        layer.open({
                            type: 2
                            , area: ['100%', '100%']
                            , title: '查看出站单'
                            , closeBtn: 1
                            , shade: 0.6 //遮罩透明度
                            , maxmin: true //允许全屏最小化
                            , anim: 0 //0-6的动画形式，-1不开启
                            , content: '../../车间管理/工序出站汇报单/Cj_StationOutBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&HBillNo=' + HBillNo + '&closeType=1'
                            , resize: false,
                            end: function () {
                            }
                            , cancel: function () {
                            }
                        })
                    } else if (data.单据类型 == "工序进站单") {
                        var linterid = data.单据主id;
                        var HBillNo = data.单据号;
                        layer.open({
                            type: 2
                            , area: ['100%', '100%']
                            , title: '查看进站单'
                            , closeBtn: 1
                            , shade: 0.6 //遮罩透明度
                            , maxmin: true //允许全屏最小化
                            , anim: 0 //0-6的动画形式，-1不开启
                            , content: '../../车间管理/工序进站接收单/Cj_StationInBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&HBillNo=' + HBillNo + '&closeType=1'
                            , resize: false,
                            end: function () {
                            }
                            , cancel: function () {
                            }
                        })
                    } else if (data.单据类型 == "取样单") {
                        var linterid = data.单据主id;
                        var HBillNo = data.单据号;
                        layer.open({
                            type: 2
                            , area: ['100%', '100%']
                            , title: '查看取样单'
                            , closeBtn: 1
                            , shade: 0.6 //遮罩透明度
                            , maxmin: true //允许全屏最小化
                            , anim: 0 //0-6的动画形式，-1不开启
                            , content: '../../质量管理/检验取样还样单/QC_Add_TakeSampleCheckBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                            , resize: false,
                            end: function () {
                            }
                            , cancel: function () {
                            }
                        })
                    } else if (data.单据类型 == "开工单") {
                        var linterid = data.单据主id;
                        var HBillNo = data.单据号;
                        layer.open({
                            type: 2
                            , area: ['100%', '100%']
                            , title: '查看开工单'
                            , closeBtn: 1
                            , shade: 0.6 //遮罩透明度
                            , maxmin: true //允许全屏最小化
                            , anim: 0 //0-6的动画形式，-1不开启
                            , content: '../../生产管理/报工台工序/开工/Sc_Add_MESBeginStepWorkBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                            , resize: false,
                            end: function () {
                            }
                            , cancel: function () {
                            }
                        })
                    } else if (data.单据类型 == "停工单") {
                        var linterid = data.单据主id;
                        var HBillNo = data.单据号;
                        layer.open({
                            type: 2
                            , area: ['100%', '100%']
                            , title: '查看取样单'
                            , closeBtn: 1
                            , shade: 0.6 //遮罩透明度
                            , maxmin: true //允许全屏最小化
                            , anim: 0 //0-6的动画形式，-1不开启
                            , content: '../../生产管理/报工台工序/停工/Sc_MESStopStepWorkBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                            , resize: false,
                            end: function () {
                            }
                            , cancel: function () {
                            }
                        })
                    } else if (data.单据类型 == "完工单") {
                        var linterid = data.单据主id;
                        var HBillNo = data.单据号;
                        layer.open({
                            type: 2
                            , area: ['100%', '100%']
                            , title: '查看取样单'
                            , closeBtn: 1
                            , shade: 0.6 //遮罩透明度
                            , maxmin: true //允许全屏最小化
                            , anim: 0 //0-6的动画形式，-1不开启
                            , content: '../../生产管理/报工台工序/完工/Sc_Add_MESEndStepWorkBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                            , resize: false,
                            end: function () {
                            }
                            , cancel: function () {
                            }
                        })
                    }
                    
                } else if (obj.event == '职员') {
                if (obj.event == '职员') {
                    var HName = data.职员;
                    var HProcID = data.工序id;
                    layer.open({
@@ -1000,7 +934,7 @@
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../../人事管理/人员履历/HR_PersonnelResumeList.html?OperationType=2&HNumber=&HName=' + HName + '&HProcID=' + HProcID +''
                        , content: '../../人事管理/人员履历/HR_PersonnelResumeList.html?OperationType=2&HNumber=&HName=' + HName + '&HProcID=' + HProcID + ''
                        , resize: false,
                        end: function () {
                        }
@@ -1008,7 +942,6 @@
                        }
                    })
                }

            });

            //机
@@ -1198,22 +1131,24 @@
            table.on('tool(mainTable_Material)', function (obj) {
                var data = obj.data;
                if (obj.event == '单据号') {
                    var linterid = data.单据主id;
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '查看上料防错单'
                        , closeBtn: 1
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../../生产管理/报工台工序/防错/Sc_Add_MaterToSourceStepBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
                        , resize: false,
                        end: function () {
                        }
                        , cancel: function () {
                        }
                    })
                    if (data.单据类型=="上料防错") {
                        var linterid = data.单据主id;
                        layer.open({
                            type: 2
                            , area: ['100%', '100%']
                            , title: '查看上料防错单'
                            , closeBtn: 1
                            , shade: 0.6 //遮罩透明度
                            , maxmin: true //允许全屏最小化
                            , anim: 0 //0-6的动画形式，-1不开启
                            , content: '../../生产管理/报工台工序/防错/Sc_Add_MaterToSourceStepBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
                            , resize: false,
                            end: function () {
                            }
                            , cancel: function () {
                            }
                        })
                    }                   
                } else if (obj.event == '职员') {
                    var HName = data.职员;
                    var HProcID = data.工序id;
@@ -1240,23 +1175,24 @@
                var data = obj.data;
                if (obj.event == '单据号') {
                    var linterid = data.单据主id;
                    if (data.单据类型 == "工序流转卡") {
                    if (data.单据类型 == "产品工艺参数") {
                        layer.open({
                            type: 2
                            , area: ['100%', '100%']
                            , title: '查看设备工艺参数点检'
                            , title: '查看产品工艺参数清单'
                            , closeBtn: 1
                            , shade: 0.6 //遮罩透明度
                            , maxmin: true //允许全屏最小化
                            , anim: 0 //0-6的动画形式，-1不开启
                            , content: '../../车间管理/工序流转卡/Sc_ProcessExchangeBill.html?OperationType=3&linterid=' + linterid + '&HEntryID=&HSouceBillType=3772'
                            , content: '../../计划管理/工艺路线/Gy_MaterialTechParamBillMain.html?OperationType=3&linterid=' + linterid + '&HEntryID=&HSouceBillType='
                            , resize: false,
                            end: function () {
                            }
                            , cancel: function () {
                            }
                        })
                    } else if (data.单据类型 == "工艺参数点检单") {
                    }
                    else if (data.单据类型 == "工艺参数点检单") {
                        layer.open({
                            type: 2
                            , area: ['100%', '100%']
@@ -1272,7 +1208,26 @@
                            , cancel: function () {
                            }
                        })
                    }                    
                    }
                    else if (data.单据类型 == "作业指导书") {
                        var HProcID = data.工序id;
                        var HMaterID = data.物料id;
                        layer.open({
                            type: 2
                            , area: ['100%', '100%']
                            , title: '查看作业指导书'
                            , closeBtn: 1
                            , shade: 0.6 //遮罩透明度
                            , maxmin: true //允许全屏最小化
                            , anim: 0 //0-6的动画形式，-1不开启
                            , content: '../../生产管理/作业指导书/Gy_SOPBill_Video.html?OperationType=5&HMaterID=' + HMaterID + '&HSourceNo=&HSourceEntryID=&HProcID=' + HProcID
                            , resize: false,
                            end: function () {
                            }
                            , cancel: function () {
                            }
                        })
                    }
                } else if (obj.event == '职员') {
                    var HName = data.职员;
                    var HProcID = data.工序id;
@@ -1285,25 +1240,6 @@
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../../人事管理/人员履历/HR_PersonnelResumeList.html?OperationType=2&HNumber=&HName=' + HName + '&HProcID=' + HProcID + ''
                        , resize: false,
                        end: function () {
                        }
                        , cancel: function () {
                        }
                    })
                } else if (obj.event == '模具名称') {
                    var linterid = data.模具id;
                    var HNumber = data.模具编码;
                    var HName = data.模具名称;
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '查看模具履历'
                        , closeBtn: 1
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../../模治具管理/器具报表/Sc_MouldResumeCheckQuery.html?OperationType=3&linterid=' + linterid + '&HNumber=' + HNumber + '&HName=' + HName + ''
                        , resize: false,
                        end: function () {
                        }
@@ -1329,47 +1265,70 @@
                        , cancel: function () {
                        }
                    })
                } else if (obj.event == '工序名称') {
                    if (data.单据类型 == "工序流转卡") {
                        var linterid = data.单据主id;
                        var HProcID = data.工序id;
                        layer.open({
                            type: 2
                            , area: ['100%', '100%']
                            , title: '查看设备履历'
                            , closeBtn: 1
                            , shade: 0.6 //遮罩透明度
                            , maxmin: true //允许全屏最小化
                            , anim: 0 //0-6的动画形式，-1不开启
                            , content: '../../质量管理/质量报表/SB_TechnologyParameterList.html?OperationType=3&linterid=' + linterid + '&HProcID=' + HProcID + ''
                            , resize: false,
                            end: function () {
                            }
                            , cancel: function () {
                            }
                        })
                    }
                    else {
                } else if (obj.event == '工艺参数') {
                    if (data.单据类型 == "产品工艺参数") {
                        var linterid = data.流转卡id;
                        var HProcID = data.工序id;
                        var HTeachName = data.工艺参数;
                        layer.open({
                            type: 2
                            , area: ['100%', '100%']
                            , title: '查看设备履历'
                            , title: '查看设备工艺参数趋势图'
                            , closeBtn: 1
                            , shade: 0.6 //遮罩透明度
                            , maxmin: true //允许全屏最小化
                            , anim: 0 //0-6的动画形式，-1不开启
                            , content: '../../质量管理/质量报表/SB_TechnologyParameterList.html?OperationType=3&linterid=' + linterid + '&HProcID=' + HProcID + ''
                            , content: '../../质量管理/质量报表/SB_TechnologyParameterList.html?OperationType=3&linterid=' + linterid + '&HProcID=' + HProcID + '&HTeachName=' + HTeachName + ''
                            , resize: false,
                            end: function () {
                            }
                            , cancel: function () {
                            }
                        })
                    }
                    }
                    }                   
                }
                   
            });

            //环
            table.on('tool(mainTable_Environments)', function (obj) {
                var data = obj.data;
                if (obj.event == '单据号') {
                    var linterid = data.单据主id;
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '查看环境检测单'
                        , closeBtn: 1
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../../质量管理/环境检测单/QC_EnvironmentTestDotCheckBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
                        , resize: false,
                        end: function () {
                        }
                        , cancel: function () {
                        }
                    })
                } else if (obj.event == '职员') {
                    var HName = data.职员;
                    var HProcID = data.工序id;
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '查看职员档案'
                        , closeBtn: 1
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../../人事管理/人员履历/HR_PersonnelResumeList.html?OperationType=2&HNumber=&HName=' + HName + '&HProcID=' + HProcID + ''
                        , resize: false,
                        end: function () {
                        }
                        , cancel: function () {
                        }
                    })
                }
            });

            //测
@@ -1500,15 +1459,151 @@
                }
            });

            //ä¿¡
            table.on('tool(mainTable_Message)', function (obj) {
                var data = obj.data;
                if (obj.event == '单据号') {
                    if (data.单据类型 == "汇报单") {
                        var linterid = data.单据主id;
                        var HBillNo = data.单据号;
                        layer.open({
                            type: 2
                            , area: ['100%', '100%']
                            , title: '查看汇报单'
                            , closeBtn: 1
                            , shade: 0.6 //遮罩透明度
                            , maxmin: true //允许全屏最小化
                            , anim: 0 //0-6的动画形式，-1不开启
                            , content: '../../车间管理/工序出站汇报单/Cj_StationOutBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&HBillNo=' + HBillNo + '&closeType=1'
                            , resize: false,
                            end: function () {
                            }
                            , cancel: function () {
                            }
                        })
                    } else if (data.单据类型 == "工序进站单") {
                        var linterid = data.单据主id;
                        var HBillNo = data.单据号;
                        layer.open({
                            type: 2
                            , area: ['100%', '100%']
                            , title: '查看进站单'
                            , closeBtn: 1
                            , shade: 0.6 //遮罩透明度
                            , maxmin: true //允许全屏最小化
                            , anim: 0 //0-6的动画形式，-1不开启
                            , content: '../../车间管理/工序进站接收单/Cj_StationInBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&HBillNo=' + HBillNo + '&closeType=1'
                            , resize: false,
                            end: function () {
                            }
                            , cancel: function () {
                            }
                        })
                    } else if (data.单据类型 == "取样单") {
                        var linterid = data.单据主id;
                        var HBillNo = data.单据号;
                        layer.open({
                            type: 2
                            , area: ['100%', '100%']
                            , title: '查看取样单'
                            , closeBtn: 1
                            , shade: 0.6 //遮罩透明度
                            , maxmin: true //允许全屏最小化
                            , anim: 0 //0-6的动画形式，-1不开启
                            , content: '../../质量管理/检验取样还样单/QC_Add_TakeSampleCheckBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                            , resize: false,
                            end: function () {
                            }
                            , cancel: function () {
                            }
                        })
                    } else if (data.单据类型 == "开工单") {
                        var linterid = data.单据主id;
                        var HBillNo = data.单据号;
                        layer.open({
                            type: 2
                            , area: ['100%', '100%']
                            , title: '查看开工单'
                            , closeBtn: 1
                            , shade: 0.6 //遮罩透明度
                            , maxmin: true //允许全屏最小化
                            , anim: 0 //0-6的动画形式，-1不开启
                            , content: '../../生产管理/报工台工序/开工/Sc_Add_MESBeginStepWorkBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                            , resize: false,
                            end: function () {
                            }
                            , cancel: function () {
                            }
                        })
                    } else if (data.单据类型 == "停工单") {
                        var linterid = data.单据主id;
                        var HBillNo = data.单据号;
                        layer.open({
                            type: 2
                            , area: ['100%', '100%']
                            , title: '查看取样单'
                            , closeBtn: 1
                            , shade: 0.6 //遮罩透明度
                            , maxmin: true //允许全屏最小化
                            , anim: 0 //0-6的动画形式，-1不开启
                            , content: '../../生产管理/报工台工序/停工/Sc_MESStopStepWorkBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                            , resize: false,
                            end: function () {
                            }
                            , cancel: function () {
                            }
                        })
                    } else if (data.单据类型 == "完工单") {
                        var linterid = data.单据主id;
                        var HBillNo = data.单据号;
                        layer.open({
                            type: 2
                            , area: ['100%', '100%']
                            , title: '查看取样单'
                            , closeBtn: 1
                            , shade: 0.6 //遮罩透明度
                            , maxmin: true //允许全屏最小化
                            , anim: 0 //0-6的动画形式，-1不开启
                            , content: '../../生产管理/报工台工序/完工/Sc_Add_MESEndStepWorkBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                            , resize: false,
                            end: function () {
                            }
                            , cancel: function () {
                            }
                        })
                    }

                } else if (obj.event == '职员') {
                    var HName = data.职员;
                    var HProcID = data.工序id;
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '查看职员档案'
                        , closeBtn: 1
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../../人事管理/人员履历/HR_PersonnelResumeList.html?OperationType=2&HNumber=&HName=' + HName + '&HProcID=' + HProcID + ''
                        , resize: false,
                        end: function () {
                        }
                        , cancel: function () {
                        }
                    })
                }

            });

            //#endregion     

            //#region æµè½¬å¡ç‚¹å‡»æŸ¥è¯¢ äººæœºæ–™æ³•çŽ¯
            function getTable_Right(linterid,SNs) {
            function getTable_Right(linterid,HProcID,SNs) {
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/QC_CustomerAppealReport/Get_QC_FiveMenOneRingList_Right',
                    type: "GET",
                    data: { "linterid": linterid, "SNs": SNs, "user": sessionStorage["HUserName"] },
                    data: { "linterid": linterid, "HProcID": HProcID, "SNs": SNs, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            var Listcol = [];
@@ -1552,10 +1647,24 @@
                                            }, style: 'cursor: pointer;'
                                        });
                                    }
                                    else if (data[j].name == '工序名称') {//添加超链接
                                    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) {
                                                return '<span style="color: blue;">' + d.工序名称 + '</span>'
                                            field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200, event: '工艺参数', templet: function (d) {
                                                return '<span style="color: blue;">' + d.工艺参数 + '</span>'
                                            }, style: 'cursor: pointer;'
                                        });
                                    }
                                    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) {
                                                return '<span style="color: blue;">' + d.流转卡 + '</span>'
                                            }, style: 'cursor: pointer;'
                                        });
                                    }
                                    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) {
                                                return '<span style="color: blue;">' + d.工序 + '</span>'
                                            }, style: 'cursor: pointer;'
                                        });
                                    }
@@ -1644,13 +1753,25 @@
                                , page: false
                            }
                            table.render(option_Measure);
                            //ä¿¡
                            option_Message = {
                                elem: '#mainTable_Message'
                                , toolbar: '#toolbarDemo2'
                                , cols: [Listcol[6]]
                                , data: data1.data.h_p_QC_FiveMenOneRingList_Query6
                                , height: 'full-80'
                                , cellMinWidth: 90
                                , limit: Number.MAX_VALUE//默认显示全部
                                , page: false
                            }
                            table.render(option_Message);
                            if (SNs =="") {
                                //左侧表格
                                option = {
                                    elem: '#mainTable'
                                    , toolbar: '#toolbarDemo'
                                    , cols: [Listcol[6]]
                                    , data: data1.data.h_p_QC_FiveMenOneRingList_Query6
                                    , cols: [Listcol[7]]
                                    , data: data1.data.h_p_QC_FiveMenOneRingList_Query7
                                    , height: 'full-80'
                                    , cellMinWidth: 90
                                }

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

@@ -157,17 +157,20 @@
            //查询条件
            var sWhere = "";
            var option = [];
            var HMater; //物料
            var HProc;  //工序
            var HEquId;   //设备
            var HTeachName;   //工艺参数
            var HModName = "SB_TechnologyParameterList";
            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["å¹´", "月", "工序"];
            var params = getUrlVars();
            var OperationType = params[params[0]]; //从参数中获取 æ•°æ®ç±»åž‹  1添加 ä¿å­˜  2复制  3 ç¼–辑
            var linterid = params[params[1]]; //从参数中获取 å•æ®å†…码
            var HProcID = params[params[2]]; //从参数中获取 å•æ®å†…码
            var HProcID = params[params[2]]; //从参数中获取 å·¥åº
                HTeachName = decodeURI(params[params[3]]); //从参数中获取 å·¥è‰ºå‚æ•°
            var ins;                        //用于导出excel
            var HMater; //物料
            var HProc;  //工序
            var HEquId;   //设备
           
            //#endregion

            //#region è¿›å…¥é¡µé¢æ—¢åŠ è½½
@@ -244,7 +247,10 @@
                set_InitGrid1(); //初始化表格       
                if (OperationType == 3) {
                    Get_SB_EquipICMOTechParamBill(linterid, HProcID);//获取流转卡,工序,设备,物料,开始结束时间
                    Get_TechParam();//获取当前流转卡,物料,工序,设备 å¯¹åº”的产品工艺参数清单
                    $("#HTechParamName").val(HTeachName);
                    $("#HEquipType").val("设备采集");
                    form.render('select');
                    Get_TechParam();//获取当前流转卡,物料,工序,设备 å¯¹åº”的产品工艺参数清单                 
                    get_FastQuery();
                    //加载折线图
                    set_Graphics();
@@ -793,11 +799,12 @@
                HMater = $("#HMaterID").val(); 
                HProc = $("#HProcID").val();
                HEquId = $("#HEquipID").val();
                HTeachName = $("#HTechParamName").val() == "" ? "":$("#HTechParamName").val();
                $.ajax({
                    url: GetWEBURL() + "/QC_CustomerAppealReport/Get_TechParamList",
                    type: "GET",
                    async: false,
                    data: { "HMaterID": HMater, "HProID": HProc, "HEquId": HEquId,"user": sessionStorage["HUserName"] },
                    data: { "HMaterID": HMater, "HProID": HProc, "HEquId": HEquId, "HTeachName": HTeachName,"user": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            var data = [];

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

@@ -1043,7 +1043,7 @@
                    , data = checkStatus.data;
                //新增行表格数据
                var NewRow = {
                    "HQCCheckItemID": "", "检验项目": "", "HInspectInstruMentID": "0", "检验仪器": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
                    "HQCCheckItemID": "", "检验项目": "", "HInspectInstruMentID": "0","检验仪器代码":"", "检验仪器": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
                    "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
                    "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
                    "HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "",
@@ -1222,6 +1222,27 @@
                    });
                }

                var data = obj.data;
                if (obj.event == '检验仪器代码') {
                    var HNumber = data.检验仪器代码;
                    var linterid= data.HInspectInstruMentID;
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '查看检验仪器'
                        , closeBtn: 1
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../../基础资料/公用基础资料/Add_Edit_Gy_InspectInstruMent.html?OperationType=3&linterid=' + linterid + ''
                        , resize: false,
                        end: function () {
                        }
                        , cancel: function () {
                        }
                    })
                }

                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                    var rowIndex = Number($(obj.tr).attr("data-index")) + Number(1);
                    if (event.key == "F7") {
@@ -1288,7 +1309,8 @@

                                    //同步更新表格和缓存对应的值
                                    obj.update({
                                        æ£€éªŒä»ªå™¨: checkStatus.data[0].检验仪器名称
                                        æ£€éªŒä»ªå™¨ä»£ç : checkStatus.data[0].检验仪器代码
                                        ,检验仪器: checkStatus.data[0].检验仪器名称
                                        , HInspectInstruMentID: checkStatus.data[0].HItemID
                                    });
                                    layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
@@ -1592,7 +1614,7 @@
                            for (var i = 0; i < data.length; i++) {
                                rowdata.push(
                                    {
                                        "HQCCheckItemID": data[i].HQCCheckItemID, "检验项目代码": data[i].检验项目代码, "检验项目": data[i].检验项目名称, "HInspectInstruMentID": data[i].HInspectInstruMentID, "检验仪器": data[i].检验仪器名称, "HQCStd": data[i].检验标准,
                                        "HQCCheckItemID": data[i].HQCCheckItemID, "检验项目代码": data[i].检验项目代码, "检验项目": data[i].检验项目名称, "HInspectInstruMentID": data[i].HInspectInstruMentID, "检验仪器代码": data[i].检验仪器代码,"检验仪器": data[i].检验仪器名称, "HQCStd": data[i].检验标准,
                                        "HUnit": data[i].单位名称, "HQCNote": data[i].检验记录, "HResult": data[i].结论 == "合格" ? 1 : 2,
                                        "HMax": data[i].最大值, "HMin": data[i].最小值, "HAvg": data[i].平均值, "HRemark": data[i].表体备注,
                                        "HAnalysisMethod": data[i].分析方法 == "定性分析" ? 1 : (data[i].分析方法 == "定量分析" ? 2 : 3), "HKeyInspect": data[i].重点检查 == "否" ? false : true,
@@ -1954,7 +1976,7 @@
                                //子表  èµ‹å€¼
                                rowdata.push(
                                    {
                                        "HQCCheckItemID": data[i]["HQCCheckItemID"], "检验项目代码": data[i].检验项目代码, "检验项目": data[i]["检验项目"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "检验仪器": data[i]["检验仪器"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["单位名称"], "HQCNote": "", "HAnalysisMethod": data[i]["分析方法"], "HResult": data[i]["默认结论"],
                                        "HQCCheckItemID": data[i]["HQCCheckItemID"], "检验项目代码": data[i].检验项目代码, "检验项目": data[i]["检验项目"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "检验仪器代码": data[i]["检验仪器代码"], "检验仪器": data[i]["检验仪器"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["单位名称"], "HQCNote": "", "HAnalysisMethod": data[i]["分析方法"], "HResult": data[i]["默认结论"],
                                        "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": data[i]["重点检查"] == 1 ? true : false, "HStatus": 0, "HSampleSchemeID": data[i]["HSampleSchemeID"], "HUnitID": data[i]["HUnitID"],
                                        "HInspectVal": '', "HTargetVal": '', "HUpLimit":  + data[i].上限值 , "HDownLimit": + data[i].下限值, "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
                                        "HSampleSchemeName": data[i].抽样方案名称, "HSampleQty": data[i].样本量, "HAcceptQty": data[i].允许数, "HInspectionLevel": data[i].检验水平, "HRejectQty": data[i].拒绝数,
@@ -2293,7 +2315,7 @@
                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
                //初始表格数据
                rowdata = [{
                    "HQCCheckItemID": "", "检验项目": "", "HInspectInstruMentID": "0", "检验仪器": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
                    "HQCCheckItemID": "", "检验项目": "", "HInspectInstruMentID": "0","检验仪器代码":"", "检验仪器": "", "HQCStd": "", "HUnit": "", "HQCNote": "", "HAnalysisMethod": "", "HResult": "",
                    "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": false, "HStatus": 0, "HSampleSchemeID": 0, "HUnitID": 0,
                    "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": '0',
                    "HSampleSchemeName": "", "HSampleQty": "0", "HSampleDamageQty": "0", "HAcceptQty": "0", "HInspectionLevel": "", "HRejectQty": "",
@@ -2313,6 +2335,8 @@
                        , { field: '检验项目代码', title: '检验项目代码'}
                        , { field: '检验项目', title: '检验项目', edit: 'text', event: 'HQCCheckItemID' }
                        , { field: 'HInspectInstruMentID', title: 'HInspectInstruMentID', hide: true }
                        , { field: '检验仪器代码', title: '检验仪器代码', totalRow: true ,templet: function (d) {
                            return '<span style="color: blue;" lay-event="检验仪器代码">' + d.检验仪器代码 + '</span>';}, style: 'cursor: pointer;'}
                        , { field: '检验仪器', title: '检验仪器', edit: 'text', event: 'HInspectInstruMentID' }
                        , { field: 'HResult', title: '结论', templet: '#HResult', event: 'HResult' }
                        , { field: 'HAnalysisMethod', title: '分析方法', templet: '#HAnalysisMethod', event: 'HAnalysisMethod' }
@@ -2414,6 +2438,7 @@
                table.render(option_Value);
            }


            //行选择处理（结论）
            form.on('select(HResult)', function (data) {
                //获取下拉框选中的值

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

@@ -2362,14 +2362,19 @@
            })
        }

        //下载文件
        //下载文件        
        function dowload(r) {
            //得到当前所在行
            var rows = r.parentNode.parentNode.rowIndex;
            //得到所在行的第五列的内容:文件地址
            var url = $("#ProImgByList tr:eq(" + (rows - 1) + ") td:eq(5)").html();
            /*window.location.href = url;*/
            window.open(url)

            var a = document.createElement('a');
            a.href = url;
            a.download = url.split('/').pop(); // æ›¿æ¢ä¸ºå®žé™…文件名
            document.body.appendChild(a);
            a.click();
            document.body.removeChild(a);
        }

        //返回流水号

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

@@ -359,11 +359,34 @@
                                        </div>
                                    </div>
                                </div>
                                <!--附件信息-->
                                <div class="layui-tab-item">
                                    <div class="layui-form-item" style="padding-top: 10px;min-height:calc(50vh);">
                                        <div class="layui-upload">
                                            <button type="button" class="layui-btn" id="testList"><i class="layui-icon"></i>选择文件</button>
                                            <div class="layui-upload-list">
                                                <table class="layui-table">
                                                    <thead>
                                                        <tr>
                                                            <th>文件名</th>
                                                            <th>大小</th>
                                                            <th>状态</th>
                                                            <th>操作</th>
                                                        </tr>
                                                    </thead>
                                                    <tbody id="ProImgByList">
                                                    </tbody>
                                                </table>
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                            <ul class="layui-tab-title">
                                <li class="layui-this">单据信息</li>
                                <li>制单信息</li>
                                <li>上料防错</li>
                                <li>附件信息</li>
                            </ul>
                        </div>
                    </div>
@@ -793,7 +816,6 @@
                        //    $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//审核按钮禁用
                        //    $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//反审核按钮禁用
                        //}
                        //PicUpload();
                        layer.close(index);
                    }
                    , error: function () {
@@ -916,7 +938,7 @@
                    , uploadListIns = upload.render({
                        elem: '#testList'

                        , url: GetWEBURL() + "/Cj_StationOutBill/UploadFile1"
                        , url: GetWEBURL() + "/Cj_StationInBill/UploadFile1"
                        , accept: 'file'
                        , multiple: true
                        , auto: false
@@ -976,7 +998,7 @@
            if (HBillNo != null || HBillNo != undefined) {
                var ProImgByList = $('#ProImgByList')
                $.ajax({
                    url: GetWEBURL() + '/Cj_StationOutBill/Filelist',
                    url: GetWEBURL() + '/Cj_StationInBill/Filelist',
                    type: "GET",
                    data: { "HBillNo": HBillNo },
                    success: function (data1) {

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

@@ -378,11 +378,34 @@
                                        </tbody>
                                    </table>
                                </div>
                                <!--附件信息-->
                                <div class="layui-tab-item">
                                    <div class="layui-form-item" style="padding-top: 10px;min-height:calc(50vh);">
                                        <div class="layui-upload">
                                            <button type="button" class="layui-btn" id="testList"><i class="layui-icon"></i>选择文件</button>
                                            <div class="layui-upload-list">
                                                <table class="layui-table">
                                                    <thead>
                                                        <tr>
                                                            <th>文件名</th>
                                                            <th>大小</th>
                                                            <th>状态</th>
                                                            <th>操作</th>
                                                        </tr>
                                                    </thead>
                                                    <tbody id="ProImgByList">
                                                    </tbody>
                                                </table>
                                            </div>
                                        </div>
                                    </div>
                                </div>
                                <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                            </div>
                            <ul class="layui-tab-title">
                                <li class="layui-this">单据信息</li>
                                <li>制单信息</li>
                                <li>附件信息</li>
                            </ul>
                        </div>
                    </div>                                     
@@ -542,6 +565,7 @@
                        //console.log(d.data);
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HBillNo").val(d.data[0].HBillNo);
                        PicUpload();
                    }
                });
                $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//审核按钮默认禁用
@@ -619,7 +643,7 @@
                                $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//审核按钮禁用
                                $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//反审核按钮禁用
                            }
                            PicUpload();
                            //PicUpload();
                            layer.close(index);
                        } else {
                            layer.close(index);

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

@@ -758,7 +758,7 @@
                    , uploadListIns = upload.render({
                        elem: '#testList'

                        , url: GetWEBURL() + "/Cj_StationOutBill/UploadFile1"
                        , url: GetWEBURL() + "/Cj_StationInBill/UploadFile1"
                        , accept: 'file'
                        , multiple: true
                        , auto: false
@@ -818,7 +818,7 @@
            if (HBillNo != null || HBillNo != undefined) {
                var ProImgByList = $('#ProImgByList')
                $.ajax({
                    url: GetWEBURL() + '/Cj_StationOutBill/Filelist',
                    url: GetWEBURL() + '/Cj_StationInBill/Filelist',
                    type: "GET",
                    data: { "HBillNo": HBillNo },
                    success: function (data1) {
@@ -1496,7 +1496,7 @@

                //删除已上传文件
                $.ajax({
                    url: GetWEBURL() + '/Cj_StationOutBill/DeleteFilelist',
                    url: GetWEBURL() + '/Cj_StationInBill/DeleteFilelist',
                    type: "GET",
                    data: { "HItemID": HItemID, "HSourceBillNo": HSourceBillNo, "HFileName": HFileName },
                    success: function (data1) {
@@ -1520,10 +1520,16 @@
            var rows = r.parentNode.parentNode.rowIndex;
            //得到所在行的第五列的内容:文件地址
            var url = $("#ProImgByList tr:eq(" + (rows - 1) + ") td:eq(5)").html();
            /*window.location.href = url;*/
            window.open(url)

            var a = document.createElement('a');
            a.href = url;
            a.download = url.split('/').pop(); // æ›¿æ¢ä¸ºå®žé™…文件名
            document.body.appendChild(a);
            a.click();
            document.body.removeChild(a);
        }


        //返回生产班组
        function GetProductionTeamValue(obj) {
            $("#HGroupName").val(obj[0].班组);