up

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPWebView.lua

@@ -20,7 +20,7 @@ function CLLPWebView.init(csObj)
         CLLPWebView.onCallOnStarted,
         CLLPWebView.onCallOnLoaded
     )
-    webView:setMargins(0, NumEx.getIntPart(130 / MyUtl.getSizeAdjust()), 0, 0)
+    webView:setMargins(0, NumEx.getIntPart(134 / MyUtl.getSizeAdjust()), 0, 0)
 end
 
 -- 设置数据
@@ -28,8 +28,17 @@ function CLLPWebView.setData(paras)
     url = paras and paras.url or ""
 end
 
---当有通用背板显示时的回调
-function CLLPWebView.onShowFrame()
+---public 当有通用背板显示时的回调
+---@param cs Coolape.CLPanelLua
+function CLLPWebView.onShowFrame(cs)
+    if cs.frameObj then
+        ---@type _BGFrame1Param
+        local d = {}
+        -- d.title = LGet(cs.titleKeyName)
+        d.title = cs.titleKeyName
+        d.panel = csSelf
+        cs.frameObj:init(d)
+    end
 end
 
 function CLLPWebView.onCallFromJS(msg)
@@ -72,9 +81,6 @@ end
 -- 处理ui上的事件，例如点击等
 function CLLPWebView.uiEventDelegate(go)
     local goName = go.name
-    if goName == "ButtonQuit" then
-        hideTopPanel()
-    end
 end
 
 -- 当顶层页面发生变化时回调

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPConnect.lua

@@ -52,13 +52,15 @@ function TRPConnect.procNetwork(cmd, succ, msg, paras)
             TRPConnect.getDataFromServer()
         end
     else
-        CLUIUtl.showConfirm(
-            "服务器连接失败，确认网络连接正常。",
-            function()
-                NetProto.socketInit(companyInfro.company_id, companyInfro.login_no)
-            end,
-            nil
-        )
+        if (cmd == "connect") then
+            CLUIUtl.showConfirm(
+                "服务器连接失败，确认网络连接正常。",
+                function()
+                    NetProto.socketInit(companyInfro.company_id, companyInfro.login_no)
+                end,
+                nil
+            )
+        end
     end
 end
 
@@ -83,8 +85,10 @@ function TRPConnect.getDataFromServer()
         5
     )
     NetProto.send.announcement_query()
-    -- NetProto.send.booking_query()
-    -- NetProto.send.replenish_query()
+    NetProto.send.booking_query()
+    NetProto.send.replenish_query()
+    NetProto.send.load_wfTicket_Settings()
+    NetProto.send.selectProductInfo()
 end
 
 -- 处理ui上的事件，例如点击等

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua

@@ -114,15 +114,18 @@ function TRPNewOrder:setData(paras)
     if paras and paras.orderId and paras.orderId > 0 then
         self.isNewOrder = false
         self.mdata = paras
+
+        if type(self.mdata.jsonStr) == "string" then
+            self.mdata.jsonStr = json.decode(self.mdata.jsonStr)
+        end
+        self.mdata.jsonStr = self.mdata.jsonStr or {}
+        self.cust = nil
     else
         --//TODO:初始值
         self.isNewOrder = true
-        self.mdata = paras
+        self.cust = paras
+        self.mdata = {}
     end
-    if type(self.mdata.jsonStr) == "string" then
-        self.mdata.jsonStr = json.decode(self.mdata.jsonStr)
-    end
-    self.mdata.jsonStr = self.mdata.jsonStr or {}
 end
 
 ---public 当有通用背板显示时的回调
@@ -161,7 +164,12 @@ function TRPNewOrder:showBaseFields()
     ---@type _ParamCellExtendFiledRoot
     local param = {}
     param.data = self.mdata or {}
-    param.onFinish = self:wrapFunc(self.setExtendFieldsMode)
+    param.onFinish = function(go)
+        if self.cust then
+            uiobjs.DetailFromRoot:setValue(self.cust, true)
+        end
+        self:setExtendFieldsMode(go)
+    end
     param.fields = {}
     ---@type _ParamCellExtendFiled
     local filedInfor