Commit 5d347f42 by mushishixian

体验需求

parent 80ceab50
...@@ -6,6 +6,7 @@ use App\Http\Services\LogService; ...@@ -6,6 +6,7 @@ use App\Http\Services\LogService;
use App\Http\Services\RegionService; use App\Http\Services\RegionService;
use App\Http\Services\SupplierAttachmentService; use App\Http\Services\SupplierAttachmentService;
use App\Http\Services\SupplierService; use App\Http\Services\SupplierService;
use App\Http\Services\SupplierShareApplyService;
use App\Http\Services\SupplierStatisticsService; use App\Http\Services\SupplierStatisticsService;
use App\Http\Services\SupplierTagService; use App\Http\Services\SupplierTagService;
use App\Http\Transformers\LogTransformer; use App\Http\Transformers\LogTransformer;
...@@ -64,6 +65,10 @@ class SupplierController extends Controller ...@@ -64,6 +65,10 @@ class SupplierController extends Controller
$statistics = $supplierStatisticsService->getSupplierListStatistics(); $statistics = $supplierStatisticsService->getSupplierListStatistics();
$this->data['statistics'] = $statistics; $this->data['statistics'] = $statistics;
$this->data['validPerms'] = []; $this->data['validPerms'] = [];
//获取共用审核的条数
$applyService = new SupplierShareApplyService();
$applyData = $applyService->getSupplierShareApplyList($request->user->userId);
$this->data['shareApplyCount'] = $applyData['total'];
return $this->view('供应商列表'); return $this->view('供应商列表');
} }
...@@ -173,8 +178,8 @@ class SupplierController extends Controller ...@@ -173,8 +178,8 @@ class SupplierController extends Controller
$supplier['system_tags'] = $systemTags ? implode(',', $systemTags) : ''; $supplier['system_tags'] = $systemTags ? implode(',', $systemTags) : '';
$supplier['customer_tags'] = $customerTags ? implode(',', $customerTags) : ''; $supplier['customer_tags'] = $customerTags ? implode(',', $customerTags) : '';
$supplierModel = new SupplierChannelModel(); $supplierModel = new SupplierChannelModel();
$supplierModel->where('supplier_id',$supplierId)->update([ $supplierModel->where('supplier_id', $supplierId)->update([
'customer_tags'=> $supplier['customer_tags'], 'customer_tags' => $supplier['customer_tags'],
'system_tags' => $supplier['system_tags'], 'system_tags' => $supplier['system_tags'],
]); ]);
$this->data['supplier'] = $supplier; $this->data['supplier'] = $supplier;
......
...@@ -33,7 +33,7 @@ class SupplierValidator ...@@ -33,7 +33,7 @@ class SupplierValidator
'return_consignee' => 'max:50', 'return_consignee' => 'max:50',
'return_phone' => 'max:50', 'return_phone' => 'max:50',
'business_license' => 'required', 'business_license' => 'required',
'established_time' => 'required', // 'established_time' => 'required',
'cn_ratio' => 'min:1', 'cn_ratio' => 'min:1',
'us_ratio' => 'min:1', 'us_ratio' => 'min:1',
]; ];
......
...@@ -47,6 +47,10 @@ ...@@ -47,6 +47,10 @@
@if(checkPerm('AuditSupplierShare')) @if(checkPerm('AuditSupplierShare'))
<button type="button" class="layui-btn layui-btn-sm" id="audit_supplier_share_apply"> <button type="button" class="layui-btn layui-btn-sm" id="audit_supplier_share_apply">
共用审核 共用审核
@if (!empty($shareApplyCount))
({{$shareApplyCount}})
<span style="margin-left: 0" class="layui-badge-dot layui-bg-orange"></span>
@endif
</button> </button>
@endif @endif
</div> </div>
......
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
</div> </div>
</div> </div>
<div class="layui-col-md8"> <div class="layui-col-md8">
<label class="layui-form-label" style="width: 80px"><span class="require">*</span>成立时间 : <label class="layui-form-label" style="width: 80px">成立时间 :
</label> </label>
<div class="layui-input-block" style="width: 150px"> <div class="layui-input-block" style="width: 150px">
<input type="text" id="established_time" name="established_time" <input type="text" id="established_time" name="established_time"
......
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