代码提交

src/views/business/apply/addApply.vue

@@ -131,8 +131,13 @@
             </el-date-picker>
           </template>
         </el-table-column>
-        <el-table-column label="下次维保日期" align="center" prop="nextMaintenanceDate" width="160px" />
+        <el-table-column label="下次维保日期" align="center" prop="nextMaintenanceDate" width="160px"/>
-        <el-table-column label="剩余使用年限" align="center" prop="remainingYears" width="160px" />
+        <el-table-column label="剩余使用年限" align="center" prop="remainingYears" width="160px">
+          <template slot-scope="{ row }">
+            <span v-if="row.remainingYears =='已超过最大使用年限'" style="color: red">{{ row.remainingYears }}</span>
+            <span v-if="row.remainingYears !=='已超过最大使用年限'">{{ row.remainingYears }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="操作" align="center" v-if="!routerParams.isView">
           <template slot-scope="{ row }">
             <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(row)" style="color: red"
@@ -149,7 +154,7 @@
       <!-- 完善后的查询表单：支持类目查询 -->
       <el-form :model="addQuery" ref="addQueryForm" label-width="40px" inline>
         <!-- 分类选择下拉框（装备/工具） -->
-        <el-form-item label="分类" prop="devType" >
+        <el-form-item label="分类" prop="devType">
           <el-select
             v-model="addQuery.devType"
             placeholder="请选择分类"
@@ -263,7 +268,9 @@
       </el-row>
 
       <!-- 设备列表表格 -->
-      <el-table ref="addTable" :data="addList" row-key="id" height="546" @selection-change="handleSelectionChange" border stripe>
+      <el-table ref="addTable" :data="addList" row-key="id" height="546" @selection-change="handleSelectionChange"
+                border stripe
+      >
         <el-table-column type="selection" width="55" align="center" :selectable="selectable" :reserve-selection="true"/>
         <el-table-column label="序号" align="center" width="80" type="index">
           <template slot-scope="scope">
@@ -366,7 +373,7 @@ export default {
         leaseType: '0',
         pageNum: 1, // 页码
         pageSize: 10, // 每页条数
-        useTimeRange: null,
+        useTimeRange: null
       },
       useProjectList: [], // 使用项目下拉选
       voltageList: [], // 电压等级下拉选
@@ -423,7 +430,7 @@ export default {
       // 新增：当前选中的类目名称（用于显示）
       currentCategoryName: '',
       currentToolCategoryName: '',
-      selectedRow: [],
+      selectedRow: []
     }
   },
   created() {

src/views/business/components/BatchApproveDialog.vue

@@ -10,14 +10,14 @@
       <!-- 待审批数据列表 -->
       <div style="margin-bottom: 20px">
         <div style="font-weight: bold; margin-bottom: 10px">待审批项目（共 {{ selectedRows.length }} 项）</div>
-        <el-table :data="selectedRows" style="width: 100%" max-height="200">
+        <el-table :data="selectedRows" style="width: 100%" max-height="260">
-          <el-table-column prop="code" label="申请单号" width="150" show-overflow-tooltip />
+          <el-table-column prop="code" label="申请单号" width="150" show-overflow-tooltip/>
-          <el-table-column prop="proName" label="项目名称" show-overflow-tooltip />
+          <el-table-column prop="proName" label="项目名称" show-overflow-tooltip/>
         </el-table>
       </div>
 
       <!-- 审批操作 -->
-      <el-form ref="approveForm" :model="approveData" label-width="100px">
+      <el-form  :rules="rules" ref="approveForm" :model="approveData" label-width="100px">
         <el-form-item label="审批结果" prop="approveResult" required>
           <el-radio-group v-model="approveData.approveResult">
             <el-radio :label="1">通过</el-radio>
@@ -59,6 +59,11 @@ export default {
       approveData: {
         approveResult: 1,
         approveOpinion: ''
+      },
+      rules: {
+        approveOpinion: [
+          { required: true, message: '请输入审批意见', trigger: 'blur' },
+        ]
       }
     }
   },
@@ -87,7 +92,7 @@ export default {
       this.loading = true
       try {
         // 对每个选中的项目执行审批
-        const promises = this.selectedRows.map(async (row) => {
+        const promises = this.selectedRows.map(async(row) => {
           // 先获取审批实例ID
           const instanceRes = await getApprovalInstanceByBusiness(this.businessType, row.id)
           if (!instanceRes || !instanceRes.data || !instanceRes.data.id) {

src/views/toolsManage/toolsLedger/index.vue

@@ -300,6 +300,21 @@ export default {
                 )
               : h('span', {}, row.repairNum)
           },
+        },{
+          label: '退役数量',
+          prop: 'scrapNum',
+          render: (h, { row }) => {
+            return row.manageMode == 0 && row.scrapNum > 0
+              ? h(
+                'span',
+                {
+                  style: { color: '#409EFF', cursor: 'pointer' },
+                  on: { click: () => this.handleDialog(row, '2') },
+                },
+                row.scrapNum,
+              )
+              : h('span', {}, row.scrapNum)
+          },
         },
         { label: '工具总数', prop: 'totalNum' },
         {