From d594af64756c9eca1584902afb41086dd3816175 Mon Sep 17 00:00:00 2001
From: Yang <903110162@qq.com>
Date: Mon, 17 Apr 2023 14:02:55 +0800
Subject: [PATCH] commit by yzf
---
src/api/api/materialteamwork.ts | 64 +++
src/views/Need/components/EditView.vue | 5 +-
src/views/half/components/EditMateria.vue | 134 +++--
src/views/half/components/EditView.vue | 2 +
src/views/half/components/MaterialSelect.vue | 160 ++++++
src/views/half/components/ShowData1.vue | 2 +-
src/views/half/half.vue | 41 +-
src/views/half/route.vue | 516 +++++++++----------
8 files changed, 590 insertions(+), 334 deletions(-)
create mode 100644 src/api/api/materialteamwork.ts
create mode 100644 src/views/half/components/MaterialSelect.vue
diff --git a/src/api/api/materialteamwork.ts b/src/api/api/materialteamwork.ts
new file mode 100644
index 0000000..226d4f0
--- /dev/null
+++ b/src/api/api/materialteamwork.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/MaterialTeamwork/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/MaterialTeamwork/GetTeamProcessList', param).then((data) => {
+ result = data.Data.List || [];
+ });
+ return result;
+}
+
+//获取协同视图信息
+export async function getTeamworkView(param) {
+ let result = {};
+ await http.post('/api/MaterialTeamwork/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/MaterialTeamwork/DockDownBomData', param).then((data) => {
+ result = data;
+ });
+ return result;
+}
+
+export async function EditTypeList(param) {
+ let result = [];
+ await http.post('/api/MaterialTeamwork/EditTypeList', param).then((data) => {
+ result = data;
+ });
+ return result;
+}
+
+export async function InsertDataModel(param) {
+ let result = [];
+ await http.post('/api/MaterialTeamwork/InsertDataModel', param).then((data) => {
+ result = data;
+ });
+ return result;
+}
+
+export async function GetMaterialTeamworkPageList(param) {
+ let result = [];
+ await http.post('/api/MaterialTeamwork/GetTeamworkPageList', param).then((data) => {
+ result = data;
+ });
+ return result;
+}
\ No newline at end of file
diff --git a/src/views/Need/components/EditView.vue b/src/views/Need/components/EditView.vue
index 8baff39..715d6d5 100644
--- a/src/views/Need/components/EditView.vue
+++ b/src/views/Need/components/EditView.vue
@@ -203,9 +203,10 @@ export default {
viewType: this.dataInfoObj.FViewType
});
console.log('_data', _data);
+ debugger
if (this.dataInfoObj.FViewType == 1 || this.dataInfoObj.FViewType == 10) {
- this.inputCodeValue = _data.rows[0].HalfCode;
- this.inputDescValue = _data.rows[0].HalfDesc;
+ this.inputCodeValue = _data.rows[0]?_data.rows[0].HalfCode:"";
+ this.inputDescValue = _data.rows[0]?_data.rows[0].HalfDesc:"";
this.isShow = true;
} else if (this.dataInfoObj.FViewType == 2 || this.dataInfoObj.FViewType == 3 || this.dataInfoObj.FViewType == 4) {
this.isBomShow = true;
diff --git a/src/views/half/components/EditMateria.vue b/src/views/half/components/EditMateria.vue
index 92bc28a..8964711 100644
--- a/src/views/half/components/EditMateria.vue
+++ b/src/views/half/components/EditMateria.vue
@@ -1,30 +1,29 @@
-
-
-
-
+
+
+ 选择
+
注：配方号+版本号+描述
-
-
-
-
-
+
+
+ 选择
+
注：配方号+版本号+描述
-
-
-
+
+
+
配方变更影响的旧物料
-
-
+
+
+
+
+
+