代码提交

src/api/address-manage/index.js

@@ -6,7 +6,7 @@ export const getAreaApi = (areaCode) => {
     url: '/material-mall/maType/getArea',
     method: 'GET',
     params: {
-      areaCode: areaCode || ''
+      areaCode: areaCode
     }
   })
 }

src/views/EquipmentRetire/index.vue

@@ -92,12 +92,11 @@
       </el-form>
 
       <el-card class="content-box">
-<!--        <el-row>
+        <el-row>
-          <el-col :span="24" style="text-align: right;">
+          <el-col :span="2">
-            <el-button type="primary" icon="el-icon-refresh" size="mini" @click="onHandleBatchRetire">批量退役
+            <span style="font-size: 20px; font-weight: 800">退役预警列表</span>
-            </el-button>
           </el-col>
-        </el-row>-->
+        </el-row>
         <div >
           <el-table :data="tableData" style="width: 100%" border stripe class="my-table">
             <el-table-column align="center" show-overflow-tooltip type="index" label="序号" width="50"/>

src/views/EquipmentRoamRecord/maintenanceRecord/index.vue

@@ -39,7 +39,10 @@
 
     <el-card class="content-box">
       <el-row>
-        <el-col :span="24" style="text-align: right;">
+        <el-col :span="2">
+          <span style="font-size: 20px; font-weight: 800">维修记录列表</span>
+        </el-col>
+        <el-col :span="22" style="text-align: right;">
           <el-button type="primary" icon="el-icon-download" size="mini" @click="onHandleExport">导出数据</el-button>
         </el-col>
       </el-row>

src/views/EquipmentRoamRecord/outboundRecord/index.vue

@@ -35,8 +35,11 @@
 
 
     <el-card class="content-box">
-      <el-row>
+      <el-row :gutter="10" class="mb8" justify="end">
-        <el-col :span="24" style="text-align: right;">
+        <el-col :span="2">
+          <span style="font-size: 20px; font-weight: 800">出库记录列表</span>
+        </el-col>
+        <el-col :span="22" style="text-align: right;">
           <el-button type="primary" icon="el-icon-download" size="mini" @click="onHandleExport">导出数据</el-button>
         </el-col>
       </el-row>

src/views/EquipmentRoamRecord/retirementRecord/index.vue

@@ -38,7 +38,10 @@
 
     <el-card class="content-box">
       <el-row>
-        <el-col :span="24" style="text-align: right;">
+        <el-col :span="2">
+          <span style="font-size: 20px; font-weight: 800">退役记录列表</span>
+        </el-col>
+        <el-col :span="22" style="text-align: right;">
           <el-button type="primary" icon="el-icon-download" size="mini" @click="onHandleExport">导出数据</el-button>
         </el-col>
       </el-row>

src/views/EquipmentRoamRecord/returnRecord/index.vue

@@ -27,7 +27,10 @@
 
     <el-card class="content-box">
       <el-row>
-        <el-col :span="24" style="text-align: right;">
+        <el-col :span="2">
+          <span style="font-size: 20px; font-weight: 800">退库记录列表</span>
+        </el-col>
+        <el-col :span="22" style="text-align: right;">
           <el-button type="primary" icon="el-icon-download" size="mini" @click="onHandleExport">导出数据</el-button>
         </el-col>
       </el-row>

src/views/EquipmentServicing/index.vue

@@ -76,6 +76,11 @@
       </el-card>
     </el-form>
     <el-card class="content-box">
+      <el-row>
+        <el-col :span="2">
+          <span style="font-size: 20px; font-weight: 800">维保预警列表</span>
+        </el-col>
+      </el-row>
       <div >
         <!-- 维保列表表格 -->
         <el-table

src/views/EquipmentSharedLease/order/index.vue

@@ -66,6 +66,9 @@
       </el-form>
     </el-card>
     <el-card class="content-box">
+      <el-col :span="2">
+        <span style="font-size: 20px; font-weight: 800">出租记录列表</span>
+      </el-col>
       <div class="table-container">
         <template v-if="cardList.length > 0">
           <div class="cart-tbody" v-for="(item, index) in cardList" :key="index">

