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

yusijie

2024-12-25 f65fe092c04cb3d18b7cb1cd511c19d408d59370

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_MaterialTechParamBillMainList.html

@@ -161,8 +161,9 @@
                        <script type="text/html" id="toolbarDemo">
                            <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_SouceExcel"><i class="layui-icon layui-icon-delete"></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_Copy" id="set_Copy"><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="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>审核</button>
@@ -235,9 +236,15 @@
                    //新增
                    case 'set_AddNew': set_AddNew();
                        break;
                    //导入
                    case 'set_SouceExcel': set_SouceExcel();
                        break;
                    //编辑
                    case 'set_ShowBill': set_ShowBill();
                        break;
                    //复制
                    case 'set_Copy': set_Copy();
                        break;  
                    //删除
                    case 'set_DeleteBill': set_DeleteBill();
                        break;
@@ -295,6 +302,7 @@
                    }
                });
            })

            //#endregion

            //#region é‡ç½®æŒ‰é’®
@@ -601,7 +609,7 @@
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HEndDate + "'";
                }
                if (number==2) {
                    if (HProject) {
                    if (HProject!='0') {
                        sWhere += " and é¡¹ç›®å· like '%" + HProject + "%'";
                    }
                }               
@@ -692,6 +700,19 @@
            }
            //#endregion


            //#region导入
            function set_SouceExcel() {
                layer.open({
                    type: 2
                    , area: ['100%', '100%']
                    , title: '产品工艺参数导入'
                    , shift: 0//弹出动画
                    , content: './Gy_MaterialTechParamBill_Excel.html?OperationType=dao&HSouceBillType='
                })
            }
            //#endregion

            //#region ç¼–辑
            function set_ShowBill() {
                var checkStatus = table.checkStatus('mainTable')
@@ -718,6 +739,29 @@
            }
            //#endregion

            //复制
            function set_Copy() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].HInterID.toString();

                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '产品工艺参数清单-编辑'
                        , shift: 0//弹出动画
                        , content: '../../计划管理/工艺路线/Gy_MaterialTechParamBillMain.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
                        , end: function () {
                            //刷新页面,
                            location.reload();
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑！');
                }
            }


            //#region åˆ é™¤
            function set_DeleteBill() {