wtt
2025-04-30 56d0239efcbb1a55435304cdbeeb5ddf54827035
工序,生产资源,工作中心,生产班组基础资料优化
7个文件已修改
149 ■■■■ 已修改文件
WebTM/views/基础资料/公用基础资料/Gy_WorkCenter_Add_Edit.html 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/工资基础资料/Gy_Group.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/工资基础资料/Gy_Group_Add_Edit.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Process.html 44 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Source.html 53 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/生产基础资料/Gy_ProcMul.html 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/检验方案单/QC_CheckProjectList.html 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_WorkCenter_Add_Edit.html
@@ -43,6 +43,7 @@
                            <ul class="layui-tab-title">
                                <li class="layui-this">基本信息</li>
                                <li>其他信息</li>
                                <li>制单信息</li>
                            </ul>
                            <div class="layui-tab-content">
                                <div class="layui-tab-item layui-show">
@@ -161,6 +162,9 @@
                                            </div>
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-tab-item">
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">创建人</label>
@@ -202,8 +206,7 @@
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                                </div>
                                <input type="hidden" value="0" name="HParentID" id="HParentID">
                            </div>
                    </div>
@@ -538,7 +541,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '部门列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_DepartmentList.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_DepartmentList.html?Type=2&HOrgName=' + sessionStorage["Organization"], 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
WebTM/views/»ù´¡×ÊÁÏ/¹¤×Ê»ù´¡×ÊÁÏ/Gy_Group.html
@@ -541,7 +541,7 @@
                            layer.close(ajaxLoad);
                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                            if ($("#ColName").find('option').length == 0) {
                                ColFilter();
                            }
                        } else {
WebTM/views/»ù´¡×ÊÁÏ/¹¤×Ê»ù´¡×ÊÁÏ/Gy_Group_Add_Edit.html
@@ -505,7 +505,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '工序列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/生产基础资料/Gy_Process.html', 'yes']
                    , content: ['../../基础资料/生产基础资料/Gy_Process.html?Type=2', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -531,7 +531,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '部门列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_DepartmentList.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_DepartmentList.html?Type=2&HOrgName=' + sessionStorage["Organization"], 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Add_Edit_Gy_Process.html
@@ -36,6 +36,7 @@
                        <div class="layui-btn-group">
                            <button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">保存</button>
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">退出</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">审核</button>
                        </div>
                    </div>
                    <div class="layui-form-item" style="padding-top: 10px;">
@@ -535,7 +536,10 @@
            form.on('submit(Cancel)', function () {
                Pub_Close(1);
            })
            //审核
            form.on('submit(set_CheckBill)', function (data) {
                set_CheckBill(data);
            });
            //是否禁用按钮
            form.on('checkbox(checkboxHStopflag)', function (data) {
                $("#HStopflag").val(data.elem.checked);
@@ -679,6 +683,34 @@
            //#region æœ¬é¡µé¢æ‰€æœ‰è¢«è°ƒç”¨çš„æ–¹æ³•
            //审核
            function set_CheckBill() {
                layer.confirm("确认要审核吗?", function (index) {
                    var HInterID = $("#HItemID").val();
                    //逻辑审核方法
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Gy_Process/AuditGy_Process", //方法所在页面和方法名
                        data: { "HInterID": HInterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                    // å¾—到frame索引
                                    var index = layer.getFrameIndex(window.name);
                                    //关闭当前frame
                                    layer.close(index);
                                });
                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                            }
                        }, error: function () {
                            layer.alert("接口请求失败!", { icon: 5 });
                        }
                    });
                })
            }
            //#region åˆ¤æ–­æ˜¯å¦ç™»å½• æœªç™»å½•则跳到登录页
            function get_LoginIs() {
@@ -945,7 +977,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '部门列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_DepartmentList.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_DepartmentList.html?type=2&HOrgName=' + sessionStorage["Organization"], 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -996,7 +1028,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '工段列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/生产基础资料/Gy_ProcMul.html', 'yes']
                    , content: ['../../基础资料/生产基础资料/Gy_ProcMul.html?Type=2', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1021,7 +1053,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '检验方案列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../质量管理/检验方案单/QC_CheckProjectList.html', 'yes']
                    , content: ['../../质量管理/检验方案单/QC_CheckProjectList.html?Type=2', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1053,7 +1085,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '检验方案列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../质量管理/检验方案单/QC_CheckProjectList.html', 'yes']
                    , content: ['../../质量管理/检验方案单/QC_CheckProjectList.html?Type=2', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -1085,7 +1117,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '检验方案列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../质量管理/检验方案单/QC_CheckProjectList.html', 'yes']
                    , content: ['../../质量管理/检验方案单/QC_CheckProjectList.html?Type=2', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Add_Edit_Gy_Source.html
@@ -36,6 +36,7 @@
                        <div class="layui-btn-group">
                            <button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">保存</button>
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">退出</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">审核</button>
                        </div>
                    </div>
                    <div class="layui-form-item" style="padding-top: 10px;">
@@ -43,6 +44,7 @@
                            <ul class="layui-tab-title">
                                <li class="layui-this">基本信息</li>
                                <li>其他信息</li>
                                <li>制单信息</li>
                            </ul>
                            <div class="layui-tab-content">
                                <div class="layui-tab-item layui-show">
@@ -253,7 +255,7 @@
                                            <div class="layui-input-inline">
                                                <input type="text" name="HCubicleQty" id="HCubicleQty" value="1" lay-verify="" autocomplete="off" class="layui-input" onfocus="this.select();">
                                            </div>
                                        </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
@@ -263,6 +265,9 @@
                                            </div>
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-tab-item">
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">创建人</label>
@@ -306,7 +311,6 @@
                                    </div>
                                </div>
                            </div>
                        </div>
                    </div>
                </form>
            </div>
@@ -383,6 +387,10 @@
                $("#HItemID").val(linterid);//修改时主表ID
                //编辑状态时,根据内码,获取信息并写入界面
                RoadBillMain(linterid);
                if ($("#HCheckEmp").val() != "") {
                    $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//
                }
            }
            else if (OperationType == 4) {//浏览
                $("#HItemID").val(linterid);//
@@ -484,7 +492,10 @@
            form.on('submit(set_SaveBill)', function (data) {
                set_SaveBill(data);
            });
            //审核
            form.on('submit(set_CheckBill)', function (data) {
                set_CheckBill(data);
            });
            //表头信息负责人弹窗
            form.on('submit(HEmpID-BT)', function () {
@@ -605,6 +616,34 @@
                });
            }
            //#endregion
            //审核
            function set_CheckBill() {
                layer.confirm("确认要审核吗?", function (index) {
                    var HInterID = $("#HItemID").val();
                    //逻辑审核方法
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Gy_Source/AuditGy_Source", //方法所在页面和方法名
                        data: { "HInterID": HInterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                    // å¾—到frame索引
                                    var index = layer.getFrameIndex(window.name);
                                    //关闭当前frame
                                    layer.close(index);
                                });
                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                            }
                        }, error: function () {
                            layer.alert("接口请求失败!", { icon: 5 });
                        }
                    });
                })
            }
            //#region ä¿å­˜æ–¹æ³•
            function set_SaveBill(data) {
@@ -728,7 +767,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '工序列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/生产基础资料/Gy_Process.html', 'yes']
                    , content: ['../../基础资料/生产基础资料/Gy_Process.html?Type=2', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -754,7 +793,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '部门列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_DepartmentList.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_DepartmentList.html?Type=2&HOrgName=' + sessionStorage["Organization"], 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -780,7 +819,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '工作中心列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_WorkCenter.html', 'yes']
                    , content: ['../../基础资料/公用基础资料/Gy_WorkCenter.html?Type=2', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -830,7 +869,7 @@
                    , area: ['90%', '90%']//大小
                    , title: '生产资源列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/生产基础资料/Gy_Source.html', 'yes']
                    , content: ['../../基础资料/生产基础资料/Gy_Source.html?Type=&Type2=2', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Gy_ProcMul.html
@@ -266,7 +266,7 @@
                //初始化表格
                set_InitGrid();
                //查询
                get_Display(sWhere);
                get_FastQuery();
                get_DefaultModule();
            }
