From 1ce7fa1c227fab4b2a97dd61876db2dfa44cd236 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 15 七月 2025 14:59:06 +0800
Subject: [PATCH] 华远:直观图界面调整

---
 WebTM/views/项目管理/工作任务/PM_WorkTaskBillMainMy.html |  172 +++++++++++++++++++++++++++++++--------------------------
 1 files changed, 93 insertions(+), 79 deletions(-)

diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillMainMy.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillMainMy.html"
index 471eac4..026e03e 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillMainMy.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillMainMy.html"
@@ -24,34 +24,34 @@
         <div class="layui-col-md12">
             <div class="layui-card" style="padding: 1px">
                 <div class="layui-card-body" style="padding: 1px;">
-                    <form class="layui-form" action="" lay-filter="component-form-group"
+                    <form class="layui-form" action="" lay-filter="component-form-group">
                     <div style="padding: 10px; ">
-                    <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="btn_LookDown" lay-filter="btn_LookDown">寮曞嚭</button>
-                    <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="btn_view" lay-filter="btn_view">棰勮</button>
-                    <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="btn_view" lay-filter="btn_view">鎵撳嵃</button>
-                    <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="btn_report" lay-filter="btn_report">姹囨姤</button>
-                    <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="get_Exit" lay-filter="get_Exit">閫�鍑�</button>
+                        <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="btn_LookDown" lay-filter="btn_LookDown">寮曞嚭</button>
+                        <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="btn_view" lay-filter="btn_view">棰勮</button>
+                        <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="btn_view" lay-filter="btn_view">鎵撳嵃</button>
+                        <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="btn_report" lay-filter="btn_report">涓嬫帹浠诲姟姹囨姤</button>
+                        <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="get_Exit" lay-filter="get_Exit">閫�鍑�</button>
                     </div>
-                    <div class="layui-tab layui-tab-card" style="margin-top:20px;" lay-filter="tab-TabTest">
-                    <ul class="layui-tab-title">
-                    <li lay-id="1" class="layui-this">鏈畬鎴�</li>
-                    <li lay-id="2">姝e湪杩涜</li>
-                    <li lay-id="3">宸插畬鎴�</li>
-                    </ul>
-                    <div class="layui-tab-content">
-                    <div class="layui-tab-item layui-show">
-                    <!--鏈畬鎴�-->
-                    <table class="layui-hide" id="mainTable_notcomplete" lay-filter="mainTable_notcomplete"></table>
-                    </div>
-                    <div class="layui-tab-item">
-                    <!--姝e湪杩涜-->
-                    <table class="layui-hide" id="mainTable_proc" lay-filter="mainTable_proc"></table>
-                    </div>
-                    <div class="layui-tab-item">
-                    <!--宸插畬鎴�-->
-                    <table class="layui-hide" id="mainTable_finish" lay-filter="mainTable_finish"></table>
-                    </div>
-                    </div>
+                    <div class="layui-tab layui-tab-card" style="margin-top:20px;" >
+                        <ul class="layui-tab-title">
+                            <li  class="layui-this">鏈畬鎴�</li>
+                            <li>姝e湪杩涜</li>
+                            <li>宸插畬鎴�</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <div class="layui-tab-item layui-show">
+                                <!--鏈畬鎴�-->
+                                <table class="layui-hide" id="mainTable_notcomplete" lay-filter="mainTable_notcomplete"></table>
+                            </div>
+                            <div class="layui-tab-item">
+                                <!--姝e湪杩涜-->
+                                <table class="layui-hide" id="mainTable_proc" lay-filter="mainTable_proc"></table>
+                            </div>
+                            <div class="layui-tab-item">
+                                <!--宸插畬鎴�-->
+                                <table class="layui-hide" id="mainTable_finish" lay-filter="mainTable_finish"></table>
+                            </div>
+                        </div>
                     </div>
                     <script type="text/html" id="toolbarDemo">
 
@@ -83,8 +83,8 @@
             var option_finish = ""; //宸插畬鎴�
             var option_proc = ""; //姝e湪杩涜
             var ins;
