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 | 42 +++++++++++++++++++++++-------------------
1 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/src/views/dry/dataDefine/DryOrder.data.ts b/src/views/dry/dataDefine/DryOrder.data.ts
index c9dad1d..2dc9a24 100644
--- a/src/views/dry/dataDefine/DryOrder.data.ts
+++ b/src/views/dry/dataDefine/DryOrder.data.ts
@@ -27,6 +27,11 @@
align: 'center',
dataIndex: 'equId_dictText',
},
+ {
+ title: '宸ュ崟鐘舵��',
+ align: 'center',
+ dataIndex: 'orderStatus_dictText',
+ },
// {
// title: '杞﹂棿',
// align: 'center',
@@ -108,11 +113,7 @@
dataIndex: 'remain',
},
- {
- title: '宸ュ崟鐘舵��',
- align: 'center',
- dataIndex: 'orderStatus',
- },
+
{
title: '鎿嶄綔浜�',
align: 'center',
@@ -144,8 +145,7 @@
field: 'orderTime',
component: 'DatePicker',
componentProps: {
- showTime: true,
- valueFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'YYYY-MM-DD',
},
},
{
@@ -161,7 +161,7 @@
field: 'herbId',
component: 'JDictSelectTag',
componentProps: {
- dictCode: 'dry_herb,name,id,tenant_id=' + getTenantId(),
+ dictCode: 'dry_herb_formula,name,id,tenant_id=' + getTenantId(),
},
},
// {
@@ -237,19 +237,23 @@
dictCode: 'dry_equipment,name,id,tenant_id=' + getTenantId(),
},
},
- {
- label: '杞﹂棿',
- field: 'shopId',
- component: 'JDictSelectTag',
- componentProps: {
- dictCode: 'dry_shop,name,id,tenant_id=' + getTenantId(),
- },
- },
// {
- // label: '宸ュ崟鐘舵��',
- // field: 'orderStatus',
- // component: 'InputNumber',
+ // label: '杞﹂棿',
+ // field: 'shopId',
+ // component: 'JDictSelectTag',
+ // componentProps: {
+ // dictCode: 'dry_shop,name,id,tenant_id=' + getTenantId(),
+ // },
// },
+ {
+ label: '宸ュ崟鐘舵��',
+ field: 'orderStatus',
+ component: 'JDictSelectTag',
+ componentProps: {
+ dictCode: 'dry_order_status',
+ stringToNumber: true,
+ },
+ },
// {
// label: '鎿嶄綔浜�',
// field: 'operator',
--
Gitblit v1.9.3