chenbin/tianrunCRM
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

up

Browse Source
This commit is contained in:
陈彬
2020-07-14 22:04:03 +08:00
parent e54411e2c2
commit a47cabede2
119 changed files with 5115 additions and 1061 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab
View File

@@ -1758,8 +1758,8 @@ MonoBehaviour:
y: 0
width: 192
height: 100
borderLeft: 0
borderRight: 0
borderLeft: 49
borderRight: 49
borderTop: 0
borderBottom: 0
paddingLeft: 0
@@ -1772,8 +1772,8 @@ MonoBehaviour:
y: 0
width: 209
height: 120
borderLeft: 0
borderRight: 0
borderLeft: 49
borderRight: 49
borderTop: 0
borderBottom: 0
paddingLeft: 0

5
Assets/trCRM/upgradeRes4Dev/priority/lua/CLLMainLua.lua
View File

@@ -31,8 +31,8 @@ CLLMainLua.init = function()
MyCfg.mode = GameMode.none
-- 日志logveiw
if ReporterMessageReceiver.self ~= nil then
ReporterMessageReceiver.self.gameObject:SetActive(false)
ReporterMessageReceiver.self.luaPath = "KOK/upgradeRes/priority/lua/toolkit/KKLogListener.lua"
ReporterMessageReceiver.self.gameObject:SetActive(true)
ReporterMessageReceiver.self.luaPath = "trCrm/upgradeRes/priority/lua/toolkit/KKLogListener.lua"
ReporterMessageReceiver.self:setLua()
end
-- 设置显示状态栏
@@ -43,6 +43,7 @@ CLLMainLua.init = function()
-- AndroidStatusBar.setFlags(AndroidStatusBar.WINDOW_FLAG_FORCE_NOT_FULLSCREEN)
-- CS.ApplicationChrome.statusBarState = CS.ApplicationChrome.States.Visible
-- CS.ApplicationChrome.dimmed = false
CS.ApplicationChrome.setSoftInputMode(CS.ApplicationChrome.ADJUST_PAN);
--设置帧率
Application.targetFrameRate = 10

4
Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBCust.lua
View File

@@ -1,7 +1,7 @@
---@class _DBCust
---@field custName
---@field custType
---@field phone
---@field phoneNo
---@field address
---@field companyName
---@field taskId
@@ -80,10 +80,10 @@ DBCust.onGetFilter = function(data)
end
DBCust.getFieldsByTask = function(taskValue)
taskValue = tostring(taskValue)
if not taskValue then
return {}
end
taskValue = tostring(taskValue)
return db.taskFields[taskValue] or {}
end

4
Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBMessage.lua
View File

@@ -85,7 +85,9 @@ DBMessage.onGetMessage = function(type, list)
db.list = db.list or {}
db.list[type] = db.list[type] or {}
db.lastGetTime = db.lastGetTime or {}
db.lastGetTime[type] = list[1].CREATETIME -- 更新最后取得的时间
if list and #list > 0 then
db.lastGetTime[type] = list[1].CREATETIME -- 更新最后取得的时间
end
---@param v _DBMessage
for i, v in ipairs(list) do
table.insert(db.list[type], v) -- 倒序

58
Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBOrder.lua
View File

@@ -3,7 +3,7 @@ local db = {}
DBOrder.PopListGroup = {
urgencyLevels = "urgencyLevels", -- 紧急程序
templateList = "templateList", -- 订单模板
templateList = "templateList" -- 订单模板
}
DBOrder.onGetFilter = function(data)
@@ -11,26 +11,76 @@ DBOrder.onGetFilter = function(data)
-- 转换成poplist
db.filtersPopup = {}
db.templateFields = {}
db.templateInfor = {}
db.nextHandlerList = {}
for k, cells in pairs(data) do
db.filtersPopup[k] = {}
---@type System.Collections.ArrayList
db.filtersPopup[k].options = ArrayList()
db.filtersPopup[k].values = ArrayList()
-- db.filtersPopup[k].options:Add("")
-- db.filtersPopup[k].values:Add("")
for i, s in ipairs(cells) do
local key = tostring(s.value)
db.filtersPopup[k].options:Add(s.name)
db.filtersPopup[k].values:Add(tostring(s.value))
db.filtersPopup[k].values:Add(key)
if k == DBOrder.PopListGroup.templateList then
db.templateInfor[key] = s
db.templateFields[key] = s.fieldAttr -- 设置任务的扩展字段
-- db.templateFields[key]
if s.nextHandlerList then
db.nextHandlerList[key] = {} -- 下一步处理人
db.nextHandlerList[key].options = ArrayList()
db.nextHandlerList[key].values = ArrayList()
for l, u in ipairs(s.nextHandlerList) do
db.nextHandlerList[key].options:Add(u.loginName)
db.nextHandlerList[key].values:Add(tostring(u.loginNo))
end
end
end
end
end
end
DBCust.getPopupList = function(popGroup)
DBOrder.getPopupList = function(popGroup)
if popGroup then
return db.filtersPopup[popGroup]
end
return db.filters
end
DBOrder.getFields = function(templateId)
if not templateId then
return {}
end
templateId = tostring(templateId)
return db.templateFields[templateId] or {}
end
DBOrder.getTemplateInfor = function(templateId)
if not templateId then
return {}
end
templateId = tostring(templateId)
return db.templateInfor[templateId] or {}
end
DBOrder.getNextHandler = function(templateId)
if not templateId then
return nil
end
templateId = tostring(templateId)
return db.nextHandlerList[templateId]
end
--==============================================================================
DBOrder.onGetProducts = function(content)
db.products = content.productList
end
DBOrder.getProducts = function()
return db.products
end
--==============================================================================
return DBOrder

4
Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBRoot.lua
View File

@@ -39,7 +39,9 @@ DBRoot.funcs = {
[NetProto.cmds.load_wfTicket_Settings] = function(data)
DBOrder.onGetFilter(data.result)
end,
[NetProto.cmds.selectProductInfo] = function(data)
DBOrder.onGetProducts(data.result)
end,
}
DBRoot.onReceiveData = function(cmd, data)

1
Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBUser.lua
View File

@@ -24,6 +24,7 @@ function DBUser.getPopList()
return poplist
end
---@return _DBUser
function DBUser.getUserById(loginNo)
local user = db[loginNo]
if user == nil then

38
Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua
View File