@@ -394,6 +394,7 @@
                if (HName) {
                    sWhere += " and å·¥æ®µåç§° like '%" + HName + "%'";
                }
                sWhere += addSWhereByOpenType();
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
@@ -922,6 +923,19 @@
                })
            }
            //#region åˆ¤æ–­æ˜¯ç›´æŽ¥æ‰“开页面还是其它页面通过选择按钮打开,并显示相应数据
            function addSWhereByOpenType() {
                //获取参数
                var params = get_UrlVars();
                var openType = params[params[0]]; //从参数中获取 æ‰“开方式  1直接打开 2其它页面通过选择按钮打开
                var addWhere = "";
                if (typeof (openType) != "undefined") {
                    addWhere += " and å®¡æ ¸äºº != '' and ç¦ç”¨æ ‡è®°!='Y'";
                }
                return addWhere;
            }
            //#endregion
            //#endregion
            //以上是layui模块
        });
WebTM/views/ÖÊÁ¿¹ÜÀí/¼ìÑé·½°¸µ¥/QC_CheckProjectList.html
@@ -427,13 +427,14 @@
                //获取项目号
                Get_HProject();
                //查询
                if (HName=="") {
                    get_Display(sWhere);
                } else {
                    sWhere += " and ç‰©æ–™åç§° = '" + HName + "'";
                    sWhere += " and å·¥åºåç§° = '" + HProcName + "'";
                    get_Display(sWhere);
                }
                //if (HName=="") {
                //    get_Display(sWhere);
                //} else {
                //    sWhere += " and ç‰©æ–™åç§° = '" + HName + "'";
                //    sWhere += " and å·¥åºåç§° = '" + HProcName + "'";
                //    get_Display(sWhere);
                //}
                get_FastQuery()
                //过滤方案查询
                get_DefaultModule();
            }
@@ -644,6 +645,10 @@
                }
                if (HProject != "" && HProject!=0) {
                    sWhere += " and é¡¹ç›®å· like '%" + HProject + "%'";
                }
                if (HName!="") {
                    sWhere += " and ç‰©æ–™åç§° = '" + HName + "'";
                    sWhere += " and å·¥åºåç§° = '" + HProcName + "'";
                }
                addSWhereByOpenType();
                get_Display(sWhere);
@@ -942,7 +947,7 @@
                var params = get_UrlVars();
                var openType = params[params[0]]; //从参数中获取 æ‰“开方式  1直接打开 2其它页面通过选择按钮打开            
                if (typeof (openType) != "undefined") {
                    sWhere += " and ç¦ç”¨æ ‡è®° = '' ";
                    sWhere += " and å®¡æ ¸äºº != ''";
                }
            }
            //#endregion