From d635eaa59273252045f5f0e6001d9cd429c14f9a Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Mon, 14 Jul 2025 17:25:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=90=E6=96=99=E7=AB=99=E9=A2=86=E6=96=99bu?=
 =?UTF-8?q?g=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../toolsLease/apply/component/addToolsApply.vue | 16 +++++++++-------
 .../outBound/component/addToolsApply.vue         | 14 ++++++++------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/views/materialsStation/toolsLease/apply/component/addToolsApply.vue b/src/views/materialsStation/toolsLease/apply/component/addToolsApply.vue
index 6e31a734..0b613ae9 100644
--- a/src/views/materialsStation/toolsLease/apply/component/addToolsApply.vue
+++ b/src/views/materialsStation/toolsLease/apply/component/addToolsApply.vue
@@ -2,16 +2,16 @@
   <!-- 新增工机具 -->
   <div>
     <el-form :model="maForm" ref="maForm" size="small" :rules="rules" :inline="true" label-width="120px">
-      <el-form-item label="租赁工程" prop="projectId">
+      <el-form-item label="租赁工程" prop="proId">
         <el-select
           v-if="!isEdit || !maForm.teamId"
-          v-model="maForm.projectId"
+          v-model="maForm.proId"
           placeholder="请选择租赁工程"
           filterable
           style="width: 240px"
           @change="changePro"
         >
-          <el-option v-for="(item, index) in projectList" :key="index" :label="item.proName" :value="item.projectId" />
+          <el-option v-for="(item, index) in projectList" :key="index" :label="item.proName" :value="item.proId" />
         </el-select>
         <el-input v-else v-model="maForm.projectName" disabled maxlength="50" style="width: 240px" />
       </el-form-item>
@@ -296,7 +296,7 @@ export default {
             trigger: 'blur'
           }
         ],
-        projectId: [
+        proId: [
           {
             required: true,
             message: '请选择租赁工程',
@@ -362,7 +362,7 @@ export default {
   watch: {
     maForm: {
       handler(newVal, oldVal) {
-        if (newVal.teamId && newVal.projectId) {
+        if (newVal.teamId && newVal.proId) {
           this.getAgreementId()
         } else {
           this.equipmentTypeList = []
@@ -386,7 +386,7 @@ export default {
     },
     // 获取协议id
     getAgreementId() {
-      if (!this.maForm.teamId || !this.maForm.projectId) return
+      if (!this.maForm.teamId || !this.maForm.proId) return
       getAgreement({
         teamId: this.maForm.teamId,
         // projectId: this.maForm.projectId,
@@ -453,7 +453,8 @@ export default {
     },
     changePro(e) {
       console.log('🚀 ~ changePro ~ e:', e)
-      this.maForm.proId = this.projectList.find(item => item.projectId === e)?.proId
+      this.maForm.proId = e  
+      this.maForm.projectId = this.projectList.find(item => item.proId === e)?.projectId
       this.getBmTeam()
     },
     changeTeam(e) {
@@ -584,6 +585,7 @@ export default {
       await getApplyInfo(this.id).then(response => {
         Object.assign(this.maForm, response.data.leaseApplyInfo)
         this.maForm.projectId = response.data.leaseApplyInfo.proId
+         this.maForm.proId = response.data.leaseApplyInfo.proId
         this.equipmentList = response.data.leaseApplyDetailsList || []
         // 如果 bmFileInfos有值
         if (this.maForm.bmFileInfos.length > 0) {
diff --git a/src/views/materialsStation/toolsLease/outBound/component/addToolsApply.vue b/src/views/materialsStation/toolsLease/outBound/component/addToolsApply.vue
index 55032ab4..71f12c63 100644
--- a/src/views/materialsStation/toolsLease/outBound/component/addToolsApply.vue
+++ b/src/views/materialsStation/toolsLease/outBound/component/addToolsApply.vue
@@ -2,17 +2,17 @@
   <!-- 新增工机具 -->
   <div>
     <el-form :model="maForm" ref="maForm" size="small" :rules="rules" :inline="true" label-width="120px">
-      <el-form-item label="租赁工程" prop="projectId">
+      <el-form-item label="租赁工程" prop="proId">
         <el-select
           v-if="!isEdit"
-          v-model="maForm.projectId"
+          v-model="maForm.proId"
           :disabled="isEdit"
           placeholder="请选择租赁工程"
           filterable
           style="width: 240px"
           @change="changePro"
         >
-          <el-option v-for="(item, index) in projectList" :key="index" :label="item.proName" :value="item.projectId" />
+          <el-option v-for="(item, index) in projectList" :key="index" :label="item.proName" :value="item.proId" />
         </el-select>
         <el-input v-else v-model="maForm.projectName" disabled maxlength="50" style="width: 240px" />
       </el-form-item>
@@ -306,7 +306,7 @@ export default {
             trigger: 'blur'
           }
         ],
-        projectId: [
+        proId: [
           {
             required: true,
             message: '请选择租赁工程',
@@ -381,7 +381,7 @@ export default {
   watch: {
     maForm: {
       handler(newVal, oldVal) {
-        if (newVal.teamId && newVal.projectId) {
+        if (newVal.teamId && newVal.proId) {
           this.getAgreementId()
         } else {
           this.equipmentTypeList = []
@@ -450,7 +450,8 @@ export default {
     },
     changePro(e) {
       console.log('🚀 ~ changePro ~ e:', e)
-      this.maForm.proId = this.projectList.find(item => item.projectId === e)?.proId
+      this.maForm.proId = e  
+      this.maForm.projectId = this.projectList.find(item => item.proId === e)?.projectId
       this.getBmTeam()
     },
     changeTeam(e) {
@@ -596,6 +597,7 @@ export default {
         }
         Object.assign(this.maForm, response.data.leaseApplyInfo)
         this.maForm.projectId = response.data.leaseApplyInfo.proId
+        this.maForm.proId = response.data.leaseApplyInfo.proId
         this.equipmentList = response.data.leaseApplyDetailsList || []
         if (this.equipmentList.length > 0) {
           this.equipmentList.forEach(item => {