@@ -8,15 +8,12 @@ NetProto.send = {}
---------------------------------------------------------------------------------------
---------------------------------------------------------------------------------------
---------------------------------------------------------------------------------------
local host = "47.111.20.34"
local host = "app.ttf-cti.com" -- "47.111.20.34"
local port = 29004
-- local host = "192.168.1.126"
-- local port = 29000
-- local baseUrl = "http://app.ttf-cti.com:29000/open_api/"
local baseUrl = joinStr("http://", host, ":", port, "/open_api/")
-- local baseUrl2 = "http://47.111.20.34:29004/open_api/"
-- local socketUrl = "ws://app.ttf-cti.com:29000/tr_socket/websocket/"
-- local socketUrl = "ws://47.111.20.34:29004/tr_socket/websocket/"
-- local baseUrl = "http://47.111.20.34/home/open_api/"
local socketUrl = joinStr("ws://", host, ":", port, "/tr_socket/websocket/")
---@type Dist.SpringWebsocket.Client
@@ -241,8 +238,9 @@ NetProto.cmds = {
update_customer = "update_customer", -- 更新客户信息
save_customer = "save_customer", -- 新建客户
create_followUp_record = "create_followUp_record", -- 新建跟进
load_wfTicket_Settings = "load_wfTicket_Settings", -- 工单配置信息
load_wfTicket_Settings = "load_WfTicket_Settings", -- 工单配置信息
selectProductInfo = "selectProductInfo", -- 商品列表
createWfInfo = "createWfInfo", -- 创建订单
}
---------------------------------------------------------------------------------------
---------------------------------------------------------------------------------------
@@ -296,9 +294,9 @@ end
---@param frame Dist.SpringWebsocket.StompFrame
NetProto.OnReceiveStompMsg = function(frame)
if isDebug then
print(frame.Code, frame.Content)
end
-- if isDebug then
-- print(frame.Code, frame.Content)
-- end
if frame.Code == StompStatus.OPENSERVER then
socket:Connect(nil, NetProto.OnReceiveStompMsg)
elseif frame.Code == StompStatus.CONNECTED then
@@ -336,6 +334,10 @@ NetProto.OnReceiveStompMsg = function(frame)
end
end
end
if isDebug then
printw(cmd, frame.Content)
end
if cmd then
doCallbackSocket(content)
dispatch(content, {cmd = cmd})
@@ -362,6 +364,7 @@ NetProto.doReconnectSocket = function()
NetProto.reconnectTimes = NetProto.reconnectTimes or 0
NetProto.isReconnect = true
if NetProto.reconnectTimes > 1 then
NetProto.reconnectTimes = 0
-- 重连失败提示
CLUIUtl.showConfirm("服务器连接失败,请重试", NetProto.doReconnectSocket)
else
@@ -541,12 +544,27 @@ NetProto.send.load_wfTicket_Settings = function(callback, timeOutSec)
NetProto.sendSocket(content, callback, timeOutSec)
end
NetProto.send.selectProductInfo = function(callback, timeOutSec)
NetProto.send.selectProductInfo = function(searchKey, page, callback, timeOutSec)
local content = {}
content.action = NetProto.cmds.selectProductInfo
content.loginNo = NetProto.loginNo
content.groupId = NetProto.groupId
content.current_page = page
content.search = searchKey
NetProto.sendSocket(content, callback, timeOutSec)
end
NetProto.send.createWfInfo = function(workFlowInfo, callback, timeOutSec)
local content = {}
content.action = NetProto.cmds.createWfInfo
local user = DBUser.getUserById(NetProto.loginNo)
content.wfStatus = "正常工单"
content.loginName = user.loginName
content.loginNo = NetProto.loginNo
content.groupId = NetProto.groupId
content.workFlowInfo = workFlowInfo
NetProto.sendSocket(content, callback, timeOutSec)
end
------------------------------------------------------
return NetProto

44
Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/KKLogListener.lua
View File

@@ -1,36 +1,14 @@
-- 日志监听
do
KKLogListener = {}
KKLogListener = {}
function KKLogListener.OnLogError(log)
-- 当有异常日志时
if KKWhiteList and KKWhiteList.isWhiteName() then
if CLAlert.self ~= nil then
alertInfo("有异常日志，请在屏幕画圈查看详细！", Color.red, 3, 4)
end
end
-- 记录到服务器
if __recodeErrorLog__ then
if
(not startswith(log.condition, "get attr is nil")) and
(not startswith(log.condition, "Releasing render texture that is set as Camera")) and
(not startswith(log.condition, "Billing disabled")) and
(not startswith(log.condition, "propNames is null")) and
(not string.find(log.condition, "/KokManagement/ErrorServlet"))
then
local url = joinStr(__httpBaseUrl3, "/KokManagement/ErrorServlet")
local formData = Hashtable()
formData:Add("errorKey", joinStr(log.condition, "\n", log.stacktrace))
WWWEx.post(url, formData, CLAssetType.text, nil, nil, nil, true)
end
end
end
function KKLogListener.OnLogWarning(log)
-- 当有警告日志时
end
--------------------------------------------
return KKLogListener
function KKLogListener.OnLogError(log)
-- 当有异常日志时
MyUtl.toastE("有异常日志，请在屏幕画圈查看详细！")
end
function KKLogListener.OnLogWarning(log)
-- 当有警告日志时
end
--------------------------------------------
return KKLogListener

5
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLToastRoot.lua
View File

@@ -40,7 +40,7 @@ function CLToastRoot.borrow()
else
cell = queue:deQueue()
end
cell.name = string.format("%11d",index)
cell.name = string.format("%11d", index)
index = index + 1
return cell
end
@@ -51,6 +51,9 @@ function CLToastRoot.returnToast(cell)
end
function CLToastRoot.toast(msg, type, staySec)
if isNilOrEmpty(msg) then
return
end
local cell = CLToastRoot.borrow()
SetActive(cell.gameObject, true)
cell:init({msg = msg, type = type, staySec = staySec}, nil)

6
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendField.lua
View File

@@ -39,9 +39,9 @@ function _cell.init(csObj)
uiobjs.spriteBg = getCC(transform, "Background", "UISprite")
end
if uiobjs.spriteBg then
uiobjs.spriteBg.width = NumEx.getIntPart(CSPMain.contentRect.z)
end
-- if uiobjs.spriteBg then
-- uiobjs.spriteBg.width = NumEx.getIntPart(CSPMain.contentRect.z)
-- end
uiobjs.boxCollider = csSelf:GetComponent("BoxCollider")
---@type UIInput

10
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendFieldRoot.lua
View File

@@ -88,16 +88,6 @@ function _cell.onLoadField(name, go, orgs)
local param = mData.fields[index]
local cell = go:GetComponent("CLCellLua")
SetActive(go, true)
--[[
---@type _ParamCellExtendFiled
local param = {
attr = fileAttr,
onMultTextInputChg = _cell.onMultTextInputChg,
isEditMode = isEditMode,
onClick = mData.onClick,
onSelect = mData.onSelect
}
]]
if param.attr.attrType == DBCust.FieldType.multext then
-- 要设置一次
param.orgOnMultTextInputChg = param.onMultTextInputChg

44
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellProductList.lua Normal file
View File

@@ -0,0 +1,44 @@
-- 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 UIToggle
uiobjs.Toggle = getCC(transform, "Toggle", "UIToggle")
end
-- 显示，
-- 注意，c#侧不会在调用show时，调用refresh
function _cell.show(go, data)
mData = data
uiobjs.formRoot:setValue(mData.data, true)
_cell.selected(mData.isSelected)
end
-- 取得数据
function _cell.getData()
return mData
end
function _cell.selected(val)
mData.isSelected = val
uiobjs.Toggle.value = val
end
function _cell.uiEventDelegate(go)
if go.name == "Toggle" then
_cell.selected(uiobjs.Toggle.value)
end
end
--------------------------------------------
return _cell

