From b1ac791a0e8896ee3d2016949911d44c9f0fb7a9 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 16 三月 2026 13:17:23 +0800
Subject: [PATCH] 封面的构件选项修改为“封面、封内合拼、多单合拼、内页”,默认封面 选择了封面构件后,新增的内页构件中的选项该为“内页、多单合拼”, 默认内页 专版按以上 合版的选项中增加“无”,默认无 无”打印的时候为空白,不显示“无”字

---
 CY_ECommercePlatform/CY.Model/OA/OA_ShebeiWeixiu.cs |   49 +++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_ShebeiWeixiu.cs b/CY_ECommercePlatform/CY.Model/OA/OA_ShebeiWeixiu.cs
index d6b0e63..68c23e4 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_ShebeiWeixiu.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_ShebeiWeixiu.cs
@@ -24,6 +24,7 @@
         public decimal? WeixiuPrice { get; set; }
         public int? Zerenren { get; set; }
         public string ZerenrenName { get; set; }
+        public string ShebeiZerenrenName { get; set; }
         public decimal? DanzePrice { get; set; }
 
         public int? WeixiuShebeiId { get; set; }
@@ -32,9 +33,39 @@
 
         public int? FukuanshenqingId { get; set; }
 
+
+        public string Fukuanfangshi { get; set; }
+
+        public string FukuanfangshiName { get
+            {
+                if (string.IsNullOrEmpty(this.Fukuanfangshi))
+                {
+                    return "";
+                }
+                else if (this.Fukuanfangshi == "1")
+                {
+                    return "瀵瑰叕杞处";
+                }
+                else if (this.Fukuanfangshi == "2")
+                {
+                    return "鐜伴噾鏀粯";
+                }
+                else
+                {
+                    return "";
+                }
+
+
+            }
+        }
+
         //鏄惁浠樿垂  1鏄�2鍚�
         public int? Shifoufufei { get; set; }
-        
+
+
+        //缁翠慨瀹℃壒鏄惁閫氳繃  1鎵瑰噯2涓嶆壒鍑�
+        public int? ApprovalStatus { get; set; }
+
 
         public DateTime? CreateTime { get; set; }
         public string Creator{ get; set; }
@@ -287,7 +318,21 @@
                 this.CateName = isChange ? MyConvert.ConvertToString(value) : CateName;
                 theValue = this.CateName;
             }
-
+            else if ("ShebeiZerenrenName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 22)
+            {
+                this.ShebeiZerenrenName = isChange ? MyConvert.ConvertToString(value) : ShebeiZerenrenName;
+                theValue = this.ShebeiZerenrenName;
+            }
+            else if ("ApprovalStatus".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 23)
+            {
+                this.ApprovalStatus = isChange ? MyConvert.ConvertToInt32(value) : ApprovalStatus;
+                theValue = this.ApprovalStatus;
+            }
+            else if ("Fukuanfangshi".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 24)
+            {
+                this.Fukuanfangshi = isChange ? MyConvert.ConvertToString(value) : Fukuanfangshi;
+                theValue = this.Fukuanfangshi;
+            }
             
 
             return theValue;

--
Gitblit v1.9.1