From 4456f43c6c73185a9f7ce46cdcdf94ab2053f02e Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 07 5月 2025 14:19:43 +0800
Subject: [PATCH] 修改生成器及出入库记录页面

---
 Weben_CMS专用代码生成器/Code/Utility/StructStrHelper.cs |   28 +++++++++++++---------------
 1 files changed, 13 insertions(+), 15 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/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 bcb9e86..c8726a8 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"
@@ -1845,9 +1845,9 @@
                     var elment = "input";
                     switch (enumDT)
                     {
-                        case DataTypeEnum.dt_datetime:
-                            elment = "date-picker";
-                            break;
+                        //case DataTypeEnum.dt_datetime:
+                        //    elment = "date-picker";
+                        //    break;
                         case DataTypeEnum.dt_bit:
                         case DataTypeEnum.dt_tinyint:
                             elment = "select";
@@ -1975,8 +1975,8 @@
       placeholder: '璇疯緭鍏ョ墿鏂欑紪鐮�',
     },
                  */
-                List<ColumnModel> newList = ListHelper.RemoveForPageAddFormAttributes(columnModelList);
-                foreach (var columnModel in newList)
+                //List<ColumnModel> newList = ListHelper.RemoveForPageAddFormAttributes(columnModelList);
+                foreach (var columnModel in columnModelList)
                 {
                     //棣栧瓧姣嶅皬鍐�
                     var low_prop_ColumnName = CommonHelper.FirstLowercase(columnModel.ColumnName);
@@ -1984,9 +1984,9 @@
                     var elment = "input";
                     switch (enumDT)
                     {
-                        case DataTypeEnum.dt_datetime:
-                            elment = "date-picker";
-                            break;
+                        //case DataTypeEnum.dt_datetime:
+                        //    elment = "date-picker";
+                        //    break;
                         case DataTypeEnum.dt_bit:
                         case DataTypeEnum.dt_tinyint:
                             elment = "select";
@@ -2215,17 +2215,15 @@
                 /*
                   materialCode: formData.value.materialCode,
                  */
-                List<ColumnModel> newList = ListHelper.RemoveForPageAddFormAttributes(columnModelList);
+                List<ColumnModel> newList = ListHelper.RemoveAttrForQueryMode(columnModelList);
                 foreach (var columnModel in newList)
                 {
-<<<<<<< HEAD
+
                     //棣栧瓧姣嶅皬鍐�
                     var low_prop_ColumnName = CommonHelper.FirstLowercase(columnModel.ColumnName);
-                    sb.Append($"{low_prop_ColumnName}: formData.value.{low_prop_ColumnName}, \n");
-=======
-                    var low_prop_ColumnName = CommonHelper.FirstLowercase(columnModel.ColumnName);
-                    sb.Append($"{low_prop_ColumnName}: formData.value.{low_prop_ColumnName},  || ''\n");
->>>>>>> a1cdc5e71aa827651a6c3e313fd7acc95b09c097
+                    sb.Append($"{low_prop_ColumnName}: formData.value.{low_prop_ColumnName} || '', \n");
+
+
                 }
                 //鍘绘帀鏈�鍚庝竴涓�,
                 var res = sb.ToString();

--
Gitblit v1.9.3