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 9a49d0c..0000000 Binary files a/wwwroot/select_org/.get_organization.dspy.swp and /dev/null differ