7
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellProductList.lua.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 156c8a77e4fb8424da798e7fd2682597
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

44
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellProductSelected.lua Normal file
View File

@@ -0,0 +1,44 @@
-- xx单元
local _cell = {}
---@type Coolape.CLCellLua
local csSelf = nil
local transform = nil
local mData = nil
local uiobjs = {}
_cell.onDeleteProduct = nil
-- 初始化，只调用一次
function _cell.init(csObj)
csSelf = csObj
transform = csSelf.transform
---@type CLUIFormRoot
uiobjs.formRoot = csSelf:GetComponent("CLUIFormRoot")
end
-- 显示，
-- 注意，c#侧不会在调用show时，调用refresh
function _cell.show(go, data)
mData = data
uiobjs.formRoot:setValue(mData)
end
-- 取得数据
function _cell.getData()
return mData
end
function _cell.uiEventDelegate(go)
if go.name == "ButtonEdit" then
getPanelAsy("PanelEditPrice", onLoadedPanelTT, {data = mData, callback = _cell.onFinishEditPrice})
elseif go.name == "ButtonDel" then
Utl.doCallback(_cell.onDeleteProduct, mData)
end
end
function _cell.onFinishEditPrice(d)
mData = d
uiobjs.formRoot:setValue(mData)
end
--------------------------------------------
return _cell

7
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellProductSelected.lua.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 4500701b5daa743d7bcb2147cedf4101
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

32
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPStart.lua
View File

@@ -43,7 +43,7 @@ function CLLPStart.setLuasAtBegainning()
-- 日志监听
if ReporterMessageReceiver.self and ReporterMessageReceiver.self.gameObject then
-- if KKWhiteList.isWhiteName() then
ReporterMessageReceiver.self.gameObject:SetActive(false)
ReporterMessageReceiver.self.gameObject:SetActive(true)
-- else
-- ReporterMessageReceiver.self.gameObject:SetActive(false)
-- end
@@ -193,11 +193,16 @@ function CLLPStart.doEnterGame()
if content.success then
local currGroup = Prefs.getCurrGroup(Prefs.getUserName())
if isNilOrEmpty(currGroup) then
---@type _ParamTRPSelectGroup
local d = {}
d.isHideCloseBtn = true
d.companyList = content.result
getPanelAsy("PanelSelectCompany", onLoadedPanel, d)
if #(content.result) == 1 then
Prefs.setCurrGroup(Prefs.getUserName(), json.encode(content.result[1]))
getPanelAsy("PanelConnect", onLoadedPanel)
else
---@type _ParamTRPSelectGroup
local d = {}
d.isHideCloseBtn = true
d.companyList = content.result
getPanelAsy("PanelSelectCompany", onLoadedPanel, d)
end
CLLPStart.hideSplash()
else
local useOldCurrGroup = false
@@ -213,11 +218,16 @@ function CLLPStart.doEnterGame()
if useOldCurrGroup then
getPanelAsy("PanelConnect", onLoadedPanel)
else
---@type _ParamTRPSelectGroup
local d = {}
d.isHideCloseBtn = true
d.companyList = content.result
getPanelAsy("PanelSelectCompany", onLoadedPanel, d)
if #(content.result) == 1 then
Prefs.setCurrGroup(Prefs.getUserName(), json.encode(content.result[1]))
getPanelAsy("PanelConnect", onLoadedPanel)
else
---@type _ParamTRPSelectGroup
local d = {}
d.isHideCloseBtn = true
d.companyList = content.result
getPanelAsy("PanelSelectCompany", onLoadedPanel, d)
end
end
CLLPStart.hideSplash()
end

3
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPTasks.lua
View File

@@ -21,6 +21,8 @@ function CSPTasks.init(csObj)
uiobjs.Content.baseClipRegion = CSPTasks.contentRect
uiobjs.TableContent = getCC(uiobjs.Content.transform, "Table", "UITable")
---@type UIToggle
uiobjs.ToggleCust = getCC(uiobjs.TableContent.transform, "Statistics/grid/ToggleCust", "UIToggle")
uiobjs.Statistics = getChild(uiobjs.TableContent.transform, "Statistics")
---@type UIScrollView
@@ -61,6 +63,7 @@ function CSPTasks.show()
end
-- uiobjs.TableTask:setList(list, nil)
uiobjs.ToggleCust:Set(true)
CSPTasks.showReportform("reportform1")
uiobjs.scrollView:ResetPosition()
end

1
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPConnect.lua
View File

@@ -88,7 +88,6 @@ function TRPConnect.getDataFromServer()
NetProto.send.booking_query()
NetProto.send.replenish_query()
NetProto.send.load_wfTicket_Settings()
NetProto.send.selectProductInfo()
end
-- 处理ui上的事件，例如点击等

1
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua
View File

@@ -226,6 +226,7 @@ function TRPCustDetail:procNetwork(cmd, succ, msg, paras)
elseif cmd == NetProto.cmds.update_customer then
if self.currToggle == 1 then
self:showDetail()
uiobjs.Head:setValue(self.mdata)
end
end
end

77
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPEditPrice.lua Normal file
View File

@@ -0,0 +1,77 @@
---@type IDBasePanel
local TRBasePanel = require("ui.panel.TRBasePanel")
---@class TRPEditPrice:TRBasePanel 邮件列表
local TRPEditPrice = class("TRPEditPrice", TRBasePanel)
local uiobjs = {}
local callback
-- 初始化，只会调用一次
function TRPEditPrice:init(csObj)
TRPEditPrice.super.init(self, csObj)
self:setEventDelegate()
---@type CLUIFormRoot
uiobjs.formRoot = self.csSelf:GetComponent("CLUIFormRoot")
end
-- 设置数据
---@param paras _ParamTRPEditPrice
function TRPEditPrice:setData(paras)
self.mdata = paras.data
callback = paras.callback
end
-- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh
function TRPEditPrice:show()
uiobjs.formRoot:setValue(self.mdata)
end
-- 刷新
function TRPEditPrice:refresh()
end
-- 关闭页面
function TRPEditPrice:hide()
end
-- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据
function TRPEditPrice:procNetwork(cmd, succ, msg, paras)
if (succ == NetSuccess) then
--[[
if cmd == xx then
end
]]
end
end
function TRPEditPrice:setEventDelegate()
self.EventDelegate = {
ButtonCancel = function()
hideTopPanel(self.csSelf)
end,
ButtonOkay = function()
hideTopPanel(self.csSelf)
self.mdata = uiobjs.formRoot:getValue(self.mdata, true)
if tonumber(self.mdata.productNum) <= 0 then
MyUtl.toastW("数量不能低于1")
return
end
Utl.doCallback(callback, self.mdata)
end
}
end
-- 处理ui上的事件，例如点击等
function TRPEditPrice:uiEventDelegate(go)
local func = self.EventDelegate[go.name]
if func then
func()
end
end
-- 当顶层页面发生变化时回调
function TRPEditPrice:onTopPanelChange(topPanel)
end
--------------------------------------------
return TRPEditPrice

7
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPEditPrice.lua.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: dff0f4357a1c44e81914c15a6a5d71a9
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

15
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPLogin.lua
View File

@@ -102,11 +102,16 @@ function TRPLogin:setEventDelegate()
local currGroup = Prefs.getCurrGroup(Prefs.getUserName())
if isNilOrEmpty(currGroup) then
---@type _ParamTRPSelectGroup
local d = {}
d.isHideCloseBtn = true
d.companyList = content.result
getPanelAsy("PanelSelectCompany", onLoadedPanel, d)
if #(content.result) == 1 then
Prefs.setCurrGroup(Prefs.getUserName(), json.encode(content.result[1]))
getPanelAsy("PanelConnect", onLoadedPanel)
else
---@type _ParamTRPSelectGroup
local d = {}
d.isHideCloseBtn = true
d.companyList = content.result
getPanelAsy("PanelSelectCompany", onLoadedPanel, d)
end
else
getPanelAsy("PanelConnect", onLoadedPanel)
end

5
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewCust.lua
View File

@@ -83,9 +83,8 @@ function TRPNewCust:show()
optionInfor = DBCust.getFilter4Popup(DBCust.FilterGroup.taskList)
uiobjs.InputTask:refreshItems(optionInfor.options, optionInfor.values)
-- optionInfor = DBCust.getFilter4Popup(DBCust.FilterGroup.loginNoList)
local poplist = DBUser.getPopList()
uiobjs.InputLogin:refreshItems(poplist.options, poplist.values)
optionInfor = DBCust.getFilter4Popup(DBCust.FilterGroup.loginNoList)
uiobjs.InputLogin:refreshItems(optionInfor.options, optionInfor.values)
self:refreshContent()

230
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua
View File

@@ -24,6 +24,15 @@ function TRPNewOrder:init(csObj)
uiobjs.ExtendRoot = getCC(uiobjs.Table.transform, "ExtendRoot", "CLCellLua")
---@type CLUIFormRoot
uiobjs.ExtendFormRoot = uiobjs.ExtendRoot:GetComponent("CLUIFormRoot")
---@type UITable
uiobjs.StepRoot = getCC(uiobjs.Table.transform, "StepRoot", "UITable")
---@type CLUIFormRoot
uiobjs.StepFormRoot = uiobjs.StepRoot:GetComponent("CLUIFormRoot")
---@type UIPopupList
uiobjs.InputNextLogino = getCC(uiobjs.StepRoot.transform, "InputNextLogino", "UIPopupList")
uiobjs.gridProjects = getCC(uiobjs.Table.transform, "InputSelectProduct/Products", "UIGrid")
uiobjs.gridProjectsPrefab = getChild(uiobjs.gridProjects.transform, "00000").gameObject
-- uiobjs.elements = uiobjs.DetailRoot.gameObject:GetComponentsInChildren(typeof(CLUIElement), true)
uiobjs.ButtonSave = getChild(self.transform, "Top/ButtonSave")
end
@@ -34,15 +43,18 @@ function TRPNewOrder:initFiledsAttr()
self.baseFiledsAttr = {}
attr = {}
attr.attrName = "工单模板"
attr.id = ""
attr.id = "templetId"
attr.attrType = DBCust.FieldType.popuplist
attr.ifMust = 1
attr.donotJoinKey = true
local popInfor = DBOrder.getPopupList(DBOrder.PopListGroup.templateList)
attr.popOptions = popInfor.options
attr.popValues = popInfor.values
table.insert(self.baseFiledsAttr, attr)
attr = {}
attr.attrName = "工单名称"
attr.id = ""
attr.id = "title"
attr.attrType = DBCust.FieldType.text
attr.ifMust = 1
attr.donotJoinKey = true
@@ -50,10 +62,13 @@ function TRPNewOrder:initFiledsAttr()
attr = {}
attr.attrName = "紧急程序"
attr.id = ""
attr.id = "urgency"
attr.attrType = DBCust.FieldType.popuplist
attr.ifMust = 0
attr.donotJoinKey = true
local popInfor = DBOrder.getPopupList(DBOrder.PopListGroup.urgencyLevels) or {}
attr.popOptions = popInfor.options
attr.popValues = popInfor.values
table.insert(self.baseFiledsAttr, attr)
attr = {}
@@ -101,7 +116,7 @@ function TRPNewOrder:initFiledsAttr()
attr = {}
attr.attrName = "订单内容"
attr.id = ""
attr.id = "content"
attr.attrType = DBCust.FieldType.multext
attr.ifMust = 0
attr.donotJoinKey = true
@@ -115,16 +130,25 @@ function TRPNewOrder:setData(paras)
self.isNewOrder = false
self.mdata = paras
if type(self.mdata.jsonStr) == "string" then
self.mdata.jsonStr = json.decode(self.mdata.jsonStr)
if type(self.mdata.attrJson) == "string" then
self.mdata.attrJson = json.decode(self.mdata.attrJson)
end
self.mdata.jsonStr = self.mdata.jsonStr or {}
self.mdata.attrJson = self.mdata.attrJson or {}
---@type _DBCust
self.cust = nil
else
--//TODO:初始值
self.isNewOrder = true
---@type _DBCust
self.cust = paras
self.mdata = {}
local popInfor = DBOrder.getPopupList(DBOrder.PopListGroup.templateList)
self.mdata.templetId = popInfor.values[0]
popInfor = DBOrder.getPopupList(DBOrder.PopListGroup.urgencyLevels)
self.mdata.urgency = popInfor.values[0]
local templateInfor = DBOrder.getTemplateInfor(self.mdata.templetId)
self.mdata.content = templateInfor.content
self.selectedProducts = {}
end
end
@@ -154,12 +178,39 @@ end
function TRPNewOrder:refreshContent()
self:showBaseFields()
local taskId = self.mdata and self.mdata.taskId or nil
self:showExtentFiles(taskId)
self:showProducts()
local templetId = self.mdata and self.mdata.templetId or nil
self:showExtentFiles(templetId)
self.csSelf:invoke4Lua(self:wrapFunc(self.reposition), 0.1)
end
function TRPNewOrder:showProducts()
local products
if self.isNewOrder then
products = self.selectedProducts
else
products = json.decode(self.mdata.prodJson)
end
CLUIUtl.resetList4Lua(uiobjs.gridProjects, uiobjs.gridProjectsPrefab, products, self:wrapFunc(self.initProductCell))
self:reposition()
end
function TRPNewOrder:initProductCell(cell, data)
cell:init(data, nil)
cell.luaTable.onDeleteProduct = self:wrapFunc(self.onDeleteProduct)
end
function TRPNewOrder:onDeleteProduct(data)
for i, v in ipairs(self.selectedProducts) do
if v.id == data.id then
table.remove(self.selectedProducts, i)
break
end
end
self:showProducts()
end
function TRPNewOrder:showBaseFields()
---@type _ParamCellExtendFiledRoot
local param = {}
@@ -182,9 +233,9 @@ function TRPNewOrder:showBaseFields()
if filedInfor.attr.attrType == DBCust.FieldType.multext then
filedInfor.onMultTextInputChg = self:wrapFunc(self.reposition)
end
filedInfor.onSelect = self:wrapFunc(self.onPopupFieldValChg)
if not self.isNewOrder then
filedInfor.onClick = self:wrapFunc(self.onClickInputField)
filedInfor.onSelect = self:wrapFunc(self.onPopupFieldValChg)
end
table.insert(param.fields, filedInfor)
end
@@ -193,30 +244,62 @@ function TRPNewOrder:showBaseFields()
end
---public 显示扩展字段
function TRPNewOrder:showExtentFiles(taskId)
---@type _ParamCellExtendFiledRoot
local param = {}
param.data = self.mdata and self.mdata.jsonStr or {}
-- param.isEditMode = true
param.onFinish = self:wrapFunc(self.setExtendFieldsMode)
param.fields = {}
local fields = DBCust.getFieldsByTask(taskId) or {}
---@type _ParamCellExtendFiled
local filedInfor
for i, v in ipairs(fields) do
filedInfor = {}
filedInfor.attr = v
filedInfor.isEditMode = true
if filedInfor.attr.attrType == DBCust.FieldType.multext then
filedInfor.onMultTextInputChg = self:wrapFunc(self.reposition)
function TRPNewOrder:showExtentFiles(templetId)
local cfgInfor = DBOrder.getTemplateInfor(templetId)
local fields = DBOrder.getFields(templetId) or {}
if #fields > 0 then
---@type _ParamCellExtendFiledRoot
local param = {}
param.data = self.mdata and self.mdata.attrJson or {}
-- param.isEditMode = true
param.onFinish = self:wrapFunc(self.setExtendFieldsMode)
param.fields = {}
---@type _ParamCellExtendFiled
local filedInfor
for i, v in ipairs(fields) do
filedInfor = {}
filedInfor.attr = v
filedInfor.isEditMode = true
if filedInfor.attr.attrType == DBCust.FieldType.multext then
filedInfor.onMultTextInputChg = self:wrapFunc(self.reposition)
end
if not self.isNewOrder then
filedInfor.onClick = self:wrapFunc(self.onClickInputField4Extend)
filedInfor.onSelect = self:wrapFunc(self.onPopupFieldValChg4Extend)
end
table.insert(param.fields, filedInfor)
end
if not self.isNewOrder then
filedInfor.onClick = self:wrapFunc(self.onClickInputField4Extend)
filedInfor.onSelect = self:wrapFunc(self.onPopupFieldValChg4Extend)
end
table.insert(param.fields, filedInfor)
SetActive(uiobjs.ExtendRoot.gameObject, true)
uiobjs.ExtendRoot:init(param, nil)
else
SetActive(uiobjs.ExtendRoot.gameObject, false)
end
uiobjs.ExtendRoot:init(param, nil)
-- next Step
local nextStep = DBOrder.getNextHandler(templetId)
if nextStep and tonumber(cfgInfor.ifToLoginNo) == 1 then
SetActive(uiobjs.StepFormRoot.gameObject, true)
uiobjs.InputNextLogino:refreshItems(nextStep.options, nextStep.values)
uiobjs.StepFormRoot:setValue(self.mdata)
else
SetActive(uiobjs.StepFormRoot.gameObject, false)
end
-- product
if tonumber(cfgInfor.ifProduct) == 1 then
SetActive(uiobjs.gridProjects.transform.parent.gameObject, true)
self.selectedProducts = {}
self:showProducts()
else
SetActive(uiobjs.gridProjects.transform.parent.gameObject, false)
end
-- refresh content
local d = uiobjs.DetailFromRoot:getValue(true)
d.content = cfgInfor.content
uiobjs.DetailFromRoot:setValue(d)
-------
uiobjs.StepRoot:Reposition()
end
function TRPNewOrder:reposition()
@@ -241,7 +324,7 @@ function TRPNewOrder:setElementMode(el)
local boxcollider = el:GetComponent("BoxCollider")
local ButtonReset = getCC(el.transform, "ButtonReset", "MyInputReset")
if (not self.isNewOrder) and (el.jsonKey == "taskId" or el.jsonKey == "phoneNo") then
if el.jsonKey == "taskId" or el.jsonKey == "phoneNo" then
boxcollider.enabled = false
else
boxcollider.enabled = true
@@ -296,18 +379,21 @@ function TRPNewOrder:procNetwork(cmd, succ, msg, paras)
end
function TRPNewOrder:onPopupFieldValChg(go)
if self.isNewOrder then
return
end
---@type CLUIElement
local el = go:GetComponent("CLUIElement")
if el then
local err = el:checkValid()
if tostring(el.value) ~= tostring(self.mdata[el.jsonKey]) then
if isNilOrEmpty(err) then
self:sendModifymsg(el.jsonKey, el.value, false)
else
MyUtl.toastW(err)
if self.isNewOrder then
if el and el.jsonKey == "templetId" then
self:showExtentFiles(el.value)
end
else
if el then
local err = el:checkValid()
if tostring(el.value) ~= tostring(self.mdata[el.jsonKey]) then
if isNilOrEmpty(err) then
self:sendModifymsg(el.jsonKey, el.value, false)
else
MyUtl.toastW(err)
end
end
end
end
@@ -416,33 +502,71 @@ end
function TRPNewOrder:setEventDelegate()
self.EventDelegate = {
ButtonSave = function()
local err = uiobjs.DetailRoot:checkValid()
local err = uiobjs.DetailFromRoot:checkValid()
err = joinStr(err, uiobjs.ExtendFormRoot:checkValid())
if not isNilOrEmpty(err) then
MyUtl.toastW(err)
return
end
local cust = uiobjs.DetailRoot:getValue(true)
cust.customerLabel = self.mdata.customerLabel
local jsonStr = uiobjs.ExtendFormRoot:getValue(true)
cust.jsonStr = jsonStr
local order = uiobjs.DetailFromRoot:getValue(true)
order.custId = self.cust.custId
local attrJson = uiobjs.ExtendFormRoot:getValue(true)
order.attrJson = attrJson
if uiobjs.StepFormRoot.gameObject.activeInHierarchy then
order = uiobjs.StepFormRoot:getValue(order, true)
end
local templateInfor = DBOrder.getTemplateInfor(order.templetId)
order.ifToLoginNo = templateInfor.ifToLoginNo
order.ifMail = templateInfor.ifMail
order.ifProduct = templateInfor.ifProduct
if uiobjs.gridProjects.gameObject.activeInHierarchy then
if self.selectedProducts == nil or #(self.selectedProducts) <= 0 then
MyUtl.toastW("请添加产品")
return
end
order.prodJson = self.selectedProducts
-- 计算价格
for i, v in ipairs(order.prodJson) do
v.totalPrice = tonumber(v.productNum) * tonumber(v.price)
v.salePrice = tonumber(v.productNum) * tonumber(v.productPrice)
end
end
order.wfType = "0" -- 0：正常工单，1：退货工单
showHotWheel()
NetProto.send.save_customer(
cust,
NetProto.send.createWfInfo(
order,
function(content)
if content.success then
getPanelAsy("PanelCustDetail", onLoadedPanel, cust)
MyUtl.toastS("订单创建成功")
hideTopPanel(self.csSelf)
end
hideHotWheel()
end
)
end,
InputSeachKey = function()
local queryKey = uiobjs.InputSeachKey.value
NetProto.send.selectProductInfo(queryKey, 1)
end,
InputSelectProduct = function()
getPanelAsy("PanelSelectProduct", onLoadedPanelTT)
-- 选择商品
getPanelAsy(
"PanelSelectProduct",
onLoadedPanelTT,
{selectedProducts = self.selectedProducts, callback = self:wrapFunc(self.onGetSelectedProducts)}
)
end,
InputAttachment = function()
-- 添加附件
end
}
end
function TRPNewOrder:onGetSelectedProducts(list)
self.selectedProducts = list
self:showProducts()
end
-- 处理ui上的事件，例如点击等
function TRPNewOrder:uiEventDelegate(go)
local func = self.EventDelegate[go.name]

137
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSelectProduct.lua Normal file
View File

@@ -0,0 +1,137 @@
---@type IDBasePanel
local TRBasePanel = require("ui.panel.TRBasePanel")
---@class TRPSelectProduct:TRBasePanel 邮件列表
local TRPSelectProduct = class("TRPSelectProduct", TRBasePanel)
local uiobjs = {}
local selectedMap = {}
-- 初始化，只会调用一次
function TRPSelectProduct:init(csObj)
TRPSelectProduct.super.init(self, csObj)
self:setEventDelegate()
MyUtl.setContentView(getChild(self.transform, "PanelContent"), 298, 200)
uiobjs.InputSeachKey = getCC(self.transform, "Top/InputSeachKey", "UIInput")
---@type UIScrollView
uiobjs.scrollView = getCC(self.transform, "PanelContent", "UIScrollView")
---@type Coolape.CLUILoopGrid
uiobjs.Grid = getCC(uiobjs.scrollView.transform, "Grid", "CLUILoopGrid")
uiobjs.ButtonEndList = getChild(uiobjs.Grid.transform, "ButtonEndList")
uiobjs.ButtonEndListLb = getCC(uiobjs.ButtonEndList, "Label", "UILabel")
end
-- 设置数据
---@param paras _ParamTRPSelectProduct
function TRPSelectProduct:setData(paras)
selectedMap = {}
self.callback = paras.callback
for i, v in ipairs(paras.selectedProducts or {}) do
selectedMap[v.id] = v
end
end
-- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh
function TRPSelectProduct:show()
uiobjs.InputSeachKey.value = ""
showHotWheel()
NetProto.send.selectProductInfo(uiobjs.InputSeachKey.value, 1)
self:showList({})
end
function TRPSelectProduct:showList(products)
SetActive(uiobjs.ButtonEndList.gameObject, false)
local list = {}
for i, v in ipairs(products or {}) do
table.insert(list, {data = v, isSelected = selectedMap[v.id] and true or false})
end
uiobjs.Grid:setList(list, self:wrapFunc(self.initCell), nil, self:wrapFunc(self.onEndList))
uiobjs.scrollView:ResetPosition()
end
function TRPSelectProduct:appList(list)
SetActive(uiobjs.ButtonEndList.gameObject, false)
uiobjs.Grid:appendList(list)
end
function TRPSelectProduct:initCell(cell, data)
cell:init(data, nil)
end
function TRPSelectProduct:onEndList(tail)
printw("到最后了==" .. tail.name)
if self.pageInfo and self.pageInfo.current_page < self.pageInfo.total_pages then
local queryKey = uiobjs.InputSeachKey.value
showHotWheel()
-- 取得下一页
NetProto.send.selectProductInfo(queryKey, self.pageInfo.current_page + 1)
else
uiobjs.ButtonEndList.localPosition = tail.transform.localPosition + Vector3.up * -210
SetActive(uiobjs.ButtonEndList.gameObject, true)
end
end
function TRPSelectProduct:getSelected()
local list = {}
if uiobjs.Grid.list ~= nil then
for i = 0, uiobjs.Grid.list.Count - 1 do
local d = uiobjs.Grid.list[i]
if d.isSelected then
d.data.productNum = d.data.productNum or 1
d.data.productPrice = d.data.price
table.insert(list, d.data)
end
end
end
return list
end
-- 刷新
function TRPSelectProduct:refresh()
end
-- 关闭页面
function TRPSelectProduct:hide()
end
-- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据
function TRPSelectProduct:procNetwork(cmd, succ, msg, paras)
if (succ == NetSuccess) then
if cmd == NetProto.cmds.selectProductInfo then
local result = paras.result or {}
self.pageInfo = result.meta
if self.pageInfo and self.pageInfo.current_page > 1 then
self:appList(result.data)
else
self:showList(result.data)
end
hideHotWheel()
end
end
end
function TRPSelectProduct:setEventDelegate()
self.EventDelegate = {
ButtonCancel = function()
hideTopPanel(self.csSelf)
end,
ButtonOkay = function()
hideTopPanel(self.csSelf)
Utl.doCallback(self.callback, self:getSelected())
end
}
end
-- 处理ui上的事件，例如点击等
function TRPSelectProduct:uiEventDelegate(go)
local func = self.EventDelegate[go.name]
if func then
func()
end
end
-- 当顶层页面发生变化时回调
function TRPSelectProduct:onTopPanelChange(topPanel)
end
--------------------------------------------
return TRPSelectProduct

7
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSelectProduct.lua.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 86e6d69b882e04ce9889f5823ad95f66
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

16
Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputCheckboxs.prefab
View File

@@ -129,6 +129,7 @@ GameObject:
- component: {fileID: 8085093767652781930}
- component: {fileID: 2439694156049545749}
- component: {fileID: 1506532759999847837}
- component: {fileID: 114031756461323902}
m_Layer: 5
m_Name: InputCheckboxs
m_TagString: Untagged
@@ -324,6 +325,21 @@ MonoBehaviour:
field:
name:
oneShot: 0
--- !u!114 &114031756461323902
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3095922444815459397}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
m_Name:
m_EditorClassIdentifier:
widget: {fileID: 0}
offset: 0
sizeAdjust: 1
--- !u!1 &5713654144068856770
GameObject:
m_ObjectHideFlags: 0

