wtt
昨天 27ccbd987c7f7c3a40fde5eb3706bde10d3e7d64
报表修改,工程项目费用待审核带保存列表更改
3个文件已修改
165 ■■■■ 已修改文件
WebTM/views/生产管理/日计划报表/ReportMOMaterReadysBillList.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/项目管理/工程项目/PM_ProjectTaskNeedCheckQuery.html 76 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/项目管理/工程项目/PM_ProjectTaskNeedSaveQuery.html 85 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/Éú²ú¹ÜÀí/Èռƻ®±¨±í/ReportMOMaterReadysBillList.html
@@ -469,8 +469,8 @@
                , page: true
                , cellMinWidth: 90
                , totalRow: true
                , limit: 1000
                , limits: [50, 500,1000, 5000, 20000]
                , limit: 50
                , limits: [50, 500,1000, 5000]
                //, loading: false               
                , cols: [[
                    { type: 'checkbox', fixed: 'left' }
WebTM/views/ÏîÄ¿¹ÜÀí/¹¤³ÌÏîÄ¿/PM_ProjectTaskNeedCheckQuery.html
@@ -94,7 +94,7 @@
                                                    <label class="layui-form-label" style="width: 85px;">任务安装费</label>
                                                    <div class="layui-input-block" style="margin-left: 120px;">
                                                        <input type="number" class="layui-input" name="HTaskSetupMoney" lay-verify="HTaskSetupMoney" id="HTaskSetupMoney" value="0" style="float: left; width: 120px" readonly>
                                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCheckSetupMoney" id="btnCheckSetupMoney" style="float: left; padding: 0 10px;">
                                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCheckSetupMoney" id="btnCheckSetupMoney" style="float: left; padding: 0 10px;display:none;">
                                                            å®¡æ ¸
                                                        </button>
                                                    </div>
@@ -103,7 +103,7 @@
                                                    <label class="layui-form-label" style="width: 85px;">任务附属费</label>
                                                    <div class="layui-input-block" style="margin-left: 120px;">
                                                        <input type="number" class="layui-input" name="HTaskOtherMoney" lay-verify="HTaskOtherMoney" id="HTaskOtherMoney" value="0" style="float: left; width: 120px" readonly>
                                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCheckOtherMoney" id="btnCheckOtherMoney" style="float: left; padding: 0 10px;">
                                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCheckOtherMoney" id="btnCheckOtherMoney" style="float: left; padding: 0 10px; display: none;">
                                                            å®¡æ ¸
                                                        </button>
                                                    </div>
@@ -112,7 +112,7 @@
                                                    <label class="layui-form-label" style="width: 85px;">任务考核费</label>
                                                    <div class="layui-input-block" style="margin-left: 120px;">
                                                        <input type="number" class="layui-input" name="HTaskExamMoney" lay-verify="HTaskExamMoney" id="HTaskExamMoney" value="0" style="float: left; width: 120px" readonly>
                                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCheckExamMoney" id="btnCheckExamMoney" style="float: left; padding: 0 10px;">
                                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCheckExamMoney" id="btnCheckExamMoney" style="float: left; padding: 0 10px; display: none;">
                                                            å®¡æ ¸
                                                        </button>
                                                    </div>
@@ -121,7 +121,7 @@
                                                    <label class="layui-form-label" style="width: 85px;">任务工费</label>
                                                    <div class="layui-input-block" style="margin-left: 120px;">
                                                        <input type="number" class="layui-input" name="HTaskWorkMoney" lay-verify="HTaskWorkMoney" id="HTaskWorkMoney" value="0" style="float: left; width: 120px" readonly>
                                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCheckWorkMoney" id="btnCheckWorkMoney" style="float: left; padding: 0 10px;">
                                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCheckWorkMoney" id="btnCheckWorkMoney" style="float: left; padding: 0 10px; display: none;">
                                                            å®¡æ ¸
                                                        </button>
                                                    </div>
@@ -155,7 +155,6 @@
        </div>
    </div>
    <script>
        var params = get_UrlVars();
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
@@ -174,8 +173,7 @@
            var optionNeedCheck = [];
            var ins;                        //用于导出excel
            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["hmainid", "HBillType", "HSupID", "HPSStyleID", "HSSID", "HCurID", "HDeptID", "HManagerID", "HEmpID", "hsubid", "HMaterID", "HUnitID",
                "HFeedback", "HPriority", "HUserID", "币别代码", "采购方式代码", "结算方式代码", "部门代码", "主管代码", "业务员代码", "计量单位代码", "HCheckFlowStatusID", "HCheckFlowID","HCheckItemID"];
            var titleData = ["hmainid"];
            //#endregion
            //#endregion
            var HModName = "PM_ProjectTaskNeedCheckQuery";
@@ -183,8 +181,8 @@
            //#region è¿›å…¥é¡µé¢æ—¢åŠ è½½
            //初始化表格
            set_InitGrid();
            //查询
            get_Display();
            get_FastQuery();
            //#endregion
            //#region ç‚¹å‡»äº‹ä»¶åŒ…括on form事件等
@@ -195,7 +193,7 @@
                    //case 'btn-Edit': get_ShowBill('mainTableNeedCheck');
                    //    break;
                    //刷新
                    case 'get_Refresh': get_Display();
                    case 'get_Refresh': get_FastQuery();
                        break;
                    //导出excel
                    case 'get_export':
@@ -212,7 +210,7 @@
                        table.exportFile(ins.config.id, optionNeedCheck.data, "xls");
                        break;
                    //列设置
                    case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], optionNeedCheck, get_Display);
                    case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], optionNeedCheck, get_FastQuery);
                        break;
                };
            });
