frist

application/admin/controller/Index.php

@@ -134,7 +134,7 @@ class Index extends Backend
         if ($this->request->isPost()) {
             $this->auth->logout();
             Hook::listen("admin_logout_after", $this->request);
-            $this->success(__('Logout successful'), 'index/login');
+            $this->redirect('index/login');
         }
         $html = "<form id='logout_submit' name='logout_submit' action='' method='post'>" . token() . "<input type='submit' value='ok' style='display:none;'></form>";
         $html .= "<script>document.forms['logout_submit'].submit();</script>";

application/admin/view/dashboard/index.html

@@ -770,7 +770,7 @@
                                             <div class="rank-body">
                                                 <div class="rank-name-row">
                                                     <span class="rank-name" title="{$item.name|default=''|htmlentities}">{$item.name|default=''|htmlentities}</span>
-                                                    <span class="rank-value">{$item.value|default='0'}</span>
+                                                    <span class="rank-value">{$item.value|default='0'}次</span>
                                                 </div>
                                                 <div class="progress rank-bar">
                                                     <div class="progress-bar" style="width:{$item.percent|default='0'}%"></div>
@@ -790,7 +790,7 @@
                                             <div class="rank-body">
                                                 <div class="rank-name-row">
                                                     <span class="rank-name" title="{$item.name|default=''|htmlentities}">{$item.name|default=''|htmlentities}</span>
-                                                    <span class="rank-value">{$item.value|default='0'}</span>
+                                                    <span class="rank-value">{$item.value|default='0'}次</span>
                                                 </div>
                                                 <div class="progress rank-bar">
                                                     <div class="progress-bar" style="width:{$item.percent|default='0'}%"></div>

application/admin/view/procuremen/index.html

@@ -51,7 +51,7 @@
     #procuremen-layout .procuremen-main {
         overflow-x: hidden !important;
         overflow-y: visible;
-        padding-right: 12px !important;
+        padding-right: 8px !important;
         flex: 1 1 0%;
         min-width: 0;
     }
@@ -260,10 +260,25 @@
     #procuremen-layout .bootstrap-table .fixed-table-body {
         overflow: auto !important;
         -webkit-overflow-scrolling: touch;
+        box-sizing: border-box;
+    }
+    #procuremen-layout .bootstrap-table .fixed-table-body > table.table {
+        margin-right: 14px;
     }
     #procuremen-layout .bootstrap-table .fixed-table-header {
         overflow: hidden;
     }
+    /* 日期列加宽并禁止省略，避免滚到最右仍被竖向滚动条挡住 */
+    #procuremen-layout .bootstrap-table thead th[data-field="dStamp"],
+    #procuremen-layout .bootstrap-table thead th[data-field="dputrecord"],
+    #procuremen-layout .bootstrap-table tbody td[data-field="dStamp"],
+    #procuremen-layout .bootstrap-table tbody td[data-field="dputrecord"] {
+        min-width: 176px !important;
+        width: 176px !important;
+        white-space: nowrap;
+        overflow: visible;
+        text-overflow: clip;
+    }
     #procuremen-layout .nice-validator .bootstrap-table td.bs-checkbox input[type="checkbox"],
     #procuremen-layout .nice-validator .bootstrap-table th.bs-checkbox input[type="checkbox"] {
         vertical-align: middle !important;

public/assets/js/backend/procuremen.js

@@ -642,8 +642,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 {field: 'cGzzxMc', title: __('外厂单位'), operate: 'LIKE', table: 'a', width: 220, align: 'center'},
                 {field: 'MBZ', title: __('备注'), operate: 'LIKE', table: 'a', width: 150, align: 'center'},
                 {field: 'cywyxm', title: __('业务员'), operate: 'LIKE', table: 'b', width: 80, align: 'center'},
-                {field: 'dStamp', title: __('操作日期'), operate: 'RANGE', addclass: 'datetimerange', autocomplete: false, table: 'a', width: 158, align: 'center', sortable: true, class: 'procuremen-th-sort-tight'},
-                {field: 'dputrecord', title: __('提交日期'), operate: 'RANGE', addclass: 'datetimerange', autocomplete: false, table: 'b', width: 158, align: 'center', sortable: true, class: 'procuremen-th-sort-tight'},
+                {field: 'dStamp', title: __('操作日期'), operate: 'RANGE', addclass: 'datetimerange', autocomplete: false, table: 'a', width: 176, align: 'center', sortable: true, class: 'procuremen-th-sort-tight'},
+                {field: 'dputrecord', title: __('提交日期'), operate: 'RANGE', addclass: 'datetimerange', autocomplete: false, table: 'b', width: 176, align: 'center', sortable: true, class: 'procuremen-th-sort-tight'},
                 {field: 'operate',title: '操作',width: 220,align: 'center',fixed: 'right', operate: false,
                     visible: indexInitWffTab !== 'pick',
                     table: table,