1.fix bug: #1337

2.更新pc_menu.json

config/pc_menu.json

@@ -5645,7 +5645,7 @@
             "type": 5,
             "rulekey": "client_pc_web_qhj_gjsxsbb_company_sales_tab",
             "isshow": true,
-            "url": "/qhj/prosaleday/xsrblinit",
+            "url": "/qhj/prosaleday/initview",
             "remark": "",
             "children": []
           },
@@ -5656,7 +5656,7 @@
             "type": 5,
             "rulekey": "client_pc_web_qhj_gjsxsbb_departmental_sale_tab",
             "isshow": true,
-            "url": "/qhj/prosaleday/deptinit",
+            "url": "/qhj/prosaleday/initview",
             "remark": "",
             "children": []
           }
@@ -5679,7 +5679,7 @@
             "type": 5,
             "rulekey": "client_pc_web_qhj_zgxsbb_company_sale_day_tab",
             "isshow": true,
-            "url": "/qhj/prosaleday/zgxsrblinit",
+            "url": "/qhj/prosaleday/zginitview",
             "remark": "",
             "children": []
           },
@@ -5690,7 +5690,7 @@
             "type": 5,
             "rulekey": "client_pc_web_qhj_zgxsbb_company_sale_week_tab",
             "isshow": true,
-            "url": "/qhj/prosaleday/zggsxszbinit",
+            "url": "/qhj/prosaleday/zginitview",
             "remark": "",
             "children": []
           },
@@ -5701,7 +5701,7 @@
             "type": 5,
             "rulekey": "client_pc_web_qhj_zgxsbb_company_sale_month_tab",
             "isshow": true,
-            "url": "/qhj/prosaleday/zggsxsybinit",
+            "url": "/qhj/prosaleday/zginitview",
             "remark": "",
             "children": []
           },
@@ -5712,7 +5712,7 @@
             "type": 5,
             "rulekey": "client_pc_web_qhj_zgxsbb_departmental_sale_week_tab",
             "isshow": true,
-            "url": "/qhj/prosaleday/zgdeptzbinit",
+            "url": "/qhj/prosaleday/zginitview",
             "remark": "",
             "children": []
           },
@@ -5723,7 +5723,7 @@
             "type": 5,
             "rulekey": "client_pc_web_qhj_zgxsbb_departmental_sale_month_tab",
             "isshow": true,
-            "url": "/qhj/prosaleday/zgdeptybinit",
+            "url": "/qhj/prosaleday/zginitview",
             "remark": "",
             "children": []
           },
@@ -5734,7 +5734,7 @@
             "type": 5,
             "rulekey": "client_pc_web_qhj_zgxsbb_product_sale_month_tab",
             "isshow": true,
-            "url": "/qhj/prosaleday/zgproducttybinit",
+            "url": "/qhj/prosaleday/zginitview",
             "remark": "",
             "children": []
           }
@@ -5757,7 +5757,7 @@
             "type": 5,
             "rulekey": "client_pc_web_qhj_kfbb_reach_rate_report_tab",
             "isshow": true,
-            "url": "/qhj/customerservice/dclinit",
+            "url": "/qhj/customerservice/initview",
             "remark": "",
             "children": []
           },
@@ -5768,7 +5768,7 @@
             "type": 5,
             "rulekey": "client_pc_web_qhj_kfbb_team_annualized_performance_ranking_report_tab",
             "isshow": true,
-            "url": "/qhj/customerservice/tdnhyjpxinit",
+            "url": "/qhj/customerservice/initview",
             "remark": "",
             "children": []
           },
@@ -5779,7 +5779,7 @@
             "type": 5,
             "rulekey": "client_pc_web_qhj_kfbb_personal_annualized_performance_ranking_report_tab",
             "isshow": true,
-            "url": "/qhj/customerservice/grnhyjpxinit",
+            "url": "/qhj/customerservice/initview",
             "remark": "",
             "children": []
           },
@@ -5790,7 +5790,7 @@
             "type": 5,
             "rulekey": "client_pc_web_qhj_kfbb_team_manager_annualized_performance_ranking_report_tab",
             "isshow": true,
-            "url": "/qhj/customerservice/tdjlnhyjpxinit",
+            "url": "/qhj/customerservice/initview",
             "remark": "",
             "children": []
           }

controllers/tradexx/qryTradexx.go

@@ -28,7 +28,7 @@ import (
 // @Tags 通用单据
 func QueryTradeHolderDetail(c *gin.Context) {
 	a := app.GinUtils{Gin: app.Gin{C: c}}
-	m := models.TradeHolderDetail{}
+	m := models.TradeHolderDetail{BUYORSELL: -1}
 	a.DoBindReq(&m)
 	a.DoGetDataI(&m)
 }

models/tradexx.go

@@ -175,7 +175,7 @@ type TradeHolderDetail struct {
 	MARKETID            int32    `json:"marketid"  xorm:"MARKETID" form:"marketid"`       // 市场ID
 	GOODSID             int32    `json:"goodsid"  xorm:"GOODSID" form:"goodsid"`          // 商品ID
 	ACCOUNTID           int64    `json:"accountid"  xorm:"ACCOUNTID" form:"accountid"`    // 账号ID
-	BUYORSELL           int32    `json:"buyorsell"  xorm:"BUYORSELL"`                     // 方向 - 0:买 1:卖
+	BUYORSELL           int32    `json:"buyorsell"  xorm:"BUYORSELL" form:"buyorsell"`    // 方向 - 0:买 1:卖
 	OPENQTY             SFLOAT64 `json:"openqty"  xorm:"OPENQTY"`                         // 建仓数量
 	HOLDERQTY           SFLOAT64 `json:"holderqty"  xorm:"HOLDERQTY"`                     // 持仓数量
 	FREEZEQTY           SFLOAT64 `json:"freezeqty"  xorm:"FREEZEQTY"`                     // 冻结数量
@@ -285,6 +285,7 @@ SELECT to_char(t.TRADEID) TRADEID,
 
 	sqlId.AndEx("utmp.userid", r.USERID, r.USERID > 0)
 	sqlId.AndEx("t.goodsid", r.GOODSID, r.GOODSID > 0)
+	sqlId.AndEx("t.BUYORSELL", r.BUYORSELL, r.BUYORSELL != -1)
 	sqlId.JoinEx(r.FtTradeMode != "", fmt.Sprintf(" and gtmp.trademode in(%v)", r.FtTradeMode))
 	sqlId.JoinEx(r.FtMarketIDs != "", fmt.Sprintf(" and gtmp.marketid in(%v)", r.FtMarketIDs))
 	sqlId.JoinEx(r.FtAccountIDs != "", fmt.Sprintf(" and t.accountid in(%v)", r.FtAccountIDs))