16
Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputDate.prefab
View File

@@ -214,6 +214,7 @@ GameObject:
- component: {fileID: 1723439637486485793}
- component: {fileID: 7375490486847536484}
- component: {fileID: 114290233639497436}
- component: {fileID: 114572621479752912}
m_Layer: 5
m_Name: InputDate
m_TagString: Untagged
@@ -414,6 +415,21 @@ MonoBehaviour:
isPause: 0
luaPath: trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendField.lua
isNeedResetAtlase: 1
--- !u!114 &114572621479752912
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4366778029194131019}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
m_Name:
m_EditorClassIdentifier:
widget: {fileID: 0}
offset: 0
sizeAdjust: 1
--- !u!1 &4634753059616572994
GameObject:
m_ObjectHideFlags: 0

16
Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputMultText.prefab
View File

@@ -250,6 +250,7 @@ GameObject:
m_Component:
- component: {fileID: 6707647812568961046}
- component: {fileID: 2839739815580303652}
- component: {fileID: 5711713659476070239}
m_Layer: 5
m_Name: Background
m_TagString: Untagged
@@ -324,6 +325,21 @@ MonoBehaviour:
mSpriteName: public__empty
mFillCenter: 1
isGrayMode: 0
--- !u!114 &5711713659476070239
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3436914829287944890}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
m_Name:
m_EditorClassIdentifier:
widget: {fileID: 0}
offset: 0
sizeAdjust: 1
--- !u!1 &3697089830196127904
GameObject:
m_ObjectHideFlags: 0

