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 | 238 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 174 insertions(+), 64 deletions(-)
diff --git a/src/views/dry/dataDefine/DryOrder.data.ts b/src/views/dry/dataDefine/DryOrder.data.ts
index e79267e..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',
@@ -38,6 +53,11 @@
dataIndex: 'feed',
},
{
+ title: '鍒濆閲嶉噺',
+ align: 'center',
+ dataIndex: 'originWeight',
+ },
+ {
title: '棰勮骞茬嚗鏃堕棿',
align: 'center',
dataIndex: 'et',
@@ -50,28 +70,50 @@
{
title: '骞茬嚗鏃堕棿',
align: 'center',
- dataIndex: 'drying',
+ dataIndex: 'dryTime',
+ },
+ {
+ title: '鐑娓╁害',
+ align: 'center',
+ dataIndex: 'windTemp',
+ },
+ {
+ title: '钂告苯閲�',
+ align: 'center',
+ dataIndex: 'steam',
+ },
+ {
+ title: '鑰楃數閲�',
+ align: 'center',
+ dataIndex: 'watt',
+ },
+ {
+ title: '鐜娓╁害',
+ align: 'center',
+ dataIndex: 'envTemp',
+ },
+ {
+ title: '鐜婀垮害',
+ align: 'center',
+ dataIndex: 'envHum',
+ },
+ {
+ title: '鑽℃枡寤舵椂锛坢s锛�',
+ align: 'center',
+ dataIndex: 'delay',
+ },
+ {
+ title: '缈绘枡娆℃暟',
+ align: 'center',
+ dataIndex: 'turn',
},
{
title: '棰勮鍓╀綑鏃堕棿',
align: 'center',
dataIndex: 'remain',
},
- {
- title: '璁惧',
- align: 'center',
- dataIndex: 'equId_dictText',
- },
- {
- title: '杞﹂棿',
- align: 'center',
- dataIndex: 'shopId_dictText',
- },
- {
- title: '宸ュ崟鐘舵��',
- align: 'center',
- dataIndex: 'orderStatus',
- },
+
+
{
title: '鎿嶄綔浜�',
align: 'center',
@@ -102,6 +144,9 @@
label: '宸ュ崟鏃堕棿',
field: 'orderTime',
component: 'DatePicker',
+ componentProps: {
+ valueFormat: 'YYYY-MM-DD',
+ },
},
{
label: '宸ュ崟鍙�',
@@ -116,44 +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: 'et',
- component: 'InputNumber',
- },
- {
- label: '骞叉枡閲嶉噺',
- field: 'yield',
- component: 'InputNumber',
- },
- {
- label: '骞茬嚗鏃堕棿',
- field: 'drying',
- 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',
@@ -162,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: '',
@@ -200,3 +279,34 @@
// 榛樿鍜屽師濮嬭〃鍗曚繚鎸佷竴鑷� 濡傛灉娴佺▼涓厤缃簡鏉冮檺鏁版嵁锛岃繖閲岄渶瑕佸崟鐙鐞唂ormSchema
return formSchema
}
+
+export interface dryOrder {
+ id: string
+ order_time: Date
+ code: string
+ herb_id: string
+ herb_name: string
+ initial: number
+ target: number
+ feed: number
+ origin_weight: number
+ et: number
+ yield: number
+ dry_time: number
+ wind_temp: number
+ env_temp: number
+ env_hum: number
+ delay: number
+ turn: number
+ remain: number
+ equ_id: string
+ shop_id: string
+ tenant_id: string
+ create_by: string
+ create_time: Date
+ update_by: string
+ update_time: Date
+ order_status: number
+ operator: string
+ temps: string
+}
--
Gitblit v1.9.3