Merge branch 'anhui-mall-ui-test' of http://192.168.0.75:3000/bonus/bonus-ui into anhui-mall-ui-test

src/views/EquipmentUpOrDown/equipment/index.vue

@@ -568,7 +568,7 @@ export default {
   display: flex;
   flex-direction: column;
   overflow: hidden;
-  
+
   ::v-deep .el-card__body {
     display: flex !important;
     flex-direction: column !important;

src/views/material/ma/type/index.vue

@@ -97,7 +97,7 @@
           </el-form>
         </el-card>
 
-        <el-card style="margin-top: 20px">
+        <el-card class="content-box" style="margin-top: 20px">
           <el-row :gutter="10" class="mb8" style="text-align: right">
             <el-col :span="24">
               <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
@@ -553,4 +553,18 @@ body {
 ::v-deep .el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
   background-color: #8decf1;
 }
+.content-box {
+  border-radius: 8px;
+  height: calc(100vh - 220px);
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+  
+  ::v-deep .el-card__body {
+    display: flex !important;
+    flex-direction: column !important;
+    height: 100% !important;
+    padding: 20px;
+  }
+}
 </style>

src/views/system/approval/index.vue

@@ -31,7 +31,7 @@
 
 
     <!-- 流程列表 -->
-    <el-card class="box-card">
+    <el-card class="content-box">
       <!-- 操作按钮 -->
       <el-row style="float:right;margin-bottom: 10px">
       <el-button type="primary" size="small" icon="el-icon-plus" @click="handleAdd">新增流程</el-button>
@@ -221,9 +221,23 @@ export default {
 }
 </script>
 
-<style scoped>
+<style scoped lang="scss">
 .box-card {
   margin-bottom: 20px;
 }
+.content-box {
+  border-radius: 8px;
+  height: calc(100vh - 240px);
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+  
+  ::v-deep .el-card__body {
+    display: flex !important;
+    flex-direction: column !important;
+    height: 100% !important;
+    padding: 20px;
+  }
+}
 </style>
 

src/views/system/equipment/index.vue

@@ -20,13 +20,13 @@
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
                  label-width="68px"
         >
-          <el-form-item label="装备分类" prop="equipmenttype">
+          <el-form-item label="类目" prop="equipmenttype">
-            <el-input v-model="queryParams.equipmenttype" placeholder="请输入装备分类" clearable style="width: 240px"
+            <el-input v-model="queryParams.equipmenttype" placeholder="请输入类目" clearable style="width: 240px"
                       @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="装备名称" prop="equipmentName">
+          <el-form-item label="名称" prop="equipmentName">
-            <el-input v-model="queryParams.equipmentName" placeholder="请输入装备名称" clearable style="width: 240px"
+            <el-input v-model="queryParams.equipmentName" placeholder="请输入名称" clearable style="width: 240px"
                       @keyup.enter.native="handleQuery"
             />
           </el-form-item>
@@ -53,11 +53,27 @@
           :row-class-name="getRowClassName"
           height="546"
         >
-          <el-table-column label="装备分类" align="center" key="equipmentName" prop="equipmentName"
+          <el-table-column label="类目" align="center" key="equipmentName" prop="equipmentName"
                            :show-overflow-tooltip="true"
           />
-          <el-table-column label="装备名称" align="center" key="equipmenttype" prop="equipmenttype"/>
+          <el-table-column label="名称" align="center" key="equipmenttype" prop="equipmenttype"/>
           <el-table-column label="基本配置" align="center" prop="configStatus"/>
+          <el-table-column label="分类" align="center" width="130">
+            <template #default="scope">
+              <div class="type-tag-wrapper">
+                <span
+                  :class="[
+                    'type-tag',
+                    'type-tag-modern',
+                    scope.row.jijuType === '1' ? 'type-equipment-modern' : 'type-tool-modern'
+                  ]"
+                >
+                  <i :class="scope.row.jijuType === '1' ? 'el-icon-suitcase' : 'el-icon-tools'" class="tag-icon"></i>
+                  {{ scope.row.jijuType === '1' ? '装备' : '工具' }}
+                </span>
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button
@@ -258,6 +274,7 @@ export default {
       this.dialogTitle = `编辑基本配置 - ${row.equipmentName}`;
       this.configForm.deptId = this.currentDeptId;
       this.configForm.equipmentId = row.equipmentId;
+       this.configForm.jijuType = row.jijuType;
       this.configForm.configs =[]
       // 检查是否选择了部门
       if (!this.currentDeptId) {
@@ -507,4 +524,58 @@ export default {
   color: #1a73e8;
   margin-left: 8px;
 }
+.type-tag-modern {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  min-width: 70px;
+  height: 32px;
+  padding: 0 16px;
+  font-size: 13px;
+  font-weight: 600;
+  line-height: 1;
+  border-radius: 16px;
+  border: none;
+  box-sizing: border-box;
+  transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+  box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1);
+  letter-spacing: 0.5px;
+}
+
+.type-equipment-modern {
+  background: linear-gradient(135deg, #409EFF 0%, #1a7be0 100%);
+  color: white;
+  position: relative;
+  overflow: hidden;
+}
+
+.type-equipment-modern::before {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: -100%;
+  width: 100%;
+  height: 100%;
+  background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.2), transparent);
+  transition: left 0.5s ease;
+}
+
+.type-equipment-modern:hover::before {
+  left: 100%;
+}
+
+.type-tool-modern {
+  background: linear-gradient(135deg, #67C23A 0%, #4a9c2a 100%);
+  color: white;
+}
+
+.tag-icon {
+  margin-right: 6px;
+  font-size: 14px;
+}
+
+.type-tag-modern:hover {
+  transform: translateY(-2px);
+  box-shadow: 0 6px 12px rgba(0, 0, 0, 0.15);
+}
 </style>

src/views/system/project/index.vue

@@ -96,7 +96,7 @@
         <el-table
           :data="projectList"
           show-overflow-tooltip
-          border stripe height="646"
+          border stripe height="550"
           @selection-change="handleSelectionChange"
         >
           <!--复选列-->