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

ch

2023-03-07 2fdbc24b2a56ec3d6027cd857dc0065e194f2514

 WebTM/views/»ù´¡×ÊÁÏ/¹¤×Ê»ù´¡×ÊÁÏ/Gy_ProcPriceList.html

@@ -78,56 +78,6 @@
                                            <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
                                        </div>
                                    </div>
                                    <div class="layui-colla-content">
                                        <div class="layui-inline">
                                            <div class="layui-inline">
                                                <span>其他条件></span>
                                            </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" name="物料代码" id="物料代码">
                                            </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" name="资源代码" id="资源代码">
                                            </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" name="部门代码" id="部门代码">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-colla-content">
                                        <div class="layui-inline">
                                            <div class="layui-inline">
                                                <span>其他条件></span>
                                            </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" name="物料名称" id="物料名称">
                                            </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" name="资源名称" id="资源名称">
                                            </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" name="部门名称" id="部门名称">
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
@@ -136,7 +86,9 @@
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
@@ -195,6 +147,12 @@
                        break;
                    //删除
                    case 'set_DeleteBill': set_DeleteBill();
                        break;
                    //审核按钮
                    case 'btn-Audit': set_CheckBill(0);
                        break;
                    //反审核按钮
                    case 'btn-DeAudit': set_CheckBill(1);
                        break;
                    //刷新
                    case 'get_Refresh': get_Refresh();
@@ -346,12 +304,6 @@
                var å·¥åºå·¥ä»·ä»£ç  = $("#工序工价代码").val();
                var å·¥åºä»£ç  = $("#工序代码").val();
                var å·¥åºåç§° = $("#工序名称").val();
                var ç‰©æ–™ä»£ç  = $("#物料代码").val();
                var èµ„源代码 = $("#资源代码").val();
                var éƒ¨é—¨ä»£ç  = $("#部门代码").val();
                var ç‰©æ–™åç§° = $("#物料名称").val();
                var èµ„源名称 = $("#资源名称").val();
                var éƒ¨é—¨åç§° = $("#部门名称").val();
                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();
@@ -386,24 +338,6 @@
                if (工序名称) {
                    sWhere += " and å·¥åºåç§° like '%" + å·¥åºåç§° + "%'";
                }
                if (物料代码) {
                    sWhere += " and ç‰©æ–™ä»£ç  like '%" + ç‰©æ–™ä»£ç  + "%'";
                }
                if (资源代码) {
                    sWhere += " and èµ„源代码 like '%" + èµ„源代码 + "%'";
                }
                if (部门代码) {
                    sWhere += " and éƒ¨é—¨ä»£ç  like '%" + éƒ¨é—¨ä»£ç  + "%'";
                }
                if (物料名称) {
                    sWhere += " and ç‰©æ–™åç§° like '%" + ç‰©æ–™åç§° + "%'";
                }
                if (资源名称) {
                    sWhere += " and èµ„源名称 like '%" + èµ„源名称 + "%'";
                }
                if (部门名称) {
                    sWhere += " and éƒ¨é—¨åç§° like '%" + éƒ¨é—¨åç§° + "%'";
                }
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
@@ -414,12 +348,6 @@
                $("#工序工价代码").val("");
                $("#工序代码").val("");
                $("#工序名称").val("");
                $("#物料代码").val("");
                $("#资源代码").val("");
                $("#部门代码").val("");
                $("#物料名称").val("");
                $("#资源名称").val("");
                $("#部门名称").val("");
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
@@ -476,12 +404,12 @@
                        var wait = layer.load();
                        //逻辑删除方法
                        $.ajax({
                            url: GetWEBURL() + 'Gy_Group/EditBill',
                            url: GetWEBURL() + '/Gy_ProcPrice/DelProcPrice',
                            type: "GET",
                            data: { "HItemID": ItemID, "user": sessionStorage["HUserName"]},
                            data: { "HInterID": ItemID, "User": sessionStorage["HUserName"]},
                            success: function (result) {
                                if (result.count == 1) {
                                    layer.msg(result.Message, { icon: 1 }, function () {
                                    layer.msg(result.Message, { time: 1 * 1000,icon: 1 }, function () {
                                        // å¾—到frame索引
                                        var index = layer.getFrameIndex(window.name);
                                        //关闭当前frame
@@ -507,6 +435,39 @@
            }
            //#endregion

            function set_CheckBill(num) {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].HItemID.toString();
                    //逻辑审核方法
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Gy_ProcPrice/AuditGy_ProcPrice", //方法所在页面和方法名
                        data: { "HInterID": InterID, "IsAudit": num, "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);
                                    //修改为功后刷新界面
                                    $("#btnSearch").trigger('click');
                                });

                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                            }
                        }, error: function () {
                            layer.alert("接口请求失败!", { icon: 5 });
                        }
                    });
                }
                else {
                    layer.msg('请选择一行数据审核！');
                }
            }

            //#region åˆ·æ–°
            function get_Refresh() {