Commit b25dfa71 by 杨树贤

Merge branch 'ysx-芯链账号添加字段-20250623'

parents 74a96fb1 cb41f14a
...@@ -41,6 +41,8 @@ class SupplierAccountApiController extends Controller ...@@ -41,6 +41,8 @@ class SupplierAccountApiController extends Controller
public function AddSupplierAccount($request) public function AddSupplierAccount($request)
{ {
$data = $request->only([ $data = $request->only([
'email',
'contacts_name',
'supplier_code', 'supplier_code',
'mobile', 'mobile',
'password_raw', 'password_raw',
...@@ -77,6 +79,8 @@ class SupplierAccountApiController extends Controller ...@@ -77,6 +79,8 @@ class SupplierAccountApiController extends Controller
{ {
$data = $request->only([ $data = $request->only([
'id', 'id',
'contacts_name',
'email',
'supplier_code', 'supplier_code',
'mobile', 'mobile',
'password_raw', 'password_raw',
......
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
let cols = [ let cols = [
{type: 'radio'}, {type: 'radio'},
{field: 'id', title: 'ID', align: 'center', width: 80}, {field: 'id', title: 'ID', align: 'center', width: 80},
{field: 'contacts_name', title: '联系人', align: 'center', width: 120},
{field: 'email', title: '邮箱', align: 'center', width: 170},
{ {
field: 'mobile', title: '账号', align: 'center', width: 170, field: 'mobile', title: '账号', align: 'center', width: 170,
templet: function (data) { templet: function (data) {
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
.layui-form-item { .layui-form-item {
margin-bottom: 5px; margin-bottom: 5px;
} }
</style> </style>
<div class="layui-card"> <div class="layui-card">
<div class="layui-card-body"> <div class="layui-card-body">
...@@ -10,23 +11,33 @@ ...@@ -10,23 +11,33 @@
<div class="layui-inline"> <div class="layui-inline">
@inject('statusPresenter','App\Presenters\StatusPresenter') @inject('statusPresenter','App\Presenters\StatusPresenter')
{!! $statusPresenter->render('supplier_code','供应商选择 : ',!empty($account['supplier_code'])?$account['supplier_code']:null, {!! $statusPresenter->render('supplier_code','供应商选择 : ',!empty($account['supplier_code'])?$account['supplier_code']:null,
$supplierCodes,['required'=>true,'width'=>'400px']) !!} $supplierCodes,['required'=>true,'width'=>'400px']) !!}
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label"><span class="require">*</span>联系人 : </label>
<div class="layui-input-block">
<input type="text" name="contacts_name" id="contacts_name" placeholder="请输入名称" class="layui-input" value="{{$account['contacts_name'] or ''}}">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label"><span class="require">*</span>邮箱 : </label>
<div class="layui-input-block">
<input type="text" name="email" id="email" placeholder="请输入邮箱" class="layui-input" value="{{$account['email'] or ''}}">
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label"><span class="require">*</span>登录账号 : </label> <label class="layui-form-label"><span class="require">*</span>登录账号 : </label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="mobile" id="mobile" <input type="text" name="mobile" id="mobile" placeholder="请输入登录账号" class="layui-input" value="{{$account['mobile'] or ''}}">
placeholder="请输入登录账号" class="layui-input"
value="{{$account['mobile'] or ''}}">
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label"><span class="require">*</span>账号密码 : </label> <label class="layui-form-label"><span class="require">*</span>账号密码 : </label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="password_raw" id="password_raw" <input type="text" name="password_raw" id="password_raw" placeholder="请输入账号密码" class="layui-input" value="{{$account['password_raw'] or ''}}">
placeholder="请输入账号密码" class="layui-input"
value="{{$account['password_raw'] or ''}}">
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
...@@ -37,11 +48,9 @@ ...@@ -37,11 +48,9 @@
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<div align="center" style="margin-top: 20px;text-align: right"> <div align="center" style="margin-top: 20px;text-align: right">
<button type="button" class="layui-btn layui-btn-sm layui-btn-info submit-loading" lay-submit <button type="button" class="layui-btn layui-btn-sm layui-btn-info submit-loading" lay-submit lay-filter="addSupplierAccount">确认
lay-filter="addSupplierAccount">确认
</button> </button>
<button type="button" class="layui-btn layui-btn-sm layui-btn-primary" lay-submit <button type="button" class="layui-btn layui-btn-sm layui-btn-primary" lay-submit lay-filter="cancel">取消
lay-filter="cancel">取消
</button> </button>
</div> </div>
</div> </div>
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
.layui-form-item { .layui-form-item {
margin-bottom: 5px; margin-bottom: 5px;
} }
</style> </style>
<div class="layui-card"> <div class="layui-card">
<div class="layui-card-body"> <div class="layui-card-body">
...@@ -11,23 +12,33 @@ ...@@ -11,23 +12,33 @@
<div class="layui-inline"> <div class="layui-inline">
@inject('statusPresenter','App\Presenters\StatusPresenter') @inject('statusPresenter','App\Presenters\StatusPresenter')
{!! $statusPresenter->render('supplier_code','供应商选择 : ',!empty($account['supplier_code'])?$account['supplier_code']:null, {!! $statusPresenter->render('supplier_code','供应商选择 : ',!empty($account['supplier_code'])?$account['supplier_code']:null,
$supplierCodes,['required'=>true,'width'=>'400px']) !!} $supplierCodes,['required'=>true,'width'=>'400px']) !!}
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label"><span class="require">*</span>联系人 : </label>
<div class="layui-input-block">
<input type="text" name="contacts_name" id="contacts_name" placeholder="请输入名称" class="layui-input" value="{{$account['contacts_name'] or ''}}">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label"><span class="require">*</span>邮箱 : </label>
<div class="layui-input-block">
<input type="text" name="email" id="email" placeholder="请输入邮箱" class="layui-input" value="{{$account['email'] or ''}}">
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label"><span class="require">*</span>登录账号 : </label> <label class="layui-form-label"><span class="require">*</span>登录账号 : </label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="mobile" id="mobile" <input type="text" name="mobile" id="mobile" placeholder="请输入登录账号" class="layui-input" value="{{$account['mobile'] or ''}}">
placeholder="请输入登录账号" class="layui-input"
value="{{$account['mobile'] or ''}}">
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label"><span class="require">*</span>账号密码 : </label> <label class="layui-form-label"><span class="require">*</span>账号密码 : </label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="password_raw" id="password_raw" <input type="text" name="password_raw" id="password_raw" placeholder="请输入账号密码" class="layui-input" value="{{$account['password_raw'] or ''}}">
placeholder="请输入账号密码" class="layui-input"
value="{{$account['password_raw'] or ''}}">
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
...@@ -38,11 +49,9 @@ ...@@ -38,11 +49,9 @@
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<div align="center" style="margin-top: 20px;text-align: right"> <div align="center" style="margin-top: 20px;text-align: right">
<button type="button" class="layui-btn layui-btn-sm layui-btn-info submit-loading" lay-submit <button type="button" class="layui-btn layui-btn-sm layui-btn-info submit-loading" lay-submit lay-filter="addSupplierAccount">确认
lay-filter="addSupplierAccount">确认
</button> </button>
<button type="button" class="layui-btn layui-btn-sm layui-btn-primary" lay-submit <button type="button" class="layui-btn layui-btn-sm layui-btn-primary" lay-submit lay-filter="cancel">取消
lay-filter="cancel">取消
</button> </button>
</div> </div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment