不良评审申请单,对不良数量增加保存前验证,异常反馈单,生产质量汇报单,设备故障登记单 增加字段

zrg

2024-07-24 8e9cd08b9b022ef1adba208aedcd9ed6e1aff005

不良评审申请单,对不良数量增加保存前验证,异常反馈单,生产质量汇报单,设备故障登记单 增加字段

 WebTM/WebTM.csproj.user

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

 WebTM/views/Éú²ú¹¤Ðò¹ÜÀí/Ôö¼Ó²»Á¼ÆÀÉóµ¥/QC_NoPassProdRequestBillMain.html

@@ -1117,6 +1117,10 @@
                layer.msg("接收人不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if ($("#HUnRightQty").val() == '' || $("#HUnRightQty").val() == null) {
                layer.msg("不良数量不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
           
           
            return Result;

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

@@ -101,7 +101,7 @@
                                            <li class="layui-this">基本信息</li>
                                            <li>制单信息</li>
                                        </ul>
                                        <div class="layui-tab-content" style="height: 700px;">
                                        <div class="layui-tab-content" style="height: 900px;">
                                            <div class="layui-tab-item layui-show">
                                                <div class="layui-form-item">
                                                    <div class="layui-inline">
@@ -121,7 +121,7 @@
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">主题:<label style="color:red"> * </label></label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HContext" lay-verify="HContext" id="HContext" autocomplete="off" readonly>
                                                            <input class="layui-input" name="HContext" lay-verify="HContext" id="HContext" autocomplete="off" >
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
@@ -184,31 +184,72 @@
                                                        </div>
                                                    </div>
                                                    <!--<div class="layui-inline">
                                                        <label class="layui-form-label">转发至:</label>
            <label class="layui-form-label">转发至:</label>
            <div class="layui-input-inline">
                <input type="text" name="HReTransmitMan" id="HReTransmitMan" class="layui-input" value="" style="float:left;width:150px;" disabled>
                <button type="button" lay-submit="" class="layui-btn" lay-filter="HReTransmitManList" id="HReTransmitManList" style="width:40px;">
                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                </button>
            </div>
        </div>-->
                                                </div>
                                                <div class="layui-form-item">
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">责任人:<label style="color:red"> * </label></label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" name="HReTransmitMan" id="HReTransmitMan" class="layui-input" value="" style="float:left;width:150px;" disabled>
                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HReTransmitManList" id="HReTransmitManList" style="width:40px;">
                                                            <input type="text" name="HBadProcManName" id="HBadProcManName" class="layui-input" value="" style="float:left;width:150px;" disabled>
                                                            <input type="hidden" name="HBadProcMan" id="HBadProcMan" class="layui-input" value="0">
                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HBadProcManList" id="HBadProcManList" style="width:40px;">
                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                            </button>
                                                        </div>
                                                    </div>-->
                                                </div>
                                                <!--<div class="layui-form-item">
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">发送类型:</label>
                                                        <label class="layui-form-label">QE责任人 :<label style="color:red"> * </label></label>
                                                        <div class="layui-input-inline">
                                                            <select name="HSendType" lay-filter="HSendType" id="HSendType">
                                                                <option value="0" selected="selected">公共</option>
                                                                <option value="1">个人</option>
                                                            </select>
                                                            <input type="text" name="HQEManName" id="HQEManName" class="layui-input" value="" style="float:left;width:150px;" disabled>
                                                            <input type="hidden" name="HQEMan" id="HQEMan" class="layui-input" value="0">
                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HQEManList" id="HQEManList" style="width:40px;">
                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                            </button>
                                                        </div>
                                                    </div>
                                                </div>-->
                                                    <div class="layui-inline">
                                                        <div class="layui-inline">
                                                            <label class="layui-form-label">问题来源:</label>
                                                            <div class="layui-input-inline">
                                                                <select name="HForm" lay-filter="HForm" id="HForm">
                                                                    <option value="人" selected="selected">人</option>
                                                                    <option value="机">机</option>
                                                                    <option value="料">料</option>
                                                                    <option value="法">法</option>
                                                                    <option value="环">环</option>
                                                                    <option value="测">测</option>
                                                                </select>
                                                            </div>
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">变化点:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" name="HChangeNote" id="HChangeNote" class="layui-input" value="" autocomplete="off">
                                                        </div>
                                                    </div>
                                                </div>

                                                <div class="layui-form-item">
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">详细类容:<label style="color:red"> * </label></label>
                                                        <label class="layui-form-label">详细内容:<label style="color:red"> * </label></label>
                                                        <div class="layui-input-inline">
                                                            <textarea placeholder="请输入详细内容" class="layui-textarea" name="HDescription" id="HDescription" style="width:1080px;"></textarea>
                                                        </div>
                                                    </div>
                                                </div>
                                                <div class="layui-form-item">
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">预防纠正措施 :</label>
                                                        <div class="layui-input-inline">
                                                            <textarea placeholder="请输入预防纠正措施 " class="layui-textarea" name="HNote" id="HNote" style="width:1080px;"></textarea>
                                                        </div>
                                                    </div>
                                                </div>
@@ -248,17 +289,23 @@
                                                </div>
                                                <div class="layui-form-item">
                                                    <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="HMainSourceBillNo" lay-verify="HMainSourceBillNo" id="HMainSourceBillNo" disabled autocomplete="off">
                                                            <input id="HMainSourceInterID" name="HMainSourceInterID" value="0" type="hidden" />
                                                            <input id="HMainSourceEntryID" name="HMainSourceEntryID" value="0" type="hidden" />
                                                            <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="float: left; width: 150px;" readonly>
                                                            <input type="hidden" value="0" name="HSourceID" id="HSourceID">
                                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="width: 40px; padding: 0 10px;">
                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                            </button>
                                                        </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="HMainSourceBillType" lay-verify="HMainSourceBillType" id="HMainSourceBillType" disabled autocomplete="off">
                                                            <input type="text" class="layui-input" name="HShiftsName" id="HShiftsName" style="float: left; width: 150px;" readonly>
                                                            <input type="hidden" value="0" name="HShiftsID" id="HShiftsID">
                                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="BtnHShiftsName" id="BtnHShiftsName" style="width: 40px; padding: 0 10px;">
                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                            </button>
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
@@ -294,6 +341,20 @@
                                                        <div class="layui-input-inline">
                                                            <input type="text" name="HHandleEmpName" id="HHandleEmpName" class="layui-input" value="" style="float:left;" disabled>
                                                            <input type="hidden" name="HHandleEmpID" id="HHandleEmpID" class="layui-input" value="0" style="float:left;">
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">源单单号:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HMainSourceBillNo" lay-verify="HMainSourceBillNo" id="HMainSourceBillNo" disabled autocomplete="off">
                                                            <input id="HMainSourceInterID" name="HMainSourceInterID" value="0" type="hidden" />
                                                            <input id="HMainSourceEntryID" name="HMainSourceEntryID" value="0" type="hidden" />
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">源单类型:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HMainSourceBillType" lay-verify="HMainSourceBillType" id="HMainSourceBillType" disabled autocomplete="off">
                                                        </div>
                                                    </div>
                                                </div>
@@ -535,7 +596,7 @@
                });
            }

            //#region   æŠ¥å·¥å°æŒ‘战 è‡ªåŠ¨å¸¦å‡ºæ•°æ® 
            //#region   æŠ¥å·¥å°æŒ‘战 è‡ªåŠ¨å¸¦å‡ºæ•°æ®

            //获取报工台跳转信息  ç‰©æ–™ æ•°é‡
            function set_Sc_ICMOBillStatus() {
@@ -618,7 +679,7 @@
                                    $("#HSendMan").val(sessionStorage["HUserName"]);   //发送人
                                    $("#HReceiveMan ").val(LoadData[0].用户名称); //接收人
                                }
                               

                            }
                            else {
                                layer.alert(data.Message, { icon: 5 });
@@ -639,13 +700,13 @@
                        url: GetWEBURL() + "/Sc_MESTransFerWorkBill/set_EquipFile", //方法所在页面和方法名
                        async: false,
                        data: {
                            "HSourceName": HSourceName  
                            "HSourceName": HSourceName
                        },
                        success: function (data) {
                            if (data.count == 1)// è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            {
                                var LoadData = data.data;
                               EquipNumber=LoadData[0].设备编码; //产品名称
                                EquipNumber = LoadData[0].设备编码; //产品名称
                            }
                            else {
                                layer.alert(data.Message, { icon: 5 });
@@ -667,7 +728,7 @@
                //初始基本信息赋值
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //单据日期
                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //制单日期
                $("#HMaker").val(sessionStorage["HUserName"]);     //制单人               
                $("#HMaker").val(sessionStorage["HUserName"]);     //制单人
                $("#HDeptID").val(sessionStorage["HDeptID"]);  //部门ID
                $("#HDeptName").val(sessionStorage["HDept"]);  //部门
            }
@@ -756,6 +817,17 @@
                                , "HHandleEmpName": data.HHandleEmpName
                                , "HMaterModel": data.HMaterModel
                                , "HQty": data.HQty
                                , "HForm": data.HForm
                                , "HChangeNote": data.HChangeNote
                                , "HNote": data.HNote
                                , "HBadProcMan": data.HBadProcMan
                                , "HBadProcManName": data.HBadProcManName
                                , "HQEMan": data.HQEMan
                                , "HQEManName": data.HQEManName
                                , "HSourceID": data.HSourceID
                                , "HSourceName": data.HSourceName
                                , "HShiftsID": data.HShiftsID
                                , "HShiftsName": data.HShiftsName
                                , "HDescription": data.HDescription
                                , "HRemark": data.HRemark
                                , "HMaker": data.HMaker                            //制单人
@@ -779,7 +851,7 @@
                        layer.alert("发生错误!", { icon: 5 });
                    }
                });
            }        
            }

            //获取下拉选中值
            form.on('select(SourceType)', function (data) {
@@ -1107,6 +1179,82 @@
                });
            });

            //责任人弹窗
            form.on('submit(HBadProcManList)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '发送人列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../基础资料/公用基础资料/Gy_EmployeeList.html?Type=HSecManager', '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('请选择数据');
                        }
                        $("#HBadProcManName").val(checkStatus.data[0].职员名称);
                        $("#HBadProcMan").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {

                    },
                    success: function (layero, index) {

                    }
                });
            });

            //QE责任人弹窗
            form.on('submit(HQEManList)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '发送人列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['80%', '80%'],
                    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('请选择数据');
                        }
                        $("#HQEManName").val(checkStatus.data[0].职员名称);
                        $("#HQEMan").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(HReTransmitManList)', function () {
                //页面层-自定义
@@ -1154,6 +1302,59 @@

                    }
                });
            });

            //生产班次
            form.on('submit(BtnHShiftsName)', function (data) {
                layer.open({
                    type: 2
                    , area: ['80%', '80%']
                    , title: '生产班次列表'
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式，-1不开启
                    , content: ['../../基础资料/生产基础资料/Gy_ShiftsList.html?', '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('请选择数据');
                        }
                        $("#HShiftsID").val(checkStatus.data[0].HItemID);
                        $("#HShiftsName").val(checkStatus.data[0].班次名称);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                })
            });

            //选择生产资源弹窗
            form.on('submit(ProductionResources-BT)', function () {//生产资源
                layer.open({
                    type: 2
                    , area: ['80%', '80%']
                    , title: '生产资源'
                    , shade: 0.6 //遮罩透明度
                    //, maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式，-1不开启
                    , content: ['../../基础资料/生产基础资料/Gy_Source.html', 'yes']
                    , resize: false
                    , 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('请选择数据');
                        }
                        $("#HSourceName").val(checkStatus.data[0].生产资源名称);
                        $("#HSourceID").val(checkStatus.data[0].HItemID);
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , cancel: function (index, layero) {
                    }
                })
            });


@@ -1231,6 +1432,16 @@
            $("#HSendMan").val(obj[0].职员名称);
        }

        function GetHManagerValue(obj) {  //QE责任人
            $("#HQEManName").val(obj[0].职员名称);
            $("#HQEMan").val(obj[0].HItemID);
        }

        function GetHSecManagerValue(obj) {  //责任人
            $("#HBadProcManName").val(obj[0].职员名称);
            $("#HBadProcMan").val(obj[0].HItemID);
        }

        function GetHDeptNameValue(obj) {  //部门
            if (HDeptType == 1) {
                $("#HDeptName").val(obj[0].部门名称);

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

@@ -15,6 +15,7 @@
    <script src="../../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../../layuiadmin/PageTitle.js"></script>
    <!--<script src="../../../../layuiadmin/modules/soulTable.js"></script>-->
</head>
<body>
    <div class="layui-fluid">
@@ -172,13 +173,14 @@
            base: '../../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index', //主入口模块
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
            //#region å…¬ç”¨å˜é‡
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , soulTable = layui.soulTable
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate

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

@@ -252,8 +252,13 @@
    <!--行下拉选择(判定结果)-->
    <script type="text/html" id="HResult">
        <select name="HResult" lay-filter="HResult" id="HResult{{d.LAY_TABLE_INDEX+1}}">
            <!--<option value="不良">不良</option>-->
            <option value="报废">报废</option>
            <option value="返工">返工</option>
            <option value="特采">特采</option>
            <option value="放行">放行</option>
            <option value="工废">工废</option>
            <option value="料废">料废</option>
             <option value="样件保留">样件保留</option>
        </select>
    </script>
    <script>
@@ -419,6 +424,8 @@
                    "规格型号": "",
                    "HPRocID": "0",
                    "工序": "",
                    "HBadProcID": "0",
                    "责任工序": "",
                    "HUnitID": "0",
                    "计量单位": "",
                    "HQty": "0",
@@ -635,6 +642,8 @@
                        , { field: '规格型号', title: '规格型号', width: 100, style: "background-color:#efefef4d;" }
                        , { field: 'HProcID', title: 'HProcID', width: 100, style: "background-color:#efefef4d;", hide: true }
                        , { field: '工序', title: '工序', width: 150 }
                        , { field: 'HBadProcID', title: 'HBadProcID', width: 100, style: "background-color:#efefef4d;", hide: true }
                        , { field: '责任工序', title: '责任工序', width: 150, event: "HBadProcID", edit: 'text' }
                        , { field: 'HUnitID', title: 'HUnitID', width: 100, style: "background-color:#efefef4d;", hide: true }
                        , { field: '计量单位', title: '计量单位', width: 100, style: "background-color:#efefef4d;" }//f7
                        , { field: 'HQty', title: '数量', width: 100, totalRow: true, edit: 'text' }
@@ -692,6 +701,8 @@
                    "规格型号": "",
                    "HPRocID": "0",
                    "工序": "",
                    "HBadProcID": "0",
                    "责任工序": "",
                    "HUnitID": "0",
                    "计量单位": "",
                    "HQty": "0",
@@ -803,6 +814,8 @@
                                        "HUnitID": data.HUnitID,
                                        "计量单位": data.计量单位,
                                        "HQty": data.数量,
                                        "HBadProcID": data.HBadProcID,
                                        "责任工序": data.责任工序,
                                        "HResult": data.判定结果,
                                        "HEmpID": data.HEmpID,
                                        "检验员": data.检验员,
@@ -985,6 +998,8 @@
                                        "HQty": result.data[i]["生产任务单数量"],
                                        "HSourceID": "0",
                                        "生产资源": "",
                                        "HBadProcID": "0",
                                        "责任工序": "",

                                        "HRemark": "",
                                        "HProcExchInterID": "0",
@@ -1584,7 +1599,37 @@
                                }
                            })
                        }
                        //物料
                        if (obj.event == "HBadProcID") {
                            layer.open({
                                type: 2
                                , skin: "layui-layer-rim" //加上边框
                                , title: "责任工序列表"  //标题
                                , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                                , shift: 2 //弹出动画
                                , area: ["90%", "90%"] //窗体大小
                                , maxmin: true //设置最大最小按钮是否显示
                                , content: ['../../../基础资料/生产基础资料/Gy_Process.html', 'yes']
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调
                                    var iframeWindow = window["layui-layer-iframe" + index];//获取弹框页面
                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//获取选中的数据

                                    if (checkStatus.data.length != 1) {
                                        return layer.msg("请选择一条数据");
                                    }
                                    //更新表格缓存的数据
                                    obj.update({
                                        "HBadProcID": checkStatus.data[0].HItemID
                                        , "责任工序": checkStatus.data[0].工序名称
                                    })
                                    layer.close(index);//关闭弹窗
                                }
                                , end: function () {                                    
                                }
                            })
                        }
                        obj.event = "";
                        return false;
                    }

 WebTM/views/É豸¹ÜÀí/Sb_Add_EqpConkBookBillList.html

