From f892002a22d5cc1f09d764c20b812d81a519135a Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 09 5月 2025 10:00:39 +0800
Subject: [PATCH] 优化查询列表
---
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.cs | 12 -
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialDrawer.tsx | 28 +--
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/Config.ts | 42 +----
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs | 21 ---
Weben_CMS专用代码生成器/Code/Utility/ListHelper.cs | 171 +++++++++++++++---------
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterial导出模板.xlsx | 0
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialCreateOrUpdateDtoBase.cs | 9 -
Weben_CMS专用代码生成器/Code/Utility/StructStrHelper.cs | 7
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialQueryDrawer.tsx | 68 +++------
Weben_CMS专用代码生成器/Code/Model/SystemCommonVar.cs | 4
10 files changed, 169 insertions(+), 193 deletions(-)
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Model/SystemCommonVar.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Model/SystemCommonVar.cs"
index 1b5b92f..a4d3f43 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Model/SystemCommonVar.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Model/SystemCommonVar.cs"
@@ -21,7 +21,7 @@
public const string c_lastModifyTime = "LastModificationTime";
-
+
public const string c_ExtraProperties = "ExtraProperties";
@@ -38,5 +38,7 @@
public const string c_DeletionTime = "DeletionTime";
+ //鎵╁睍瀛楁
+ public static List<string> c_Extend = new List<string>() { "OperationRemark".ToUpper(), "DeleteRemark".ToUpper(), "ExtraField1".ToUpper(), "ExtraField2".ToUpper(), "ExtraField3".ToUpper() };
}
}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/ListHelper.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/ListHelper.cs"
index a3bac9e..6758b4b 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/ListHelper.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/ListHelper.cs"
@@ -23,18 +23,73 @@
for (int i = 0; i < columnNameList.Count; i++)
{
columnModel = columnNameList[i];
- if (columnModel.ColumnName.ToUpper() == SystemCommonVar.c_creator.ToUpper()
+ if (
+ columnModel.ColumnName.ToUpper() == SystemCommonVar.c_creator.ToUpper()
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_CreateId.ToUpper()
|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_createTime.ToUpper()
+
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ModifyId.ToUpper()
|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifier.ToUpper()
|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifyTime.ToUpper()
+
|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Id.ToUpper()
+
|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ExtraProperties.ToUpper()
|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ConcurrencyStamp.ToUpper()
+
|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_DeleterId.ToUpper()
|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_delFlag.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_CreateId.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ModifyId.ToUpper()
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_DeletionTime.ToUpper()
+
+
|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Sort.ToUpper()
+ || SystemCommonVar.c_Extend.Contains(columnModel.ColumnName.ToUpper())
+ )
+ {
+ continue;
+ }
+ newList.Add(columnModel);
+ }
+ return newList;
+ }
+
+ #endregion
+
+ #region 銆愰〉闈€�戝垪琛ㄧ晫闈�
+
+ /// <summary>
+ /// 椤甸潰琛ㄦ牸灞曠ず鐨� 瀛楁鍒楄〃
+ /// </summary>
+ /// <param name="columnNameList"></param>
+ /// <returns></returns>
+ public static List<ColumnModel> RemoveForPageTableListQueryAttributes(List<ColumnModel> columnNameList)
+ {
+ List<ColumnModel> newList = new List<ColumnModel>();
+ ColumnModel columnModel = null;
+ for (int i = 0; i < columnNameList.Count; i++)
+ {
+ columnModel = columnNameList[i];
+ if (
+ columnModel.ColumnName.ToUpper() == SystemCommonVar.c_CreateId.ToUpper()
+ //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_creator.ToUpper()
+ //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_createTime.ToUpper()
+
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ModifyId.ToUpper()
+ //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifier.ToUpper()
+ //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifyTime.ToUpper()
+
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Id.ToUpper()
+
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ExtraProperties.ToUpper()
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ConcurrencyStamp.ToUpper()
+
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_DeleterId.ToUpper()
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_delFlag.ToUpper()
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_DeletionTime.ToUpper()
+
+
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Sort.ToUpper()
+ || SystemCommonVar.c_Extend.Contains(columnModel.ColumnName.ToUpper())
)
{
@@ -46,6 +101,53 @@
}
#endregion
+
+ #region 銆愰〉闈€�戦珮绾ф煡璇㈡樉绀虹殑鍒�
+
+ /// <summary>
+ /// 銆愰〉闈€�戦珮绾ф煡璇㈡樉绀虹殑鍒�
+ /// </summary>
+ /// <param name="columnNameList"></param>
+ /// <returns></returns>
+ public static List<ColumnModel> RemoveAttrForQueryMode(List<ColumnModel> columnNameList)
+ {
+ List<ColumnModel> newList = new List<ColumnModel>();
+ ColumnModel columnModel = null;
+ for (int i = 0; i < columnNameList.Count; i++)
+ {
+ columnModel = columnNameList[i];
+ if (
+ columnModel.ColumnName.ToUpper() == SystemCommonVar.c_CreateId.ToUpper()
+ //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_creator.ToUpper()
+ //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_createTime.ToUpper()
+
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ModifyId.ToUpper()
+ //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifier.ToUpper()
+ //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifyTime.ToUpper()
+
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Id.ToUpper()
+
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ExtraProperties.ToUpper()
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ConcurrencyStamp.ToUpper()
+
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_DeleterId.ToUpper()
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_delFlag.ToUpper()
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_DeletionTime.ToUpper()
+
+
+ || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Sort.ToUpper()
+ || SystemCommonVar.c_Extend.Contains(columnModel.ColumnName.ToUpper())
+ )
+ {
+ continue;
+ }
+ newList.Add(columnModel);
+ }
+ return newList;
+ }
+
+ #endregion
+
/// <summary>
/// 鑾峰彇鏈�鏂扮殑鍒桳ist闆嗗悎(鍘绘帀 creator鍜宑reateTime)
/// </summary>
@@ -213,41 +315,7 @@
}
- /// <summary>
- /// 椤甸潰琛ㄦ牸灞曠ず鐨� 瀛楁鍒楄〃
- /// </summary>
- /// <param name="columnNameList"></param>
- /// <returns></returns>
- public static List<ColumnModel> RemoveForPageTableListQueryAttributes(List<ColumnModel> columnNameList)
- {
- List<ColumnModel> newList = new List<ColumnModel>();
- ColumnModel columnModel = null;
- for (int i = 0; i < columnNameList.Count; i++)
- {
- columnModel = columnNameList[i];
- if (
- columnModel.ColumnName.ToUpper() == SystemCommonVar.c_creator.ToUpper()
- // || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_createTime.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifier.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifyTime.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Id.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ExtraProperties.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ConcurrencyStamp.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_DeleterId.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_delFlag.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_CreateId.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ModifyId.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_IsDisabled.ToUpper()
- //|| columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Sort.ToUpper()
- )
- {
- continue;
- }
- newList.Add(columnModel);
- }
- return newList;
- }
/// <summary>
/// 鑾峰彇鏈�鏂扮殑鍒桳ist闆嗗悎(鍘绘帀 Id锛孋reateId锛孧odifyId)
@@ -387,34 +455,7 @@
}
-
- public static List<ColumnModel> RemoveAttrForQueryMode(List<ColumnModel> columnNameList)
- {
- List<ColumnModel> newList = new List<ColumnModel>();
- ColumnModel columnModel = null;
- for (int i = 0; i < columnNameList.Count; i++)
- {
- columnModel = columnNameList[i];
- if (columnModel.ColumnName.ToUpper() == SystemCommonVar.c_creator.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifier.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_lastModifyTime.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Id.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ExtraProperties.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ConcurrencyStamp.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_DeleterId.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_delFlag.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_CreateId.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_ModifyId.ToUpper()
- || columnModel.ColumnName.ToUpper() == SystemCommonVar.c_Sort.ToUpper()
-
- )
- {
- continue;
- }
- newList.Add(columnModel);
- }
- return newList;
- }
+
/// <summary>
/// 鑾峰彇鏈�鏂扮殑鍒桳ist闆嗗悎(鍘绘帀 ID)
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/StructStrHelper.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/StructStrHelper.cs"
index c1a638d..fa5a73d 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/StructStrHelper.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Utility/StructStrHelper.cs"
@@ -2262,7 +2262,12 @@
}
-
+ /// <summary>
+ /// 椤甸潰琛ㄦ牸鍒楁樉绀�
+ /// </summary>
+ /// <param name="columnModelList"></param>
+ /// <param name="param"></param>
+ /// <returns></returns>
public static string GetVueFormOptionsStr_EntityNameClass_Config_Attrs(List<ColumnModel> columnModelList, GenerateCodeParam param)
{
StringBuilder sb = new StringBuilder();
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialCreateOrUpdateDtoBase.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialCreateOrUpdateDtoBase.cs"
index 49888bf..81769dd 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialCreateOrUpdateDtoBase.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialCreateOrUpdateDtoBase.cs"
@@ -140,14 +140,9 @@
public string? LastModifierId { get; set; }
/// <summary>
- /// 鍒涘缓浜�
+ /// 鍒犻櫎鏃堕棿
/// </summary>
- public string? CreatorName { get; set; }
-
- /// <summary>
- /// 淇敼浜�
- /// </summary>
- public string? LastModifierName { get; set; }
+ public DateTime? DeletionTime { get; set; }
/// <summary>
/// 鎿嶄綔澶囨敞
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.cs"
index b110054..92b76ef 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.cs"
@@ -155,16 +155,10 @@
public bool? IsDisabled { get; set; }
/// <summary>
- /// 鍒涘缓浜�
+ /// 鍒犻櫎鏃堕棿
/// </summary>
- [ExcelColumn(Name = "鍒涘缓浜�", Width = 25)]
- public string CreatorName { get; set; }
-
- /// <summary>
- /// 淇敼浜�
- /// </summary>
- [ExcelColumn(Name = "淇敼浜�", Width = 25)]
- public string LastModifierName { get; set; }
+ [ExcelColumn(Name = "鍒犻櫎鏃堕棿", Width = 25)]
+ public DateTime DeletionTime { get; set; }
/// <summary>
/// 鎿嶄綔澶囨敞
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs"
index e9d12bf..74a0476 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs"
@@ -166,13 +166,6 @@
updateObj.RedundantField3 = input.RedundantField3;
updateObj.Remark = input.Remark;
updateObj.IsDisabled = input.IsDisabled;
- updateObj.CreatorName = input.CreatorName;
- updateObj.LastModifierName = input.LastModifierName;
- updateObj.OperationRemark = input.OperationRemark;
- updateObj.DeleteRemark = input.DeleteRemark;
- updateObj.ExtraField1 = input.ExtraField1;
- updateObj.ExtraField2 = input.ExtraField2;
- updateObj.ExtraField3 = input.ExtraField3;
await wmsMaterialRepository.UpdateAsync(updateObj);
@@ -351,13 +344,6 @@
RedundantField3 = impItem.RedundantField3,
Remark = impItem.Remark,
IsDisabled = impItem.IsDisabled,
-CreatorName = impItem.CreatorName,
-LastModifierName = impItem.LastModifierName,
-OperationRemark = impItem.OperationRemark,
-DeleteRemark = impItem.DeleteRemark,
-ExtraField1 = impItem.ExtraField1,
-ExtraField2 = impItem.ExtraField2,
-ExtraField3 = impItem.ExtraField3,
};
@@ -390,13 +376,6 @@
RedundantField3 = impItem.RedundantField3,
Remark = impItem.Remark,
IsDisabled = impItem.IsDisabled,
-CreatorName = impItem.CreatorName,
-LastModifierName = impItem.LastModifierName,
-OperationRemark = impItem.OperationRemark,
-DeleteRemark = impItem.DeleteRemark,
-ExtraField1 = impItem.ExtraField1,
-ExtraField2 = impItem.ExtraField2,
-ExtraField3 = impItem.ExtraField3,
};
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterial\345\257\274\345\207\272\346\250\241\346\235\277.xlsx" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterial\345\257\274\345\207\272\346\250\241\346\235\277.xlsx"
index 865262b..01bff94 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterial\345\257\274\345\207\272\346\250\241\346\235\277.xlsx"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterial\345\257\274\345\207\272\346\250\241\346\235\277.xlsx"
Binary files differ
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialDrawer.tsx" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialDrawer.tsx"
index 9b9e2f6..a777cf9 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialDrawer.tsx"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialDrawer.tsx"
@@ -300,18 +300,18 @@
placeholder: '璇疯緭鍏ュ娉�',
},
{
- label: '鍒涘缓浜�',
- prop: 'creatorName',
- el: 'input',
+ label: '鍒犻櫎鏃堕棿',
+ prop: 'deletionTime',
+ el: (props: any, { attrs }: SetupContext) => {
+ return h(datePicker, {
+ ...props,
+ clearable: true,
+ ...attrs,
+ })
+ },
+ width: '100%',
//disabled: disabled,
- placeholder: '璇疯緭鍏ュ垱寤轰汉',
- },
- {
- label: '淇敼浜�',
- prop: 'lastModifierName',
- el: 'input',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ヤ慨鏀逛汉',
+ placeholder: '璇疯緭鍏ュ垹闄ゆ椂闂�',
},
{
label: '鎿嶄綔澶囨敞',
@@ -405,8 +405,7 @@
redundantField2: formData.value.redundantField2,
redundantField3: formData.value.redundantField3,
remark: formData.value.remark,
-creatorName: formData.value.creatorName,
-lastModifierName: formData.value.lastModifierName,
+deletionTime: formData.value.deletionTime,
operationRemark: formData.value.operationRemark,
deleteRemark: formData.value.deleteRemark,
extraField1: formData.value.extraField1,
@@ -488,8 +487,7 @@
redundantField2: res.redundantField2,
redundantField3: res.redundantField3,
remark: res.remark,
-creatorName: res.creatorName,
-lastModifierName: res.lastModifierName,
+deletionTime: res.deletionTime,
operationRemark: res.operationRemark,
deleteRemark: res.deleteRemark,
extraField1: res.extraField1,
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialQueryDrawer.tsx" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialQueryDrawer.tsx"
index ea15e00..301eb74 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialQueryDrawer.tsx"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialQueryDrawer.tsx"
@@ -300,6 +300,13 @@
options: [{label: '鏄�',value: true}, {label: '鍚�',value: false}]
},
{
+ label: '鎵╁睍灞炴��',
+ prop: 'extraProperties',
+ el: 'input',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ユ墿灞曞睘鎬�',
+ },
+ {
label: '鍒涘缓鏃堕棿',
prop: 'creationTime',
el: (props: any, { attrs }: SetupContext) => {
@@ -314,6 +321,20 @@
placeholder: '璇疯緭鍏ュ垱寤烘椂闂�',
},
{
+ label: '淇敼鏃堕棿',
+ prop: 'lastModificationTime',
+ el: (props: any, { attrs }: SetupContext) => {
+ return h(dateTimePickerRange, {
+ ...props,
+ clearable: true,
+ ...attrs,
+ })
+ },
+ width: '100%',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ヤ慨鏀规椂闂�',
+ },
+ {
label: '鍒涘缓浜�',
prop: 'creatorName',
el: 'input',
@@ -326,41 +347,6 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ヤ慨鏀逛汉',
- },
- {
- label: '鎿嶄綔澶囨敞',
- prop: 'operationRemark',
- el: 'input',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ユ搷浣滃娉�',
- },
- {
- label: '鍒犻櫎澶囨敞',
- prop: 'deleteRemark',
- el: 'input',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ュ垹闄ゅ娉�',
- },
- {
- label: '鎵╁睍瀛楁1',
- prop: 'extraField1',
- el: 'input',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ユ墿灞曞瓧娈�1',
- },
- {
- label: '鎵╁睍瀛楁2',
- prop: 'extraField2',
- el: 'input',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ユ墿灞曞瓧娈�2',
- },
- {
- label: '鎵╁睍瀛楁3',
- prop: 'extraField3',
- el: 'input',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ユ墿灞曞瓧娈�3',
},
])
/**
@@ -398,14 +384,11 @@
redundantField3: formData.value.redundantField3 || '',
remark: formData.value.remark || '',
isDisabled: formData.value.isDisabled || '',
+extraProperties: formData.value.extraProperties || '',
creationTime: formData.value.creationTime || '',
+lastModificationTime: formData.value.lastModificationTime || '',
creatorName: formData.value.creatorName || '',
-lastModifierName: formData.value.lastModifierName || '',
-operationRemark: formData.value.operationRemark || '',
-deleteRemark: formData.value.deleteRemark || '',
-extraField1: formData.value.extraField1 || '',
-extraField2: formData.value.extraField2 || '',
-extraField3: formData.value.extraField3 || '',
+lastModifierName: formData.value.lastModifierName || '',
}
return data;
}
@@ -450,8 +433,7 @@
formData.value.RedundantField2 = ''
formData.value.RedundantField3 = ''
formData.value.Remark = ''
-formData.value.CreatorName = ''
-formData.value.LastModifierName = ''
+formData.value.DeletionTime = ''
formData.value.OperationRemark = ''
formData.value.DeleteRemark = ''
formData.value.ExtraField1 = ''
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/Config.ts" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/Config.ts"
index 1033632..c2b4865 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/Config.ts"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/Config.ts"
@@ -110,13 +110,18 @@
width:160,
},
{
- field: 'sort',
- title: '鎺掑簭',
+ field: 'remark',
+ title: '澶囨敞',
width:160,
},
{
- field: 'remark',
- title: '澶囨敞',
+ field: 'isDisabled',
+ title: '鏄惁绂佺敤',
+ width:80,
+},
+{
+ field: 'extraProperties',
+ title: '鎵╁睍灞炴��',
width:160,
},
{
@@ -125,8 +130,8 @@
width:180,
},
{
- field: 'deletionTime',
- title: '鍒犻櫎鏃堕棿',
+ field: 'lastModificationTime',
+ title: '淇敼鏃堕棿',
width:180,
},
{
@@ -137,31 +142,6 @@
{
field: 'lastModifierName',
title: '淇敼浜�',
- width:160,
-},
-{
- field: 'operationRemark',
- title: '鎿嶄綔澶囨敞',
- width:160,
-},
-{
- field: 'deleteRemark',
- title: '鍒犻櫎澶囨敞',
- width:160,
-},
-{
- field: 'extraField1',
- title: '鎵╁睍瀛楁1',
- width:160,
-},
-{
- field: 'extraField2',
- title: '鎵╁睍瀛楁2',
- width:160,
-},
-{
- field: 'extraField3',
- title: '鎵╁睍瀛楁3',
width:160,
},
]
--
Gitblit v1.9.3