Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
杨树贤
/
liexin_supplier
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
643e9515
authored
May 28, 2026
by
杨树贤
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fix
parent
1c56538a
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
37 additions
and
17 deletions
app/Http/Controllers/SupplierController.php
app/Http/Services/SupplierAuditService.php
resources/views/script/ConfirmCrmSupplierScript.blade.php
resources/views/web/ConfirmCrmSupplier.blade.php
storage/framework/views/587faa134dc1f8953abf61cb2995b8264ba36a12.php
app/Http/Controllers/SupplierController.php
View file @
643e9515
...
...
@@ -461,6 +461,7 @@ class SupplierController extends Controller
// 获取采购员列表
$intraCodeModel
=
new
IntracodeModel
();
$this
->
data
[
'userCodes'
]
=
$intraCodeModel
->
getChannelUsersEncode
(
false
);
$this
->
data
[
'has_channel_uid'
]
=
!
empty
(
$supplier
[
'channel_uid'
]);
return
$this
->
view
(
'转化供应商确认'
);
}
...
...
app/Http/Services/SupplierAuditService.php
View file @
643e9515
...
...
@@ -679,8 +679,16 @@ class SupplierAuditService
$logService
=
new
LogService
();
$logService
->
AddLog
(
$supplierId
,
LogModel
::
UPDATE_OPERATE
,
'客户转化供应商审核'
,
$logContent
);
}
else
{
$updateData
=
[];
if
(
!
empty
(
$channelUid
))
{
$updateData
[
'channel_uid'
]
=
$channelUid
;
}
if
(
!
empty
(
$updateData
))
{
$updateData
[
'update_time'
]
=
time
();
SupplierChannelModel
::
where
(
'supplier_id'
,
$supplierId
)
->
update
(
$updateData
);
}
// 中间节点审核通过,记录日志
$logContent
=
"确认客户转化供应商:审核通过"
;
$logContent
=
"确认客户转化供应商:审核通过
,等待下一层审核
"
;
$logService
=
new
LogService
();
$logService
->
AddLog
(
$supplierId
,
LogModel
::
UPDATE_OPERATE
,
'客户转化供应商审核'
,
$logContent
);
}
...
...
resources/views/script/ConfirmCrmSupplierScript.blade.php
View file @
643e9515
...
...
@@ -10,12 +10,16 @@
let
channelUid
=
data
.
field
.
channel_uid
||
''
;
let
url
=
'/api/supplier_crm/AuditCustomerConvertSupplier'
;
let
re
s
=
ajax
(
url
,
{
let
re
questData
=
{
supplier_id
:
supplierId
,
audit_opinion
:
auditOpinion
,
remark
:
remark
,
channel_uid
:
channelUid
,
});
};
// 只有当channel_uid存在时才传递
if
(
channelUid
)
{
requestData
.
channel_uid
=
channelUid
;
}
let
res
=
ajax
(
url
,
requestData
);
if
(
!
res
)
{
parent
.
layer
.
msg
(
'网络错误,请重试'
,
{
icon
:
5
});
}
else
{
...
...
resources/views/web/ConfirmCrmSupplier.blade.php
View file @
643e9515
...
...
@@ -57,8 +57,15 @@
</div>
<div
class=
"layui-col-sm6"
>
@inject('statusPresenter','App\Presenters\StatusPresenter')
{!! $statusPresenter->render('channel_uid','指定采购员 : ',null,
$userCodes,['required'=>true,'width'=>'150px']) !!}
@if($has_channel_uid)
<label
class=
"layui-form-label"
>
指定采购员 :
</label>
<div
class=
"layui-input-block block-42 info-label"
>
{{ array_get($userCodes, $supplier['channel_uid'], '未知') }}
</div>
@else
{!! $statusPresenter->render('channel_uid','指定采购员 : ',null,
$userCodes,['required'=>true,'width'=>'150px']) !!}
@endif
</div>
</div>
<blockquote
class=
"layui-elem-quote layui-text"
>
...
...
storage/framework/views/587faa134dc1f8953abf61cb2995b8264ba36a12.php
View file @
643e9515
...
...
@@ -289,18 +289,18 @@
<?php
$statusPresenter
=
app
(
'App\Presenters\StatusPresenter'
);
?>
<?php
echo
$statusPresenter
->
render
(
'supplier_source'
,
'供应商来源'
,
0
,
config
(
'fixed.SupplierSource'
));
?>
</div>
<div
class=
"layui-inline"
>
<label
class=
"layui-form-label"
>
代理品牌
</label>
<div
class=
"layui-input-inline"
>
<div
id=
"agency_brands_filter"
style=
"width: 425px"
></div>
<input
type=
"hidden"
name=
"agency_brands"
id=
"agency_brands_filter_value"
value=
""
>
</div>
</div>
<div
class=
"layui-row"
>
<div
class=
"layui-inline"
style=
"width: 600px"
>
<?php
$transformableTimeIntervalPresenter
=
app
(
'App\Presenters\Filter\TransformableTimeIntervalPresenter'
);
?>
<?php
echo
$transformableTimeIntervalPresenter
->
render
([
'update_time'
=>
'更新时间'
,
'create_time'
=>
'创建时间'
,
'sku_create_time'
=>
'首次上传sku时间'
]);
?>
<div
class=
"layui-inline"
>
<label
class=
"layui-form-label"
>
代理品牌
</label>
<div
class=
"layui-input-inline"
>
<div
id=
"agency_brands_filter"
style=
"width: 425px"
></div>
<input
type=
"hidden"
name=
"agency_brands"
id=
"agency_brands_filter_value"
value=
""
>
</div>
</div>
<div
class=
"layui-row"
>
<div
class=
"layui-inline"
style=
"width: 600px"
>
<?php
$transformableTimeIntervalPresenter
=
app
(
'App\Presenters\Filter\TransformableTimeIntervalPresenter'
);
?>
<?php
echo
$transformableTimeIntervalPresenter
->
render
([
'update_time'
=>
'更新时间'
,
'create_time'
=>
'创建时间'
,
'sku_create_time'
=>
'首次上传sku时间'
]);
?>
</div>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment