From a6b195f59d47a38ad8ae579a0e17c60dae034129 Mon Sep 17 00:00:00 2001
From: Yang <903110162@qq.com>
Date: Sun, 14 May 2023 21:22:18 +0800
Subject: [PATCH] commit by yzf

---
 src/views/Need/components/EditView.vue    | 11 +++++++++--
 src/views/Need/components/FormulaView.vue |  5 +++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/views/Need/components/EditView.vue b/src/views/Need/components/EditView.vue
index 03acd1e..14a5868 100644
--- a/src/views/Need/components/EditView.vue
+++ b/src/views/Need/components/EditView.vue
@@ -1,6 +1,6 @@
 <template>
 	<lay-container fluid="true" class="content-box">
-		<FormulaView :teamId="dataInfoObj.FTeamID" :halfId="dataInfoObj.FMaterialHalfIDs"></FormulaView>
+		<FormulaView v-if="isFormula" :teamId="dataInfoObj.FTeamID" @changeFormula="changeFormula" :halfId="dataInfoObj.FMaterialHalfIDs"></FormulaView>
 		<lay-layer area="90%" v-model="showFreezingColumnSettingBox" title="固定列设置" :end="closeFreezingSetting">
 			<FreezingColumnSetting v-if="showFreezingColumnSettingBox" :columns="originalColumns"
 				:freezingColumns="freezingColumnSetting" @cancelClick="setFreezingColumnsSetting"></FreezingColumnSetting>
@@ -180,6 +180,7 @@ export default {
 		const idx = ref([]);
 		const materialInfoList=ref([]);
 		const dataRowsList=ref("");
+		const isFormula=ref(true);
 		return {
 			dataColumn,
 			dataList,
@@ -201,7 +202,8 @@ export default {
 			tmpDataColumn,
 			materialInfoList,
 			idx,
-			dataRowsList
+			dataRowsList,
+			isFormula
 		};
 	},
 	props: {
@@ -629,7 +631,12 @@ export default {
 		},
 		deepCopy(arr) {
 			return JSON.parse(JSON.stringify(arr))
+		},
+		changeFormula(val){
+			debugger
+			this.isFormula=val;
 		}
+
 	}
 }
 </script>
diff --git a/src/views/Need/components/FormulaView.vue b/src/views/Need/components/FormulaView.vue
index f845d2c..872fb34 100644
--- a/src/views/Need/components/FormulaView.vue
+++ b/src/views/Need/components/FormulaView.vue
@@ -110,6 +110,11 @@
                 
                 // this.dataColumn = dataColumn;
 				this.dataList = dataList;
+
+                if(formulaList.length==0)
+                {
+                    this.$emit('changeFormula', false);
+                }
             }
         }
     }