From 9c28a8bce762d7121f8b8c2779cabe2ea4231703 Mon Sep 17 00:00:00 2001
From: leo <10200039@qq.com>
Date: Fri, 28 Apr 2023 10:11:58 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E6=96=B9=E6=B8=85=E5=8D=95=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=88=97=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Order/formula.vue | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/views/Order/formula.vue b/src/views/Order/formula.vue
index 58994e3..dabd70b 100644
--- a/src/views/Order/formula.vue
+++ b/src/views/Order/formula.vue
@@ -63,6 +63,12 @@
 				<template v-slot:FFactoryCode="{ data }">
 					{{ data.FFactoryCode }}
 				</template>
+				<template v-slot:FConversionPersonnel="{ data }">
+					{{ data.FConversionPersonnel }}
+				</template>
+				<template v-slot:FDevDate="{ data }">
+					{{ data.FDevDate }}
+				</template>
 				<template v-slot:FAddDate="{ data }">
 					{{ data.FAddDate }}
 				</template>
@@ -138,17 +144,12 @@
 				},
 				{
 					title: "转规格人员",
-					key: "",
+					key: "FConversionPersonnel",
 					width: "110px"
 				},
 				{
 					title: "开发日期",
-					key: "",
-					width: "110px"
-				},
-				{
-					title: "BOM版本号",
-					key: "",
+					key: "FDevDate",
 					width: "110px"
 				},
 				{
@@ -258,12 +259,14 @@
 				this.postData.FPageIndex = this.pageInfo.current;
 				this.postData.FPageSize = this.pageInfo.limit;
 				let result = await getPageList(this.postData, "Formula");
+				console.log('result', result);
 				result.Data.List = result.Data.List || [];
 				result.Data.List.forEach((item) => {
 					let type = this.typeList.find(s => s.FValue == item.FType);
 					item.FTypeName = type == null ? item.FType : type.FName;
 					item.FAddDate = item.FAddDate == null ? "" : this.dateFormat(item.FAddDate);
 					item.FEditDate = item.FEditDate == null ? "" : this.dateFormat(item.FEditDate);
+					item.FDevDate = item.FDevDate == null ? "" : this.dateFormat(item.FDevDate);
 				});
 				this.pageInfo.total = result.Data.Total || 0;
 				this.dataList = result.Data.List;