From 7e884598090cc350949bbfa1dae02e207c1ac64f Mon Sep 17 00:00:00 2001
From: itcast <hello@itcast.cn>
Date: Mon, 24 Nov 2025 18:11:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipmentInput/add.vue                    |  3 ++
 src/views/EquipmentRetireApply/detail.vue     | 22 +++++++------
 src/views/EquipmentRetireApply/index.vue      | 14 +++++++--
 src/views/address-manage/index.vue            |  5 +--
 src/views/business/apply/addApply.vue         |  3 +-
 src/views/contract-manage/index.vue           |  5 +--
 .../repairAudit/repairDetailsAudit.vue        |  2 +-
 src/views/material/ma/type/index.vue          |  2 +-
 src/views/search/lease/index.vue              | 11 +++----
 src/views/system/config/index.vue             | 18 +++++++++--
 src/views/system/dept/index.vue               | 17 ++++++++--
 src/views/system/dict/index.vue               | 22 +++++++++++--
 src/views/system/menu/index.vue               | 17 ++++++++--
 src/views/system/notice/index.vue             | 17 ++++++++--
 src/views/system/post/index.vue               | 17 ++++++++--
 src/views/system/role/index.vue               |  4 +--
 .../toolsManage/codeToolsLedger/index.vue     | 31 +++++++++++++++++++
 17 files changed, 169 insertions(+), 41 deletions(-)

diff --git a/src/views/EquipmentEntryApply/equipmentInput/add.vue b/src/views/EquipmentEntryApply/equipmentInput/add.vue
index 62ff26f0..ae63151e 100644
--- a/src/views/EquipmentEntryApply/equipmentInput/add.vue
+++ b/src/views/EquipmentEntryApply/equipmentInput/add.vue
@@ -391,6 +391,9 @@ export default {
         count: [{ required: true, message: '请输入装备数量', trigger: 'blur' }],
         unit: [{ required: true, message: '请输入计数单位', trigger: 'blur' }],
         purchaseDate: [{ required: true, message: '请选择采购日期', trigger: 'change' }],
+        certificateList: [{ required: true, message: '请上传合格证', trigger: 'change' }],
+        inspectionList: [{ required: true, message: '请上传检测证书', trigger: 'change' }],
+        mainFileList: [{ required: true, message: '请上传图片', trigger: 'change' }]
       },
       propertyVoList: [], // 特征属性集合
     }
diff --git a/src/views/EquipmentRetireApply/detail.vue b/src/views/EquipmentRetireApply/detail.vue
index 4fe8bda8..412d1d05 100644
--- a/src/views/EquipmentRetireApply/detail.vue
+++ b/src/views/EquipmentRetireApply/detail.vue
@@ -64,14 +64,15 @@
           <el-table-column align="center" prop="scrapQuantity" label="申请报废数量" width="120" />
           <el-table-column align="center" prop="retireReason" label="退役原因" width="180">
             <template slot-scope="scope">
-              <el-input
+              <el-select
                 v-model="scope.row.retireReason"
-                placeholder="请输入退役原因"
+                placeholder="请选择退役原因"
                 size="small"
-                maxlength="20"
-                show-word-limit
                 :disabled="!canEdit"
-              />
+              >
+                <el-option label="人为" value="人为"></el-option>
+                <el-option label="自然" value="自然"></el-option>
+              </el-select>
             </template>
           </el-table-column>
           <el-table-column align="center" label="报废附件" width="140">
