up

2020-07-26 11:12:32 +08:00
parent 67a1f974bf
commit 53e9c8d4ce
69 changed files with 15012 additions and 105 deletions
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua
@@ -8,6 +8,8 @@ local _TopHeight_ = 132
 local _BottomHeight_ = 147
 local _ContentRect
 local _sizeAdjust
+
+---@return UnityEngine.Vector4
 MyUtl.getUIContent = function(panel, top, bottom, forceCal)
    -- if _ContentRect and (not forceCal) then
    --     return _ContentRect
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellProccessHis.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellProccessHis.lua
@@ -0,0 +1,58 @@
+-- xx单元
+local _cell = {}
+---@type Coolape.CLCellLua
+local csSelf = nil
+local transform = nil
+local mData = nil
+local uiobjs = {}
+
+-- 初始化，只调用一次
+function _cell.init(csObj)
+    csSelf = csObj
+    transform = csSelf.transform
+    ---@type CLUIFormRoot
+    uiobjs.formRoot = csSelf:GetComponent("CLUIFormRoot")
+
+    ---@type UIPopupList
+    uiobjs.LabelServerNo = getCC(transform, "LabelServerNo", "UIPopupList")
+    uiobjs.SpriteHeadIcon = getCC(transform, "SpriteHeadBg/SpriteHeadIcon", "UITexture")
+    ---@type UISprite
+    uiobjs.SpriteLine2 = getChild(transform, "SpriteLine2")
+end
+
+-- 显示，
+-- 注意，c#侧不会在调用show时，调用refresh
+function _cell.show(go, data)
+    mData = data
+    local optionInfor = DBUser.getPopList(DBUser.FilterGroup.user)
+    uiobjs.LabelServerNo:refreshItems(optionInfor.options, optionInfor.values)
+
+    uiobjs.formRoot:setValue(mData)
+
+    ---@type _DBUser
+    local user = DBUser.getUserById(mData.loginNo)
+    if user then
+        DBUser.getIcon(
+            mData.loginNo,
+            function(texture)
+                if texture and texture.name == user.imageUrl then
+                    uiobjs.SpriteHeadIcon.mainTexture = texture
+                end
+            end
+        )
+    end
+
+    if csSelf.name == "000000" then
+        SetActive(uiobjs.SpriteLine2.gameObject, false)
+    else
+        SetActive(uiobjs.SpriteLine2.gameObject, true)
+    end
+end
+
+-- 取得数据
+function _cell.getData()
+    return mData
+end
+
+--------------------------------------------
+return _cell
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellProccessHis.lua.meta
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellProccessHis.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: d79c3efc1f6bf4c05b6825694fa9d500
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPCalender.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPCalender.lua
@@ -291,9 +291,6 @@ function PanelCalender.setSelectDate(cell, year, month, day)
            )
        end
        LabelSelectDate.text = dataStr
-
-        curYear = selectedYear
-        curMonth = selectedMonth
        PanelCalender.refreshDays()
    else
        local dataStr =
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua
@@ -360,6 +360,7 @@ function TRPCustDetail:showOrders()
    else
        showHotWheel()
        -- //TODO:
+        MyUtl.toastW("TODO:取何取得单个客户的订单？？？")
        NetProto.send.query_cust_calllog(self.mdata.phoneNo, nil, 1)
        uiobjs.OrderRoot:setList({}, self:wrapFunc(self.initOrderCell))
    end
@@ -425,6 +426,7 @@ end

 ---@param el CLUIElement
 function TRPCustDetail:onClickMoreProc(el)
+    MyUtl.toastW("TODO:" .. el.jsonKey)
    if el.jsonKey == "follows" then
        -- 跟进记录
    elseif el.jsonKey == "followTasks" then
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua
@@ -636,6 +636,7 @@ function TRPNewOrder:onGetImage(path)
            return
        end
    end