16
Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputPoplist.prefab
View File

@@ -17,6 +17,7 @@ GameObject:
- component: {fileID: 6356504636838832541}
- component: {fileID: 9053534331056369762}
- component: {fileID: 114097241059719580}
- component: {fileID: 114583540844523490}
m_Layer: 5
m_Name: InputPoplist
m_TagString: Untagged
@@ -268,6 +269,21 @@ MonoBehaviour:
isPause: 0
luaPath: trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendField.lua
isNeedResetAtlase: 1
--- !u!114 &114583540844523490
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 772436816849070028}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
m_Name:
m_EditorClassIdentifier:
widget: {fileID: 0}
offset: 0
sizeAdjust: 1
--- !u!1 &3752426191522449626
GameObject:
m_ObjectHideFlags: 0

16
Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputText.prefab
View File

@@ -340,6 +340,7 @@ GameObject:
- component: {fileID: 2270108241694216974}
- component: {fileID: 114614343490987310}
- component: {fileID: 5790993641769127909}
- component: {fileID: 114450741716434618}
m_Layer: 5
m_Name: InputText
m_TagString: Untagged
@@ -567,6 +568,21 @@ MonoBehaviour:
onDrag: []
onBecameVisible: []
onBecameInvisible: []
--- !u!114 &114450741716434618
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6259930685614177535}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
m_Name:
m_EditorClassIdentifier:
widget: {fileID: 0}
offset: 0
sizeAdjust: 1
--- !u!1 &6856486077525911941
GameObject:
m_ObjectHideFlags: 0

6
Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConfirm.prefab
View File

@@ -873,7 +873,7 @@ MonoBehaviour:
relative: 0
absolute: -100
updateAnchors: 1
mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
mColor: {r: 0.8, g: 0.8, b: 0.8, a: 1}
mPivot: 4
mWidth: 825
mHeight: 2
@@ -1381,7 +1381,7 @@ MonoBehaviour:
relative: 0
absolute: -20
updateAnchors: 1
mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
mColor: {r: 0.8, g: 0.8, b: 0.8, a: 1}
mPivot: 1
mWidth: 2
mHeight: 110
@@ -1389,7 +1389,7 @@ MonoBehaviour:
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 0.015625
aspectRatio: 0.018181818
mType: 1
mFillDirection: 4
mFillAmount: 1

2
Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConnect.prefab
View File

@@ -76,7 +76,7 @@ MonoBehaviour:
mClipping: 0
mClipRange: {x: 0, y: 0, z: 300, w: 200}
mClipSoftness: {x: 4, y: 4}
mDepth: 10001
mDepth: 10
mSortingOrder: 0
mClipOffset: {x: 0, y: 0}
--- !u!114 &5447032094512914035

2
Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab
View File

@@ -8136,7 +8136,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3}
m_Name:
m_EditorClassIdentifier:
jsonKey: dealflag
jsonKey: dealFlag
formatValue:
labeName: {fileID: 0}
defaultName:

6
Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustList.prefab
View File

@@ -3209,7 +3209,7 @@ GameObject:
- component: {fileID: 7170620776478054822}
- component: {fileID: 1182383136}
m_Layer: 5
m_Name: LabelCompanyName
m_Name: LabelPhoneNo
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -3310,7 +3310,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3}
m_Name:
m_EditorClassIdentifier:
jsonKey: companyName
jsonKey: phoneNo
formatValue:
labeName: {fileID: 0}
defaultName:
@@ -3585,7 +3585,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da6df6b770ac942ab8916dc960507b8f, type: 3}
m_Name:
m_EditorClassIdentifier:
cellCount: 9
cellCount: 10
isPlayTween: 0
twType: 0
tweenSpeed: 0.01

1501
Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelEditPrice.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelEditPrice.prefab.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 6d833b598325d4890a2b96ba1fbc1182
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

6
Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelLogin.prefab
View File

@@ -175,7 +175,7 @@ MonoBehaviour:
spriteBg: {fileID: 0}
valueIsNumber: 0
isPhoneNum: 0
inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
inValidColor: {r: 1, g: 0.98458993, b: 0.8066038, a: 1}
--- !u!1 &169019246291288862
GameObject:
m_ObjectHideFlags: 0
@@ -352,7 +352,7 @@ MonoBehaviour:
anchorOffset: 0
softBorderPadding: 1
renderQueue: 0
startingRenderQueue: 3004
startingRenderQueue: 3000
mClipTexture: {fileID: 0}
mAlpha: 1
mClipping: 0
@@ -1820,4 +1820,4 @@ MonoBehaviour:
spriteBg: {fileID: 0}
valueIsNumber: 0
isPhoneNum: 0
inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
inValidColor: {r: 1, g: 0.9882353, b: 0.80784315, a: 1}

2834
Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab
View File

File diff suppressed because it is too large Load Diff

278
Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSelectProduct.prefab
View File

