Commit afd52278 by mushishixian

标签修改

parent b92aef04
......@@ -172,6 +172,11 @@ class SupplierController extends Controller
$customerTags = $tagService->getTagsBySupplierId($supplierId, 2);
$supplier['system_tags'] = $systemTags ? implode(',', $systemTags) : '';
$supplier['customer_tags'] = $customerTags ? implode(',', $customerTags) : '';
$supplierModel = new SupplierChannelModel();
$supplierModel->where('supplier_id',$supplierId)->update([
'customer_tags'=> $supplier['customer_tags'],
'system_tags' => $supplier['system_tags'],
]);
$this->data['supplier'] = $supplier;
$this->data['address'] = $supplierService->getAddress($supplierId);
$supplierAttachmentService = new SupplierAttachmentService();
......
......@@ -150,8 +150,8 @@ class SupplierService
$oldCustomerTags = array_get($oldSupplier, 'customer_tags');
$oldSystemTags = array_get($oldSupplier, 'system_tags');
$tagService = new SupplierTagService();
// $tagService->saveTags($supplierId, 14, $channel['system_tags'], $oldSystemTags);
// $tagService->saveTags($supplierId, 4, $channel['customer_tags'], $oldCustomerTags);
$tagService->saveTags($supplierId, 14, $channel['system_tags'], $oldSystemTags);
$tagService->saveTags($supplierId, 4, $channel['customer_tags'], $oldCustomerTags);
}
//保存附件
$attachmentService = new SupplierAttachmentService();
......
......@@ -81,7 +81,7 @@ class SupplierShareApplyService
{
$applyModel = new SupplierShareApplyModel();
$count = $applyModel->where('supplier_id', $map['supplier_id'])
->where('apply_code_id', $map['apply_code_id'])->where('department_id', $map['apply_department_id'])
->where('apply_code_id', $map['apply_code_id'])->where('apply_department_id', $map['apply_department_id'])
->whereNotIn('status', [$applyModel::STATUS_AUDIT_REJECT, $applyModel::STATUS_REVIEW_REJECT])->count();
return $count;
}
......
......@@ -35,7 +35,7 @@
<div id="{{$name}}_file_div">
@foreach($attachment[$name] as $k=>$item)
<span class="single_file_div">
<a href="{{$item['url']}}" target="_blank">
<a href="{{$item['url']}}" target="_blank" value="{{array_get($item,'file_name','未知文件名')}}">
{{array_get($item,'file_name','未知文件名')}}
</a>
<i class="layui-icon delete_file"
......
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