commit by yzf

src/api/api/halfmaterialteamwork.ts

@@ -0,0 +1,64 @@
+import http from '../http';
+
+//获取协同集合
+export async function getTeamworkPageList(param) {
+	param = param || { FPageIndex: 1, FPageSize: 10 };
+	let result = {};
+	await http.post('/api/HalfMaterialTeamwork/GetTeamworkPageList', param).then((data) => {
+		result = data;
+	});
+	return result;
+}
+
+//获取流程集合
+export async function getTeamProcessList(teamId) {
+	let param = { FPageIndex: 1, FPageSize: 999, FTeamID: teamId };
+	let result = [];
+	await http.post('/api/HalfMaterialTeamwork/GetTeamProcessList', param).then((data) => {
+		result = data.Data.List || [];
+	});
+	return result;
+}
+
+//获取协同视图信息
+export async function getTeamworkView(param) {
+	let result = {};
+	await http.post('/api/HalfMaterialTeamwork/GetTeamworkView', param).then((data) => {
+		result = data.Data;
+	});
+	return result;
+}
+
+//下载BOM
+export async function downloadBOM(teamId) {
+	let param = { FTeamID: teamId };
+	let result = [];
+	await http.post('/api/HalfMaterialTeamwork/DockDownBomData', param).then((data) => {
+		result = data;
+	});
+	return result;
+}
+
+export async function EditTypeList(param) {
+	let result = [];
+	await http.post('/api/HalfMaterialTeamwork/EditTypeList', param).then((data) => {
+		result = data;
+	});
+	return result;
+}
+
+export async function InsertDataModel(param) {
+	let result = [];
+	await http.post('/api/HalfMaterialTeamwork/InsertDataModel', param).then((data) => {
+		result = data;
+	});
+	return result;
+}
+
+export async function GetMaterialTeamworkPageList(param) {
+	let result = [];
+	await http.post('/api/HalfMaterialTeamwork/GetTeamworkPageList', param).then((data) => {
+		result = data;
+	});
+	return result;
+}

src/views/half/components/EditMateria.vue

@@ -123,7 +123,7 @@ import {
 } from '/src/api/api/formula';
 import{
 	InsertDataModel
-} from'/src/api/api/materialteamwork'
+} from'/src/api/api/halfmaterialteamwork'
 export default {
 	components: {
 		MaterialSelect
@@ -330,7 +330,28 @@ export default {
 		//数据-验证
 		async submitClick(isCreate) {
 			let postData = {"FTestCode":this.formula1,"FNewTestCode":this.formula2,"FCreateFactoryID":this.factoryID};
-			let result=await InsertDataModel(postData);
+			
+			let ids = layer.load(0)
+
+
+			try {
+				let result=await InsertDataModel(postData);
+				if (result.Code== 200) {
+					layer.msg('创建成功');
+					this.cancelClick(true);
+				} else {
+					layer.msg('创建失败');
+				}
+			} catch (e) { }
+			layer.close(ids);
+
+
+			// if(result.Code==200){
+
+			// 	setTimeout(() => {
+			// 		layer.close(ids);
+			// 	}, 3000);
+			// }
 		},
 		//数据-确认
 		sureTextCode(postData) {

src/views/half/half.vue

@@ -73,7 +73,7 @@ import {
 import ShowData1 from '../half/components/ShowData1.vue';
 import EditMateria from '../half/components/EditMateria.vue';
 import EditView from '../half/components/EditView.vue';
-import {GetMaterialTeamworkPageList} from"/src/api/api/materialteamwork"
+import {GetMaterialTeamworkPageList} from"/src/api/api/halfmaterialteamwork"
 import '@layui/layui-vue/es/checkbox/index.css';
 import '@layui/layui-vue/es/radio/index.css';
 

src/views/half/route.vue

@@ -246,7 +246,7 @@ export default {
 			}
 			this.postData.FPageIndex = this.pageInfo.current;
 			this.postData.FPageSize = this.pageInfo.limit;
-			let result = await getPageList(this.postData, "MaterialTask");
+			let result = await getPageList(this.postData, "HalfMaterialTask");
 			debugger
 			let $this=this;
 			this.dataList = result.Data.List.map(function (item) {