uptada

f/web-kboss/src/assets/css/iconfont/demo_index.html

@@ -54,6 +54,42 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe61b;</span>
+                <div class="name">复制</div>
+                <div class="code-name">&amp;#xe61b;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe64c;</span>
+                <div class="name">大类-全部产品</div>
+                <div class="code-name">&amp;#xe64c;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe641;</span>
+                <div class="name">资源管理器</div>
+                <div class="code-name">&amp;#xe641;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe616;</span>
+                <div class="name">社区服务</div>
+                <div class="code-name">&amp;#xe616;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe648;</span>
+                <div class="name">复制</div>
+                <div class="code-name">&amp;#xe648;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe602;</span>
+                <div class="name">订单管理</div>
+                <div class="code-name">&amp;#xe602;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe625;</span>
                 <div class="name">客服</div>
@@ -96,9 +132,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1760680783657') format('woff2'),
+  src: url('iconfont.woff2?t=1760930186762') format('woff2'),
-       url('iconfont.woff?t=1760680783657') format('woff'),
+       url('iconfont.woff?t=1760930186762') format('woff'),
-       url('iconfont.ttf?t=1760680783657') format('truetype');
+       url('iconfont.ttf?t=1760930186762') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -124,6 +160,60 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont icon-fuzhi"></span>
+            <div class="name">
+              复制
+            </div>
+            <div class="code-name">.icon-fuzhi
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-dalei-quanbuchanpin"></span>
+            <div class="name">
+              大类-全部产品
+            </div>
+            <div class="code-name">.icon-dalei-quanbuchanpin
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-ziyuanguanliqi"></span>
+            <div class="name">
+              资源管理器
+            </div>
+            <div class="code-name">.icon-ziyuanguanliqi
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-shequfuwu"></span>
+            <div class="name">
+              社区服务
+            </div>
+            <div class="code-name">.icon-shequfuwu
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-fuzhi-"></span>
+            <div class="name">
+              复制
+            </div>
+            <div class="code-name">.icon-fuzhi-
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-dingdanguanli"></span>
+            <div class="name">
+              订单管理
+            </div>
+            <div class="code-name">.icon-dingdanguanli
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-kefu"></span>
             <div class="name">
@@ -187,6 +277,54 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-fuzhi"></use>
+                </svg>
+                <div class="name">复制</div>
+                <div class="code-name">#icon-fuzhi</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-dalei-quanbuchanpin"></use>
+                </svg>
+                <div class="name">大类-全部产品</div>
+                <div class="code-name">#icon-dalei-quanbuchanpin</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-ziyuanguanliqi"></use>
+                </svg>
+                <div class="name">资源管理器</div>
+                <div class="code-name">#icon-ziyuanguanliqi</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-shequfuwu"></use>
+                </svg>
+                <div class="name">社区服务</div>
+                <div class="code-name">#icon-shequfuwu</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-fuzhi-"></use>
+                </svg>
+                <div class="name">复制</div>
+                <div class="code-name">#icon-fuzhi-</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-dingdanguanli"></use>
+                </svg>
+                <div class="name">订单管理</div>
+                <div class="code-name">#icon-dingdanguanli</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-kefu"></use>

f/web-kboss/src/assets/css/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 5043107 */
-  src: url('iconfont.woff2?t=1760680783657') format('woff2'),
+  src: url('iconfont.woff2?t=1760930186762') format('woff2'),
-       url('iconfont.woff?t=1760680783657') format('woff'),
+       url('iconfont.woff?t=1760930186762') format('woff'),
-       url('iconfont.ttf?t=1760680783657') format('truetype');
+       url('iconfont.ttf?t=1760930186762') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,30 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-fuzhi:before {
+  content: "\e61b";
+}
+
+.icon-dalei-quanbuchanpin:before {
+  content: "\e64c";
+}
+
+.icon-ziyuanguanliqi:before {
+  content: "\e641";
+}
+
+.icon-shequfuwu:before {
+  content: "\e616";
+}
+
+.icon-fuzhi-:before {
+  content: "\e648";
+}
+
+.icon-dingdanguanli:before {
+  content: "\e602";
+}
+
 .icon-kefu:before {
   content: "\e625";
 }

f/web-kboss/src/assets/css/iconfont/iconfont.json

@@ -5,6 +5,48 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "300409",
+      "name": "复制",
+      "font_class": "fuzhi",
+      "unicode": "e61b",
+      "unicode_decimal": 58907
+    },
+    {
+      "icon_id": "10621831",
+      "name": "大类-全部产品",
+      "font_class": "dalei-quanbuchanpin",
+      "unicode": "e64c",
+      "unicode_decimal": 58956
+    },
+    {
+      "icon_id": "11121510",
+      "name": "资源管理器",
+      "font_class": "ziyuanguanliqi",
+      "unicode": "e641",
+      "unicode_decimal": 58945
+    },
+    {
+      "icon_id": "12459826",
+      "name": "社区服务",
+      "font_class": "shequfuwu",
+      "unicode": "e616",
+      "unicode_decimal": 58902
+    },
+    {
+      "icon_id": "12562411",
+      "name": "复制",
+      "font_class": "fuzhi-",
+      "unicode": "e648",
+      "unicode_decimal": 58952
+    },
+    {
+      "icon_id": "19657695",
+      "name": "订单管理",
+      "font_class": "dingdanguanli",
+      "unicode": "e602",
+      "unicode_decimal": 58882
+    },
     {
       "icon_id": "2674476",
       "name": "客服",

f/web-kboss/src/views/administrator/departmentManagement/index.vue

@@ -3,7 +3,7 @@
     <el-row :gutter="10">
       <el-col :span="8" style="overflow-x: auto;min-width: 100px;" class="treeCard">
         <el-card class="left" style="font-size: 14px;overflow-x: auto!important;padding: 0!important;min-width: 200px;">
-          <el-button type="primary" size="small" v-if="treeData.length==[]" @click="addDepartment()">请添加部门</el-button>
+          <el-button type="primary" size="small" v-if="treeData.length==[]" @click="addDepartment()" style="margin-left: 14px;margin-top: 14px;">请添加部门</el-button>
           <Tree id="tree" style="overflow-x: auto!important; height: calc(100vh - 106px);" v-else ref="tree" node-key="id" :tree-data="treeData" :add-form-arr="addFormArr" :add-form="addForm" @treeDelChange="treeDelChange" :default-props="defaultProps" :default-expand-all="true" :is-add-del="true" @treeSubmitChange="treeSubmitChange" @treeUpdateChange="treeUpdateChange" @treeEditChange="treeEditChange"></Tree>
         </el-card>
       </el-col>

f/web-kboss/src/views/customer/orderManagement/index.vue

@@ -49,12 +49,8 @@
         <el-col :span="24">
           <div class="mobile-filter">
             <span class="filter-label">类型:</span>
-            <el-button
+            <el-button v-for="(config, type) in orderTypes" :key="type" size="mini"
-              v-for="(config, type) in orderTypes"
+              :type="businessOpFilter === type ? config.buttonType : ''" @click="handleBusinessOpFilter(type)">
-              :key="type"
-              size="mini"
-              :type="businessOpFilter === type ? config.buttonType : ''"
-              @click="handleBusinessOpFilter(type)">
               {{ config.text }}
             </el-button>
           </div>
@@ -66,10 +62,7 @@
         <el-col :span="24">
           <div class="mobile-filter">
             <span class="filter-label">状态:</span>
-            <el-button
+            <el-button v-for="status in orderStatuses" :key="status.value" size="mini"
-              v-for="status in orderStatuses"
-              :key="status.value"
-              size="mini"
               :type="orderStatusFilter === status.value ? status.buttonType : ''"
               @click="handleOrderStatusFilter(status.value)">
               {{ status.text }}
@@ -88,15 +81,14 @@
 
     <!-- PC端头部 -->
     <el-card class="pcCard" v-else>
+      <!-- 头 -->
+      <div class="top">
         <div class="header-container">
           <div class="search-group">
             <el-select v-model="select" filterable @change="selectSearch" class="search-select" placeholder="请选择"
               size="small" style="width: 100px">
               <el-option label="订单号" value="id" />
               <el-option label="订单日期" value="order_date" />
-            <!-- <el-option label="订单状态:未支付" value="0" />
-            <el-option label="订单状态:已支付" value="1" />
-            <el-option label="订单状态:已取消" value="3" /> -->
             </el-select>
 
             <el-input size="small" v-show="select == 'id'" placeholder="请输入内容" class="search-input" @input="input"
@@ -139,15 +131,15 @@
               </div>
             </div>
           </div>
-
+        </div>
+      </div>
+      <!-- 底部 -->
+      <div class="btm">
         <!-- 类型筛选 -->
         <div class="type-filter">
           <span>订单类型筛选：</span>
-          <el-button
+          <el-button v-for="(config, type) in orderTypes" :key="type"
-            v-for="(config, type) in orderTypes"
+            :type="businessOpFilter === type ? config.buttonType : ''" @click="handleBusinessOpFilter(type)">
-            :key="type"
-            :type="businessOpFilter === type ? config.buttonType : ''"
-            @click="handleBusinessOpFilter(type)">
             {{ config.text }}
           </el-button>
         </div>
@@ -155,9 +147,7 @@
         <!-- 状态筛选 -->
         <div class="status-filter">
           <span>订单状态筛选：</span>
-          <el-button
+          <el-button v-for="status in orderStatuses" :key="status.value"
-            v-for="status in orderStatuses"
-            :key="status.value"
             :type="orderStatusFilter === status.value ? status.buttonType : ''"
             @click="handleOrderStatusFilter(status.value)">
             {{ status.text }}
@@ -176,51 +166,70 @@
 
     <!-- 表格部分 -->
     <el-card class="orderList">
-      <el-table border :data="tableData" class="table" height="calc(100vh - 264px)" v-loading="all_price_show">
+      <div class="table-box" >
-        <el-table-column label="序号" width="180">
+        <el-table border :data="tableData" class="table" height="64vh" width="100%" v-loading="all_price_show">
+          <el-table-column label="序号" width="120" align="center" header-align="center">
             <template slot-scope="scope">
-            {{ (pagination.page - 1) * pagination.size + scope.$index + 1 }}
+              <div class="cell-content">{{ (pagination.page - 1) * pagination.size + scope.$index + 1 }}</div>
             </template>
           </el-table-column>
-        <el-table-column align="center" min-width="180" header-align="center" prop="product_name" label="产品名称">
+          <el-table-column align="center" header-align="center" prop="product_name" label="产品名称" width="200" show-overflow-tooltip>
-        </el-table-column>
-        <el-table-column align="center" min-width="180" header-align="center" prop="id" label="订单号"></el-table-column>
-        <el-table-column align="center" header-align="center" label="订单原价" prop="list_price">
             <template slot-scope="scope">
-            ￥{{ scope.row.list_price }}
+              <div class="cell-content">{{ scope.row.product_name }}</div>
             </template>
           </el-table-column>
-        <el-table-column align="center" header-align="center" label="订单折后价">
+          <el-table-column align="center" header-align="center" prop="id" label="订单号" show-overflow-tooltip>
             <template slot-scope="scope">
-            {{ scope.row.amount ? "￥" + scope.row.amount : "-" }}
+              <div class="cell-content">{{ scope.row.id }}</div>
             </template>
           </el-table-column>
-        <el-table-column align="center" header-align="center" label="订单类型">
+          <el-table-column align="center" header-align="center" label="订单原价" width="140">
             <template slot-scope="scope">
-            <el-tag :style="{ padding: '0 8px' }" :type="getOrderTypeConfig(scope.row.business_op).type">
+              <div class="cell-content">￥{{ scope.row.list_price }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" header-align="center" label="订单折后价" width="140">
+            <template slot-scope="scope">
+              <div class="cell-content">{{ scope.row.amount ? "￥" + scope.row.amount : "-" }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" header-align="center" label="订单类型" width="120">
+            <template slot-scope="scope">
+              <div class="cell-content">
+                <el-tag :type="getOrderTypeConfig(scope.row.business_op).type">
                   {{ getOrderTypeConfig(scope.row.business_op).text }}
                 </el-tag>
+              </div>
             </template>
           </el-table-column>
-        <el-table-column align="center" header-align="center" label="订单状态">
+          <el-table-column align="center" header-align="center" label="订单状态" width="120">
             <template slot-scope="scope">
-            <el-tag :style="{ padding: '0 5px' }" :type="getOrderStatusConfig(scope.row.order_status).tagType" effect="dark">
+              <div class="cell-content">
+                <el-tag :type="getOrderStatusConfig(scope.row.order_status).tagType" effect="dark">
                   {{ getOrderStatusConfig(scope.row.order_status).text }}
                 </el-tag>
+              </div>
             </template>
           </el-table-column>
-        <el-table-column align="center" header-align="center" prop="order_date" label="订单日期"></el-table-column>
+          <el-table-column align="center" header-align="center" label="订单日期" width="150">
-        <el-table-column align="center" header-align="center" label="操作">
             <template slot-scope="scope">
+              <div class="cell-content">{{ formatOrderDate(scope.row.order_date) }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" header-align="center" label="操作" width="140">
+            <template slot-scope="scope">
+              <div class="cell-content">
                 <el-button size="small" v-if="scope.row.order_status === '0'" type="primary"
-              @click="orderDetails(scope.row)" style="padding: 8px 15px">去支付
+                  @click="orderDetails(scope.row)">去支付
                 </el-button>
-            <el-button size="small" v-else type="primary" @click="orderDetails(scope.row)" style="padding: 8px">
+                <el-button size="small" v-else type="primary" @click="orderDetails(scope.row)" style="line-height: 0;">
                   查看详情
                 </el-button>
+              </div>
             </template>
           </el-table-column>
         </el-table>
+      </div>
 
       <!-- 分页 -->
       <div class="page">
@@ -330,6 +339,40 @@ export default {
     this.isMobile = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(this.userAgent);
   },
   methods: {
+    // 格式化订单日期为 XXXX-XX-XX 格式
+    formatOrderDate(dateString) {
+      if (!dateString) return '-';
+
+      try {
+        // 处理各种可能的日期格式
+        const date = new Date(dateString);
+        if (isNaN(date.getTime())) {
+          // 如果 Date 解析失败，尝试直接处理字符串
+          if (typeof dateString === 'string') {
+            // 移除可能的时间部分
+            const datePart = dateString.split(' ')[0];
+            const parts = datePart.split('-');
+            if (parts.length === 3) {
+              const year = parts[0];
+              const month = parts[1].padStart(2, '0');
+              const day = parts[2].padStart(2, '0');
+              return `${year}-${month}-${day}`;
+            }
+          }
+          return dateString; // 如果无法处理，返回原字符串
+        }
+
+        // 标准日期格式化
+        const year = date.getFullYear().toString();
+        const month = (date.getMonth() + 1).toString().padStart(2, '0');
+        const day = date.getDate().toString().padStart(2, '0');
+        return `${year}-${month}-${day}`;
+      } catch (error) {
+        console.error('日期格式化错误:', error, dateString);
+        return dateString; // 出错时返回原字符串
+      }
+    },
+
     // 获取订单类型配置
     getOrderTypeConfig(type) {
       return this.orderTypes[type] || { text: "-", type: "primary", buttonType: "" };
@@ -620,7 +663,47 @@ export default {
   // PC端优化样式
   .pcCard {
     margin-bottom: 10px;
+    .btm{
+      display: flex;
+      margin-top: 10px;
+      .type-filter{
+         display: flex;
+        align-items: center;
+        span {
+          margin-right: 8px;
+          font-size: 14px;
+          color: #606266;
+          white-space: nowrap;
+        }
 
+        .el-button {
+          margin-right: 5px;
+          padding: 7px 12px;
+        }
+      }
+      .status-filter {
+        display: flex;
+        align-items: center;
+        margin-left: 20px;
+
+        span {
+          margin-right: 8px;
+          font-size: 14px;
+          color: #606266;
+          white-space: nowrap;
+        }
+
+        .el-button {
+          margin-right: 5px;
+          padding: 7px 12px;
+        }
+      }
+
+      .reset {
+        display: flex;
+        align-items: center;
+      }
+    }
     .header-container {
       display: flex;
       align-items: center;
@@ -672,6 +755,7 @@ export default {
           align-items: center;
           font-size: 14px;
           margin-left: 10px;
+
           .stat-label {
             color: #606266;
             margin-right: 8px;
@@ -689,35 +773,12 @@ export default {
           }
         }
       }
-
-      .type-filter, .status-filter {
-        display: flex;
-        align-items: center;
-        margin-left: 20px;
-
-        span {
-          margin-right: 8px;
-          font-size: 14px;
-          color: #606266;
-          white-space: nowrap;
-        }
-
-        .el-button {
-          margin-right: 5px;
-          padding: 7px 12px;
-        }
-      }
-
-      .reset {
-        display: flex;
-        align-items: center;
-      }
     }
   }
 
   .orderList {
     margin-top: 10px;
-    height: calc(100vh - 180px);
+    height: calc(100vh - 214px);
 
     .table {
       width: 100%;
@@ -739,6 +800,43 @@ export default {
   padding: 0 8px !important;
 }
 
+// 表格行高调整
+::v-deep .el-table {
+  .el-table__row {
+    width: 100%;
+    height: 56px; // 增加行高
+  }
+
+  .el-table__cell {
+    padding: 12px 0; // 增加单元格内边距
+  }
+
+  .cell-content {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 100%;
+    min-height: 28px;
+  }
+
+  .el-button {
+    height: 32px;
+    // line-height: 32px;
+  }
+}
+
+// 表头样式调整
+::v-deep .el-table .el-table__header-wrapper {
+  .el-table__cell {
+    padding: 16px 0;
+    background-color: #d0cff8;
+    .cell {
+      font-weight: 600;
+      font-size: 14px;
+    }
+  }
+}
+
 // 响应式调整
 @media screen and (max-width: 1200px) {
   .pcCard .header-container {

f/web-kboss/src/views/sales/BdUserMangement/orderMangement/index.vue

@@ -113,7 +113,9 @@
         </el-table>
       </el-dialog>
     </div>
-    <div>
+
+
+    <div class="table-box">
       <el-table
         v-loading="tableLoading"
         :data="listData"
@@ -212,6 +214,7 @@
 
       </el-table>
       <el-pagination
+        class="paginationStyle"
         layout="prev, pager, next"
         @current-change="handleCurrentChange"
         :total="total">
@@ -462,7 +465,7 @@ export default {
 <style scoped lang="scss">
 .mainBox {
   padding-left: 5px;
-  height: 100%;
+  height: 90vh;
   background: white;
 
   .headerT {
@@ -473,6 +476,8 @@ export default {
 
   .headerL {
     width: fit-content;
+    padding-top: 20px;
+    padding-left: 20px;
   }
 
   .headerR {
@@ -508,4 +513,11 @@ export default {
     //width: 24%;
   }
 }
+.table-box{
+  padding:  20px;
+}
+.paginationStyle{
+  text-align: center;
+  margin: 20px;
+}
 </style>

f/web-kboss/src/views/sales/customerManagement/jiNanChaoSuanUserList/index.vue

@@ -5,6 +5,7 @@ align="center" header-align="center"
       <div style="height: 50px;display: flex;justify-content: flex-start;align-items: center;padding-left: 10px">
         <el-button type="primary" @click="hpcLdapAddVisible()" size="small">新增超算账号</el-button>
       </div>
+      <div class="table-box">
         <el-table :data="tableDate" class="table_height" border height="calc(100vh - 150px)" v-loading="loading">
         <el-table-column align="center" header-align="center" prop="ldapuid" label="超算用户编码"></el-table-column>
         <el-table-column align="center" header-align="center" prop="orgname" label="已绑定用户">
@@ -29,6 +30,7 @@ align="center" header-align="center"
         </el-table-column>
       </el-table>
       </div>
+    </div>
 
     <!-- 新增超算账号弹窗 -->
     <el-dialog title="新增超算账号" :visible.sync="addDialogVisible" width="30%" :before-close="handleClose">
@@ -306,4 +308,8 @@ export default {
 .table_height {
   width: 100%;
 }
+.table-box{
+  padding:10px 20px;
+
+}
 </style>

f/web-kboss/src/views/sales/distributorManagement/index.vue

@@ -9,7 +9,7 @@
           :data="distributorList"
           style="width: 100%"
           :unique-opened="true"
-          height="calc(100vh - 130px)"
+          height="100%"
           v-loading="loading"
           highlight-current-row
           :row-key="getRowKeys"
@@ -2576,7 +2576,10 @@ export default {
 }
 
 .distributor_box {
-  height: calc(100vh - 130px);
+  height: calc(100vh - 160px);
+  padding: 20px;
+  background-color: #fff;
+  margin-top: 16px;
 }
 
 /* 展开详情样式优化 */