From 00022dc47224054a70d5a32b915c9616d25c8f03 Mon Sep 17 00:00:00 2001 From: Yang <903110162@qq.com> Date: Mon, 17 Apr 2023 20:37:40 +0800 Subject: [PATCH] commit by yzf --- src/api/api/halfmaterialteamwork.ts | 64 +++++++ src/views/half/components/EditMateria.vue | 25 ++- src/views/half/components/EditView.vue | 198 ++++++++++++++++++++-- src/views/half/half.vue | 2 +- src/views/half/route.vue | 2 +- 5 files changed, 273 insertions(+), 18 deletions(-) create mode 100644 src/api/api/halfmaterialteamwork.ts diff --git a/src/api/api/halfmaterialteamwork.ts b/src/api/api/halfmaterialteamwork.ts new file mode 100644 index 0000000..927cecd --- /dev/null +++ b/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; +} \ No newline at end of file diff --git a/src/views/half/components/EditMateria.vue b/src/views/half/components/EditMateria.vue index 8964711..c08bfae 100644 --- a/src/views/half/components/EditMateria.vue +++ b/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) { diff --git a/src/views/half/components/EditView.vue b/src/views/half/components/EditView.vue index 07f4dff..715d6d5 100644 --- a/src/views/half/components/EditView.vue +++ b/src/views/half/components/EditView.vue @@ -1,21 +1,24 @@