From c01a285f928756eb203830974799b7d3ede20231 Mon Sep 17 00:00:00 2001
From: Yang <903110162@qq.com>
Date: Sun, 23 Apr 2023 09:56:01 +0800
Subject: [PATCH] commit by yzf

---
 src/api/http.ts                           | 4 ++--
 src/views/Need/components/EditView.vue    | 2 +-
 src/views/half/components/EditMateria.vue | 1 +
 src/views/half/components/EditViewOFF.vue | 6 ++----
 src/views/half/components/FormulaView.vue | 2 +-
 src/views/half/half.vue                   | 5 ++++-
 src/views/materia/components/EditView.vue | 2 +-
 7 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/api/http.ts b/src/api/http.ts
index acc494b..623e134 100644
--- a/src/api/http.ts
+++ b/src/api/http.ts
@@ -3,8 +3,8 @@ import { layer } from '@layui/layer-vue'
 
 const config = {
 	timeout: 600000,
-	//baseURL: "http://124.222.104.55:58178/",
-	baseURL: "http://localhost:58178/",
+	baseURL: "http://124.222.104.55:58178/",
+	//baseURL: "http://localhost:58178/",
 	// baseURL: "http://plm-pw-test.hbflavor.com:81/",
 	headers: {
 		'Content-Type': 'application/json;charset=UTF-8',
diff --git a/src/views/Need/components/EditView.vue b/src/views/Need/components/EditView.vue
index 3a11dea..bb8025a 100644
--- a/src/views/Need/components/EditView.vue
+++ b/src/views/Need/components/EditView.vue
@@ -209,7 +209,7 @@ export default {
 	},
 	mounted() {
 		this.getUserPower();
-		this.initPage(this.idx);
+		//this.initPage(this.idx);
 	},
 	methods: {
 		async getUserPower() {
diff --git a/src/views/half/components/EditMateria.vue b/src/views/half/components/EditMateria.vue
index 213092f..53a2f62 100644
--- a/src/views/half/components/EditMateria.vue
+++ b/src/views/half/components/EditMateria.vue
@@ -312,6 +312,7 @@ export default {
 		},
 		//配方接口
 		async _getPageList(isFirst) {
+			debugger
 			if (isFirst) {
 				this.pageInfo.current = 1;
 				this.pageInfo.total = 0;
diff --git a/src/views/half/components/EditViewOFF.vue b/src/views/half/components/EditViewOFF.vue
index a0281c7..72d511c 100644
--- a/src/views/half/components/EditViewOFF.vue
+++ b/src/views/half/components/EditViewOFF.vue
@@ -1,6 +1,6 @@
 <template>
 	<lay-container fluid="true" class="content-box">
-		<FormulaView :teamId="dataInfoObj.FTeamID" :halfId="dataInfoObj.FMaterialHalfIDs"></FormulaView>
+		<FormulaView :teamId="dataInfoObj.FTeamID" :dataInfoObj="dataInfoObj" :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>
@@ -209,7 +209,7 @@ export default {
 	},
 	mounted() {
 		this.getUserPower();
-		this.initPage(this.idx);
+		//this.initPage(this.idx);
 	},
 	methods: {
 		async getUserPower() {
@@ -227,12 +227,10 @@ export default {
 		},
 		async initPage(idx) {
 			this.idx = idx;
-			debugger
 			let _data = await getListByHalfMaterialTeamId({
 				teamId: this.dataInfoObj.FTeamID,
 				viewType: this.dataInfoObj.FViewType
 			});
-
 			this.materialInfoList = await GetMaterialInfoList() || null;
 
 
diff --git a/src/views/half/components/FormulaView.vue b/src/views/half/components/FormulaView.vue
index b065f7d..022e0b3 100644
--- a/src/views/half/components/FormulaView.vue
+++ b/src/views/half/components/FormulaView.vue
@@ -84,7 +84,7 @@
 					width: "56"
 				}];
                 let dataList = [];
-
+                debugger
 				let postData = {
 					FTeamID: this.dataInfoObj.FTeamID,
 					FViewType: 2,
diff --git a/src/views/half/half.vue b/src/views/half/half.vue
index 77ee92f..582b233 100644
--- a/src/views/half/half.vue
+++ b/src/views/half/half.vue
@@ -285,7 +285,10 @@ export default {
 		},
 		showEditMaterial(i,data) {
 			debugger
-			data["FTeamID"]=data.FID;
+			if(data)
+			{
+				data["FTeamID"]=data.FID;
+			}
 			this.objInfoObj=data;
 
 			this.showEditBox[i] = true;
diff --git a/src/views/materia/components/EditView.vue b/src/views/materia/components/EditView.vue
index fd103b2..b39b7c9 100644
--- a/src/views/materia/components/EditView.vue
+++ b/src/views/materia/components/EditView.vue
@@ -209,7 +209,7 @@ export default {
 	},
 	mounted() {
 		this.getUserPower();
-		this.initPage(this.idx);
+		//this.initPage(this.idx);
 	},
 	methods: {
 		async getUserPower() {