Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemWeb

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://124.222.104.55:58178/",
-	//baseURL: "http://localhost:58178/",
+	baseURL: "http://localhost:58178/",
 	// baseURL: "http://plm-pw-test.hbflavor.com:81/",
 	headers: {
 		'Content-Type': 'application/json;charset=UTF-8',

src/views/Need/components/EditFSuccedaneum.vue

@@ -1,6 +1,6 @@
 <template>
 	<lay-container style="height:700px;overflow: auto;" fluid="true" class="content-box">
-		<MaterialList :teamId="dataInfoObj.FTeamID" :halfId="dataInfoObj.FMaterialHalfIDs"></MaterialList>
+		<FormulaView :teamId="dataInfoObj.FTeamID" :halfId="dataInfoObj.FMaterialHalfIDs"></FormulaView>
 		
 		<lay-table id="dataTable" v-if="dataColumn.length > 0" height="320px" :columns="dataColumn" :data-source="dataList"
 			:cellStyle="cellStyle" :cellClassName="cellClassName">
@@ -98,12 +98,12 @@ import {
 import { EditTypeList } from "/src/api/api/teamwork";
 
 import OperateLog from "./OperateLog.vue";
-import MaterialList from "./MaterialList.vue";
+import FormulaView from "./FormulaView.vue";
 
 export default {
 	components: {
 		OperateLog,
-		MaterialList,
+		FormulaView,
 	},
 	setup() {
 		let dataColumn = [{
@@ -237,7 +237,6 @@ export default {
 			this.initPage(layer.load(2));
 		},
 		async initPage(idx) {
-			debugger
 			let _data = await GetMaterialInfoListByTeamId({
 				tempId: this.dataInfoObj.FTeamID
 			});
@@ -313,7 +312,6 @@ export default {
 			updateInfo.FSuccedaneumType = "";
 			updateInfo.FSuccedaneumCode = "";
 			let result = await UpdateDataModel(updateInfo) || 0;
-			debugger
 			// 发送保存请求
 			if (result.Code==200) {
 				await commonSave({

src/views/Need/components/FormulaView.vue

@@ -88,6 +88,7 @@
 				};
 
 				let result = await getTeamworkView(postData);
+                debugger
 
                 let formulaList = result["List1"]