Merge branch 'equipManage'

src/views/equipManage/equipLedger/index.vue

@@ -35,7 +35,7 @@
       <el-button type="primary" plain icon="Plus" @click="handleAdd"
         v-hasPermi="['equipment:ledger:add']">新增</el-button>
       <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleBatchDelete"
-        v-hasPermi="['equipment:ledger:delete']">删除</el-button>
+        v-hasPermi="['equipment:ledger:remove']">删除</el-button>
       <el-button type="warning" plain icon="Download" @click="handleExport"
         v-hasPermi="['equipment:ledger:export']">导出</el-button>
       <el-button type="info" plain icon="Upload" @click="handleImport"
@@ -252,7 +252,7 @@
           <el-table-column label="操作" width="80" v-if="!formDisabled">
             <template #default="scope">
               <el-button type="danger" link icon="Delete" @click="removeCheckRecord(scope.$index)"
-                v-hasPermi="['equipment:ledger:delete']">删除</el-button>
+                v-hasPermi="['equipment:ledger:remove']">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -589,15 +589,25 @@ async function submitForm() {
         if (submitData.inspectionTeamLeaderId) {
           const leaderRes = await getUser(submitData.inspectionTeamLeaderId)
           submitData.inspectionTeamLeaderName = leaderRes.data?.nickName || ''
+        }else{
+          submitData.inspectionTeamLeaderId = ''
+          submitData.inspectionTeamLeaderName = ''
         }
         if (submitData.inspectionTeamMember1Id) {
           const member1Res = await getUser(submitData.inspectionTeamMember1Id)
           submitData.inspectionTeamMember1Name = member1Res.data?.nickName || ''
+        }else{
+          submitData.inspectionTeamMember1Id = ''
+          submitData.inspectionTeamMember1Name = ''
         }
         if (submitData.inspectionTeamMember2Id) {
           const member2Res = await getUser(submitData.inspectionTeamMember2Id)
           submitData.inspectionTeamMember2Name = member2Res.data?.nickName || ''
+        }else{
+          submitData.inspectionTeamMember2Id = ''
+          submitData.inspectionTeamMember2Name = ''
         }
+ 
       } catch (error) {
         console.error('获取用户信息失败:', error)
       }