@@ -148,11 +149,12 @@ export default {
   computed: {
     // 判断是否可以编辑（新增状态或待审批状态下可以编辑）
     canEdit() {
-      if (this.isNew) {
-        return true
-      }
-      const status = this.getStatusLabel()
-      return status === '待审批'
+      // 如果是新增页面，允许编辑
+      if (this.isNew) return true;
+      // 从路由参数中获取 mode
+      const mode = this.$route.query.mode;
+      // 如果 mode 是 'edit'，允许编辑；如果是 'view' 或其他值，不允许编辑
+      return mode === 'edit';
     }
   },
   methods: {
diff --git a/src/views/EquipmentRetireApply/index.vue b/src/views/EquipmentRetireApply/index.vue
index c0699381..00ab629b 100644
--- a/src/views/EquipmentRetireApply/index.vue
+++ b/src/views/EquipmentRetireApply/index.vue
@@ -142,12 +142,15 @@ export default {
       this.$router.push('/equipment/retire-apply/detail/new')
     },
 
-    // 查看/编辑
+    // 查看
     onHandleView(row) {
       this.$router.push({
         name: 'RetireApplyDetail',
         params: { id: row.id },
-        query: { taskInfo: JSON.stringify(row) }
+        query: {
+          taskInfo: JSON.stringify(row),
+          mode: 'view' // 增加 mode 参数，标识为查看模式
+        }
       })
     },
 
@@ -156,10 +159,15 @@ export default {
       this.$router.push({
         name: 'RetireApplyDetail',
         params: { id: row.id },
-        query: { taskInfo: JSON.stringify(row) }
+        query: {
+          taskInfo: JSON.stringify(row),
+          mode: 'edit' // 增加 mode 参数，标识为编辑模式
+        }
       })
     },
 
+
+
     // 删除
     async onHandleDelete(row) {
       this.$confirm('确定删除该退役申请吗?', '提示', {
diff --git a/src/views/address-manage/index.vue b/src/views/address-manage/index.vue
index a4b9f3f5..f3b0097f 100644
--- a/src/views/address-manage/index.vue
+++ b/src/views/address-manage/index.vue
@@ -41,7 +41,8 @@
         <template slot-scope="{ row }">
           <el-button
             size="small"
-            type="primary"
+            type="text"
+            icon="el-icon-edit"
             class="primary-lease"
             @click="onRepublish(row)"
           >
@@ -51,7 +52,7 @@
       </el-table-column>
     </el-table>
     </div>
-    
+
     <div class="pagination-wrapper">
     <pagination
       :total="total"
diff --git a/src/views/business/apply/addApply.vue b/src/views/business/apply/addApply.vue
index c8a84c77..84fb6b00 100644
--- a/src/views/business/apply/addApply.vue
+++ b/src/views/business/apply/addApply.vue
@@ -313,7 +313,8 @@ export default {
         proCity: [{ required: true, message: '请选择项目所在市', trigger: 'change' }],
         proCounty: [{ required: true, message: '请选择项目所在区/县', trigger: 'change' }],
         proLocation: [{ required: true, message: '请输入详细地址', trigger: 'blur' }],
-        useUnit: [{ required: true, message: '请输入需求单位', trigger: 'blur' }]
+        useUnit: [{ required: true, message: '请输入需求单位', trigger: 'blur' }],
+
       },
 
       typeList: [
diff --git a/src/views/contract-manage/index.vue b/src/views/contract-manage/index.vue
index eb4a74f2..69bce655 100644
--- a/src/views/contract-manage/index.vue
+++ b/src/views/contract-manage/index.vue
@@ -100,10 +100,11 @@
       <el-table-column align="center" prop="updateTime" label="更新时间"/>
       <el-table-column align="center" label="操作" :width="220">
         <template scope="scope">
-          <el-button size="mini" type="primary" @click="onContract(scope.row)">编辑</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="onContract(scope.row)">编辑</el-button>
           <el-button
             size="mini"
-            type="danger"
+            type="text"
+            icon="el-icon-delete"
             @click="onDelete(scope.row.id)"
             v-if="scope.row.status == 0"
           >删除</el-button>
diff --git a/src/views/equipmentRepair/repairAudit/repairDetailsAudit.vue b/src/views/equipmentRepair/repairAudit/repairDetailsAudit.vue
index 597f3396..62c25cb6 100644
--- a/src/views/equipmentRepair/repairAudit/repairDetailsAudit.vue
+++ b/src/views/equipmentRepair/repairAudit/repairDetailsAudit.vue
@@ -8,7 +8,7 @@
         </el-col>
         <el-col v-if="!routerParams.isView" :span="20" style="display: flex; justify-content: flex-end">
           <el-button type="primary" @click="handleApprove">通过</el-button>
-          <el-button type="danger" @click="handleReject">驳回</el-button>
+          <el-button type="primary" @click="handleReject">驳回</el-button>
         </el-col>
       </el-row>
 
diff --git a/src/views/material/ma/type/index.vue b/src/views/material/ma/type/index.vue
index bb5f7130..d348a7f4 100644
--- a/src/views/material/ma/type/index.vue
+++ b/src/views/material/ma/type/index.vue
@@ -89,7 +89,7 @@
               />
             </el-form-item>
 
-            <el-form-item>
+            <el-form-item style="float: right">
               <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
               <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
             </el-form-item>
diff --git a/src/views/search/lease/index.vue b/src/views/search/lease/index.vue
index f2bb0584..35c6b220 100644
--- a/src/views/search/lease/index.vue
+++ b/src/views/search/lease/index.vue
@@ -13,7 +13,7 @@
                 maxlength="20"
               />
             </el-form-item>
-            <el-form-item prop="code" label="装备编码" style="margin-left: 25px;">
+            <el-form-item prop="code" label="装备编码" style="margin-left: 20px;">
               <el-input
                 v-model="queryParams.code"
                 placeholder="装备编码"
@@ -23,7 +23,7 @@
               />
             </el-form-item>
 
-            <el-form-item prop="maStatus" label="装备状态" style="margin-left: 25px;">
+            <el-form-item prop="maStatus" label="装备状态" style="margin-left: 20px;">
               <el-select
                 style="width: 100% "
 
@@ -39,7 +39,7 @@
             </el-form-item>
 
 
-            <el-form-item prop="rentNum" label="共享次数" style="margin-left: 25px;">
+            <el-form-item prop="rentNum" label="共享次数" style="margin-left: 20px;">
               <el-input
                 v-model="queryParams.rentNum"
                 placeholder="共享次数"
@@ -50,8 +50,7 @@
               />
             </el-form-item>
 
-
-            <el-form-item prop="dateRange" label="更新时间" style="margin-left: 25px;">
+            <el-form-item prop="dateRange" label="更新时间" style="margin-left: 20px;">
               <el-date-picker
 
                 v-model="dateRange"
@@ -60,7 +59,7 @@
                 range-separator="至"
                 start-placeholder="更新开始日期"
                 end-placeholder="更新结束日期"
-                style="width: 250px "
+                style="width: 260px "
               >
               </el-date-picker>
             </el-form-item>
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index 4e931a88..27687780 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -40,13 +40,14 @@
           end-placeholder="结束日期"
         ></el-date-picker>
       </el-form-item>
-      <el-form-item>
+      <el-form-item style="float: right">
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button  icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
+      <div class="action-bar">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -100,6 +101,7 @@
         >刷新缓存</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      </div>
     </el-row>
 
     <el-table v-loading="loading" :data="configList" @selection-change="handleSelectionChange">
@@ -346,3 +348,15 @@ export default {
   }
 };
 </script>
+
+
+<style lang="scss" scoped>
+/* 新增：统一的操作栏容器样式，用于将所有按钮和工具栏放在右侧 */
+.action-bar {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end; /* 关键：整体内容靠右对齐 */
+  gap: 10px; /* 统一设置内部元素的间距 */
+  width: 100%;
+}
+</style>
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index e940934f..7a783432 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -29,7 +29,7 @@
                     />
                 </el-select>
             </el-form-item>
-            <el-form-item>
+            <el-form-item style="float: right">
                 <el-button
                     type="primary"
                     icon="el-icon-search"
@@ -38,7 +38,7 @@
                     >搜索</el-button
                 >
                 <el-button
-                    type="primary"
+
                     icon="el-icon-refresh"
                     size="mini"
                     @click="resetQuery"
@@ -48,6 +48,7 @@
         </el-form>
 
         <el-row :gutter="10" class="mb8">
+          <div class="action-bar">
             <el-col :span="1.5">
                 <el-button
                     type="primary"
@@ -73,6 +74,7 @@
                 :showSearch.sync="showSearch"
                 @queryTable="getList"
             ></right-toolbar>
+          </div>
         </el-row>
 
         <el-table
@@ -485,3 +487,14 @@ export default {
     },
 }
 </script>
+
+<style lang="scss" scoped>
+/* 新增：统一的操作栏容器样式，用于将所有按钮和工具栏放在右侧 */
+.action-bar {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end; /* 关键：整体内容靠右对齐 */
+  gap: 10px; /* 统一设置内部元素的间距 */
+  width: 100%;
+}
+</style>
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index feee91dc..ca892068 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -45,13 +45,14 @@
           end-placeholder="结束日期"
         ></el-date-picker>
       </el-form-item>
-      <el-form-item>
+      <el-form-item style="float: right">
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button  icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <el-row :gutter="10" class="mb8" >
+      <div class="action-bar">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -105,6 +106,7 @@
         >刷新缓存</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      </div>
     </el-row>
 
     <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
@@ -345,3 +347,17 @@ export default {
   }
 };
 </script>
+
+
+
+
+ <style lang="scss" scoped>
+ /* 新增：统一的操作栏容器样式，用于将所有按钮和工具栏放在右侧 */
+ .action-bar {
+   display: flex;
+   align-items: center;
+   justify-content: flex-end; /* 关键：整体内容靠右对齐 */
+   gap: 10px; /* 统一设置内部元素的间距 */
+   width: 100%;
+ }
+ </style>
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index e5c9ef92..53590071 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -19,13 +19,14 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item>
+      <el-form-item style="float: right">
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button  icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
+      <div class="action-bar">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -46,6 +47,7 @@
         >展开/折叠</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      </div>
     </el-row>
 
     <el-table
@@ -487,3 +489,14 @@ export default {
   }
 };
 </script>
+
+<style lang="scss" scoped>
+/* 新增：统一的操作栏容器样式，用于将所有按钮和工具栏放在右侧 */
+.action-bar {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end; /* 关键：整体内容靠右对齐 */
+  gap: 10px; /* 统一设置内部元素的间距 */
+  width: 100%;
+}
+</style>
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index a0da94ee..518d3491 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -27,13 +27,14 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item>
+      <el-form-item style="float:right">
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button  icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
+      <div class="action-bar">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -70,6 +71,7 @@
         >
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      </div>
     </el-row>
 
     <el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange">
@@ -483,3 +485,14 @@ export default {
   },
 }
 </script>
+
+<style lang="scss" scoped>
+/* 新增：统一的操作栏容器样式，用于将所有按钮和工具栏放在右侧 */
+.action-bar {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end; /* 关键：整体内容靠右对齐 */
+  gap: 10px; /* 统一设置内部元素的间距 */
+  width: 100%;
+}
+</style>
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index de246f00..5d5ef882 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -27,13 +27,14 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item>
+      <el-form-item style="float: right">
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button  icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
+      <div class="action-bar">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -77,6 +78,7 @@
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      </div>
     </el-row>
 
     <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
@@ -307,3 +309,14 @@ export default {
   }
 };
 </script>
