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

yusijie

2024-04-16 ac5fa14718dee20acc4a7e9c16f01426f606688c

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

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -3,10 +3,10 @@
    //var WEBURL = "http://192.168.16.80:8011/";          //办公室服务器
    //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地*/
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
    //var WEBURL = "http://localhost/API/";             //颜晓军本地配置
    var WEBURL = "http://localhost/API/";             //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    //var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    var WEBURL = "http://localhost:8083/API/";  //陈雯静本地配置
    //var WEBURL = "http://localhost:8083/API/";  //陈雯静本地配置
    //var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";    //余思杰本地配置(安瑞)

 WebTM/views/WMSɨÂëÄ£¿é/ÆäËûÈë¿â/Kf_OtherInBill_PDA.html

@@ -428,7 +428,8 @@
                                icon: 0, time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示", btn: ['确认']
                            }, function () { parent.location.href = "../../../views/index_Mobile.html"; });
                        }
                    }
                    },
                    complete: function (XHR, TS) { XHR = null }//回收资源
                });
                layer.closeAll("loading");
            }
@@ -439,12 +440,22 @@
                console.log("playSound");
                var audio = document.getElementById("cs");
                audio.play();
                audio.onended = function () {
                    // å½“音频播报完成时，调用 pause å’Œè®¾ç½® currentTime ä¸º 0 ä»¥åœæ­¢æ’­æŠ¥å¹¶é‡ç½®
                    audio.pause();
                    audio.currentTime = 0;
                };
            }
            //成功提示音
            function playSound_OK() {
                console.log("playSound_OK");
                var audio = document.getElementById("cs2");
                audio.play();
                audio.onended = function () {
                    // å½“音频播报完成时，调用 pause å’Œè®¾ç½® currentTime ä¸º 0 ä»¥åœæ­¢æ’­æŠ¥å¹¶é‡ç½®
                    audio.pause();
                    audio.currentTime = 0;
                };
            }

            //#region åˆå§‹åŒ–界面
@@ -532,7 +543,8 @@
                            form.render('select');
                        }
                        layer.closeAll("loading");
                    }
                    },
                    complete: function (XHR, TS) { XHR = null }//回收资源
                })
            }
            //初始化表格
@@ -544,6 +556,9 @@
                    , height: 'full-60'
                    , cellMinWidth: 90
                    , limit: 50
                    , done: function () {
                        layer.closeAll("loading");
                    }
                };
            }

@@ -595,7 +610,8 @@
                        else {
                            layer.msg(d.Message, { icon: 0, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    }
                    },
                    complete: function (XHR, TS) { XHR = null }//回收资源
                });
                HSourceFlag = false;
            }
@@ -648,7 +664,8 @@
                        $("#HSupID").val(d.data[0].HCusID);
                        $("#HSupName").val(d.data[0].HSupName);
                        $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
                    }
                    },
                    complete: function (XHR, TS) { XHR = null }//回收资源
                })
            }

@@ -719,7 +736,8 @@
                                });
                            }
                            layer.closeAll("loading");
                        }
                        },
                        complete: function (XHR, TS) { XHR = null }//回收资源
                    });
                }
            });
@@ -799,7 +817,8 @@
                                });
                            }
                            layer.closeAll("loading");
                        }
                        },
                        complete: function (XHR, TS) { XHR = null }//回收资源
                    });
                }
            });
@@ -872,7 +891,8 @@
                                });
                            }
                            layer.closeAll("loading");
                        }
                        },
                        complete: function (XHR, TS) { XHR = null }//回收资源
                    });
                }
            });
@@ -941,7 +961,8 @@
                                });
                            }
                            layer.closeAll("loading");
                        }
                        },
                        complete: function (XHR, TS) { XHR = null }//回收资源
                    });
                }
            });
@@ -1010,7 +1031,8 @@
                                });
                            }
                            layer.closeAll("loading");
                        }
                        },
                        complete: function (XHR, TS) { XHR = null }//回收资源
                    });
                }
            });
@@ -1079,7 +1101,8 @@
                                });
                            }
                            layer.closeAll("loading");
                        }
                        },
                        complete: function (XHR, TS) { XHR = null }//回收资源
                    });
                }
            });
@@ -1169,6 +1192,7 @@
                                    layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                }
                            },
                            complete: function (XHR, TS) { XHR = null },//回收资源
                            error: function (err) {
                                layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            }
@@ -1245,6 +1269,7 @@
                                        layer.msg(data.Message, { icon: 2, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                    }
                                },
                                complete: function (XHR, TS) { XHR = null },//回收资源
                                error: function (err) {
                                    layer.msg('错误' + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                                }
@@ -1342,7 +1367,8 @@
                                $("#HSourceBillNo").focus();
                            });
                        }
                    }
                    },
                    complete: function (XHR, TS) { XHR = null }//回收资源
                });
                layer.closeAll("loading");
            }
@@ -1426,6 +1452,7 @@
                                    });
                                }
                            },
                            complete: function (XHR, TS) { XHR = null },//回收资源
                            error: function (err) {
                                playSound();
                                layer.msg('错误' + err, {
@@ -1591,6 +1618,7 @@
                                });
                            }
                        },
                        complete: function (XHR, TS) { XHR = null },//回收资源
                        error: function (err) {
                            playSound();
                            layer.msg("错误！" + err, {
@@ -1707,7 +1735,8 @@
                            $("#HWHName_B").val("");
                            $("#HSPName_B").val("");
                        }
                    }
                    },
                    complete: function (XHR, TS) { XHR = null }//回收资源
                });
            }


 WebTM/views/WMSɨÂëÄ£¿é/ÏúÊÛ³ö¿â/Kf_SellOutBill_QiaoYi_PDA.html

@@ -290,8 +290,9 @@
            var HMaker = sessionStorage["HUserName"]
            var HBillerID = sessionStorage["HBillerID"]
            var HStockOrgID = sessionStorage["OrganizationID"]  //组织ID
            var HSourceFlag = false     //是否已扫码标志
            var OperationType = 0       //操作类型（1新增、2从缓存列表中返回）
            var HSourceFlag = false         //是否已扫码标志
            var HDisBillEntryList = false   //是否创建并渲染过表格
            var OperationType = 0           //操作类型（1新增、2从缓存列表中返回）
            var listOption = [];
            var BarCodelistOption = [];
            var columns = "";
@@ -410,14 +411,18 @@
                    , height: 'full-100'
                    , cellMinWidth: 90
                    , limit: 150
                    , done: function () {
                        layer.closeAll("loading");
                    }
                };

                //明细清单
                BarCodelistOption = {
                    elem: '#mx-table'
                    //, toolbar: '#toolbarDemo'
                    , page: true
                    , cellMinWidth: 90
                    , limit: 3000
                    , limit: 50
                    , totalRow: true
                    , cols: [[
                        { field: '包号', title: '包号', width: 80 }
@@ -1499,9 +1504,19 @@
                            listOption.cols = [columns];
                            listOption.data = result.data.Materlist;
                            listOption.totalRow = true;
                            table.render(listOption);
                            BarCodelistOption.data = result.data.BarCodelist;
                            table.render(BarCodelistOption);

                            if (!HDisBillEntryList) {
                                table.render(listOption);               //创建并渲染表格
                                table.render(BarCodelistOption);
                                HDisBillEntryList = true;
                            }
                            else {
                                table.cache['wl-table'] = null;         //清空表格缓存数据
                                table.reload('wl-table', listOption);   //对表格进行重载
                                table.cache['mx - table'] = null;
                                table.reload('mx-table', BarCodelistOption);
                            }
                        }
                        else {
                            layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });

 WebTM/views/video/success.wav

Binary files differ

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

@@ -8,6 +8,11 @@
    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <style type="text/css">
        .layui-form-label {
            width: 85px;
@@ -46,10 +51,12 @@
                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
                                <ul class="layui-tab-title">
                                    <li class="layui-this">基本信息</li>
                                    <li >其他信息</li>
                                    <li>其他信息</li>
                                    <li>附件信息</li>
                                </ul>
                                <h1 style="text-align:center;"><b>物料设置</b></h1>
                                <div class="layui-tab-content">
                                    <!--基本信息-->
                                    <div class="layui-tab-item layui-show">
                                        <div class="layui-form-item">
                                            <div class="layui-row">
@@ -93,15 +100,15 @@
                                                        </div>
                                                    </div>
                                                    <!--<div class="layui-inline">
                <label class="layui-form-label">主计量单位：</label>
                <div class="layui-input-inline">
                    <input class="layui-input" type="text" name="HUnitName" id="HUnitName" value="0" readonly>
                    <input class="layui-input" type="hidden" name="HUnitID" id="HUnitID" value="0" readonly>
                    <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                    </button>
                </div>
            </div>-->
                        <label class="layui-form-label">主计量单位：</label>
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="HUnitName" id="HUnitName" value="0" readonly>
                            <input class="layui-input" type="hidden" name="HUnitID" id="HUnitID" value="0" readonly>
                            <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                            </button>
                        </div>
                    </div>-->
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">克重</label>
@@ -238,6 +245,7 @@
                                            </div>
                                        </div>
                                    </div>
                                    <!--其他信息-->
                                    <div class="layui-tab-item">
                                        <div class="layui-form-item">
                                            <div class="layui-row">
@@ -324,7 +332,7 @@
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label" > å•ä»¶æœ€å¤§ä¸Šé™ï¼š</label>
                                                    <label class="layui-form-label"> å•ä»¶æœ€å¤§ä¸Šé™ï¼š</label>
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HPieceMaxQty" lay-verify="HPieceMaxQty" id="HPieceMaxQty" autocomplete="off" value="0">
                                                    </div>
@@ -513,8 +521,63 @@
                                                        <input class="layui-input" name="HSTDMACHINEPREPARETIME" lay-verify="HSTDMACHINEPREPARETIME" id="HSTDMACHINEPREPARETIME" autocomplete="off" value="0">
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">常用材料：</label>
                                                    <div class="layui-input-inline">
                                                        <input type="checkbox" name="HCommonUseFlag" id="HCommonUseFlag" lay-skin="primary" lay-filter="checkbox" value="true" title="是否常用材料">
                                                    </div>
                                                </div>

                                            </div>
                                            <div class="layui-row">
                                                <div class="layui-inline">
                                                    <label class="layui-form-label"> åŠ æƒå¹³å‡ä»·ï¼š</label>
                                                    <div class="layui-input-inline">
                                                        <input class="layui-input" name="HAvgStockPrice" lay-verify="HAvgStockPrice" id="HAvgStockPrice" autocomplete="off" value="0">
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label"> ç»“ç®—ä»·</label>
                                                    <div class="layui-input-inline" style="margin-top:10px">
                                                        <input class="layui-input" name="HFootPrice" lay-verify="HFootPrice" id="HFootPrice" autocomplete="off" value="0">
                                                    </div>
                                                </div>

                                                <div class="layui-inline">
                                                    <label class="layui-form-label"> å«ç¨Žæˆæœ¬ä»·</label>
                                                    <div class="layui-input-inline" style="margin-top:10px">
                                                        <input class="layui-input" name="HTaxCost" lay-verify="HTaxCost" id="HTaxCost" autocomplete="off" value="0">
                                                    </div>
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label"> ä¸å«ç¨Žæˆæœ¬ä»·</label>
                                                    <div class="layui-input-inline" style="margin-top:10px">
                                                        <input class="layui-input" name="HNoTaxCost" lay-verify="HNoTaxCost" id="HNoTaxCost" autocomplete="off" value="0">
                                                    </div>
                                                </div>
                                            </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="mainTable">
                                                        <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>
@@ -559,7 +622,7 @@
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index', //主入口模块
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','colorpicker'], function () {
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'colorpicker', 'upload'], function () {
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
@@ -568,6 +631,7 @@
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
                , upload = layui.upload
                , colorpicker = layui.colorpicker

            //初始化界面
@@ -578,6 +642,28 @@
                //id new
                $("#HItemID").val(0);
                get_ReadConfigFile();

                // ç›‘听按钮点击事件，触发文件输入框的点击事件  
                document.getElementById('testList').addEventListener('click', function () {
                    // è§¦å‘文件输入框的点击事件  
                    document.getElementById('HNumber').click();
                });

                // ç›‘听文件输入框的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();
                    }
                });
              
            }
            else if (OperationType==2){
                //修改时主表ID
@@ -588,6 +674,9 @@
                $("#HItemID").val(hID);
                //修改时主表ID
                RoadBillMain(hID);
                //文件选择初始化
                PicUpload();
                getFile();
            }


