出站单优化，模具管理证据字段负责人，报工台页面显示优化

zrg

2026-01-26 7e8ebf852f6ebc05eddc0c45b427240f34323472

出站单优化，模具管理证据字段负责人，报工台页面显示优化

 WebTM/WebTM.csproj.user

@@ -3,7 +3,7 @@
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>D:\智云迈思\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\工作代码\智云迈思\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <ProjectView>ShowAllFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />

 WebTM/layuiadmin/layui/css/ReportPlatform.css

@@ -228,3 +228,71 @@
    float: left;
    top: 6px;
}

/* èµ„源绑定区域的容器样式 */
.cnt1 {
    border: 1px solid #5FB878;
    height: 60px;
    border-radius: 5px;
    position: relative; /* æ·»åŠ ç›¸å¯¹å®šä½ */
}

/* æ·»åŠ æŒ‰é’®ï¼ˆ+）样式 */
.imgicon0 {
    height: 100px;
    display: block;
    text-align: center;
    margin: 0.2em auto;
    width: 100px;
    cursor: pointer; /* é¼ æ ‡å˜æˆæ‰‹æŒ‡æ ·å¼ */
}

/* é’ˆå¯¹åŽèˆŸç»„织的特殊样式 */
.cnt1 .imgicon0 {
    /* è°ƒæ•´ä½ç½®å’Œå¤§å°ä»¥é€‚应60px高度的容器 */
    font-size: 40px; /* å‡å°å›¾æ ‡å¤§å° */
    height: 60px; /* è°ƒæ•´é«˜åº¦ */
    width: 60px; /* è°ƒæ•´å®½åº¦ */
    line-height: 60px; /* åž‚直居中 */
    margin: 0 auto; /* æ°´å¹³å±…中 */
}

/* å…¶ä»–组织的样式 */
.cnt .imgicon0 {
    /* 150px高度容器的样式 */
    font-size: 60px;
    height: 150px;
    width: 150px;
    line-height: 150px;
    margin: 0 auto;
}

.imgicon0:hover {
    cursor: pointer; /*鼠标变成手指样式*/
    -webkit-transition: border linear .1s, -webkit-box-shadow linear .5s;
    border-color: rgba(141, 39, 142, .75);
    -webkit-box-shadow: 0 0 18px rgba(111, 1, 32, 3);
    color: #5FB878; /* æ‚¬åœæ—¶æ”¹å˜é¢œè‰² */
    transform: scale(1.1); /* æ‚¬åœæ—¶è½»å¾®æ”¾å¤§ */
    transition: all 0.3s ease; /* å¹³æ»‘过渡效果 */
}

/* å¯ä»¥æ·»åŠ ä¸€ä¸ªä¸“门的加号按钮样式类 */
.add-icon-container {
    display: flex;
    align-items: center;
    justify-content: center;
    width: 100%;
    height: 100%;
}

    .add-icon-container .layui-icon-addition {
        font-size: 40px;
        color: #5FB878;
    }

    .add-icon-container:hover .layui-icon-addition {
        color: #13ad4c;
        transform: rotate(90deg); /* æ‚¬åœæ—¶æ—‹è½¬æ•ˆæžœ */
        transition: all 0.3s ease;
    }

 WebTM/views/IpadIndex.html

@@ -20,6 +20,7 @@
    <script src="../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../layuiadmin/zgqCustom/zgqCustom.js"></script>


    <script>
        var wktag = 0;
        var workcode = "";          //工单号
@@ -89,71 +90,131 @@
                    {
                        HSBName = LoadData[0].HSourceName;
                        for (var i = 1; i <= LoadData.length + 1; i++) {
                            if (i <= LoadData.length) {
                                var html1 = '';
                                html1 += '<div class="layui-col-sm12 layui-col-md3">';
                                html1 += '<div class="cnt ctop" id="ts' + i + '" onclick="Check(this,' + i + ')">';
                                html1 += '<dl>';
                                html1 += '<dd>';
                                html1 += '<h1 style="display:none;"><span>资源ID：</span><span id="eqpid' + i + '">' + LoadData[i - 1].HSourceID + '</span></h1>';
                                html1 += '<h1><span>设备编号：</span><span id="eqp' + i + '">' + LoadData[i - 1].HSourceName + '</span></h1>';
                                html1 += '<h1><span>设备代码：</span><span id="eqp' + i + '">' + LoadData[i - 1].HSourceNumber + '</span></h1>';
                                html1 += '<h1><span>操作员：</span><span id="HEmpName' + i + '">' + LoadData[i - 1].HUserName + '</span></h1>';
                                html1 += '<h1><span>生产班组：</span><span id="HGroupName' + i + '">' + LoadData[i - 1].GroupName + '</span></h1>';
                                //html1 += '<h1><span>当前工单：</span><span id="po' + i + '">' + (LoadData[i - 1].HSourceBillNo == null ? '' : LoadData[i - 1].HSourceBillNo) + '</span></h1>';
                                //html1 += '<h1><span>产品名称：</span><span id="ptn' + i + '">' + (LoadData[i - 1].HName == null ? '' : LoadData[i - 1].HName) + '</span></h1>';
                                //html1 += '<h1><span>产品规格：</span><span id="pts' + i + '">' + (LoadData[i - 1].HModel == null ? '' : LoadData[i - 1].HModel) + '</span></h1>';
                                html1 += '<h1><span>负责人：</span><span id="us' + i + '">' + LoadData[i - 1].HEmpName + '</span></h1>';
                                switch (LoadData[i - 1].HStatus) {
                                    case "空闲":
                                        html1 += '<h1><span>当前状态：</span><span class="gj_icon color_border6"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
                                        break;
                                    case "开机":
                                        html1 += '<h1><span>当前状态：</span><span class="gj_icon color_border4"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
                                        break;
                                    case "停机":
                                        html1 += '<h1><span>当前状态：</span><span class="gj_icon color_border3"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
                                        break;
                                    case "生产":
                                        html1 += '<h1><span>当前状态：</span><span class="gj_icon color_border2"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
                                        break;
                                    case "维修进行中":
                                        html1 += '<h1><span>当前状态：</span><span class="gj_icon color_border5"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
                                        break;
                                    case "维修结束":
                                        html1 += '<h1><span>当前状态：</span><span class="gj_icon color_border1"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
                                        break;
                                    case "维修终止":
                                        html1 += '<h1><span>当前状态：</span><span class="gj_icon color_border1"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
                                        break;
                                    default:
                                }
                                html1 += '<h1 hidden> <span id="HGroupID' + i + '">' + LoadData[i - 1].HGroupID + '</span></h1>';
                                html1 += '<h1 hidden> <span id="HManagerID' + i + '">' + LoadData[i - 1].HManagerID + '</span></h1>';
                                html1 += '</dd>';
                                html1 += '</dl>';
                                html1 += '</div>';
                                html1 += '</div>';
                                $("#topleft").append(html1);
                                $("#ts" + i + "").append('<span class="layui-icon layui-icon-delete delete"  onclick="Delete(event,this,' + i + ')"></span>'); //在当前div后追加加一个span删除
                            if (sessionStorage["Organization"] == "宁波市华舟包装有限公司") {
                                if (i <= LoadData.length) {
                                    var html1 = '';
                                    html1 += '<div class="layui-col-sm12 layui-col-md2">';
                                    html1 += '<div class="cnt1 ctop" id="ts' + i + '" onclick="Check(this,' + i + ')">';
                                    html1 += '<dl>';
                                    html1 += '<dd>';
                                    html1 += '<h1 style="display:none;"><span>资源ID：</span><span id="eqpid' + i + '">' + LoadData[i - 1].HSourceID + '</span></h1>';
                                    html1 += '<h1><span>设备编号：</span><span id="eqp' + i + '">' + LoadData[i - 1].HSourceName + '</span></h1>';
                                    html1 += '<h1><span>设备代码：</span><span id="eqp' + i + '">' + LoadData[i - 1].HSourceNumber + '</span></h1>';
                                    switch (LoadData[i - 1].HStatus) {
                                        case "空闲":
                                            html1 += '<h1><span>当前状态：</span><span class="gj_icon color_border6"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
                                            break;
                                        case "开机":
                                            html1 += '<h1><span>当前状态：</span><span class="gj_icon color_border4"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
                                            break;
                                        case "停机":
                                            html1 += '<h1><span>当前状态：</span><span class="gj_icon color_border3"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
                                            break;
                                        case "生产":
                                            html1 += '<h1><span>当前状态：</span><span class="gj_icon color_border2"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
                                            break;
                                        case "维修进行中":
                                            html1 += '<h1><span>当前状态：</span><span class="gj_icon color_border5"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
                                            break;
                                        case "维修结束":
                                            html1 += '<h1><span>当前状态：</span><span class="gj_icon color_border1"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
                                            break;
                                        case "维修终止":
                                            html1 += '<h1><span>当前状态：</span><span class="gj_icon color_border1"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
                                            break;
                                        default:
                                    }
                                    html1 += '<h1 hidden> <span id="HGroupID' + i + '">' + LoadData[i - 1].HGroupID + '</span></h1>';
                                    html1 += '<h1 hidden> <span id="HManagerID' + i + '">' + LoadData[i - 1].HManagerID + '</span></h1>';
                                    html1 += '</dd>';
                                    html1 += '</dl>';
                                    html1 += '</div>';
                                    html1 += '</div>';
                                    $("#topleft").append(html1);
                                    $("#ts" + i + "").append('<span class="layui-icon layui-icon-delete delete"  onclick="Delete(event,this,' + i + ')"></span>'); //在当前div后追加加一个span删除

                                //根据返回的 é€‰ä¸­æ ‡å¿—HNowFlag设置选中的资源
                                if (LoadData[i - 1].HNowFlag) {
                                    $('.ctop').removeClass('check');  //删除不同父级clss样式相同的所有元素
                                    $("#ts" + i + "").addClass('check'); // æ·»åŠ å½“前元素的样式
                                    Check(this, i);
                                    //根据返回的 é€‰ä¸­æ ‡å¿—HNowFlag设置选中的资源
                                    if (LoadData[i - 1].HNowFlag) {
                                        $('.ctop').removeClass('check');  //删除不同父级clss样式相同的所有元素
                                        $("#ts" + i + "").addClass('check'); // æ·»åŠ å½“前元素的样式
                                        Check(this, i);
                                    }
                                }
                                else {
                                    var html1 = '';
                                    html1 += '<div class="layui-col-sm12 layui-col-md2">';
                                    html1 += '<div class="cnt1 ctop" id="ts' + i + '" onclick="Check(this,' + i + ')">';
                                    html1 += '<span class="layui-icon layui-icon-addition imgicon0" onclick="Add(event,this,' + i + ')"></span>';
                                    html1 += '</div>';
                                    html1 += '</div>';
                                    $("#topleft").append(html1);

                                }
                            } else {
                                if (i <= LoadData.length) {
                                    var html1 = '';
                                    html1 += '<div class="layui-col-sm12 layui-col-md3">';
                                    html1 += '<div class="cnt ctop" id="ts' + i + '" onclick="Check(this,' + i + ')">';
                                    html1 += '<dl>';
                                    html1 += '<dd>';
                                    html1 += '<h1 style="display:none;"><span>资源ID：</span><span id="eqpid' + i + '">' + LoadData[i - 1].HSourceID + '</span></h1>';
                                    html1 += '<h1><span>设备编号：</span><span id="eqp' + i + '">' + LoadData[i - 1].HSourceName + '</span></h1>';
                                    html1 += '<h1><span>设备代码：</span><span id="eqp' + i + '">' + LoadData[i - 1].HSourceNumber + '</span></h1>';
                                    html1 += '<h1><span>操作员：</span><span id="HEmpName' + i + '">' + LoadData[i - 1].HUserName + '</span></h1>';
                                    html1 += '<h1><span>生产班组：</span><span id="HGroupName' + i + '">' + LoadData[i - 1].GroupName + '</span></h1>';
                                    html1 += '<h1><span>负责人：</span><span id="us' + i + '">' + LoadData[i - 1].HEmpName + '</span></h1>';
                                    switch (LoadData[i - 1].HStatus) {
                                        case "空闲":
                                            html1 += '<h1><span>当前状态：</span><span class="gj_icon color_border6"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
                                            break;
                                        case "开机":
                                            html1 += '<h1><span>当前状态：</span><span class="gj_icon color_border4"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
                                            break;
                                        case "停机":
                                            html1 += '<h1><span>当前状态：</span><span class="gj_icon color_border3"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
                                            break;
                                        case "生产":
                                            html1 += '<h1><span>当前状态：</span><span class="gj_icon color_border2"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
                                            break;
                                        case "维修进行中":
                                            html1 += '<h1><span>当前状态：</span><span class="gj_icon color_border5"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
                                            break;
                                        case "维修结束":
                                            html1 += '<h1><span>当前状态：</span><span class="gj_icon color_border1"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
                                            break;
                                        case "维修终止":
                                            html1 += '<h1><span>当前状态：</span><span class="gj_icon color_border1"></span><span>' + LoadData[i - 1].HStatus + '</span></h1>';
                                            break;
                                        default:
                                    }
                                    html1 += '<h1 hidden> <span id="HGroupID' + i + '">' + LoadData[i - 1].HGroupID + '</span></h1>';
                                    html1 += '<h1 hidden> <span id="HManagerID' + i + '">' + LoadData[i - 1].HManagerID + '</span></h1>';
                                    html1 += '</dd>';
                                    html1 += '</dl>';
                                    html1 += '</div>';
                                    html1 += '</div>';
                                    $("#topleft").append(html1);
                                    $("#ts" + i + "").append('<span class="layui-icon layui-icon-delete delete"  onclick="Delete(event,this,' + i + ')"></span>'); //在当前div后追加加一个span删除

                                    //根据返回的 é€‰ä¸­æ ‡å¿—HNowFlag设置选中的资源
                                    if (LoadData[i - 1].HNowFlag) {
                                        $('.ctop').removeClass('check');  //删除不同父级clss样式相同的所有元素
                                        $("#ts" + i + "").addClass('check'); // æ·»åŠ å½“前元素的样式
                                        Check(this, i);
                                    }
                                }
                                else {
                                    var html1 = '';
                                    html1 += '<div class="layui-col-sm12 layui-col-md3">';
                                    html1 += '<div class="cnt ctop" id="ts' + i + '" onclick="Check(this,' + i + ')">';
                                    html1 += '<span class="layui-icon layui-icon-addition imgicon0" onclick="Add(event,this,' + i + ')"></span>';
                                    html1 += '</div>';
                                    html1 += '</div>';
                                    $("#topleft").append(html1);

                                }
                            }
                            else {
                                var html1 = '';
                                html1 += '<div class="layui-col-sm12 layui-col-md3">';
                                html1 += '<div class="cnt ctop" id="ts' + i + '" onclick="Check(this,' + i + ')">';
                                html1 += '<span class="layui-icon layui-icon-addition imgicon0" onclick="Add(event,this,' + i + ')"></span>';
                                html1 += '</div>';
                                html1 += '</div>';
                                $("#topleft").append(html1);

                            }
                        }
                    }
                    else {
@@ -926,7 +987,7 @@
                end: function () {

                },
            });           
            });
        }

        //SIP ä½œä¸šæŒ‡å¯¼ä¹¦
@@ -1689,7 +1750,7 @@
            //        break;
            //    case "斯莫尔汇报":
            //        sWhere = " where HSourceID='" + HSourceID1 + "' and HSourceBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus not in('1','2')";   //是否有不为开工、停工挂起状态
            //        break;                    
            //        break;
            //}

            $.ajax({

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Gy_MouldFile.html

@@ -71,6 +71,12 @@
                                            <input type="text" class="layui-input" name="HBarCode" id="HBarCode" value="">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">位置</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" lay-verify="HLocation" name="HLocation" id="HLocation" value="">
                                        </div>
                                    </div>
                                </div>

                                <div class="layui-row" style="margin-top:10px">
@@ -168,6 +174,16 @@
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">负责人</label>
                                        <div class="layui-input-block" style="margin-left: 80px;">
                                            <input type="text" class="layui-input" name="HManagerName" id="HManagerName" style="width: 60%;display: inline-block;" readonly>
                                            <input type="hidden" class="layui-input" name="HManagerID" id="HManagerID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;">
                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHManagerList" id="btnHManagerList" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                            </button>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">品牌</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" lay-verify="HBrand" name="HBrand" id="HBrand" value="">
@@ -181,12 +197,6 @@
                                                <option value="外校">外校</option>
                                                <option value="免校">免校</option>
                                            </select>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">位置</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input" lay-verify="HLocation" name="HLocation" id="HLocation" value="">
                                        </div>
                                    </div>
                                </div>
@@ -1451,6 +1461,45 @@
            });


            //表头信息选择检验员弹窗
            form.on('submit(btnHManagerList)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '使用人列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['90%', '90%'],
                    maxmin: true,
                    content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HManager', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {

                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HManagerName").val(checkStatus.data[0].职员名称);
                        $("#HManagerID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {

                    },
                    success: function (layero, index) {

                    }
                });
            });


            //虚拟仓
            form.on('submit(HNowSupList)', function () {
                var typeid = $("#HNowSupTypeID").val();//获取虚拟仓类型
@@ -2020,6 +2069,8 @@
                        $("#HNextMainDate").val(d.data[0].校正日期);
                        $("#HUserID").val(d.data[0].HUserID);
                        $("#HUserName").val(d.data[0].使用人);
                        $("#HManagerID").val(d.data[0].HManagerID);
                        $("#HManagerName").val(d.data[0].负责人);
                        $("#HBrand").val(d.data[0].品牌);
                        $("#HCalibrationType").val(d.data[0].校准类型);
                        $("#HLocation").val(d.data[0].位置);
@@ -2870,6 +2921,10 @@
            $("#HUserName").val(obj[0].职员名称);
            $("#HUserID").val(obj[0].HItemID);
        }
        function GetHManagerValue(obj) {  //质检员
            $("#HManagerName").val(obj[0].职员名称);
            $("#HManagerID").val(obj[0].HItemID);
        }
        function GetGyMaterial(obj) {  //物料
            $("#HName").val(obj.物料名称);
            $("#HMaterNumber").val(obj.物料代码);

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

@@ -208,7 +208,7 @@
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-bottom: 15px;">
                                    <div class="layui-row" style="margin-bottom: 15px; display:none">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 65px;">穴号</label>
                                            <div class="layui-input-block" style="margin-left: 95px; width: 150px">
@@ -234,7 +234,7 @@
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-bottom: 15px;">
                                    <div class="layui-row" style="margin-bottom: 15px; display: none">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 65px;">遗失数量</label>
                                            <div class="layui-input-block" style="margin-left: 95px;">
@@ -248,7 +248,7 @@
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-bottom: 15px;">
                                    <div class="layui-row" style="margin-bottom: 15px; display: none">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 65px;">报废数量</label>
                                            <div class="layui-input-block" style="margin-left: 95px;">
@@ -262,7 +262,7 @@
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-bottom: 15px;">
                                    <div class="layui-row" style="margin-bottom: 15px; display: none">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 65px;">工废数量</label>
                                            <div class="layui-input-block" style="margin-left: 95px;">
@@ -276,7 +276,7 @@
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-bottom: 15px;">
                                    <div class="layui-row" style="margin-bottom: 15px; ">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 65px;">模具编号</label>
                                            <div class="layui-input-block" style="margin-left: 95px;">
@@ -323,7 +323,15 @@
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-bottom: 15px; text-align: center;">
                                        <div style="margin-top: 20px;">
                                            <button type="button" lay-submit="" lay-filter="Add" class="layui-btn layui-btn-radius" style="margin-right: 20px;" id="Add">新增</button>
                                            <button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius" style="margin-right: 20px;" id="Saver">保存</button>
                                            <button type="button" lay-submit="" lay-filter="Exit" class="layui-btn layui-btn-radius" id="Exit">退出</button>
                                        </div>
                                    </div>
                                </div>
                               
                            </div>
                            <div id="center" style="width: 100%; height: calc(55vh); margin-top: 1%;">
                                <div id="center-left" style="width: 30%; height: calc(40vh); float: left;">
@@ -345,7 +353,7 @@
                                    <div id="chart2" style="width: 75%; height: calc(40vh); left: 2%; float: left;"></div>
                                </div>
                            </div>
                            <div id="bottom" style="width: 100%; height: calc(20vh);">
                            <!--<div id="bottom" style="width: 100%; height: calc(20vh);">
                                <div id="bottom-left" style="width: 100%; height: calc(10vh);">
                                    <div style="text-align: left; width: 100%; height: calc(20vh); margin-left:410px ">                                       
                                        <button type="button" lay-submit="" lay-filter="Add" class="layui-btn layui-btn-radius " style="margin-left: 20%;" id="Add">新增</button>
@@ -353,7 +361,7 @@
                                        <button type="button" lay-submit="" lay-filter="Exit" class="layui-btn layui-btn-radius " style="margin-left: 5%; " id="Exit">退出</button>
                                    </div>
                                </div>
                            </div>
                            </div>-->
                        </div>
                        <div id="center-right-maintable" style="width: 34%; height: calc(135vh); float: left; margin-left: 0.2%; background-color: rgb(255 255 255) ">
                            <div class="layui-tab" lay-filter="tab-POStockInBill">
@@ -445,6 +453,29 @@
        //初始化界面
        set_ClearBill();

        //获取页面跳转参数  //单据编辑状态： 1.无源单新增   2.有源单新增   3.编辑  4.浏览  5.变更
        var params = get_UrlVars();
        if (typeof (params[params[0]]) == "undefined") {
            var OperationType = 1;//操作类型
        } else {
            var OperationType = params[params[0]];//操作类型
            var HInterID = params[params[1]];//单据内码
            var HEntry = params[params[2]];//单据子内码
        }


        var edit = function (data) {
            HSourceInterID = data[0].HSourceInterID;
            HSourceEntryID = data[0].HSourceEntryID;
            HSourceBillNo = data[0].HSourceBillNo;
            HSourceBillType = data[0].HSourceBillType;

        }

        if (OperationType==2) {
            txtHBarCode_KeyDown(HSourceBillNo);
        }

        $("#HEquipName").text(HEquipName);//设备名称
        $("#HEquipCode").text(HEquipCode);//设备编号
        $("#HEmpName").text(HEmpName);//操作员

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

@@ -68,11 +68,17 @@
                                    äº§çº¿æŸ¥è¯¢
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch_cx" id="btnReSearch_cx" style="padding:0 5px">产线重置</button>
                                <div class="layui-row" style="margin-top:10px;">
                                <div class="layui-row" style="margin-top:10px;margin-left:100px">
                                    <div class="layui-inline">
                                        <label class="layui-form-label">物料代码</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HNumber" id="HNumber">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">物料名称</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HName" id="HName">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
@@ -733,16 +739,29 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length == 1) {
                    var linterid = data[0].hmainid.toString();
                    layer.open({
                        type: 2
                        , area: ['80%', '80%']
                        , title: '打印模版选择'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: false //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + linterid.toString() + '&MyMsg=' + linterid.toString() + '&Type=Sc_ProcessExchangeArrangement', 'yes']
                        , resize: false
                    })
                    if (sessionStorage["Organization"] == "宁波市华舟包装有限公司") {
                        layer.open({
                            type: 2
                            , area: ['40%', '80%']
                            , title: '打印模版选择'
                            , shade: 0.6 //遮罩透明度
                            , maxmin: false //允许全屏最小化
                            , anim: 0 //0-6的动画形式，-1不开启
                            , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + linterid.toString() + "|" + 3 + '&MyMsg=' + linterid.toString() + '&Type=HProcessExchange', 'yes']
                            , resize: false
                        })
                    } else {
                        layer.open({
                            type: 2
                            , area: ['40%', '80%']
                            , title: '打印模版选择'
                            , shade: 0.6 //遮罩透明度
                            , maxmin: false //允许全屏最小化
                            , anim: 0 //0-6的动画形式，-1不开启
                            , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + linterid.toString() + "|" + QJQD + '&MyMsg=' + linterid.toString() + '&Type=HProcessExchange', 'yes']
                            , resize: false
                        })
                    }
                }
                else {
                    layer.msg('请选择一行数据打印！');
@@ -1100,7 +1119,6 @@


                            var dataCol = [];//数据库查询出的列数据
                           /* var titleData = ["单据ID", "HMouldID", "hsubid", "HManagerID", "源单主内码", "源单子内码"];//不需要显示的字段 å¯æ‰©å±•*/

                            dataCol = data1.data[0].HGridString.split(',');

@@ -1121,13 +1139,7 @@
                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                } else {
                                    option.cols[0][i + 1]["style"] = "font-size:100%";
                                }
                                //设置列宽
                                //if (data1.data[0].HColumnWidth != 0) {
                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
                                //} else {
                                //    option.cols[0][i + 1]["width"] = "";
                                //}
                                }                              
                                //显示列
                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                    option.cols[0][i + 1]["hide"] = false;
@@ -1186,7 +1198,6 @@


                            var dataCol = [];//数据库查询出的列数据
                            /* var titleData = ["单据ID", "HMouldID", "hsubid", "HManagerID", "源单主内码", "源单子内码"];//不需要显示的字段 å¯æ‰©å±•*/

                            dataCol = data1.data[0].HGridString.split(',');

@@ -1207,13 +1218,7 @@
                                    option2.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                } else {
                                    option2.cols[0][i + 1]["style"] = "font-size:100%";
                                }
                                //设置列宽
                                //if (data1.data[0].HColumnWidth != 0) {
                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
                                //} else {
                                //    option.cols[0][i + 1]["width"] = "";
                                //}
                                }                              
                                //显示列
                                if (dataCols[1] == 0 && $.inArray(option2.cols[0][i + 1]["title"], titleData) == -1) {
                                    option2.cols[0][i + 1]["hide"] = false;