+    MyUtl.toastW("TODO:上传附件还没有做！！！！")
    table.insert(self.images, {path = path, onDelete = self:wrapFunc(self.onDelImage)})
    self:showImages()
 end
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderDetail.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderDetail.lua
@@ -0,0 +1,439 @@
+---@type IDBasePanel
+local TRBasePanel = require("ui.panel.TRBasePanel")
+---@class TRPOrderDetail:TRBasePanel
+local TRPOrderDetail = class("TRPOrderDetail", TRBasePanel)
+
+local uiobjs = {}
+-- 初始化，只会调用一次
+function TRPOrderDetail:init(csObj)
+    TRPOrderDetail.super.init(self, csObj)
+
+    self:prepareMoreData()
+    self:setEventDelegate()
+
+    uiobjs.TogglesPanel = getCC(self.transform, "Top/SpriteToggle/Toggles", "UIPanel")
+    local v4 = MyUtl.getUIContent(self.csSelf, 0, 0)
+    ---@type UnityEngine.Vector4
+    local baseClipRegion = uiobjs.TogglesPanel.baseClipRegion
+    baseClipRegion.z = v4.z - 100
+    uiobjs.TogglesPanel.baseClipRegion = baseClipRegion
+    ---@type UIScrollView
+    uiobjs.TogglesScroll = uiobjs.TogglesPanel:GetComponent("UIScrollView")
+
+    ---@type UIGrid
+    uiobjs.ToggleGrid = getCC(uiobjs.TogglesPanel.transform, "Grid", "UIGrid")
+    ---@type UIToggle
+    uiobjs.ToggleDetail = getCC(uiobjs.ToggleGrid.transform, "ToggleDetail", "UIToggle")
+
+    MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132 + 160 + 30, 0)
+    ---@type UIScrollView
+    uiobjs.scrollView = getCC(self.transform, "PanelContent", "UIScrollView")
+    ---@type UITable
+    uiobjs.Table = getCC(uiobjs.scrollView.transform, "Table", "UITable")
+
+    ---@type CLUIFormRoot
+    uiobjs.DetailRoot = getCC(uiobjs.Table.transform, "DetailRoot", "CLCellLua")
+    uiobjs.ExtendRoot = getCC(uiobjs.Table.transform, "ExtendRoot", "CLCellLua")
+    uiobjs.ProductRoot = getCC(uiobjs.Table.transform, "ProductRoot", "UITable")
+    uiobjs.ProductPrefab = getChild(uiobjs.ProductRoot.transform, "00000").gameObject
+
+    ---@type Coolape.CLUILoopGrid
+    uiobjs.Records = getCC(uiobjs.Table.transform, "Records", "CLUILoopGrid")
+    uiobjs.ButtonEndList = getChild(uiobjs.Records.transform, "ButtonEndList")
+    uiobjs.AttachmentRoot = getCC(uiobjs.Table.transform, "AttachmentRoot", "CLCellLua")
+
+    uiobjs.FinanceRoot = getCC(uiobjs.Table.transform, "FinanceRoot", "CLCellLua")
+    ---@type Coolape.CLUILoopGrid
+    uiobjs.SubOrders = getCC(uiobjs.Table.transform, "SubOrders", "CLUILoopGrid")
+    uiobjs.ButtonEndListSub = getChild(uiobjs.SubOrders.transform, "ButtonEndList")
+end
+
+function TRPOrderDetail:prepareMoreData()
+    self.baseFileds = {}
+    ---@type _ParamFieldAttr
+    local attr = {}
+    attr.id = "id"
+    attr.attrName = "订单ID"
+    attr.attrType = DBCust.FieldType.text
+    attr.ifMust = 0
+    attr.height = 160
+    attr.donotJoinKey = true
+    table.insert(self.baseFileds, attr)
+
+    attr = {}
+    attr.id = "title"
+    attr.attrName = "订单名称"
+    attr.attrType = DBCust.FieldType.text
+    attr.ifMust = 0
+    attr.height = 160
+    attr.donotJoinKey = true
+    table.insert(self.baseFileds, attr)
+
+    attr = {}
+    attr.id = "templetName"
+    attr.attrName = "订单模板"
+    attr.attrType = DBCust.FieldType.text
+    attr.ifMust = 0
+    attr.height = 160
+    attr.donotJoinKey = true
+    table.insert(self.baseFileds, attr)
+
+    attr = {}
+    attr.id = "urgency"
+    attr.attrName = "紧急程度"
+    attr.attrType = DBCust.FieldType.popuplist
+    attr.ifMust = 0
+    attr.height = 160
+    attr.donotJoinKey = true
+    local popInfor = DBOrder.getPopupList(DBOrder.PopListGroup.urgencyLevels)
+    attr.popOptions = popInfor.options
+    attr.popValues = popInfor.values
+    table.insert(self.baseFileds, attr)
+
+    attr = {}
+    attr.id = "custName"
+    attr.attrName = "客户名称"
+    attr.attrType = DBCust.FieldType.text
+    attr.ifMust = 0
+    attr.height = 160
+    attr.donotJoinKey = true
+    table.insert(self.baseFileds, attr)
+
+    attr = {}
+    attr.id = "_phoneNo"
+    attr.attrName = "联系方式"
+    attr.attrType = DBCust.FieldType.text
+    attr.ifMust = 0
+    attr.height = 160
+    attr.donotJoinKey = true
+    table.insert(self.baseFileds, attr)
+
+    attr = {}
+    attr.id = "companyName"
+    attr.attrName = "公司名称"
+    attr.attrType = DBCust.FieldType.text
+    attr.ifMust = 0
+    attr.height = 160
+    attr.donotJoinKey = true
+    table.insert(self.baseFileds, attr)
+
+    attr = {}
+    attr.id = "address"
+    attr.attrName = "联系地址"
+    attr.attrType = DBCust.FieldType.text
+    attr.ifMust = 0
+    attr.height = 160
+    attr.donotJoinKey = true
+    table.insert(self.baseFileds, attr)
+
+    attr = {}
+    attr.id = "content"
+    attr.attrName = "订单内容"
+    attr.attrType = DBCust.FieldType.multext
+    attr.ifMust = 0
+    attr.height = 160
+    attr.donotJoinKey = true
+    table.insert(self.baseFileds, attr)
+    --------------------------------------------
+end
+
+-- 设置数据
+---@param paras _ParamTRPOrderDetail
+function TRPOrderDetail:setData(paras)
+    self.mdata = paras
+    self.mdata._phoneNo = MyUtl.hidePhone(self.mdata.phoneNo)
+    if type(self.mdata.attrJson) == "string" then
+        self.mdata.attrJson = json.decode(self.mdata.attrJson)
+    end
+    if type(self.mdata.prodJson) == "string" then
+        self.mdata.prodJson = json.decode(self.mdata.prodJson)
+    end
+end
+
+---public 当有通用背板显示时的回调
+---@param cs Coolape.CLPanelLua
+function TRPOrderDetail:onShowFrame(cs)
+    if cs.frameObj then
+        ---@type _BGFrame1Param
+        local d = {}
+        -- d.title = LGet(cs.titleKeyName)
+        d.title = self.mdata.companyName
+        d.panel = cs
+        cs.frameObj:init(d)
+    end
+end
+
+-- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh
+function TRPOrderDetail:show()
+    self.records = nil
+    uiobjs.ToggleDetail:Set(true)
+    self.currToggle = 1
+    uiobjs.TogglesScroll:ResetPosition()
+    self:showDetail()
+end
+
+function TRPOrderDetail:showDetail()
+    self:release()
+    SetActive(uiobjs.DetailRoot.gameObject, true)
+    SetActive(uiobjs.FinanceRoot.gameObject, false)
+    SetActive(uiobjs.Records.gameObject, false)
+    SetActive(uiobjs.AttachmentRoot.gameObject, false)
+    SetActive(uiobjs.SubOrders.gameObject, false)
+
+    self:showBaseFileds()
+
+    self:reposition()
+end
+
+function TRPOrderDetail:showProducts()
+    if #self.mdata.prodJson > 0 then
+        SetActive(uiobjs.ProductRoot.gameObject, true)
+        CLUIUtl.resetList4Lua(
+            uiobjs.ProductRoot,
+            uiobjs.ProductPrefab,
+            self.mdata.prodJson,
+            self:wrapFunc(self.initProductCell)
+        )
+    else
+        SetActive(uiobjs.ProductRoot.gameObject, false)
+    end
+    self:reposition()
+end
+
+function TRPOrderDetail:initProductCell(cell, data)
+    local formRoot = cell:GetComponent("CLUIFormRoot")
+    formRoot:setValue(data)
+end
+
+function TRPOrderDetail:reposition()
+    uiobjs.Table:Reposition()
+    uiobjs.scrollView.disableDragIfFits = true
+    uiobjs.scrollView:ResetPosition()
+end
+
+function TRPOrderDetail:showBaseFileds()
+    ---@type _ParamCellExtendFiledRoot
+    local param = {}
+    param.data = self.mdata or {}
+    param.onFinish = function()
+        self:showExtentFiles(self.mdata.templetId)
+        self:showProducts()
+        self:wrapFunc(self.reposition)
+    end
+    param.fields = {}
+    local fields = self.baseFileds
+    ---@type _ParamCellExtendFiled
+    local filedInfor
+    for i, v in ipairs(fields) do
+        filedInfor = {}
+        filedInfor.attr = v
+        filedInfor.showMode = _FieldMode.showOnly
+        table.insert(param.fields, filedInfor)
+    end
+    uiobjs.DetailRoot:init(param, nil)
+end
+
+---public 显示扩展字段
+function TRPOrderDetail:showExtentFiles(templetId)
+    ---@type _ParamCellExtendFiledRoot
+    local param = {}
+    param.data = self.mdata and self.mdata.attrJson or {}
+    param.onFinish = self:wrapFunc(self.reposition)
+    param.fields = {}
+    local fields = DBCust.getFieldsByTask(templetId) or {}
+    ---@type _ParamCellExtendFiled
+    local filedInfor
+    for i, v in ipairs(fields) do
+        filedInfor = {}
+        filedInfor.attr = v
+        filedInfor.showMode = _FieldMode.showOnly
+        table.insert(param.fields, filedInfor)
+    end
+    if #fields > 0 then
+        SetActive(uiobjs.ExtendRoot.gameObject, true)
+        uiobjs.ExtendRoot:init(param, nil)
+    else
+        SetActive(uiobjs.ExtendRoot.gameObject, false)
+    end
+end
+
+function TRPOrderDetail:showAttachment()
+    self:release()
+    SetActive(uiobjs.DetailRoot.gameObject, false)
+    SetActive(uiobjs.ExtendRoot.gameObject, false)
+    SetActive(uiobjs.ProductRoot.gameObject, false)
+    SetActive(uiobjs.AttachmentRoot.gameObject, true)
+    SetActive(uiobjs.Records.gameObject, false)
+    SetActive(uiobjs.FinanceRoot.gameObject, false)
+    SetActive(uiobjs.SubOrders.gameObject, false)
+
+    MyUtl.toastW("TODO:还没有附件数据")
+    self:reposition()
+end
+
+function TRPOrderDetail:showRecords()
+    self:release()
+    SetActive(uiobjs.DetailRoot.gameObject, false)
+    SetActive(uiobjs.ExtendRoot.gameObject, false)
+    SetActive(uiobjs.ProductRoot.gameObject, false)
+    SetActive(uiobjs.AttachmentRoot.gameObject, false)
+    SetActive(uiobjs.Records.gameObject, true)
+    SetActive(uiobjs.FinanceRoot.gameObject, false)
+    SetActive(uiobjs.SubOrders.gameObject, false)
+    if self.records then
+        uiobjs.Records:setList(
+            self.records.data or {},
+            self:wrapFunc(self.initRecordCell),
+            self:wrapFunc(self.onHeadList),
+            self:wrapFunc(self.onEndList)
+        )
+    else
+        showHotWheel()
+        NetProto.send.query_cust_calllog(self.mdata.phoneNo, nil, 1)
+        uiobjs.Records:setList({}, self:wrapFunc(self.initRecordCell))
+    end
+
+    MyUtl.toastW("TODO:流转记录接口还没有")
+    self:reposition()
+end
+
+function TRPOrderDetail:initRecordCell(cell, data)
+    cell:init(data, nil)
+end
+
+function TRPOrderDetail:onHeadList(head)
+    printw("到最顶端了")
+end
+
+function TRPOrderDetail:onEndList(tail)
+    printw("到最后了==" .. tail.name)
+    if self.records and self.records.meta.current_page < self.records.meta.total_pages then
+        showHotWheel()
+        -- 取得下一页
+        NetProto.send.query_cust_calllog(self.mdata.phoneNo, nil, self.records.meta.current_page + 1)
+    else
+        uiobjs.ButtonEndList.localPosition = tail.transform.localPosition + Vector3.up * -270
+        SetActive(uiobjs.ButtonEndList.gameObject, true)
+    end
+end
+
+function TRPOrderDetail:showFinance()
+    self:release()
+    SetActive(uiobjs.DetailRoot.gameObject, false)
+    SetActive(uiobjs.ExtendRoot.gameObject, false)
+    SetActive(uiobjs.ProductRoot.gameObject, false)
+    SetActive(uiobjs.AttachmentRoot.gameObject, false)
+    SetActive(uiobjs.Records.gameObject, false)
+    SetActive(uiobjs.FinanceRoot.gameObject, true)
+    SetActive(uiobjs.SubOrders.gameObject, false)
+
+    MyUtl.toastW("TODO:财务数据怎么来？？")
+    self:reposition()
+end
+
+function TRPOrderDetail:showSubOrders()
+    self:release()
+    SetActive(uiobjs.DetailRoot.gameObject, false)
+    SetActive(uiobjs.ExtendRoot.gameObject, false)
+    SetActive(uiobjs.ProductRoot.gameObject, false)
+    SetActive(uiobjs.AttachmentRoot.gameObject, false)
+    SetActive(uiobjs.Records.gameObject, false)
+    SetActive(uiobjs.FinanceRoot.gameObject, false)
+    SetActive(uiobjs.SubOrders.gameObject, true)
+
+    MyUtl.toastW("TODO:子订单数据怎么来？？")
+    self:reposition()
+end
+
+-- 刷新
+function TRPOrderDetail:refresh()
+end
+
+function TRPOrderDetail:release()
+    if uiobjs.ExtendRoot.luaTable then
+        uiobjs.ExtendRoot.luaTable.release()
+    end
+    if uiobjs.DetailRoot.luaTable then
+        uiobjs.DetailRoot.luaTable.release()
+    end
+end
+
+-- 关闭页面
+function TRPOrderDetail:hide()
+    self:release()
+end
+
+-- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据
+function TRPOrderDetail:procNetwork(cmd, succ, msg, paras)
+    if (succ == NetSuccess) then
+        if cmd == NetProto.cmds.query_cust_calllog then
+            local result = paras.result
+            if self.records == nil then
+                self.records = result
+            else
+                if self.records.meta.current_page < result.meta.current_page then
+                    self.records.meta = result.meta
+                    for i, v in ipairs(result.data) do
+                        table.insert(self.records.data, v)
+                    end
+                end
+            end
+
+            hideHotWheel()
+            if self.records and uiobjs.Records.gameObject.activeInHierarchy then
+                if self.records.meta.current_page == 1 then
+                    self:showRecords()
+                else
+                    uiobjs.Records:appendList(result.data)
+                end
+            end
+        end
+    end
+end
+
+function TRPOrderDetail:setEventDelegate()
+    self.EventDelegate = {
+        ToggleDetail = function()
+            self.currToggle = 1
+            self:showDetail()
+        end,
+        ToggleAttachment = function()
+            self.currToggle = 2
+            self:showAttachment()
+        end,
+        ToggleProcessHis = function()
+            self.currToggle = 3
+            self:showRecords()
+        end,
+        ToggleFinance = function()
+            self.currToggle = 4
+            self:showFinance()
+        end,
+        ToggleSub = function()
+            self.currToggle = 5
+            self:showSubOrders()
+        end,
+        ButtonAddAttachment = function()
+        end,
+        ButtonAddMoney = function()
+        end,
+        ButtonAddLogistics = function()
+        end,
+        ButtonAdd = function()
+        end
+    }
+end
+-- 处理ui上的事件，例如点击等
+function TRPOrderDetail:uiEventDelegate(go)
+    local func = self.EventDelegate[go.name]
+    if func then
+        func()
+    end
+end
+
+-- 当顶层页面发生变化时回调
+function TRPOrderDetail:onTopPanelChange(topPanel)
+end
+
+--------------------------------------------
+return TRPOrderDetail
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderDetail.lua.meta
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderDetail.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 6dbe0ef6ea22741c99c0fafb577fb647
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderList.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderList.lua
@@ -158,7 +158,7 @@ function TRPOrderList:initCell(cell, data)
 end

 function TRPOrderList:onClickCell(cell, data)
-    -- getPanelAsy("PanelCustDetail", onLoadedPanelTT, data)
+    getPanelAsy("PanelOrderDetail", onLoadedPanelTT, data)
 end

 function TRPOrderList:refreshFilterBtnStatus()