From 6c36d1646b40a11153b1bf97d3227bc3c926450b Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Tue, 23 Sep 2025 12:09:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/basic/projectMerge/index.vue     | 15 ++++++++
 .../outBound/component/addToolsApply.vue      | 36 +++++++++----------
 2 files changed, 33 insertions(+), 18 deletions(-)
 create mode 100644 src/views/material/basic/projectMerge/index.vue

diff --git a/src/views/material/basic/projectMerge/index.vue b/src/views/material/basic/projectMerge/index.vue
new file mode 100644
index 00000000..583d1f58
--- /dev/null
+++ b/src/views/material/basic/projectMerge/index.vue
@@ -0,0 +1,15 @@
+<template>
+  <div class="app-container">工程合并</div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {}
+  },
+  created() {},
+  methods: {}
+}
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/materialsStation/toolsLease/outBound/component/addToolsApply.vue b/src/views/materialsStation/toolsLease/outBound/component/addToolsApply.vue
index b4068a82..a222311a 100644
--- a/src/views/materialsStation/toolsLease/outBound/component/addToolsApply.vue
+++ b/src/views/materialsStation/toolsLease/outBound/component/addToolsApply.vue
@@ -392,24 +392,24 @@ export default {
       this.projectInfoList()
     }
   },
-  // watch: {
-  //   'maForm.teamId'(newVal) {
-  //     console.log("kkkkkkkkkkkkkkkkkkkk",newVal)
-  //     if (newVal && this.maForm.proId) {
-  //       this.getAgreementId()
-  //     } else {
-  //       this.equipmentTypeList = []
-  //     }
-  //   },
-  //   'maForm.proId'(newVal) {
-  //     console.log("ppppppppppppppppppppppp",newVal)
-  //     if (newVal && this.maForm.teamId) {
-  //       this.getAgreementId()
-  //     } else {
-  //       this.equipmentTypeList = []
-  //     }
-  //   }
-  // },
+  watch: {
+    'maForm.teamId'(newVal) {
+      console.log('🚀 ~ maForm.teamId:', newVal)
+      if (newVal && this.maForm.proId) {
+        this.getAgreementId()
+      } else {
+        this.equipmentTypeList = []
+      }
+    },
+    'maForm.proId'(newVal) {
+      console.log('🚀 ~ maForm.proId:', newVal)
+      if (newVal && this.maForm.teamId) {
+        this.getAgreementId()
+      } else {
+        this.equipmentTypeList = []
+      }
+    }
+  },
   methods: {
     // 获取协议id
     async getAgreementId() {