-            var TableTab = "mainTable_notcomplete";  //鍒濆鍖栭〉闈㈡椂榛樿涓� 鈥滄湭瀹屾垚鈥� 椤电
-            var cur_title = "鏈畬鎴�"; //褰撳墠閫変腑椤电
+            //var TableTab = "mainTable_notcomplete";  //鍒濆鍖栭〉闈㈡椂榛樿涓� 鈥滄湭瀹屾垚鈥� 椤电
+            //var cur_title = "鏈畬鎴�"; //褰撳墠閫変腑椤电
             //#endregion
 
             //#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -116,22 +116,6 @@
             form.on('submit(get_Exit)', function (data) {
                 Pub_Close(2);
             });
-
-            
-
-            
-            //鐩戝惉褰撳墠澶勪簬鍝竴涓〉绛撅紝浼� HModName 鍊�
-            element.on('tab(tab-TabTest)', function (data) {
-                HMaterInfo = table.cache['mainTable'];
-                cur_title = data.elem.context.innerText;
-                if (cur_title == "鏈畬鎴�") {
-                    TableTab = "mainTable_notcomplete";
-                } else if (cur_title == "宸插畬鎴�") {
-                    TableTab = "mainTable_finish";
-                } else if (cur_title == "姝e湪杩涜") {
-                    TableTab = "mainTable_proc";
-                }
-            })
             //#endregion
 
             //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
@@ -159,6 +143,7 @@
                     elem: '#mainTable_notcomplete'
                     , toolbar: '#toolbarDemo'
                     , page: true
+                    , totalRow: true
                     , height: 300
                     , cellMinWidth: 90
                     , limit: 50
@@ -174,6 +159,7 @@
                     elem: '#mainTable_finish'
                     , page: false
                     , height: 500
+                    , totalRow: true
                     , cellMinWidth: 90
                     , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
                     , cols: []
@@ -186,6 +172,7 @@
                     elem: '#mainTable_proc'
                     , page: false
                     , height: 500
+                    , totalRow: true
                     , cellMinWidth: 90
                     , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
                     , cols: []
@@ -204,6 +191,7 @@
                     data: {  "user": sessionStorage["HUserName"] },
                     success: function (data1) {
                         if (data1.count == 1) {
+                            var totalArray = ["璇勪及宸ユ椂","宸茶�楃敤宸ユ椂"]
                             var data = [];
                             var col = [];
                             //缁欑┖鐨勬暟缁勮祴鍊�
@@ -216,6 +204,9 @@
                                 // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                 if ($.inArray(data[i].name, titleData) > -1) {
                                     col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else if ($.inArray(data[i].name, totalArray) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                                 }
                                 else {
                                     switch (data[i].Type) {
@@ -237,6 +228,7 @@
                                 , data: data1.data.h_p_PM_WorkTaskBillMyList
                                 , height: 'full-80'
                                 , page: true
+                                , totalRow: true
                                 , limits: [50, 500, 5000, 50000]
                                 , limit: 50
                                 , cellMinWidth: 90
@@ -251,6 +243,7 @@
                                 , data: data1.data.h_p_PM_WorkTaskBillMyList1
                                 , height: 'full-80'
                                 , page: true
+                                , totalRow: true
                                 , limits: [50, 500, 5000, 50000]
                                 , limit: 50
                                 , cellMinWidth: 90
@@ -264,6 +257,7 @@
                                 , data: data1.data.h_p_PM_WorkTaskBillMyList2
                                 , height: 'full-80'
                                 , page: true
+                                , totalRow: true
                                 , limits: [50, 500, 5000, 50000]
                                 , limit: 50
                                 , cellMinWidth: 90
@@ -275,7 +269,7 @@
                             var HBillType = "鎴戠殑浠诲姟";
                             Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                             //鍒锋柊琛ㄦ牸鏁版嵁
-                            //DisPlay_HideColumn();
+                           // DisPlay_HideColumn();
 
                             layer.close(ajaxLoad);
                             if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
@@ -298,47 +292,53 @@
 
             //#region 瀵煎嚭Execel
             function get_Export() {
-
-                table.exportFile(ins.config.id, option_notcomplete.data, "xls");
+                var data = option_notcomplete.data
+                data.forEach((item) => {
+                    // 濡傛灉鏌愪釜瀛楁鐨勫�煎お闀匡紝闇�瑕佸幓闄ゆ崲琛岀
+                    if (item.浠诲姟鎻忚堪.length > 0) {  // 鍋囪瀛楁鍚嶄负field
+                        item.浠诲姟鎻忚堪 = item.浠诲姟鎻忚堪.replace(/[\r\n]+/g, '');  // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+                    }
+                });
+                table.exportFile(ins.config.id, data, "xls");
             }
+            //#endregion
 
             //#region 姹囨姤
             function get_report() {
-                var checkStatus = table.checkStatus("mainTable_proc")
-                    , data = checkStatus.data;
+                var activeTab = getActiveTab();
 
+                if (activeTab == "鏈畬鎴�") {
+                    var checkStatus = table.checkStatus('mainTable_notcomplete')
+                        , data = checkStatus.data;
+                } else if (activeTab == "宸插畬鎴�") {
+                    var checkStatus = table.checkStatus('mainTable_finish')
+                        , data = checkStatus.data;
+                } else if (activeTab == "姝e湪杩涜") {
+                    var checkStatus = table.checkStatus('mainTable_proc')
+                        , data = checkStatus.data;
+                }
+               
+                var HInterID = data[0].HInterID;
+                var HEntryID = data[0].HEntryID;
                 if (data.length == 1) {
                     layer.open({
-                        type: 2,
-                        skin: 'layui-layer-rim', //鍔犱笂杈规
-                        title: '鏂板浜ч噺姹囨姤鍗�',
-                        closeBtn: 1,
-                        shift: 2,
-                        area: ['100%', '100%'],
-                        maxmin: true,
-                        content: '../../鐢熶骇绠$悊/浜ч噺姹囨姤鍗�/Sc_Add_ProductReportBillList.html?OperationType=2&linterid=&HSouceBillType=',
-                        end: function () {
-
-                        },
-                        success: function (dom, index) {
-                            var deliverData = [];
-                            deliverData.push({
-                                "HBillType": data[0].鍗曟嵁绫诲瀷,
-                                "HSourceInterID": data[0].HInterID,
-                                "HSourceEntryID": data[0].婧愬崟瀛愬唴鐮�,
-                                "HSourceBillNo": data[0].婧愬崟鍗曞彿,
-                                "HSourceBillType": data[0].婧愬崟绫诲瀷
-                            });
-
-                            //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
-                            var iframe = window['layui-layer-iframe' + index];
-                            //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
-                            iframe.edit(deliverData);
-                        },
-                    });
-                } else {
-                    layer.msg('璇峰湪 姝e湪鐢熶骇 椤电涓�夋嫨涓�琛屾暟鎹紑宸ワ紒');
-                }                  
+                        type: 2
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['100%', '100%']
+                        , title: '宸ヤ綔浠诲姟-涓嬫帹'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../椤圭洰绠$悊/宸ヤ綔浠诲姟/PM_WorkTaskReportBill.html?OperationType=2&linterid=' + HInterID + '&HSouceBillType='
+                        , btn: ['纭畾'],
+                        // 鎸夐挳1 鐨勫洖璋�
+                        btn1: function (index, layero, that) {
+                            //鍒锋柊椤甸潰
+                            $("#btnSearch").trigger('click');
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹笅鎺紒');
+                }
             }
             //#endregion
             
@@ -393,6 +393,20 @@
             }
             //#endregion         
 
+            // 鑾峰彇鏍囩
+            function getActiveTab() {
+                var tabs = document.getElementsByClassName("layui-tab-title")[0].getElementsByTagName("li");
+                var activeTab;
+                for (var i = 0; i < tabs.length; i++) {
+                    if (tabs[i].classList.contains("layui-this")) {
+                        activeTab = tabs[i].innerText;
+                        break;
+                    }
+                }
+                return activeTab;
+
+            }
+
             //#region 闅愯棌鍒楄缃�
             function get_HideColumn() {
                 var colName = "";

--
Gitblit v1.9.1