From 5fd50410f31a2b3c72158e52480be771dff76335 Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Wed, 17 Sep 2025 20:40:15 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=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  | 13 +++++++++++++
 .../toolsLease/apply/component/homeApply.vue      |  2 +-
 .../apply/component/queryToolsApply.vue           | 12 ++++++++++++
 .../outBound/component/addToolsApply.vue          | 15 +++++++++++++++
 .../toolsLease/outBound/component/homeApply.vue   |  4 ++--
 .../outBound/component/queryToolsApply.vue        | 12 ++++++++++++
 6 files changed, 55 insertions(+), 3 deletions(-)

diff --git a/src/views/materialsStation/toolsLease/apply/component/addToolsApply.vue b/src/views/materialsStation/toolsLease/apply/component/addToolsApply.vue
index 481786be..6da8afce 100644
--- a/src/views/materialsStation/toolsLease/apply/component/addToolsApply.vue
+++ b/src/views/materialsStation/toolsLease/apply/component/addToolsApply.vue
@@ -71,6 +71,16 @@
         />
       </el-form-item>
 
+      <el-form-item label="所属分包" prop="subUnitName">
+        <el-input
+          v-model="maForm.subUnitName"
+          :placeholder="maForm.subUnitName ? '请输入所属分包' : '暂无分包'"
+          disabled
+          maxlength="50"
+          style="width: 240px"
+        />
+      </el-form-item>
+
       <el-form-item label="类型规格" prop="deviceType">
         <el-row :gutter="10">
           <el-col :span="15">
