From 220db80e605945ced1b33443020933206b0915db Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期四, 24 七月 2025 14:56:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'bak/master' into master-lpyun
---
src/views/dry/dataDefine/DryEquipment.data.ts | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 110 insertions(+), 4 deletions(-)
diff --git a/src/views/dry/dataDefine/DryEquipment.data.ts b/src/views/dry/dataDefine/DryEquipment.data.ts
index e57a768..1e6d6bd 100644
--- a/src/views/dry/dataDefine/DryEquipment.data.ts
+++ b/src/views/dry/dataDefine/DryEquipment.data.ts
@@ -21,12 +21,58 @@
dataIndex: 'type_dictText',
},
{
+ title: '鍒堕�犲晢',
+ align: 'center',
+ dataIndex: 'manufacturer',
+ },
+ {
+ title: '璐叆鏃ユ湡',
+ align: 'center',
+ dataIndex: 'purchaseDate',
+ },
+ {
+ title: '鍚敤鏃ユ湡',
+ align: 'center',
+ dataIndex: 'startDate',
+ },
+ {
+ title: '瀹夎浣嶇疆',
+ align: 'center',
+ dataIndex: 'location',
+ },
+ {
+ title: '璁惧鐘舵��',
+ align: 'center',
+ dataIndex: 'status',
+ customRender: ({text}) => {
+ // 0-'鏂板',1-'鍦ㄧ敤', 2-'鍋滅敤', 3-'缁翠慨', 4-'鎶ュ簾'
+ const options = {
+ '0': '鏂板',
+ '1': '鍦ㄧ敤',
+ '2': '鍋滅敤',
+ '3': '缁翠慨',
+ '4': '鎶ュ簾'
+ };
+ return options[text] || text;
+ }
+ },
+ {
+ title: '鎶ュ簾鏃ユ湡',
+ align: 'center',
+ dataIndex: 'scrapDate',
+ },
+ {
title: '璁惧鎻忚堪',
align: 'center',
dataIndex: 'remark',
},
{
- title: '杞﹂棿id',
+ title: '璁惧IP',
+ align: 'center',
+ dataIndex: 'ip',
+ },
+ {
+ title: '杞﹂棿',
align: 'center',
dataIndex: 'shopId_dictText',
},
@@ -94,13 +140,72 @@
},
},
{
+ label: '鍒堕�犲晢',
+ field: 'manufacturer',
+ component: 'Input',
+ },
+ {
+ label: '璐叆鏃ユ湡',
+ field: 'purchaseDate',
+ component: 'DatePicker',
+ componentProps: {
+ valueFormat: 'YYYY-MM-DD',
+ format: 'YYYY-MM-DD'
+ },
+ },
+ {
+ label: '鍚敤鏃ユ湡',
+ field: 'startDate',
+ component: 'DatePicker',
+ componentProps: {
+ valueFormat: 'YYYY-MM-DD',
+ format: 'YYYY-MM-DD'
+ },
+ },
+ {
+ label: '瀹夎浣嶇疆',
+ field: 'location',
+ component: 'Input',
+ },
+ {
+ label: '璁惧鐘舵��',
+ field: 'status',
+ component: 'Select',
+ componentProps: {
+ options: [ // '鍛ㄤ繚','鏈堜繚','瀛ｄ繚','骞翠繚'
+ { label: '鏂板', value: '0' },
+ { label: '鍦ㄧ敤', value: '1' },
+ { label: '鍋滅敤', value: '2' },
+ { label: '缁翠慨', value: '3' },
+ { label: '鎶ュ簾', value: '4' }
+ ]
+ },
+ },
+ {
+ label: '鎶ュ簾鏃ユ湡',
+ field: 'scrapDate',
+ component: 'DatePicker',
+ componentProps: {
+ valueFormat: 'YYYY-MM-DD',
+ format: 'YYYY-MM-DD'
+ },
+ },
+ {
+ label: '璁惧IP',
+ field: 'ip',
+ component: 'Input',
+ dynamicRules: ({ model, schema }) => {
+ return [{ required: true, message: '璇风粦瀹氳澶嘔P!' }, { ...rules.duplicateCheckRule('dry_equipment', 'ip', model, schema)[0] }]
+ },
+ },
+ {
label: '璁惧绫诲瀷',
field: 'type',
component: 'JDictSelectTag',
componentProps: {
dictCode: 'dry_eqp_type,name,id,tenant_id=' + getTenantId(),
},
- dynamicRules: ({ model, schema }) => {
+ dynamicRules: ({ }) => {
return [{ required: true, message: '璇疯緭鍏ヨ澶囩被鍨�!' }]
},
},
@@ -116,7 +221,7 @@
componentProps: {
dictCode: 'dry_shop,name,id,tenant_id=' + getTenantId(),
},
- dynamicRules: ({ model, schema }) => {
+ dynamicRules: ({ }) => {
return [{ required: true, message: '璇疯緭鍏ヨ溅闂磇d!' }]
},
},
@@ -125,7 +230,7 @@
field: 'enable',
component: 'JSwitch',
componentProps: {},
- dynamicRules: ({ model, schema }) => {
+ dynamicRules: ({ }) => {
return [{ required: true, message: '璇疯緭鍏ュ惎鐢ㄧ姸鎬�!' }]
},
},
@@ -161,5 +266,6 @@
update_by: string
update_time: Date
tenant_id: number
+ ip: string
order: dryOrder
}
--
Gitblit v1.9.3