fix: fix column name + ensure dspy now returns CRUD page after create

- sub_resellers column is sub_reseller_name (not sub_dist_name)
- After ensure, return UrlWidget loading CRUD list filtered by id
- Popup size increased for CRUD page viewing

wwwroot/api/ensure_distribution_agreement.dspy

@@ -1,4 +1,4 @@
-"""Check if a distribution_agreement exists for sub_reseller_id. If not, create one."""
+"""Check/create distribution_agreement for sub_reseller_id, then show CRUD page."""
 sub_reseller_id = params_kw.get('sub_reseller_id')
 if not sub_reseller_id:
     return {'widgettype': 'Error', 'options': {'title': 'Error', 'message': 'Missing sub_reseller_id', 'timeout': 3}}
@@ -11,27 +11,16 @@ dbname = get_module_dbname('supplychain')
 async with DBPools().sqlorContext(dbname) as sor:
     # Check existing
     recs = await sor.sqlExe(
-        'SELECT id, agreement_code, agreement_name FROM distribution_agreements WHERE sub_reseller_id = ${sid}$ AND resellerid = ${rid}$ AND status = ${st}$',
+        'SELECT id FROM distribution_agreements WHERE sub_reseller_id = ${sid}$ AND resellerid = ${rid}$ AND status = ${st}$',
         {'sid': sub_reseller_id, 'rid': userorgid, 'st': '1'}
     )
-    if recs:
+    if not recs:
-        r = recs[0]
+        # Get sub_reseller name
-        return {
-            'widgettype': 'Message',
-            'options': {
-                'title': '协议已存在',
-                'message': f'分销协议 {r.agreement_code} {r.agreement_name} 已存在',
-                'type': 'success',
-                'timeout': 3
-            }
-        }
-
-    # Get sub_reseller info for name
         sub = await sor.sqlExe(
-        'SELECT sub_dist_name FROM sub_resellers WHERE id = ${sid}$',
+            'SELECT sub_reseller_name FROM sub_resellers WHERE id = ${sid}$',
             {'sid': sub_reseller_id}
         )
-    sub_name = sub[0].sub_dist_name if sub else sub_reseller_id
+        sub_name = sub[0].sub_reseller_name if sub else sub_reseller_id
 
         # Generate agreement_code
         prefix = f"DA-{datetime.datetime.now().strftime('%Y%m%d')}"
@@ -58,12 +47,12 @@ async with DBPools().sqlorContext(dbname) as sor:
             'updated_at': now,
         })
 
+# Return CRUD page embedded in popup
 return {
-        'widgettype': 'Message',
+    'widgettype': 'UrlWidget',
     'options': {
-            'title': '创建成功',
+        'url': f'../distribution_agreements_list?sub_reseller_id={sub_reseller_id}',
-            'message': f'已为{sub_name}创建分销协议 {agreement_code}',
+        'width': '100%',
-            'type': 'success',
+        'height': '100%'
-            'timeout': 5
     }
 }

wwwroot/api/ensure_supply_contract.dspy

@@ -1,4 +1,4 @@
-"""Check if a supply_contract exists for supplier_id. If not, create one."""
+"""Check/create supply_contract for supplier_id, then show CRUD page."""
 supplier_id = params_kw.get('supplier_id')
 if not supplier_id:
     return {'widgettype': 'Error', 'options': {'title': 'Error', 'message': 'Missing supplier_id', 'timeout': 3}}
@@ -11,21 +11,10 @@ dbname = get_module_dbname('supplychain')
 async with DBPools().sqlorContext(dbname) as sor:
     # Check existing
     recs = await sor.sqlExe(
-        'SELECT id, contract_code, contract_name FROM supply_contracts WHERE supplier_id = ${sid}$ AND resellerid = ${rid}$ AND status = ${st}$',
+        'SELECT id FROM supply_contracts WHERE supplier_id = ${sid}$ AND resellerid = ${rid}$ AND status = ${st}$',
         {'sid': supplier_id, 'rid': userorgid, 'st': '1'}
     )
-    if recs:
+    if not recs:
-        r = recs[0]
-        return {
-            'widgettype': 'Message',
-            'options': {
-                'title': '协议已存在',
-                'message': f'供销协议 {r.contract_code} {r.contract_name} 已存在',
-                'type': 'success',
-                'timeout': 3
-            }
-        }
-
         # Get supplier name
         sub = await sor.sqlExe(
             'SELECT supplier_name FROM suppliers WHERE id = ${sid}$',
@@ -58,12 +47,12 @@ async with DBPools().sqlorContext(dbname) as sor:
             'updated_at': now,
         })
 
+# Return CRUD page embedded in popup
 return {
-        'widgettype': 'Message',
+    'widgettype': 'UrlWidget',
     'options': {
-            'title': '创建成功',
+        'url': f'../supply_contracts_list?supplier_id={supplier_id}',
-            'message': f'已为{sup_name}创建供销协议 {contract_code}',
+        'width': '100%',
-            'type': 'success',
+        'height': '100%'
-            'timeout': 5
     }
 }

wwwroot/sub_distributors_list/index.ui

@@ -325,8 +325,8 @@
         "target": "PopupWindow",
         "popup_options": {
             "title": "分销协议",
-            "height": "200px",
+            "height": "80%",
-            "width": "400px"
+            "width": "85%"
         },
         "params_mapping": {
             "mapping": {"id": "sub_reseller_id"},

wwwroot/suppliers_list/index.ui

@@ -457,8 +457,8 @@
         "target": "PopupWindow",
         "popup_options": {
             "title": "供销协议",
-            "height": "200px",
+            "height": "80%",
-            "width": "400px"
+            "width": "85%"
         },
         "params_mapping": {
             "mapping": {"id": "supplier_id"},