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 @@
+
+ 工程合并
+
+
+
+
+
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() {