@@ -280,6 +280,7 @@ GameObject:
- component: {fileID: 6443676307379350713}
- component: {fileID: 5129961851071160420}
- component: {fileID: 2953575355203642134}
- component: {fileID: 5748525195033831039}
m_Layer: 5
m_Name: 00000
m_TagString: Untagged
@@ -321,7 +322,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
isPause: 0
luaPath: trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustFilterGroup.lua
luaPath: trCRM/upgradeRes/priority/lua/ui/cell/TRCellProductList.lua
isNeedResetAtlase: 1
--- !u!114 &5129961851071160420
MonoBehaviour:
@@ -391,6 +392,19 @@ MonoBehaviour:
widget: {fileID: 5129961851071160420}
offset: 0
sizeAdjust: 1
--- !u!114 &5748525195033831039
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1339031885216242466}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 16bd2beefa5ca4a3ba0753143d28e2d9, type: 3}
m_Name:
m_EditorClassIdentifier:
jsonKey:
--- !u!1 &1476048743331547168
GameObject:
m_ObjectHideFlags: 0
@@ -421,6 +435,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 3250592075526405360}
- {fileID: 312477580778927759}
m_Father: {fileID: 8302959411981827612}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -460,7 +475,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da6df6b770ac942ab8916dc960507b8f, type: 3}
m_Name:
m_EditorClassIdentifier:
cellCount: 10
cellCount: 14
isPlayTween: 0
twType: 0
tweenSpeed: 0.01
@@ -556,6 +571,106 @@ MonoBehaviour:
mSpriteName: public__empty
mFillCenter: 1
isGrayMode: 0
--- !u!1 &3516691852276209336
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3318967223522064214}
- component: {fileID: 3838711473590820217}
m_Layer: 5
m_Name: Label
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3318967223522064214
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3516691852276209336}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 312477580778927759}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &3838711473590820217
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3516691852276209336}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3}
m_Name:
m_EditorClassIdentifier:
leftAnchor:
target: {fileID: 0}
relative: 0
absolute: 0
rightAnchor:
target: {fileID: 0}
relative: 1
absolute: 0
bottomAnchor:
target: {fileID: 0}
relative: 0
absolute: 0
topAnchor:
target: {fileID: 0}
relative: 1
absolute: 0
updateAnchors: 1
mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
mPivot: 4
mWidth: 1125
mHeight: 50
mDepth: 11
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 22.5
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
mText: "\u65E0\u66F4\u591A\u4FE1\u606F"
mFontSize: 46
mFontStyle: 0
mAlignment: 0
mEncoding: 1
mMaxLineCount: 0
mEffectStyle: 0
mEffectColor: {r: 0, g: 0, b: 0, a: 1}
mSymbols: 1
mEffectDistance: {x: 1, y: 1}
mOverflow: 0
mMaterial: {fileID: 0}
mApplyGradient: 0
mGradientTop: {r: 1, g: 1, b: 1, a: 1}
mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1}
mSpacingX: 0
mSpacingY: 0
mUseFloatSpacing: 0
mFloatSpacingX: 0
mFloatSpacingY: 0
mShrinkToFit: 0
mMaxLineWidth: 0
mMaxLineHeight: 0
mLineWidth: 0
mMultiline: 1
isAppendEndingString: 0
AppendString: '...'
fontName: EmptyFont
--- !u!1 &3625231913236928321
GameObject:
m_ObjectHideFlags: 0
@@ -966,7 +1081,7 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
mPivot: 3
mWidth: 84
mWidth: 284
mHeight: 42
mDepth: 5
autoResizeBoxCollider: 0
@@ -1083,7 +1198,7 @@ MonoBehaviour:
checkSprite: {fileID: 0}
checkAnimation: {fileID: 0}
eventReceiver: {fileID: 0}
functionName: OnActivate
functionName:
startsChecked: 0
--- !u!114 &2409523827425164381
MonoBehaviour:
@@ -1254,7 +1369,14 @@ MonoBehaviour:
caretColor: {r: 0.60296786, g: 1, b: 0, a: 0.8}
selectionColor: {r: 1, g: 0.8745098, b: 0.5529412, a: 0.5}
onSubmit: []
onChange: []
onChange:
- mTarget: {fileID: 6984233625075085881}
mMethodName: uiEventDelegate
mParameters:
- obj: {fileID: 0}
field:
name: go
oneShot: 0
mValue:
--- !u!114 &4318169829063325852
MonoBehaviour:
@@ -1422,7 +1544,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3}
m_Name:
m_EditorClassIdentifier:
jsonKey:
jsonKey: num
formatValue: "\u5E93\u5B58\uFF1A{0}"
labeName: {fileID: 0}
defaultName:
@@ -1528,6 +1650,7 @@ GameObject:
m_Component:
- component: {fileID: 7271328320495617231}
- component: {fileID: 6073061147799334719}
- component: {fileID: 1872187556}
m_Layer: 5
m_Name: LabelTitle
m_TagString: Untagged
@@ -1618,6 +1741,30 @@ MonoBehaviour:
isAppendEndingString: 0
AppendString: '...'
fontName: EmptyFont
--- !u!114 &1872187556
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6062575811671155989}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3}
m_Name:
m_EditorClassIdentifier:
jsonKey: name
formatValue:
labeName: {fileID: 0}
defaultName:
canNull: 0
checkIDCard: 0
minLen: 0
maxLen: 0
spriteBg: {fileID: 0}
valueIsNumber: 0
isPhoneNum: 0
inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
--- !u!1 &6109131649511301274
GameObject:
m_ObjectHideFlags: 0
@@ -1800,6 +1947,94 @@ MonoBehaviour:
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 0.5405276
--- !u!1 &6575156775745750833
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 312477580778927759}
- component: {fileID: 7219926862309829378}
- component: {fileID: 5260718638861744539}
- component: {fileID: 3624412198162812352}
m_Layer: 5
m_Name: ButtonEndList
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &312477580778927759
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6575156775745750833}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -592.75, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 3318967223522064214}
m_Father: {fileID: 6641565186329801146}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &7219926862309829378
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6575156775745750833}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1125, y: 87.74999, z: 0}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &5260718638861744539
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6575156775745750833}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3}
m_Name:
m_EditorClassIdentifier:
tweenTarget: {fileID: 3516691852276209336}
hover: {r: 0.88235295, g: 0.78431374, b: 0.5882353, a: 1}
pressed: {r: 0.7176471, g: 0.6392157, b: 0.48235294, a: 1}
disabledColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
duration: 0.2
skipColorEffect: 1
dragHighlight: 0
hoverSprite:
pressedSprite:
disabledSprite:
hoverSprite2D: {fileID: 0}
pressedSprite2D: {fileID: 0}
disabledSprite2D: {fileID: 0}
pixelSnap: 0
onClick: []
--- !u!114 &3624412198162812352
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6575156775745750833}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3}
m_Name:
m_EditorClassIdentifier:
scrollView: {fileID: 0}
draggablePanel: {fileID: 0}
--- !u!1 &6583241675011228078
GameObject:
m_ObjectHideFlags: 0
@@ -1962,6 +2197,7 @@ GameObject:
m_Component:
- component: {fileID: 2927355420003232706}
- component: {fileID: 8281559266079674693}
- component: {fileID: 2023641540}
m_Layer: 5
m_Name: LabelPrice
m_TagString: Untagged
@@ -1977,7 +2213,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6814252217244726824}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -137.00002, y: -42, z: 0}
m_LocalPosition: {x: -137, y: -42, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3250592075526405360}
@@ -2014,7 +2250,7 @@ MonoBehaviour:
updateAnchors: 0
mColor: {r: 0.94509804, g: 0.76862746, b: 0.05882353, a: 1}
mPivot: 3
mWidth: 200
mWidth: 284
mHeight: 42
mDepth: 5
autoResizeBoxCollider: 0
@@ -2052,6 +2288,30 @@ MonoBehaviour:
isAppendEndingString: 0
AppendString: '...'
fontName: EmptyFont
--- !u!114 &2023641540
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6814252217244726824}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3}
m_Name:
m_EditorClassIdentifier:
jsonKey: price
formatValue:
labeName: {fileID: 0}
defaultName:
canNull: 0
checkIDCard: 0
minLen: 0
maxLen: 0
spriteBg: {fileID: 0}
valueIsNumber: 0
isPhoneNum: 0
inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
--- !u!1 &6984233625075085880
GameObject:
m_ObjectHideFlags: 0
@@ -2147,7 +2407,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
isPause: 0
luaPath:
luaPath: trCRM/upgradeRes/priority/lua/ui/panel/TRPSelectProduct.lua
isNeedBackplate: 1
destroyWhenHide: 0
isNeedResetAtlase: 1