+
+<style lang="scss" scoped>
+/* 新增：统一的操作栏容器样式，用于将所有按钮和工具栏放在右侧 */
+.action-bar {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end; /* 关键：整体内容靠右对齐 */
+  gap: 10px; /* 统一设置内部元素的间距 */
+  width: 100%;
+}
+</style>
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index c80a66e8..6a7f780f 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -46,9 +46,9 @@
               end-placeholder="结束日期"
             ></el-date-picker>
           </el-form-item>
-          <el-form-item class="query-buttons">
+          <el-form-item class="query-buttons" style="margin-left: 120px">
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
-            <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            <el-button  icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-form>
       </div>
diff --git a/src/views/toolsManage/codeToolsLedger/index.vue b/src/views/toolsManage/codeToolsLedger/index.vue
index 146b9985..d5242d51 100644
--- a/src/views/toolsManage/codeToolsLedger/index.vue
+++ b/src/views/toolsManage/codeToolsLedger/index.vue
@@ -325,6 +325,37 @@ export default {
         { label: '规格型号', prop: 'typeName' },
         { label: '计量单位', prop: 'unitName' },
         { label: '工具编码', prop: 'toolCode' },
+        {
+          label: "工具状态",
+          prop: "status",
+          width: 120,
+          render: (h, { row }) => {
+            // 定义状态与 el-tag 属性的映射关系
+            // 这样做比 switch/case 更清晰，也更容易维护
+            const statusOptions = {
+              0: { text: "在库", type: "success" },
+              1: { text: "在用", type: "info" },
+              2: { text: "在修", type: "warning" },
+              3: { text: "已报废", type: "danger" },
+            };
+            // 获取当前状态对应的配置，如果没有则用默认值
+            const option = statusOptions[row.status] || {
+              text: "未知状态",
+              type: "",
+            };
+            return h(
+              "el-tag", // 1. 要创建的组件是 el-tag
+              {
+                props: {
+                  type: option.type,
+                  size: "mini",
+                },
+              },
+              option.text
+            );
+          },
+        },
+
         { label: '下次检验时间', prop: 'nextCheckDate' },
         { label: '生产厂家', prop: 'supplierName', width: 200 },
         { label: '出厂日期', prop: 'productionDate' },