@@ -123,14 +123,32 @@
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 85px;">紧急程度</label>
                                                <div class="layui-input-block" style="margin-left: 120px;width:180px">
                                                    <select name="HLev" id="HLev" lay-filter="HLev">
                                                        <option value="普通" selected="">普通</option>
                                                        <option value="重要" >重要</option>
                                                        <option value="紧急">紧急</option>
                                                    </select>
                                                </div>
                                            </div>                                           
                                        </div>
                                        <div class="layui-form-item">     
                                            <div class="layui-inline">
                                                <label class="layui-form-label">故障原因分析及预防措施</label>
                                                <div class="layui-input-inline" style="width:300px;">
                                                    <textarea placeholder="请输入故障原因分析及预防措施" class="layui-textarea" name="HReason" id="HReason"></textarea>
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">摘要</label>
                                                <div class="layui-input-inline">
                                                <div class="layui-input-inline" style="width:300px;">
                                                    <textarea placeholder="请输入摘要" class="layui-textarea" name="HExplanation" id="HExplanation"></textarea>
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">备注</label>
                                                <div class="layui-input-inline">
                                                <div class="layui-input-inline" style="width:300px;">
                                                    <textarea placeholder="请输入备注" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
                                                </div>
                                            </div>
@@ -480,6 +498,8 @@
                                , "HConkTypeName": data.故障类别          //故障类别
                                , "HConkBeginDate": formatDate(data.发生日期) //故障发生日期
                                , "HExplanation": data.故障描述           //摘要
                                , "HLev": data.紧急程度                //备注
                                , "HReason": data.故障原因分析及预防措施                //备注
                                , "HRemark": data.表头备注                //备注

                            });

 WebTM/views/ÖÊÁ¿¹ÜÀí/¼ìÑéÈ¡Ñù»¹Ñùµ¥/QC_Add_TakeSampleCheckBill.html

