From 6fcb00f27e80b38cea4ccb059112ad7cf99d8745 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期五, 25 十月 2024 15:18:22 +0800
Subject: [PATCH] 新增干草配方历史功能模块

---
 src/views/dry/dataDefine/DryOrder.data.ts |  205 +++++++++++++++++++++++++++-----------------------
 1 files changed, 110 insertions(+), 95 deletions(-)

diff --git a/src/views/dry/dataDefine/DryOrder.data.ts b/src/views/dry/dataDefine/DryOrder.data.ts
index 959d62c..2dc9a24 100644
--- a/src/views/dry/dataDefine/DryOrder.data.ts
+++ b/src/views/dry/dataDefine/DryOrder.data.ts
@@ -23,6 +23,21 @@
 		dataIndex: 'herbId_dictText',
 	},
 	{
+		title: '璁惧',
+		align: 'center',
+		dataIndex: 'equId_dictText',
+	},
+  {
+    title: '宸ュ崟鐘舵��',
+    align: 'center',
+    dataIndex: 'orderStatus_dictText',
+  },
+	// {
+	// 	title: '杞﹂棿',
+	// 	align: 'center',
+	// 	dataIndex: 'shopId_dictText',
+	// },
+	{
 		title: '鍒濆鍚按鐜�',
 		align: 'center',
 		dataIndex: 'initial',
@@ -63,6 +78,16 @@
 		dataIndex: 'windTemp',
 	},
 	{
+		title: '钂告苯閲�',
+		align: 'center',
+		dataIndex: 'steam',
+	},
+	{
+		title: '鑰楃數閲�',
+		align: 'center',
+		dataIndex: 'watt',
+	},
+	{
 		title: '鐜娓╁害',
 		align: 'center',
 		dataIndex: 'envTemp',
@@ -87,21 +112,8 @@
 		align: 'center',
 		dataIndex: 'remain',
 	},
-	{
-		title: '璁惧',
-		align: 'center',
-		dataIndex: 'equId_dictText',
-	},
-	{
-		title: '杞﹂棿',
-		align: 'center',
-		dataIndex: 'shopId_dictText',
-	},
-	{
-		title: '宸ュ崟鐘舵��',
-		align: 'center',
-		dataIndex: 'orderStatus',
-	},
+
+
 	{
 		title: '鎿嶄綔浜�',
 		align: 'center',
@@ -133,8 +145,7 @@
 		field: 'orderTime',
 		component: 'DatePicker',
 		componentProps: {
-			showTime: true,
-			valueFormat: 'YYYY-MM-DD HH:mm:ss',
+			valueFormat: 'YYYY-MM-DD',
 		},
 	},
 	{
@@ -150,74 +161,74 @@
 		field: 'herbId',
 		component: 'JDictSelectTag',
 		componentProps: {
-			dictCode: 'dry_herb,name,id,tenant_id=' + getTenantId(),
+			dictCode: 'dry_herb_formula,name,id,tenant_id=' + getTenantId(),
 		},
 	},
-	{
-		label: '鍒濆鍚按鐜�',
-		field: 'initial',
-		component: 'InputNumber',
-	},
-	{
-		label: '鐩爣鍚按鐜�',
-		field: 'target',
-		component: 'InputNumber',
-	},
+	// {
+	// 	label: '鍒濆鍚按鐜�',
+	// 	field: 'initial',
+	// 	component: 'InputNumber',
+	// },
+	// {
+	// 	label: '鐩爣鍚按鐜�',
+	// 	field: 'target',
+	// 	component: 'InputNumber',
+	// },
 	{
 		label: '鎶曟枡閲�',
 		field: 'feed',
 		component: 'InputNumber',
 	},