src/views/EquipmentSharedOrder/order/index.vue

@@ -62,6 +62,9 @@
     </el-card>
 
     <el-card class="content-box">
+      <el-col :span="2">
+        <span style="font-size: 20px; font-weight: 800">租赁记录列表</span>
+      </el-col>
       <div class="table-container">
         <!-- 订单列表 -->
         <template v-if="cardList.length > 0">

src/views/EquipmentUpOrDown/equipment/index.vue

@@ -73,20 +73,27 @@
 
         <!-- 数据列表（保持原有内容，优化样式） -->
         <el-card class="content-box">
-            <el-row class="content-header">
+
+            <el-row :gutter="24" class="mb8">
+              <el-col :span="4">
+                <span style="font-size: 20px; font-weight: 800">装备上下架列表</span>
+              </el-col>
+              <el-col :span="20" >
                 <el-button
                     size="mini"
                     type="danger"
                     class="primary-lease"
                     @click="handleBatchDown"
+                    style="float: right;margin-right: 10px"
                     :disabled="selectedRows.length === 0"
                 >
                     批量下架
                 </el-button>
 
-                <el-button size="mini" @click="equipment" type="primary" class="primary-lease">
+                <el-button style="float: right;margin-right: 10px" size="mini" @click="equipment" type="primary" class="primary-lease">
                     添加上架装备
                 </el-button>
+              </el-col>
             </el-row>
 
             <el-table
@@ -701,11 +708,8 @@ export default {
 }
 
 .content-header {
-    display: flex;
+
-    gap: 10px;
-    justify-content: flex-end;
     margin-bottom: 16px;
-    flex-shrink: 0;
 }
 
 /* 表格样式优化 */

src/views/EquipmentUpOrDown/tool/index.vue

@@ -71,24 +71,28 @@
 
         <!-- 数据列表 -->
         <el-card class="content-box">
-            <el-row
+            <el-row :gutter="24" class="mb8">
-                style="margin-bottom: 16px; display: flex; justify-content: flex-end; align-items: center; gap: 10px"
+              <el-col :span="4">
-            >
+                <span style="font-size: 20px; font-weight: 800">工具上下架列表</span>
+              </el-col>
+              <el-col :span="20">
                 <el-button
-                    size="mini"
+                  size="mini"
-                    type="danger"
+                  type="danger"
-                    class="primary-lease"
+                  class="primary-lease"
-                    @click="handleBatchDown"
+                  @click="handleBatchDown"
-                    :disabled="selectedRows.length === 0"
+                  style="float: right;margin-right: 10px"
+                  :disabled="selectedRows.length === 0"
                 >
-                    批量下架
+                  批量下架
                 </el-button>
 
-                <el-button size="mini" @click="numberTool" type="primary" class="primary-lease">
+                <el-button size="mini"  style="float: right;margin-right: 10px" @click="numberTool" type="primary" class="primary-lease">
-                    上架数量工具
+                  上架数量工具
                 </el-button>
 
-                <el-button size="mini" @click="codeTool" type="primary" class="primary-lease"> 上架编码工具 </el-button>
+                <el-button size="mini"  style="float: right;margin-right: 10px" @click="codeTool" type="primary" class="primary-lease"> 上架编码工具 </el-button>
+              </el-col>
             </el-row>
 
             <div>
@@ -1129,17 +1133,7 @@ export default {
         padding: 20px;
     }
 
-    .el-row:first-child {
-        margin-bottom: 16px;
-        flex-shrink: 0;
 
-        .el-col {
-            display: flex;
-            justify-content: flex-end;
-            align-items: center;
-            gap: 12px;
-        }
-    }
 
     .table-container {
         overflow: hidden;

src/views/equipmentRepair/repairApply/repairList.vue

@@ -46,7 +46,7 @@
         <el-col :span="4">
           <span style="font-size: 20px; font-weight: 800">维修申请列表</span>
         </el-col>
-        <el-col :span="24" style="display: flex; justify-content: flex-end">
+        <el-col :span="20" style="display: flex; justify-content: flex-end">
           <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新建申请</el-button>
         </el-col>
         <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" /> -->

src/views/search/lease/index.vue

@@ -13,7 +13,7 @@
                 maxlength="20"
               />
             </el-form-item>
-            <el-form-item prop="code" label="装备编码" style="margin-left: 20px;">
+            <el-form-item prop="code" label="装备编码">
               <el-input
                 v-model="queryParams.code"
                 placeholder="装备编码"
@@ -23,7 +23,7 @@
               />
             </el-form-item>
 
-            <el-form-item prop="maStatus" label="装备状态" style="margin-left: 20px;">
+            <el-form-item prop="maStatus" label="装备状态">
               <el-select
                 style="width: 100% "
 
@@ -39,7 +39,7 @@
             </el-form-item>
 
 
-            <el-form-item prop="rentNum" label="共享次数" style="margin-left: 20px;">
+            <el-form-item prop="rentNum" label="共享次数">
               <el-input
                 v-model="queryParams.rentNum"
                 placeholder="共享次数"
@@ -50,7 +50,7 @@
               />
             </el-form-item>
 
-            <el-form-item prop="dateRange" label="更新时间" style="margin-left: 20px;">
+            <el-form-item prop="dateRange" label="更新时间">
               <el-date-picker
 
                 v-model="dateRange"

src/views/stockManagement/entryApply/apply.vue

@@ -3,8 +3,8 @@
     <GoBack :title="title" @goBack="goBack" />
     <el-tabs v-model="activeName" :before-leave="beforeClick">
       <el-tab-pane label="施工装备" name="EquipmentAdd"></el-tab-pane>
-      <el-tab-pane label="数量工具" name="AddNum"></el-tab-pane>
       <el-tab-pane label="编码工具" name="AddCode"></el-tab-pane>
+      <el-tab-pane label="数量工具" name="AddNum"></el-tab-pane>
     </el-tabs>
     <component ref="componentRef" :is="isShowComponent" />
   </div>

src/views/stockManagement/entryApply/components/EquipmentAdd.vue

@@ -4,13 +4,13 @@
     <el-form :model="queryParams" ref="queryFormRef" :inline="true" inline label-width="auto" size="small">
       <el-card class="search-box">
         <el-row>
-          <el-form-item label="审批状态" prop="status">
+<!--          <el-form-item label="审批状态" prop="status">-->
-            <el-select clearable style="width: 200px" placeholder="请选择审批状态" v-model="queryParams.status">
+<!--            <el-select clearable style="width: 200px" placeholder="请选择审批状态" v-model="queryParams.status">-->
-              <el-option label="待审批" value="0"/>
+<!--              <el-option label="待审批" value="0"/>-->
-              <el-option label="已审批" value="1"/>
+<!--              <el-option label="已审批" value="1"/>-->
-              <el-option label="草稿" value="3"/>
+<!--              <el-option label="草稿" value="3"/>-->
-            </el-select>
+<!--            </el-select>-->
-          </el-form-item>
+<!--          </el-form-item>-->
 
           <el-form-item prop="name" label="装备名称">
             <el-input clearable style="width: 200px" placeholder="请输入内容" v-model.trim="queryParams.name"/>

src/views/toolsManage/toolsLedger/index.vue

@@ -97,9 +97,9 @@
       <el-row :gutter="10" class="mb8">
         <el-col :span="1.5">
           <!-- <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出数据</el-button> -->
-          <div style="font-size: 20; font-weight: 800">数量工具台账列表</div>
+          <div style="font-size: 20px; font-weight: 800">数量工具台账列表</div>
         </el-col>
-        <el-button icon="el-icon-download" style="margin-left: 1290px" type="primary" size="mini" @click="handleExport">
+        <el-button icon="el-icon-download" style="margin-left: 1250px" type="primary" size="mini" @click="handleExport">
           导出数据
         </el-button>
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"/>