@@ -811,6 +900,11 @@
                                , "HQCSchemeName_Patrol": data.巡检检验方案
                                , "HMaterRuleType": data.物料公式
                                , "HColorNo": data.颜色色号
                                , "HCommonUseFlag": data.是否不常用材料
                                , "HAvgStockPrice": data.加权平均价
                                , "HFootPrice": data.结算价
                                , "HTaxCost": data.含税成本价
                                , "HNoTaxCost": data.不含税成本价
                            });

                            colorpicker.render({
@@ -841,6 +935,11 @@
                    data.field.HCHECKPRODUCT = 1
                } else {
                    data.field.HCHECKPRODUCT = 0
                }
                if (data.field.HCommonUseFlag) {
                    data.field.HCommonUseFlag = 1
                } else {
                    data.field.HCommonUseFlag = 0
                }
                var sMainStr = JSON.stringify(data.field);
                //var sSubStr = JSON.stringify(table.cache['mainTable']);
@@ -1475,12 +1574,212 @@
            function set_ClearBill() {

            }
           

            //#region æ–‡ä»¶ä¸Šä¼ 
            function PicUpload() {
                //多图片上传
                //多文件列表示例
                var ProImgByList = $('#ProImgByList')
                    , uploadListIns = upload.render({
                        elem: '#testList'

                        , url: GetWEBURL() + "/Cj_StationOutBill/UploadFile1"
                        , 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 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);

                                //某图片放大预览
                                $(".ImgClass").click(function () {
                                    var idx = $(".ImgClass").index(this);//获取点击行下标显示对应的图片

                                    var width = $("#showImg").width();
                                    var height = $("#showImg").height();
                                    var scaleWH = width / height;
                                    var bigH = 600;
                                    var bigW = scaleWH * bigH;
                                    if (bigW > 900) {
                                        bigW = 900;
                                        bigH = bigW / scaleWH;
                                    }

                                    // æ”¾å¤§é¢„览图片
                                    layer.open({
                                        type: 1,
                                        title: false,
                                        closeBtn: 1,
                                        shadeClose: true,
                                        area: [bigW + 'px', bigH + 'px'], //宽高
                                        content: "<img width='" + bigW + "' height='" + bigH + "' src=" + result + " />"
                                    });
                                });
                            });
                        }
                        , 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() + '/Cj_StationOutBill/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 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);
                            }
                            //某图片放大预览
                            $(".ImgClass").click(function () {
                                var idx = $(".ImgClass").index(this);//获取点击行下标显示对应的图片

                                var width = $("#showImg" + idx).width();
                                var height = $("#showImg" + idx).height();
                                var scaleWH = width / height;
                                var bigH = 600;
                                var bigW = scaleWH * bigH;
                                if (bigW > 900) {
                                    bigW = 900;
                                    bigH = bigW / scaleWH;
                                }
                                // æ”¾å¤§é¢„览图片
                                layer.open({
                                    type: 1,
                                    title: false,
                                    closeBtn: 1,
                                    shadeClose: true,
                                    area: [bigW + 'px', bigH + 'px'], //宽高
                                    content: "<img width='" + bigW + "' height='" + bigH + "' src=" + data1.data[idx].HFilePath + " />"
                                });
                            });

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



            //以上是layui模块
        });


        //#region ä¸‹è½½å·²ä¸Šä¼ çš„文件
        function dowload(r) {
            //得到当前所在行
            var rows = r.parentNode.parentNode.rowIndex;
            //得到所在行的第五列的内容:文件地址
            var url = $("#ProImgByList tr:eq(" + (rows - 1) + ") td:eq(6)").html();
            /*window.location.href = url;*/
            window.open(url)
        }
        //#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() + '/Cj_StationOutBill/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


        //返回仓库
        function GetHWHValue(obj) {
            $("#HWhName").val(obj[0].HName);

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

@@ -93,7 +93,7 @@
                        </div>
                        <div class="layui-card-body">
                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
                                <h1 style="text-align:center;"><b>异常反馈签到单</b></h1>
                                <h1 style="text-align:center;"><b>异常反馈验收单</b></h1>
                                <div class="layui-tab-content">
                                    <div class="layui-tab layui-tab-card">
                                        <ul class="layui-tab-title">

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

@@ -93,7 +93,7 @@
                        </div>
                        <div class="layui-card-body">
                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
                                <h1 style="text-align:center;"><b>异常反馈签到单</b></h1>
                                <h1 style="text-align:center;"><b>异常反馈处理单</b></h1>
                                <div class="layui-tab-content">
                                    <div class="layui-tab layui-tab-card">
                                        <ul class="layui-tab-title">

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

@@ -532,7 +532,8 @@
                        data: {
                            "HInterID": linterid,
                            "HEntryID": HEntryID,
                            "user": sessionStorage["HUserName"]
                            "user": sessionStorage["HUserName"],
                            "num": 1
                        },
                        dataType: "json",
                        success: function (data) {

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

@@ -100,7 +100,6 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>反关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop"><i class="layui-icon layui-icon-radio"></i>作废</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>反作废</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-XTSign"><i class="layui-icon layui-icon-radio"></i>下推异常反馈签到单</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-XTHand"><i class="layui-icon layui-icon-radio"></i>下推异常反馈处理单</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
@@ -205,10 +204,7 @@
                    case 'btn-DeDrop':
                        set_DropBill(1);
                        break;
                    //下推异常反馈签到按钮
                    case 'btn-XTSign':
                        set_XTSign();
                        break;
                  
                    //下推异常反馈处理按钮
                    case 'btn-XTHand':
                        set_XTHand();
@@ -474,27 +470,7 @@
            }
            //#endregion

            //下推异常反馈签到单
            function set_XTSign() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HInterID = data[0].hmainid.toString();
                    layer.open({
                        type: 2
                        , skin: 'layui-layer-rim' //加上边框
                        , area: ['100%', '100%']
                        , title: '新增异常反馈签到单'
                        , shift: 0//弹出动画
                        , content: '../../生产管理/异常反馈单/OA_ErrMsgBackSignBillMain.html?OperationType=2&linterid=' + HInterID + '&HEntryID=&HSouceBillType=' + 4529 + ''
                        , btn: [],
                        end: function (index, layero, that) {
                            //刷新页面
                            $("#btnSearch").trigger('click');
                        }
                    })
                }
            }
           

            //下推异常反馈处理单
            function set_XTHand() {

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

@@ -105,7 +105,6 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-XTReceive" id="btn-XTReceive"><i class="layui-icon layui-icon-radio"></i>下推异常反馈接收单</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-XTReceive" id="btn-XTHand"><i class="layui-icon layui-icon-radio"></i>下推异常反馈处理单</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-XTSign-in" id="btn-XTSign-in"><i class="layui-icon layui-icon-radio"></i>下推异常反馈签到单</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Test" id="btn-Test" style="display:none;"><i class="layui-icon layui-icon-circle"></i>验证</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
@@ -193,9 +192,7 @@
                    //下推异常反馈接收单
                    case 'btn-XTReceive': set_XTReceive();
                        break;
                    //下推异常反馈处理单
                    case 'btn-XTHand': set_XTHand();
                        break;
                  
                    //下推异常反馈签到单
                    case 'btn-XTSign-in': set_XTSign();
                        break;
@@ -553,29 +550,7 @@
                }
            }

            //下推异常反馈处理单
            function set_XTReceive() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HInterID = data[0].HInterID.toString();
                    var HEntryID = data[0].HEntryID.toString();
                    layer.open({
                        type: 2
                        , skin: 'layui-layer-rim' //加上边框
                        , area: ['100%', '100%']
                        , title: '新增异常反馈处理单'
                        , shift: 0//弹出动画
                        , content: '../../生产管理/异常反馈单/OA_ErrMsgBackHandleBillMain.html?OperationType=2&linterid=' + HInterID + '&HEntryID=' + HEntryID + '&HSouceBillType=' + 4502 + ''
                        , btn: [],
                        end: function (index, layero, that) {
                            //刷新页面
                            $("#btnSearch").trigger('click');
                        }
                    })
                }
            }

        
            //下推异常反馈签到单
            function set_XTSign() {
                var checkStatus = table.checkStatus('mainTable')

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

@@ -633,7 +633,7 @@
            $.ajax({
                url: GetWEBURL() + "/MES_SampleRecordBill_PDA/SampleRecordBillHBarCode_KeyDown",
                type: "GET",
                data: { "HBarCode": HBarCode, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"], "HBillType": "" },
                data: { "HBarCode": HBarCode, "HInterID": $('#HProcExchHinteID').val(), "UserID": sessionStorage["Czybm"], "HBillType": "7505" },
                success: function (result) {
                    if (result.count == 1) {
                        var data = result.data[0];

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

@@ -780,7 +780,7 @@
                            url: GetWEBURL() + "LEMS/Gy_RoutingBillList",
                            async: true,
                            data: {
                                "sWhere": "and HMaterID=" + $("#HMaterID2").val() + " and HOrgID = " + sessionStorage["OrganizationID"] + " and HMainProcID=0 "
                                "sWhere": "and HMaterID=" + $("#HMaterID2").val() + " and HOrgID = " + sessionStorage["OrganizationID"] + " and HMainProcID=0  and é»˜è®¤å·¥è‰º='1' "
                                , "user": sessionStorage["HUserName"]
                            },
                            success: function (result) {