@@ -429,6 +439,7 @@ export default {
           this.maForm.relPhone = team.relPhone || ''
           this.maForm.relName = team.relName
           this.maForm.teamLeaderIdCard = team.teamLeaderIdCard
+          this.maForm.subUnitName = team.subUnitName || ''
         } else {
           this.maForm.teamId = res.data[0].id
           this.maForm.teamName = res.data[0].teamName
@@ -436,6 +447,7 @@ export default {
           this.maForm.relPhone = res.data[0].relPhone || ''
           this.maForm.relName = res.data[0].relName
           this.maForm.teamLeaderIdCard = res.data[0].teamLeaderIdCard
+          this.maForm.subUnitName = res.data[0].subUnitName || ''
         }
         // this.projectInfoList()
       } catch (error) {
@@ -469,6 +481,7 @@ export default {
       this.maForm.relPhone = team.relPhone || ''
       this.maForm.phone = team.relPhone || ''
       this.maForm.teamLeaderIdCard = team.teamLeaderIdCard
+      this.maForm.subUnitName = team.subUnitName || ''
       console.log('🚀 ~ changeTeam ~ this.maForm.teamName:', this.maForm.teamName)
       // this.projectInfoList()
     },
diff --git a/src/views/materialsStation/toolsLease/apply/component/homeApply.vue b/src/views/materialsStation/toolsLease/apply/component/homeApply.vue
index f32e7a5f..df91f2ab 100644
--- a/src/views/materialsStation/toolsLease/apply/component/homeApply.vue
+++ b/src/views/materialsStation/toolsLease/apply/component/homeApply.vue
@@ -187,7 +187,7 @@
             <div class="info" style="margin-top: 10px; display: flex; flex-wrap: wrap">
               <div class="item" style="width: 50%; flex-shrink: 0; margin-bottom: 5px; font-size: 14px">
                 <span>领料班组：</span>
-                {{ leaseApplyData.teamName }}
+                {{ leaseApplyData.subUnitName ? '( ' + leaseApplyData.subUnitName + ' ) ' + leaseApplyData.teamName : leaseApplyData.teamName }}
               </div>
               <div class="item" style="width: 50%; flex-shrink: 0; margin-bottom: 5px; font-size: 14px">
                 <span>工程名称：</span>
diff --git a/src/views/materialsStation/toolsLease/apply/component/queryToolsApply.vue b/src/views/materialsStation/toolsLease/apply/component/queryToolsApply.vue
index 843d1111..7f0f7756 100644
--- a/src/views/materialsStation/toolsLease/apply/component/queryToolsApply.vue
+++ b/src/views/materialsStation/toolsLease/apply/component/queryToolsApply.vue
@@ -50,6 +50,18 @@
           readonly
         />
       </el-form-item>
+
+      <el-form-item label="所属分包" prop="subUnitName">
+        <el-input
+          v-model="maForm.subUnitName"
+          placeholder="所属分包"
+          clearable
+          maxlength="50"
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+          readonly
+        />
+      </el-form-item>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
diff --git a/src/views/materialsStation/toolsLease/outBound/component/addToolsApply.vue b/src/views/materialsStation/toolsLease/outBound/component/addToolsApply.vue
index 262f4a22..d33c2a23 100644
--- a/src/views/materialsStation/toolsLease/outBound/component/addToolsApply.vue
+++ b/src/views/materialsStation/toolsLease/outBound/component/addToolsApply.vue
@@ -31,6 +31,7 @@
             :label="item.teamName"
             :value="item.id"
             :data-key="item.id"
+             @change="changeTeam"
           />
         </el-select>
         <el-input v-else v-model="maForm.teamName" disabled maxlength="50" style="width: 240px" />
@@ -72,6 +73,16 @@
         />
       </el-form-item>
 
+      <el-form-item label="所属分包" prop="subUnitName">
+        <el-input
+          v-model="maForm.subUnitName"
+          :placeholder="maForm.subUnitName ? '请输入所属分包' : '暂无分包'"
+          disabled
+          maxlength="50"
+          style="width: 240px"
+        />
+      </el-form-item>
+
       <el-form-item label="类型规格" prop="deviceType">
         <el-row :gutter="10">
           <el-col :span="15">
@@ -440,6 +451,7 @@ export default {
           this.maForm.relPhone = team.relPhone || ''
           this.maForm.relName = team.relName
           this.maForm.teamLeaderIdCard = team.teamLeaderIdCard
+          this.maForm.subUnitName = team.subUnitName || ''
         } else {
           this.maForm.teamId = res.data[0].id
           this.maForm.teamName = res.data[0].teamName
@@ -447,6 +459,7 @@ export default {
           this.maForm.relPhone = res.data[0].relPhone || ''
           this.maForm.relName = res.data[0].relName
           this.maForm.teamLeaderIdCard = res.data[0].teamLeaderIdCard
+          this.maForm.subUnitName = res.data[0].subUnitName || ''
         }
         // this.projectInfoList()
       } catch (error) {
@@ -459,6 +472,7 @@ export default {
       this.maForm.projectId = this.projectList.find(item => item.proId === e)?.projectId
       this.getBmTeam()
     },
+    
     changeTeam(e) {
       console.log('🚀 ~ changeTeam ~ e:', e)
       // this.maForm.projectId = null
@@ -471,6 +485,7 @@ export default {
       this.maForm.relPhone = team.relPhone || ''
       this.maForm.phone = team.relPhone || ''
       this.maForm.teamLeaderIdCard = team.teamLeaderIdCard
+      this.maForm.subUnitName = team.subUnitName || ''
       console.log('🚀 ~ changeTeam ~ this.maForm.teamName:', this.maForm.teamName)
       // this.projectInfoList()
     },
diff --git a/src/views/materialsStation/toolsLease/outBound/component/homeApply.vue b/src/views/materialsStation/toolsLease/outBound/component/homeApply.vue
index 9181e98d..fa83355c 100644
--- a/src/views/materialsStation/toolsLease/outBound/component/homeApply.vue
+++ b/src/views/materialsStation/toolsLease/outBound/component/homeApply.vue
@@ -168,7 +168,7 @@
     />
 
     <!-- 领料单弹窗 -->
-    <el-dialog :visible.sync="open" width="800px" :title="title" append-to-body>
+    <el-dialog :visible.sync="open" width="900px" :title="title" append-to-body>
       <div style="height: 500px; overflow-y: scroll; padding: 0 20px">
         <vue-easy-print tableShow ref="remarksPrintRef">
           <div id="checkIdTwo" class="print-table">
@@ -176,7 +176,7 @@
             <div class="info" style="margin-top: 10px; display: flex; flex-wrap: wrap">
               <div class="item" style="width: 50%; flex-shrink: 0; margin-bottom: 5px; font-size: 14px">
                 <span>领料班组：</span>
-                {{ leaseApplyData.teamName }}
+                 {{ leaseApplyData.subUnitName ? '( ' + leaseApplyData.subUnitName + ' ) ' + leaseApplyData.teamName : leaseApplyData.teamName }}
               </div>
               <div class="item" style="width: 50%; flex-shrink: 0; margin-bottom: 5px; font-size: 14px">
                 <span>工程名称：</span>
diff --git a/src/views/materialsStation/toolsLease/outBound/component/queryToolsApply.vue b/src/views/materialsStation/toolsLease/outBound/component/queryToolsApply.vue
index 58c7786d..9a94b7e2 100644
--- a/src/views/materialsStation/toolsLease/outBound/component/queryToolsApply.vue
+++ b/src/views/materialsStation/toolsLease/outBound/component/queryToolsApply.vue
@@ -44,6 +44,18 @@
           readonly
         />
       </el-form-item>
+
+      <el-form-item label="所属分包" prop="subUnitName">
+        <el-input
+          v-model="maForm.subUnitName"
+          placeholder="所属分包"
+          clearable
+          maxlength="50"
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+          readonly
+        />
+      </el-form-item>
     </el-form>
 
     <el-row :gutter="10" class="mb8">