-	{
-		label: '鍘熷閲嶉噺',
-		field: 'originWeight',
-		component: 'InputNumber',
-	},
-	{
-		label: '棰勮骞茬嚗鏃堕棿',
-		field: 'et',
-		component: 'InputNumber',
-	},
-	{
-		label: '骞叉枡閲嶉噺',
-		field: 'yield',
-		component: 'InputNumber',
-	},
-	{
-		label: '骞茬嚗鏃堕棿',
-		field: 'dryTime',
-		component: 'InputNumber',
-	},
-	{
-		label: '鐑娓╁害',
-		field: 'windTemp',
-		component: 'InputNumber',
-	},
-	{
-		label: '鐜娓╁害',
-		field: 'envTemp',
-		component: 'InputNumber',
-	},
-	{
-		label: '鐜婀垮害',
-		field: 'envHum',
-		component: 'InputNumber',
-	},
-	{
-		label: '鑽℃枡寤舵椂锛坢s锛�',
-		field: 'delay',
-		component: 'InputNumber',
-	},
-	{
-		label: '缈绘枡娆℃暟',
-		field: 'turn',
-		component: 'InputNumber',
-	},
-	{
-		label: '棰勮鍓╀綑鏃堕棿',
-		field: 'remain',
-		component: 'InputNumber',
-	},
+	// {
+	// 	label: '鍘熷閲嶉噺',
+	// 	field: 'originWeight',
+	// 	component: 'InputNumber',
+	// },
+	// {
+	// 	label: '棰勮骞茬嚗鏃堕棿',
+	// 	field: 'et',
+	// 	component: 'InputNumber',
+	// },
+	// {
+	// 	label: '骞叉枡閲嶉噺',
+	// 	field: 'yield',
+	// 	component: 'InputNumber',
+	// },
+	// {
+	// 	label: '骞茬嚗鏃堕棿',
+	// 	field: 'dryTime',
+	// 	component: 'InputNumber',
+	// },
+	// {
+	// 	label: '鐑娓╁害',
+	// 	field: 'windTemp',
+	// 	component: 'InputNumber',
+	// },
+	// {
+	// 	label: '鐜娓╁害',
+	// 	field: 'envTemp',
+	// 	component: 'InputNumber',
+	// },
+	// {
+	// 	label: '鐜婀垮害',
+	// 	field: 'envHum',
+	// 	component: 'InputNumber',
+	// },
+	// {
+	// 	label: '鑽℃枡寤舵椂锛坢s锛�',
+	// 	field: 'delay',
+	// 	component: 'InputNumber',
+	// },
+	// {
+	// 	label: '缈绘枡娆℃暟',
+	// 	field: 'turn',
+	// 	component: 'InputNumber',
+	// },
+	// {
+	// 	label: '棰勮鍓╀綑鏃堕棿',
+	// 	field: 'remain',
+	// 	component: 'InputNumber',
+	// },
 	{
 		label: '璁惧',
 		field: 'equId',
@@ -226,27 +237,31 @@
 			dictCode: 'dry_equipment,name,id,tenant_id=' + getTenantId(),
 		},
 	},
-	{
-		label: '杞﹂棿',
-		field: 'shopId',
-		component: 'JDictSelectTag',
-		componentProps: {
-			dictCode: 'dry_shop,name,id,tenant_id=' + getTenantId(),
-		},
-	},
+	// {
+	// 	label: '杞﹂棿',
+	// 	field: 'shopId',
+	// 	component: 'JDictSelectTag',
+	// 	componentProps: {
+	// 		dictCode: 'dry_shop,name,id,tenant_id=' + getTenantId(),
+	// 	},
+	// },
 	{
 		label: '宸ュ崟鐘舵��',
 		field: 'orderStatus',
-		component: 'InputNumber',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: 'dry_order_status',
+      stringToNumber: true,
+    },
 	},
-	{
-		label: '鎿嶄綔浜�',
-		field: 'operator',
-		component: 'JDictSelectTag',
-		componentProps: {
-			dictCode: 'sys_user,realname,id,tenant_id=' + getTenantId(),
-		},
-	},
+	// {
+	// 	label: '鎿嶄綔浜�',
+	// 	field: 'operator',
+	// 	component: 'JDictSelectTag',
+	// 	componentProps: {
+	// 		dictCode: 'sys_user,realname,id,tenant_id=' + getTenantId(),
+	// 	},
+	// },
 	// TODO 涓婚敭闅愯棌瀛楁锛岀洰鍓嶅啓姝讳负ID
 	{
 		label: '',

--
Gitblit v1.9.3