From 6ca4e5755da9a468b055230f7b605dc4f3328ca2 Mon Sep 17 00:00:00 2001 From: yumoqing Date: Thu, 20 Feb 2025 10:09:58 +0800 Subject: [PATCH] bugix --- json/agreedetail.json | 4 +- json/prodpricing.json | 12 ------ json/prodpricingtab.json | 4 +- json/prodtype.json | 39 ++++++++++++++++-- json/product.json | 21 +++++++--- script/roleperm.sh | 2 + wwwroot/select_org/.get_organization.dspy.swp | Bin 16384 -> 0 bytes 7 files changed, 58 insertions(+), 24 deletions(-) delete mode 100644 json/prodpricing.json delete mode 100644 wwwroot/select_org/.get_organization.dspy.swp diff --git a/json/agreedetail.json b/json/agreedetail.json index 069d924..9463e45 100644 --- a/json/agreedetail.json +++ b/json/agreedetail.json @@ -2,11 +2,11 @@ "tblname":"agreedetail", "params":{ "browserfields": { - "exclouded": ["id"], + "exclouded": ["id", "agreeid"], "alters": {} }, "editexclouded": [ - "id" + "id", "agreeid" ] } } diff --git a/json/prodpricing.json b/json/prodpricing.json deleted file mode 100644 index 88b4fd5..0000000 --- a/json/prodpricing.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "tblname":"prodpricing", - "params":{ - "browserfields": { - "exclouded": ["id"], - "alters": {} - }, - "editexclouded": [ - "id" - ] - } -} diff --git a/json/prodpricingtab.json b/json/prodpricingtab.json index 858875f..0ac556c 100644 --- a/json/prodpricingtab.json +++ b/json/prodpricingtab.json @@ -2,11 +2,11 @@ "tblname":"prodpricingtab", "params":{ "browserfields": { - "exclouded": ["id"], + "exclouded": ["id", "prodid"], "alters": {} }, "editexclouded": [ - "id" + "id", "prodid" ] } } diff --git a/json/prodtype.json b/json/prodtype.json index 079c2bb..498fbee 100644 --- a/json/prodtype.json +++ b/json/prodtype.json @@ -3,9 +3,42 @@ "uitype":"tree", "params":{ "idField":"id", - "textField":"path", + "textField":"name", "parentField":"parentid", "editable":true, + "toolbar":{ + "tools":[ + { + "target":"PopupWindow", + "name":"spec", + "selected_data":true, + "label":"规格" + } + ] + }, + "binds":[ + { + "wid":"self", + "event":"spec", + "actiontype":"urlwidget", + "target":"PopupWindow", + "popup_options":{ + "width":"80%", + "height":"80%" + }, + "params_mapping":{ + "mapping":{ + "id":"prodtypeid" + }, + "need_others":false + }, + "options":{ + "params":{ + }, + "url":"/platformbiz/prodtypespec" + } + } + ], "browserfields": { "exclouded": ["id", "parentid" ], "alters": {} @@ -15,9 +48,9 @@ ], "subtables":[ { - "field":"parentid", + "field":"prodtypeid", "title":"产品类型", - "subtable":"prodtype" + "subtable":"prodtypespec" } ] } diff --git a/json/product.json b/json/product.json index eb9c78d..ad68184 100644 --- a/json/product.json +++ b/json/product.json @@ -1,13 +1,24 @@ { "tblname":"product", "params":{ - "logined_userorgid":"ownerid", + "logined_userorgid":"orgid", "browserfields": { - "exclouded": ["id"], - "alters": {} + "exclouded": ["id", "orgid", "providerid", "agreeid", "providerpid" ], + "alters": { + } }, "editexclouded": [ - "id" - ] + "id", "orgid", "providerid", "agreeid", "providerpid" + ], + "subtables":[ + { + "field":"prodid", + "params":{ + "prodtypeid":"${prodtypeid}" + }, + "subtable":"prodpricingtab", + "title":"产品定价" + } + ] } } diff --git a/script/roleperm.sh b/script/roleperm.sh index ad07140..c320114 100755 --- a/script/roleperm.sh +++ b/script/roleperm.sh @@ -1,5 +1,7 @@ #!/usr/bin/bash +python ~/py/rbac/script/roleperm.py sage platformbiz provider sale retail_agree agreedetail agreedetailstep agreeproduct organization +python ~/py/rbac/script/roleperm.py sage platformbiz provider sale product prodpricing prodpricingtab python ~/py/rbac/script/roleperm.py sage platformbiz reseller sale reseller retail_agree agreedetail agreedetailstep agreeproduct organization python ~/py/rbac/script/roleperm.py sage platformbiz reseller operator provide_agree coupontype agreedetail agreedetailstep agreeproduct organization product prodpricing prodpricingtab coupontype coupon coupon_log recharge_log resource biz_order python ~/py/rbac/script/roleperm.py sage platformbiz owner operator paychannel prodtype diff --git a/wwwroot/select_org/.get_organization.dspy.swp b/wwwroot/select_org/.get_organization.dspy.swp deleted file mode 100644 index 9a49d0c8bfe905048ecb5f98f67722049d88a268..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16384 zcmeI2TWl0n7{?EYXi+Ya5MOvWERfkYW!o(mVYM&H3lWow0l}u(%x7wB3k|?j~ zqB?%oXHj8EELjqZ@Ons5qXB7aNg|O@6-6)6#E2Nw{fZhc35(W|m!++|E-A7{&|=B) zYi6lT0j9vX3dHr$l9e;b(lT$UnQx(M0iFB6`f-b}M5X{!fGNNfU}Z?xWVVM z2;spqU=t_-^TA&;3HcrT2rh$8upjIOJ3tLs1IoaBFb~WIzuZsASKtG15_Et=APFkL zYES~)zy)sIN67c!6VL@Z!Ew+G0^o750+fJ4Fbn)VgOG2)70?aNfde20Hi6Zk96SUb z1UCx^F~C*u8Tbfvf;}J({9q$k2fSbg`1M{wegN0NRd61(fjZy^rJxWj1k=Dzc-itL zxBwbK5@=u(co-}KGr`x>3Hbti3f=;(Km}D`1E>JYz+76a_n1GR@VdLGC?rMj=ZYW&3rRtN6R70uQ>Tq1S~DUzyzx$|Ra9digXN!;T47_ahC&0m}F*eMN*Ibw^7La4w+ zd0C)#Dve0BB3)EJn0XO(5h+AR)#4*#Hi+Yf(onsud4ftTiLtk>)@X{1ctH&D@rdrv z)MG}vLy{N~v|-aK%1x)1kt_x5-6^dH-PaIn#MaVJ7$K4Zr_Mtir>b)vuJA|jR||J!{%Jx;{38r6iwFU@}f;sQ)tN*T`|?{9BUUpbS@c$Al9e;}?&vZ!ejHvuy${}vb>XN;qb zxvcVnpyp+-Z25}(?F}?{rMk}MvL~XOk-Uvg=APN#+GupVY4&tak8?HSLLa))1xeE- z8Gna5$)hiJXNYgZ^eZnI-OWzj!%PPyJ^3%0O?5Qowi#2EI&>G8-`Ecer@NTZ`44Zp z>0s);UOXpK2QQ>gAI&w+K}FX2psuL?ShXVOaY;=^Z^!<)mhHrG#&}Yl&OAemmQ%*w zwp@1kh{S7t>!~u~aMva|#}k=>fqzs-&Sx z&UWPB7t;`xWLjyuVzQ#!KA-6`4fLK>Yzw@nsCal2 ztX`Q*9rFfaI>(x#>Xv8hxXDPgHHDvQX=ddq^f_f>d^qDxd+ErmRuZxfE^2cAChx14 zwaiLqFxy~+Y!39$h}m8;G1vcVv1V@s=K3GYNo%`?@M&-YybRhvGcfaQ18idoFa?+b zOaZ0V17o+d@;q_0}sAsR`6j-4!dz?ea)hT*OGFOCM3O@3IQ{RqCSTAdU)&N&U{P6 LYY&a0w2%A^wG7tC