@@ -254,7 +254,39 @@
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">取样数量:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HQty" lay-verify="HQty" id="HQty" autocomplete="off">
                                                            <input class="layui-input" name="HQty" lay-verify="HQty" id="HQty" value="0" autocomplete="off">
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">破坏性实验数量:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HSampleDamageQty" lay-verify="HSampleDamageQty" id="HSampleDamageQty" value="0" autocomplete="off">
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">报废内容</label>
                                                        <div class="layui-input-inline" style="width:300px;height:15px">
                                                            <textarea placeholder="请输入报废内容" class="layui-textarea" name="HBadNote" id="HBadNote"></textarea>
                                                        </div>
                                                    </div>
                                                </div>
                                                <div class="layui-form-item">                                                   
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">产品单重1:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HProdWeight1" lay-verify="HProdWeight1" id="HProdWeight1" value="0" autocomplete="off">
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">产品单重2:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HProdWeight2" lay-verify="HProdWeight2" id="HProdWeight2" value="0" autocomplete="off">
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">产品单重3:</label>
                                                        <div class="layui-input-inline">
                                                            <input class="layui-input" name="HProdWeight3" lay-verify="HProdWeight3" id="HProdWeight3" value="0" autocomplete="off">
                                                        </div>
                                                    </div>
                                                </div>
@@ -589,6 +621,11 @@
                                , "HCheckEmp": data[0]["HCheckEmp"]                   //取样员ID
                                , "HCheckEmpName": data[0]["取样员"]           //取样员
                                , "HQty": data[0]["取样数量"]           //取样数量
                                , "HSampleDamageQty": data[0]["破坏性实验数量"]           //破坏性实验数量
                                , "HBadNote": data[0]["报废内容"]           //报废内容
                                , "HProdWeight1": data[0]["产品单重1"]           //产品单重1
                                , "HProdWeight2": data[0]["产品单重2"]           //产品单重2
                                , "HProdWeight3": data[0]["产品单重3"]           //产品单重3
                                , "HGroupID": data[0]["HGroupID"]                //班组ID
                                , "HGroupName": data[0]["生产班组"]              //班组名称
                                , "HShiftsID": data[0]["HShiftsID"]                //班次ID
@@ -712,7 +749,7 @@
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../../基础资料/公用基础资料/Gy_Material.html', 'yes'],
                    content: ['../../基础资料/公用基础资料/Gy_Material.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {

@@ -752,7 +789,7 @@
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../../基础资料/生产基础资料/Gy_Source.html', 'yes'],
                    content: ['../../基础资料/生产基础资料/Gy_Source.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {