From a7711b47c02807531f04313ae829584310f37aba Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 28 十一月 2025 12:17:10 +0800
Subject: [PATCH] 你们明天在那个公文管理公文管理那个操作操作界面增加一个审核, 好点审核呢,实际上是修改这个只有我才有一个权限, 只是只有我一个人,因为现在来看他们。相当于说, 没经过我审核,他们整些你看嘛,发你妈一些公文, 像狗屎一样,格式都不对头,在这儿乱在这儿乱写啊, 必须就是我,我审核,我点审核,你相就是复制一个修改过嘛, 相当于就是。好,必须是我,我点了审核好后头我修改好了, 提交好了才能发布。只要我没在审核里头的话,好,这个就发布不了 。好怀疑着呢,怀疑怀疑着来修改,还是在修改里头整?

---
 CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs
index cbf326d..96cfe90 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs
@@ -561,6 +561,8 @@
             SetParamValue(searchParam, 20, CurrentUser.StaffId);
             SetParamValue(searchParam, 21, CurrentUser.TrueName);
             SetParamValue(searchParam, 28, this.txtSearchyjname.Value);
+            SetParamValue(searchParam, 30, this.selWorkStates.Value);
+            SetParamValue(searchParam, 31, this.selDeleverStates.Value);
             if (!IsPostBack && !IsCallback)
             {
                 if (Session["OrderList"] != null)
@@ -609,6 +611,10 @@
                             this.selAppraise.SelectedValue = searchParam[index].ToString();
                         if (index == 28)
                             this.txtSearchyjname.Value = searchParam[index].ToString();
+                        if (index == 30)
+                            this.selWorkStates.Value = searchParam[index].ToString();
+                        if (index == 31)
+                            this.selDeleverStates.Value = searchParam[index].ToString();
 
                     }
 
@@ -620,7 +626,6 @@
                     SetParamValue(searchParam, 19, CurrentUser.TrueMemberId);
                     SetParamValue(searchParam, 20, CurrentUser.StaffId);
                     SetParamValue(searchParam, 21, CurrentUser.TrueName);
-                    SetParamValue(searchParam, 28, this.txtSearchyjname.Value);
                 }
             }
             else
@@ -778,7 +783,7 @@
                         {
                             if (opType == "鎾ゅ崟")
                             {
-                                if (orderState == 4 || orderState == 5)
+                                if (orderState == 3 || orderState == 4 || orderState == 5)
                                 {
                                     isCan = false;
                                 }
@@ -877,6 +882,7 @@
                 headerRow.CreateCell(12).SetCellValue("閲戦");
                 headerRow.CreateCell(13).SetCellValue("宸叉敹娆�");
                 headerRow.CreateCell(14).SetCellValue("鏈粯娆�");
+                headerRow.CreateCell(15).SetCellValue("閫佽揣閲戦");
 
                 // 娣诲姞鏁版嵁
                 int rowIndex = 1;
@@ -898,6 +904,7 @@
                     row.CreateCell(12).SetCellValue(order.SumPrice.HasValue? order.SumPrice.Value.ToDouble2().Value:0);
                     row.CreateCell(13).SetCellValue(order.TradingSingle.PayedMoney.HasValue ? order.TradingSingle.PayedMoney.Value.ToDouble2().Value : 0);
                     row.CreateCell(14).SetCellValue(order.UnPayedMoney.ToDouble2().Value);
+                    row.CreateCell(15).SetCellValue(order.SonghuoJine.HasValue ? order.SonghuoJine.Value.ToDouble2().Value : 0);
 
 
                 }

--
Gitblit v1.9.1