@@ -312,6 +310,17 @@
            //#endregion
            //#region è¯¥é¡µé¢æ‰€æœ‰æ–¹æ³•
            //直接执行列表筛选 åŠ è½½æ•°æ®åˆ°ç½‘æ ¼
            //快速过滤
            function get_FastQuery() {
                //初始话按钮点击
                sWhere = " '"+addSWhereByOpenType() + "'";
                //查询
                get_Display(sWhere);
                //调用接口后清空sWhere缓存
                sWhere = "";
            }
            //#region åˆå§‹åŒ–表格
            function set_InitGrid() {
                //设置审核按钮不可点击
@@ -319,7 +328,6 @@
                $('#btnCheckOtherMoney').prop('disabled', true).addClass('layui-btn-disabled');
                $('#btnCheckExamMoney').prop('disabled', true).addClass('layui-btn-disabled');
                $('#btnCheckWorkMoney').prop('disabled', true).addClass('layui-btn-disabled');
                optionNeedCheck = {
                    elem: '#mainTableNeedCheck'
                    , toolbar: '#toolbarDemoNeedCheck'
@@ -347,13 +355,13 @@
            //#endregion
            //#region åŠ è½½è¡¨æ ¼
            function get_Display() {
            function get_Display(sWhere) {
                var ajaxLoad = layer.load();//遮罩
                $.ajax({
                    url: GetWEBURL() + '/PM_ProjectBill/NeedCheckQuery',
                    type: "GET",
                    async: false,
                    data: {"user": sessionStorage["HUserName"] },
                    data: { "user": sessionStorage["HUserName"], "sWhere": sWhere },
                    success: function (data1) {
                        if (data1.count == 1) {
                            var data = [];//列字段数据
@@ -539,7 +547,7 @@
                                    //关闭当前frame
                                    layer.close(index);
                                    //修改为功后刷新界面
                                    get_Display();
                                    get_FastQuery();
                                });
                            } else {
@@ -556,6 +564,44 @@
            }
            //#endregion
            //#region åˆ¤æ–­æ˜¯ç›´æŽ¥æ‰“开页面还是其它页面通过选择按钮打开,并显示相应数据
            function addSWhereByOpenType() {
                //获取参数
                var params = get_UrlVars();
                var openType = params[params[0]]; //从参数中获取 æ‰“开方式
                var addSWhere = openType;
                //根据递入参数隐藏对应按钮和显示列
                if (openType == "SetupMoney") {
                    $('#btnCheckSetupMoney').show();
                    //titleData.push("任务工费审核");
                    //titleData.push("任务考核费审核");
                    //titleData.push("任务附属费审核");
                } else if (openType == "OtherMoney") {
                    $('#btnCheckOtherMoney').show();
                    //titleData.push("任务安装费审核");
                    //titleData.push("任务工费审核");
                    //titleData.push("任务考核费审核");
                } else if (openType == "ExamMoney") {
                    $('#btnCheckExamMoney').show();
                    //titleData.push("任务安装费审核");
                    //titleData.push("任务工费审核");
                    //titleData.push("任务附属费审核");
                } else if (openType == "WorkMoney") {
                    $('#btnCheckWorkMoney').show();
                    //titleData.push("任务安装费审核");
                    //titleData.push("任务考核费审核");
                    //titleData.push("任务附属费审核");
                } else {
                    addSWhere="other"
                    //titleData.push("任务安装费审核");
                    //titleData.push("任务工费审核");
                    //titleData.push("任务考核费审核");
                    //titleData.push("任务附属费审核");
                }
                return addSWhere;
            }
            //#endregion\
            //#endregion
WebTM/views/ÏîÄ¿¹ÜÀí/¹¤³ÌÏîÄ¿/PM_ProjectTaskNeedSaveQuery.html
@@ -94,10 +94,10 @@
                                                    <label class="layui-form-label" style="width: 85px;">任务安装费</label>
                                                    <div class="layui-input-block" style="margin-left: 120px;">
                                                        <input type="number" class="layui-input" name="HTaskSetupMoney" lay-verify="HTaskSetupMoney" id="HTaskSetupMoney" value="0" style="float: left; width: 120px" >
                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHTaskSetupMoney" id="btnSearchHTaskSetupMoney" style="width: 40px; float: left;">
                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHTaskSetupMoney" id="btnSearchHTaskSetupMoney" style="width: 40px; float: left; display: none;">
                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                        </button>
                                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSaveSetupMoney" id="btnSaveSetupMoney" style="float: left; padding: 0 10px;">
                                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSaveSetupMoney" id="btnSaveSetupMoney" style="float: left; padding: 0 10px; display: none;">
                                                            ä¿å­˜
                                                        </button>
                                                    </div>
@@ -106,10 +106,10 @@
                                                    <label class="layui-form-label" style="width: 85px;">任务附属费</label>
                                                    <div class="layui-input-block" style="margin-left: 120px;">
                                                        <input type="number" class="layui-input" name="HTaskOtherMoney" lay-verify="HTaskOtherMoney" id="HTaskOtherMoney" value="0" style="float: left; width: 120px" >
                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHTaskOtherMoney" id="btnSearchHTaskOtherMoney" style="width: 40px; float: left;">
                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHTaskOtherMoney" id="btnSearchHTaskOtherMoney" style="width: 40px; float: left; display: none;">
                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                        </button>
                                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSaveOtherMoney" id="btnSaveOtherMoney" style="float: left; padding: 0 10px;">
                                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSaveOtherMoney" id="btnSaveOtherMoney" style="float: left; padding: 0 10px; display: none;">
                                                            ä¿å­˜
                                                        </button>
                                                    </div>
@@ -118,10 +118,10 @@
                                                    <label class="layui-form-label" style="width: 85px;">任务考核费</label>
                                                    <div class="layui-input-block" style="margin-left: 120px;">
                                                        <input type="number" class="layui-input" name="HTaskExamMoney" lay-verify="HTaskExamMoney" id="HTaskExamMoney" value="0" style="float: left; width: 120px" >
                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHTaskExamMoney" id="btnSearchHTaskExamMoney" style="width: 40px; float: left;">
                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHTaskExamMoney" id="btnSearchHTaskExamMoney" style="width: 40px; float: left; display: none;">
                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                        </button>
                                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSaveExamMoney" id="btnSaveExamMoney" style="float: left; padding: 0 10px;">
                                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSaveExamMoney" id="btnSaveExamMoney" style="float: left; padding: 0 10px; display: none;">
                                                            ä¿å­˜
                                                        </button>
                                                    </div>
@@ -130,10 +130,10 @@
                                                    <label class="layui-form-label" style="width: 85px;">任务工费</label>
                                                    <div class="layui-input-block" style="margin-left: 120px;">
                                                        <input type="number" class="layui-input" name="HTaskWorkMoney" lay-verify="HTaskWorkMoney" id="HTaskWorkMoney" value="0" style="float: left; width: 120px" >
                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHTaskWorkMoney" id="btnSearchHTaskWorkMoney" style="width: 40px; float: left;">
                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHTaskWorkMoney" id="btnSearchHTaskWorkMoney" style="width: 40px; float: left; display: none;">
                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                        </button>
                                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSaveWorkMoney" id="btnSaveWorkMoney" style="float: left; padding: 0 10px;">
                                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSaveWorkMoney" id="btnSaveWorkMoney" style="float: left; padding: 0 10px; display: none;">
                                                            ä¿å­˜
                                                        </button>
                                                    </div>
@@ -193,8 +193,8 @@
            //#region è¿›å…¥é¡µé¢æ—¢åŠ è½½
            //初始化表格
            set_InitGrid();
            //查询
            get_Display();
            get_FastQuery();
            //#endregion
            //#region ç‚¹å‡»äº‹ä»¶åŒ…括on form事件等
@@ -205,7 +205,7 @@
                    //case 'btn-Edit': get_ShowBill('mainTableNeedSave');
                    //    break;
                    //刷新
                    case 'get_Refresh': get_Display();
                    case 'get_Refresh': get_FastQuery();
                        break;
                    //导出excel
                    case 'get_export':
@@ -222,7 +222,7 @@
                        table.exportFile(ins.config.id, optionNeedSave.data, "xls");
                        break;
                    //列设置
                    case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], optionNeedSave, get_Display);
                    case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], optionNeedSave, get_FastQuery);
                        break;
                };
            });
@@ -345,6 +345,17 @@
            //#endregion
            //#region è¯¥é¡µé¢æ‰€æœ‰æ–¹æ³•
            //快速过滤
            function get_FastQuery() {
                //初始话按钮点击
                sWhere = " '" + addSWhereByOpenType() + "'";
                //查询
                get_Display(sWhere);
                //调用接口后清空sWhere缓存
                sWhere = "";
            }
            //#region åˆå§‹åŒ–表格
            function set_InitGrid() {
                //设置保存按钮不可点击
@@ -380,13 +391,13 @@
            //#endregion
            //#region åŠ è½½è¡¨æ ¼
            function get_Display() {
            function get_Display(sWhere) {
                var ajaxLoad = layer.load();//遮罩
                $.ajax({
                    url: GetWEBURL() + '/PM_ProjectBill/NeedSaveQuery',
                    type: "GET",
                    async: false,
                    data: {"user": sessionStorage["HUserName"] },
                    data: { "user": sessionStorage["HUserName"], "sWhere": sWhere },
                    success: function (data1) {
                        if (data1.count == 1) {
                            var data = [];//列字段数据
@@ -572,7 +583,7 @@
                                    //关闭当前frame
                                    layer.close(index);
                                    //修改为功后刷新界面
                                    get_Display();
                                    get_FastQuery();
                                });
                            } else {
@@ -715,7 +726,49 @@
                })
            }
            //#endregion
            //#region åˆ¤æ–­æ˜¯ç›´æŽ¥æ‰“开页面还是其它页面通过选择按钮打开,并显示相应数据
            function addSWhereByOpenType() {
                //获取参数
                var params = get_UrlVars();
                var openType = params[params[0]]; //从参数中获取 æ‰“开方式
                var addSWhere = openType;
                //根据递入参数隐藏对应按钮和显示列
                if (openType == "SetupMoney") {
                    $('#btnSaveSetupMoney').show();
                    $('#btnSearchHTaskSetupMoney').show();
                    //titleData.push("任务工费审核");
                    //titleData.push("任务考核费审核");
                    //titleData.push("任务附属费审核");
                } else if (openType == "OtherMoney") {
                    $('#btnSaveOtherMoney').show();
                    $('#btnSearchHTaskOtherMoney').show();
                    //titleData.push("任务安装费审核");
                    //titleData.push("任务工费审核");
                    //titleData.push("任务考核费审核");
                } else if (openType == "ExamMoney") {
                    $('#btnSaveExamMoney').show();
                    $('#btnSearchHTaskExamMoney').show();
                    //titleData.push("任务安装费审核");
                    //titleData.push("任务工费审核");
                    //titleData.push("任务附属费审核");
                } else if (openType == "WorkMoney") {
                    $('#btnSaveWorkMoney').show();
                    $('#btnSearchHTaskWorkMoney').show();
                    //titleData.push("任务安装费审核");
                    //titleData.push("任务考核费审核");
                    //titleData.push("任务附属费审核");
                } else {
                    addSWhere = "other"
                    //titleData.push("任务安装费审核");
                    //titleData.push("任务工费审核");
                    //titleData.push("任务考核费审核");
                    //titleData.push("任务附属费审核");
                }
                return addSWhere;
            }
            //#endregion\
            //#endregion
            //#endregion