Skip to content

杨树贤 / liexin_supplier

Go to a project
Commit 0c61f249 by 杨树贤
Options

添加付款方式管理

parent 35457e10
Inline Side-by-side
Showing with 300 additions and 79 deletions
app/Http/Controllers/Api/SupplierApiController.php
...@@ -38,7 +38,6 @@ class SupplierApiController extends Controller ...@@ -38,7 +38,6 @@ class SupplierApiController extends Controller
'upload_file', 'upload_file',
'legal_representative', 'legal_representative',
'established_time', 'established_time',
'pay_type',
'trading_method', 'trading_method',
//省市 //省市
...@@ -77,6 +76,10 @@ class SupplierApiController extends Controller ...@@ -77,6 +76,10 @@ class SupplierApiController extends Controller
'main_customers', 'main_customers',
'ticket_time', 'ticket_time',
'billing_period_detail', 'billing_period_detail',
//付款方式
'pay_type',
'pay_detail',
]; ];
public function Entrance(Request $request, $id) public function Entrance(Request $request, $id)
...@@ -127,6 +130,7 @@ class SupplierApiController extends Controller ...@@ -127,6 +130,7 @@ class SupplierApiController extends Controller
} }
$channelMap = array_merge($this->channelMap, config('field.AttachmentFields')); $channelMap = array_merge($this->channelMap, config('field.AttachmentFields'));
$channel = $request->only($channelMap); $channel = $request->only($channelMap);
dd($channel);
$service = new SupplierService(); $service = new SupplierService();
$result = $service->saveSupplier($channel); $result = $service->saveSupplier($channel);
if (!$result) { if (!$result) {
......
app/Http/Controllers/Filter/SupplierFilter.php
...@@ -17,7 +17,7 @@ class SupplierFilter ...@@ -17,7 +17,7 @@ class SupplierFilter
$map = $request->all(); $map = $request->all();
$map = array_map(function ($item) { $map = array_map(function ($item) {
return trim($item); return trim($item);
},$map); }, $map);
//显示默认的数据(有权限逻辑) //显示默认的数据(有权限逻辑)
$query = $this->defaultFilter($query, $map['source_type']); $query = $this->defaultFilter($query, $map['source_type']);
//判断筛选参数 //判断筛选参数
...@@ -100,10 +100,6 @@ class SupplierFilter ...@@ -100,10 +100,6 @@ class SupplierFilter
} }
//默认过滤带有-1字符串的供应商名称的数据 //默认过滤带有-1字符串的供应商名称的数据
$query->whereRaw('supplier_name NOT LIKE "%-1"'); $query->whereRaw('supplier_name NOT LIKE "%-1"');
// if ($map['source_type'] == 'all') {
// //还要看到所有黑名单
// $query->orWhere('status', SupplierChannelModel::STATUS_BLOCK);
// }
return $query; return $query;
} }
...@@ -123,7 +119,6 @@ class SupplierFilter ...@@ -123,7 +119,6 @@ class SupplierFilter
//默认展示的数据查询 //默认展示的数据查询
//看全部的权限,优先级最高 //看全部的权限,优先级最高
// if ($canViewAllSupplier || $sourceType == 'block') {
if ($canViewAllSupplier) { if ($canViewAllSupplier) {
//能查看所有的话,限制基本没有 //能查看所有的话,限制基本没有
} else { } else {
...@@ -170,7 +165,6 @@ class SupplierFilter ...@@ -170,7 +165,6 @@ class SupplierFilter
} }
} }
// $query->orwhere('status', SupplierChannelModel::STATUS_BLOCK);
//先判断获取类型 //先判断获取类型
switch ($sourceType) { switch ($sourceType) {
case "all": case "all":
...@@ -245,7 +239,6 @@ class SupplierFilter ...@@ -245,7 +239,6 @@ class SupplierFilter
case "has_supplier_tag": case "has_supplier_tag":
$query->where(function ($q) { $query->where(function ($q) {
$q->whereRaw("system_tags REGEXP '客户指定供应商'"); $q->whereRaw("system_tags REGEXP '客户指定供应商'");
// $q->where('system_tags', '!=', '')->orWhere('customer_tags', '!=', '');
}); });
break; break;
//附件里面缺少品质协议的 //附件里面缺少品质协议的
......
app/Http/Controllers/IndexController.php
...@@ -51,8 +51,8 @@ class IndexController extends Controller ...@@ -51,8 +51,8 @@ class IndexController extends Controller
$this->data['dates'] = array_values(array_column($statistics['all'], 'date')); $this->data['dates'] = array_values(array_column($statistics['all'], 'date'));
$this->data['all_increase_statistics'] = array_values(array_column($statistics['all'], 'count')); $this->data['all_increase_statistics'] = array_values(array_column($statistics['all'], 'count'));
$this->data['user_increase_statistics'] = array_values(array_column($statistics['user'], 'count')); $this->data['user_increase_statistics'] = array_values(array_column($statistics['user'], 'count'));
$intracodeModel = new IntracodeModel(); $intraCodeModel = new IntracodeModel();
$userCodes = $intracodeModel->getSampleEncode(); $userCodes = $intraCodeModel->getSampleEncode();
$this->data['user'] = $userCodes; $this->data['user'] = $userCodes;
$this->data['purchase_users'] = []; $this->data['purchase_users'] = [];
foreach ($userCodes as $userId => $code) { foreach ($userCodes as $userId => $code) {
......
app/Http/Controllers/SkuController.php
...@@ -53,8 +53,8 @@ class SkuController extends Controller ...@@ -53,8 +53,8 @@ class SkuController extends Controller
}, $brandSelectValue); }, $brandSelectValue);
} }
$this->data['brandSelectValue'] = $brandSelectValue; $this->data['brandSelectValue'] = $brandSelectValue;
$intracodeModel = new IntracodeModel(); $intraCodeModel = new IntracodeModel();
$this->data['userCodes'] = $intracodeModel->getSampleEncode(); $this->data['userCodes'] = $intraCodeModel->getSampleEncode();
return $this->view('供应商日志'); return $this->view('供应商日志');
} }
......
app/Http/Controllers/SupplierContactController.php
...@@ -60,9 +60,9 @@ class SupplierContactController extends Controller ...@@ -60,9 +60,9 @@ class SupplierContactController extends Controller
$model = new SupplierReceiptModel(); $model = new SupplierReceiptModel();
$this->data['receipt'] = $model->where('contact_id', $contactId)->first()->toArray(); $this->data['receipt'] = $model->where('contact_id', $contactId)->first()->toArray();
} }
$intracodeModel = new IntracodeModel(); $intraCodeModel = new IntracodeModel();
// $userCodes = $intracodeModel->getSampleEncode(); // $userCodes = $intraCodeModel->getSampleEncode();
$this->data['userCodes'] = $intracodeModel->getChannelUsersEncode(false); $this->data['userCodes'] = $intraCodeModel->getChannelUsersEncode(false);
return $this->view('添加联系方式'); return $this->view('添加联系方式');
} }
...@@ -73,8 +73,8 @@ class SupplierContactController extends Controller ...@@ -73,8 +73,8 @@ class SupplierContactController extends Controller
$contactId = $request->get('contact_id'); $contactId = $request->get('contact_id');
$model = new SupplierContactModel(); $model = new SupplierContactModel();
$this->data['contact'] = $model->where('contact_id', $contactId)->first()->toArray(); $this->data['contact'] = $model->where('contact_id', $contactId)->first()->toArray();
$intracodeModel = new IntracodeModel(); $intraCodeModel = new IntracodeModel();
$userCodes = $intracodeModel->getChannelUsersEncode(); $userCodes = $intraCodeModel->getChannelUsersEncode();
$this->data['userCodes'] = $userCodes; $this->data['userCodes'] = $userCodes;
return $this->view('添加联系方式'); return $this->view('添加联系方式');
} }
......
app/Http/Controllers/SupplierController.php
...@@ -58,12 +58,9 @@ class SupplierController extends Controller ...@@ -58,12 +58,9 @@ class SupplierController extends Controller
public function SupplierList($request) public function SupplierList($request)
{ {
//判断权限 //判断权限
$intracodeModel = new IntracodeModel(); $intraCodeModel = new IntracodeModel();
$this->data['userCodes'] = $intracodeModel->getChannelUsersEncode(); $this->data['userCodes'] = $intraCodeModel->getChannelUsersEncode();
$this->data['users'] = $intracodeModel->getAdminUserAndCode(); $this->data['users'] = $intraCodeModel->getAdminUserAndCode();
// $supplierStatisticsService = new SupplierStatisticsService();
// $statistics = $supplierStatisticsService->getSupplierListStatistics();
// $this->data['statistics'] = $statistics;
$this->data['validPerms'] = []; $this->data['validPerms'] = [];
//获取共用审核的条数 //获取共用审核的条数
$applyService = new SupplierShareApplyService(); $applyService = new SupplierShareApplyService();
...@@ -101,7 +98,6 @@ class SupplierController extends Controller ...@@ -101,7 +98,6 @@ class SupplierController extends Controller
$this->data['address'] = $supplierService->getAddress($supplierId); $this->data['address'] = $supplierService->getAddress($supplierId);
$supplierAttachmentService = new SupplierAttachmentService(); $supplierAttachmentService = new SupplierAttachmentService();
$this->data['attachment'] = $supplierAttachmentService->getAttachment($supplierId); $this->data['attachment'] = $supplierAttachmentService->getAttachment($supplierId);
// dd($supplierAttachmentService->getAttachment($supplierId));
return $this->view('供应商详情'); return $this->view('供应商详情');
} }
...@@ -110,10 +106,10 @@ class SupplierController extends Controller ...@@ -110,10 +106,10 @@ class SupplierController extends Controller
{ {
$supplierId = $request->get('supplier_id'); $supplierId = $request->get('supplier_id');
$supplierService = new SupplierService(); $supplierService = new SupplierService();
$intracodeModel = new IntracodeModel(); $intraCodeModel = new IntracodeModel();
$this->data['outside_contact_status'] = Config('fixed.OutsideContactStatus'); $this->data['outside_contact_status'] = Config('fixed.OutsideContactStatus');
$this->data['outside_contact_type'] = Config('fixed.OutsideContactType'); $this->data['outside_contact_type'] = Config('fixed.OutsideContactType');
$userCodes = $intracodeModel->getChannelUsersEncode(false); $userCodes = $intraCodeModel->getChannelUsersEncode(false);
$this->data['userCodes'] = $userCodes; $this->data['userCodes'] = $userCodes;
$this->data['user'] = $userCodes; $this->data['user'] = $userCodes;
$this->data['purchase_users'] = []; $this->data['purchase_users'] = [];
...@@ -146,9 +142,9 @@ class SupplierController extends Controller ...@@ -146,9 +142,9 @@ class SupplierController extends Controller
//编辑供应商 //编辑供应商
public function UpdateSupplier($request) public function UpdateSupplier($request)
{ {
$intracodeModel = new IntracodeModel(); $intraCodeModel = new IntracodeModel();
$userCodes = $intracodeModel->getSampleEncode(); $userCodes = $intraCodeModel->getSampleEncode();
$this->data['userCodes'] = $intracodeModel->getChannelUsersEncode(); $this->data['userCodes'] = $intraCodeModel->getChannelUsersEncode();
$this->data['user'] = $userCodes; $this->data['user'] = $userCodes;
$this->data['purchase_users'] = []; $this->data['purchase_users'] = [];
$this->data['operate'] = 'update'; $this->data['operate'] = 'update';
...@@ -223,8 +219,8 @@ class SupplierController extends Controller ...@@ -223,8 +219,8 @@ class SupplierController extends Controller
$transformer = new SupplierTransformer(); $transformer = new SupplierTransformer();
$supplier = $transformer->transformInfo($supplier); $supplier = $transformer->transformInfo($supplier);
$this->data['supplier'] = $supplier; $this->data['supplier'] = $supplier;
$intracodeModel = new IntracodeModel(); $intraCodeModel = new IntracodeModel();
$this->data['userCodes'] = $intracodeModel->getChannelUsersEncode(false); $this->data['userCodes'] = $intraCodeModel->getChannelUsersEncode(false);
$logModel = new LogModel(); $logModel = new LogModel();
$this->data['logs'] = $logModel->where('supplier_id', $supplierId) $this->data['logs'] = $logModel->where('supplier_id', $supplierId)
->where('action', '分配渠道开发员')->orderBy('id', 'desc') ->where('action', '分配渠道开发员')->orderBy('id', 'desc')
...@@ -243,8 +239,8 @@ class SupplierController extends Controller ...@@ -243,8 +239,8 @@ class SupplierController extends Controller
$transformer = new SupplierTransformer(); $transformer = new SupplierTransformer();
$suppliers = $transformer->transformList($suppliers); $suppliers = $transformer->transformList($suppliers);
$this->data['suppliers'] = $suppliers; $this->data['suppliers'] = $suppliers;
$intracodeModel = new IntracodeModel(); $intraCodeModel = new IntracodeModel();
$this->data['userCodes'] = $intracodeModel->getChannelUsersEncode(false); $this->data['userCodes'] = $intraCodeModel->getChannelUsersEncode(false);
return $this->view('批量分配渠道开发员'); return $this->view('批量分配渠道开发员');
} }
...@@ -258,16 +254,16 @@ class SupplierController extends Controller ...@@ -258,16 +254,16 @@ class SupplierController extends Controller
$transformer = new SupplierTransformer(); $transformer = new SupplierTransformer();
$supplier = $transformer->transformInfo($supplier); $supplier = $transformer->transformInfo($supplier);
$this->data['supplier'] = $supplier; $this->data['supplier'] = $supplier;
$intracodeModel = new IntracodeModel(); $intraCodeModel = new IntracodeModel();
$this->data['userCodes'] = $intracodeModel->getChannelUsersEncode(false); $this->data['userCodes'] = $intraCodeModel->getChannelUsersEncode(false);
return $this->view('添加采购员'); return $this->view('添加采购员');
} }
//操作日志列表 //操作日志列表
public function LogList($request, $data) public function LogList($request, $data)
{ {
$intracodeModel = new IntracodeModel(); $intraCodeModel = new IntracodeModel();
$data['userCodes'] = $intracodeModel->getSampleEncode(); $data['userCodes'] = $intraCodeModel->getSampleEncode();
$data['title'] = '操作日志记录'; $data['title'] = '操作日志记录';
return view('web', $data); return view('web', $data);
} }
...@@ -280,8 +276,8 @@ class SupplierController extends Controller ...@@ -280,8 +276,8 @@ class SupplierController extends Controller
$supplier = $model->where('supplier_id', $supplierId)->first(); $supplier = $model->where('supplier_id', $supplierId)->first();
$supplier = $supplier ? $supplier->toArray() : []; $supplier = $supplier ? $supplier->toArray() : [];
$this->data['supplier'] = $supplier; $this->data['supplier'] = $supplier;
$intracodeModel = new IntracodeModel(); $intraCodeModel = new IntracodeModel();
$userCodes = $intracodeModel->getSampleEncode(); $userCodes = $intraCodeModel->getSampleEncode();
//去除非当前供应商所拥有的采购的人员,只能从当前供应商设置的采购里面选择云芯采购员 //去除非当前供应商所拥有的采购的人员,只能从当前供应商设置的采购里面选择云芯采购员
$channelUids = explode(',', $supplier['channel_uid']); $channelUids = explode(',', $supplier['channel_uid']);
foreach ($userCodes as $codeId => $value) { foreach ($userCodes as $codeId => $value) {
......
app/Http/Controllers/SupplierSyncLogController.php
...@@ -39,8 +39,8 @@ class SupplierSyncLogController extends Controller ...@@ -39,8 +39,8 @@ class SupplierSyncLogController extends Controller
//操作日志列表 //操作日志列表
public function SupplierSyncLogList($request, $data) public function SupplierSyncLogList($request, $data)
{ {
$intracodeModel = new IntracodeModel(); $intraCodeModel = new IntracodeModel();
$data['userCodes'] = $intracodeModel->getSampleEncode(); $data['userCodes'] = $intraCodeModel->getSampleEncode();
$data['title'] = '供应商同步日志记录'; $data['title'] = '供应商同步日志记录';
return view('web', $data); return view('web', $data);
} }
......
app/Http/Middleware/CheckLogin.php
...@@ -56,8 +56,8 @@ class CheckLogin ...@@ -56,8 +56,8 @@ class CheckLogin
} }
$user = $ret->data; $user = $ret->data;
$user->header = $request->cookie('oa_header'); $user->header = $request->cookie('oa_header');
$intracodeModel = new IntracodeModel(); $intraCodeModel = new IntracodeModel();
$codeId = $intracodeModel->where('admin_id', $user->userId)->value('code_id'); $codeId = $intraCodeModel->where('admin_id', $user->userId)->value('code_id');
$user->codeId = $codeId; $user->codeId = $codeId;
$request->user = $user; $request->user = $user;
} else { } else {
...@@ -73,8 +73,8 @@ class CheckLogin ...@@ -73,8 +73,8 @@ class CheckLogin
} }
$user = $ret->data; $user = $ret->data;
$intracodeModel = new IntracodeModel(); $intraCodeModel = new IntracodeModel();
$codeId = $intracodeModel->where('admin_id', $user->userId)->value('code_id'); $codeId = $intraCodeModel->where('admin_id', $user->userId)->value('code_id');
$user->codeId = $codeId ?: 99999; $user->codeId = $codeId ?: 99999;
$request->user = $user; $request->user = $user;
} }
......
app/Http/Services/AdminUserService.php
...@@ -14,16 +14,16 @@ class AdminUserService ...@@ -14,16 +14,16 @@ class AdminUserService
public function getAdminUserInfoByCodeId($codeId) public function getAdminUserInfoByCodeId($codeId)
{ {
$intracodeModel = new IntracodeModel(); $intraCodeModel = new IntracodeModel();
$userInfoModel = new UserInfoModel(); $userInfoModel = new UserInfoModel();
$adminId = $intracodeModel->where('code_id', $codeId)->value('admin_id'); $adminId = $intraCodeModel->where('code_id', $codeId)->value('admin_id');
return $userInfoModel->where('userId', $adminId)->first(); return $userInfoModel->where('userId', $adminId)->first();
} }
public function getCodeIdsByUserIds($userIds) public function getCodeIdsByUserIds($userIds)
{ {
$intracodeModel = new IntracodeModel(); $intraCodeModel = new IntracodeModel();
return $intracodeModel->whereIn('admin_id', $userIds)->pluck('code_id'); return $intraCodeModel->whereIn('admin_id', $userIds)->pluck('code_id');
} }
public function getAdminUserInfo($userId) public function getAdminUserInfo($userId)
...@@ -63,7 +63,7 @@ class AdminUserService ...@@ -63,7 +63,7 @@ class AdminUserService
$usersOperation = $departmentService->getUserByDepartmentId(9); $usersOperation = $departmentService->getUserByDepartmentId(9);
$users = array_merge($usersMarket, $usersOperation); $users = array_merge($usersMarket, $usersOperation);
$userIds = array_column($users, 'userId'); $userIds = array_column($users, 'userId');
$intracodeModel = new IntracodeModel(); $intraCodeModel = new IntracodeModel();
return $intracodeModel->getEncodeByUserIds($userIds); return $intraCodeModel->getEncodeByUserIds($userIds);
} }
} }
\ No newline at end of file
app/Http/Services/SkuService.php
...@@ -80,9 +80,9 @@ class SkuService ...@@ -80,9 +80,9 @@ class SkuService
} }
$list[] = $sku; $list[] = $sku;
} }
$intracodeModel = new IntracodeModel(); $intraCodeModel = new IntracodeModel();
$encodedList = array_column($list, 'encoded'); $encodedList = array_column($list, 'encoded');
$encodedUsers = $intracodeModel->getEncodedUserByEncoded($encodedList); $encodedUsers = $intraCodeModel->getEncodedUserByEncoded($encodedList);
$list = array_map(function ($item) use ($encodedUsers) { $list = array_map(function ($item) use ($encodedUsers) {
$encoded = array_get($item, 'encoded', 0); $encoded = array_get($item, 'encoded', 0);
$item['encoded_user_name'] = array_get($encodedUsers, $encoded, ''); $item['encoded_user_name'] = array_get($encodedUsers, $encoded, '');
......
app/Http/Services/SupplierPayTypeService.php 0 → 100644
<?php
namespace App\Http\Services;
use App\Model\SupplierExtendModel;
use App\Model\SupplierPayTypeModel;
class SupplierPayTypeService
{
public static function getSupplierPayTypeList($supplierId)
{
$payTypeList = SupplierPayTypeModel::where('supplier_id', $supplierId)->get();
$payTypeList = !empty($payTypeList) ? $payTypeList->toArray() : [];
return $payTypeList;
}
}
\ No newline at end of file
app/Http/Transformers/SupplierTransformer.php
...@@ -5,6 +5,7 @@ namespace App\Http\Transformers; ...@@ -5,6 +5,7 @@ namespace App\Http\Transformers;
use App\Http\Services\AdminUserService; use App\Http\Services\AdminUserService;
use App\Http\Services\SupplierPayTypeService;
use App\Http\Services\SupplierService; use App\Http\Services\SupplierService;
use App\Http\Services\SupplierSkuAuditRulerService; use App\Http\Services\SupplierSkuAuditRulerService;
use App\Http\Services\SupplierSkuUploadRulerService; use App\Http\Services\SupplierSkuUploadRulerService;
...@@ -19,8 +20,8 @@ class SupplierTransformer ...@@ -19,8 +20,8 @@ class SupplierTransformer
{ {
public function transformList($list) public function transformList($list)
{ {
$intracodeModel = new IntracodeModel(); $intraCodeModel = new IntracodeModel();
$users = $intracodeModel->getSampleEncode(true); $users = $intraCodeModel->getSampleEncode(true);
$supplierIds = array_column($list, 'supplier_id'); $supplierIds = array_column($list, 'supplier_id');
$viewCheckService = new ViewCheckService(); $viewCheckService = new ViewCheckService();
$viewData = $viewCheckService->checkSupplierView($supplierIds); $viewData = $viewCheckService->checkSupplierView($supplierIds);
...@@ -66,8 +67,8 @@ class SupplierTransformer ...@@ -66,8 +67,8 @@ class SupplierTransformer
public function getChannelUserNames($channelUid) public function getChannelUserNames($channelUid)
{ {
$canViewAllChannelUser = checkPerm('ViewAllChannelUser'); $canViewAllChannelUser = checkPerm('ViewAllChannelUser');
$intracodeModel = new IntracodeModel(); $intraCodeModel = new IntracodeModel();
$userCodes = $intracodeModel->getAllSampleEncode(); $userCodes = $intraCodeModel->getAllSampleEncode();
$data = []; $data = [];
$channelUidList = explode(',', $channelUid); $channelUidList = explode(',', $channelUid);
$channelUidList = array_unique($channelUidList); $channelUidList = array_unique($channelUidList);
...@@ -90,8 +91,8 @@ class SupplierTransformer ...@@ -90,8 +91,8 @@ class SupplierTransformer
if (empty($supplier)) { if (empty($supplier)) {
return []; return [];
} }
$intracodeModel = new IntracodeModel(); $intraCodeModel = new IntracodeModel();
$users = $intracodeModel->getSampleEncode(true); $users = $intraCodeModel->getSampleEncode(true);
$supplier['stockup_type_data'] = $this->transformStockupTypeData($supplier['stockup_type']); $supplier['stockup_type_data'] = $this->transformStockupTypeData($supplier['stockup_type']);
$supplier['established_time'] = !empty($supplier['established_time']) ? date('Y-m-d', $supplier['established_time'] = !empty($supplier['established_time']) ? date('Y-m-d',
$supplier['established_time']) : ''; $supplier['established_time']) : '';
...@@ -118,6 +119,7 @@ class SupplierTransformer ...@@ -118,6 +119,7 @@ class SupplierTransformer
$supplier['extra_fee'] = $ExtendModel->getExtendExtra($supplier['supplier_code'], $supplier['supplier_id']); $supplier['extra_fee'] = $ExtendModel->getExtendExtra($supplier['supplier_code'], $supplier['supplier_id']);
//获取供应商地址信息 //获取供应商地址信息
$supplier = $this->getSupplierAddress($supplier); $supplier = $this->getSupplierAddress($supplier);
$supplier['pay_type_list'] = SupplierPayTypeService::getSupplierPayTypeList($supplier['supplier_id']);
//获取最近修改信息 //获取最近修改信息
$logModel = new LogModel(); $logModel = new LogModel();
$log = $logModel->where('supplier_id', $supplier['supplier_id']) $log = $logModel->where('supplier_id', $supplier['supplier_id'])
...@@ -126,9 +128,9 @@ class SupplierTransformer ...@@ -126,9 +128,9 @@ class SupplierTransformer
$supplier['last_update_time'] = empty($supplier['last_update_time']) ? date('Y-m-d H:i:s', $supplier['last_update_time'] = empty($supplier['last_update_time']) ? date('Y-m-d H:i:s',
$log['add_time']) : '无'; $log['add_time']) : '无';
$supplier['has_certification_name'] = array_get(config('fixed.CertificationStatus'), $supplier['has_certification_name'] = array_get(config('fixed.CertificationStatus'),
$supplier['has_certification'], ''); array_get($supplier, 'has_certification', ''), '');
$supplier['sku_tag_name'] = array_get(config('field.SkuTag'), $supplier['sku_tag'], '无'); $supplier['sku_tag_name'] = array_get(config('field.SkuTag'), array_get($supplier,'sku_tag',''), '无');
$supplier['sku_mode_name'] = array_get(config('field.SkuMode'), $supplier['sku_mode'], '无'); $supplier['sku_mode_name'] = array_get(config('field.SkuMode'), array_get($supplier,'sku_mode',''), '无');
return $supplier; return $supplier;
} }
...@@ -174,7 +176,7 @@ class SupplierTransformer ...@@ -174,7 +176,7 @@ class SupplierTransformer
$brandNames = ''; $brandNames = '';
foreach ($brands as $brand) { foreach ($brands as $brand) {
$brand = json_decode($brand, true); $brand = json_decode($brand, true);
$brandNames = $brandNames .' | '. $brand['brand_name']; $brandNames = $brandNames . ' | ' . $brand['brand_name'];
} }
return $brandNames; return $brandNames;
} }
......
app/Model/SupplierPayTypeModel.php 0 → 100644
<?php
namespace App\Model;
use Illuminate\Database\Eloquent\Model;
class SupplierPayTypeModel extends Model
{
protected $connection='web';
protected $table='supplier_pay_type';
protected $primaryKey = 'id';
public $timestamps = false;
}
app/Presenters/StatusPresenter.php
...@@ -11,6 +11,8 @@ class StatusPresenter ...@@ -11,6 +11,8 @@ class StatusPresenter
$isRequired = array_get($option, 'required', false); $isRequired = array_get($option, 'required', false);
$isDisable = array_get($option, 'disable') === true ? 'disabled' : ''; $isDisable = array_get($option, 'disable') === true ? 'disabled' : '';
$width = array_get($option, 'width', 'auto'); $width = array_get($option, 'width', 'auto');
$noName = array_get($option, 'noName');
$name = $noName ? '' : $name;
$requiredHtml = $isRequired ? '<span class="require">*</span>' : ""; $requiredHtml = $isRequired ? '<span class="require">*</span>' : "";
$html = <<<EOF $html = <<<EOF
<label class="layui-form-label"> <label class="layui-form-label">
......
config/fixed.php
...@@ -86,11 +86,15 @@ return [ ...@@ -86,11 +86,15 @@ return [
], ],
'SupplierPayType' => [ 'SupplierPayType' => [
1 => '账期-周期结算', //全款
2 => '账期-定期结算', 3 => '预付款',
3 => '全款', //账期-周期结算
4 => '定金' 1 => '账期',
//账期-定期结算
2 => '货到付款',
// 4 => '定金'
], ],
'SupplierApiType' => [ 'SupplierApiType' => [
1 => 'API', 1 => 'API',
2 => 'FTP', 2 => 'FTP',
......
resources/views/script/UpdateSupplierScript.blade.php
...@@ -2,11 +2,7 @@ ...@@ -2,11 +2,7 @@
layui.use(['table', 'form', 'element', 'layer', 'admin', 'index', 'laydate', 'xmSelect'], function () { layui.use(['table', 'form', 'element', 'layer', 'admin', 'index', 'laydate', 'xmSelect'], function () {
let admin = layui.admin; let admin = layui.admin;
let form = layui.form; let form = layui.form;
let layDate = layui.laydate;
let table = layui.table; let table = layui.table;
let index = layui.index;
let element = layui.element;
let xmSelect = layui.xmSelect;
$('#supplierDetailUrl').click(function () { $('#supplierDetailUrl').click(function () {
layer.load(1); layer.load(1);
...@@ -24,8 +20,6 @@ ...@@ -24,8 +20,6 @@
confirmMessage = '确定要修改供应商信息吗?<br>一旦修改关键字段,该供应商就会再次进入<b>待审核</b>状态,需要去列表页<b>提交申请审核</b>,送至主管审核'; confirmMessage = '确定要修改供应商信息吗?<br>一旦修改关键字段,该供应商就会再次进入<b>待审核</b>状态,需要去列表页<b>提交申请审核</b>,送至主管审核';
} }
layer.confirm(confirmMessage, function (index) { layer.confirm(confirmMessage, function (index) {
// debugger
let layerIndex = layer.load();
let res = ajax('/api/supplier/UpdateSupplier', data.field); let res = ajax('/api/supplier/UpdateSupplier', data.field);
if (res.err_code === 0) { if (res.err_code === 0) {
admin.putTempData("needFreshList", 1) admin.putTempData("needFreshList", 1)
......
resources/views/script/supplier/SupplierPayTypeScript.blade.php 0 → 100644
<script>
layui.use(['table', 'form', 'element', 'layer', 'admin'], function () {
let admin = layui.admin;
let form = layui.form;
//要根据付款类型的不同选项,切换不同的显示
form.on('select(pay_type[])', function (data) {
const payType = data.value;
$('.pay_type_' + payType + '_div').show();
if (payType === '1') {
$('.pay_type_2_div').hide();
$('.pay_type_3_div').hide();
form.render('select');
}
if (payType === '2') {
$('.pay_type_1_div').hide();
$('.pay_type_3_div').hide();
form.render('select');
}
if (payType === '3') {
$('.pay_type_1_div').hide();
$('.pay_type_2_div').hide();
form.render('select');
}
});
form.on('select(pay_type_3_type)', function (data) {
const value = data.value;
let parentDiv = $(this).parents('.pay_type_3_div');
if (value === '首款比例') {
parentDiv.find('.temp').text('%')
}
if (value === '首款金额') {
parentDiv.find('.temp').text('RMB')
}
});
$(document).on('click', '.delete_pay_type', function () {
let count = $('.pay_type_div').size();
if (count <= 1) {
layer.msg('至少要保留一个付款方式', {icon: 5});
return;
}
$(this).parents('.pay_type_div').remove();
});
$(document).on('click', '.add_pay_type', function () {
$('#pay_type_div_list').append($('#pay_type_template').html());
form.render('select');
});
});
</script>
\ No newline at end of file
resources/views/web/UpdateSupplier.blade.php
...@@ -149,14 +149,11 @@ ...@@ -149,14 +149,11 @@
</div> </div>
</div> </div>
<div class="layui-col-md3"> <div class="layui-col-md3">
<div class="layui-inline">
@inject('statusPresenter','App\Presenters\StatusPresenter')
{!! $statusPresenter->render('pay_type','付款方式 : ',
isset($supplier)?$supplier['pay_type']:'',config('fixed.SupplierPayType'),['required'=>false]) !!}
</div>
</div> </div>
</div> </div>
<hr/> <hr/>
@include('web.supplier.SupplierPayType')
<hr/>
<blockquote class="layui-elem-quote layui-text"> <blockquote class="layui-elem-quote layui-text">
<b>财务信息</b> <b>财务信息</b>
</blockquote> </blockquote>
......
resources/views/web/supplier/SupplierPayType.blade.php 0 → 100644
<blockquote class="layui-elem-quote layui-text">
<b>付款方式</b>
</blockquote>
@if (empty($supplier['pay_type_list']))
<script>
$(document).ready(function () {
$('#pay_type_div_list').append($('#pay_type_template').html());
});
</script>
@endif
<div id="pay_type_div_list">
@if (!empty($supplier['pay_type_list']))
@foreach($supplier['pay_type_list'] as $payType)
<div class="layui-row pay_type_div" style="margin-bottom: 10px;">
<div class="layui-col-md2">
<div class="layui-inline">
@inject('statusPresenter','App\Presenters\StatusPresenter')
{!! $statusPresenter->render('pay_type[]','付款方式 : ',
$payType['pay_type'],config('fixed.SupplierPayType'),['required'=>false]) !!}
</div>
</div>
<input type="hidden" name="pay_type_extra">
<div class="layui-col-md10" style="width:500px;margin-bottom: 3px;">
<div class="layui-row">
@if ($payType['pay_type']==1)
<div class="pay_type_1_div">
<div class="layui-row" style="padding-left:80px">
月结&nbsp
<div class="layui-input-inline" style="width: 50px;">
<input class="layui-input" type="text" name="">
</div>
&nbsp天
</div>
</div>
@endif
@if ($payType['pay_type']==2)
<div class="pay_type_2_div">
</div>
@endif
@if ($payType['pay_type']==3)
<div class="pay_type_3_div">
<div class="layui-col-md3">
<label class="layui-form-label" style="margin-bottom: 5px">
<span class="require">*</span>首款要求 :
</label>
</div>
<div class="layui-col-md3" style="margin-left: -15px">
<div class="layui-input-inline" style="width: 100px">
<select lay-filter="pay_type_3_type">
<option value="首款比例"
@if (!empty($payType['pay_type_extra'])&&strpos($payType['pay_type_extra'],'%')!==false)
selected='selected'
@endif>首款比例
</option>
<option value="首款金额"
@if (!empty($payType['pay_type_extra'])&&strpos($payType['pay_type_extra'],'RMB')!==false)
selected='selected'
@endif>首款金额
</option>
</select>
</div>
</div>
<div class="layui-col-md6">
<div class="layui-input-inline" style="width: 100px;margin-left: -20px;">
<input class="layui-input" type="text" value="{{$payType['pay_type_value']}}" name="">
</div>
&nbsp
@if (!empty($payType['pay_type_extra'])&&strpos($payType['pay_type_extra'],'%')!==false)
<span class="temp">%</span>
@elseif (!empty($payType['pay_type_extra'])&&strpos($payType['pay_type_extra'],'RMB')!==false)
<span class="temp">RMB</span>
@else
<span class="temp">%</span>
@endif
</div>
</div>
@endif
{{-- <div style="float: left">--}}
{{-- <button type="button" class="layui-btn layui-btn-danger layui-btn-sm delete_pay_type">删除--}}
{{-- </button>--}}
{{-- <button type="button" class="layui-btn layui-btn-sm add_pay_type">新增</button>--}}
{{-- </div>--}}
</div>
</div>
</div>
@endforeach
@endif
</div>
<template id="pay_type_template">
<div class="layui-row pay_type_div" style="margin-bottom: 10px;">
<div class="layui-col-md2">
<div class="layui-inline">
@inject('statusPresenter','App\Presenters\StatusPresenter')
{!! $statusPresenter->render('pay_type[]','付款方式 : ',
isset($supplier['pay_type[]'])?$supplier['pay_type[]']:'',config('fixed.SupplierPayType'),['required'=>false]) !!}
</div>
</div>
<input type="hidden" name="pay_type_extra">
<div class="layui-col-md10" style="width:500px;margin-bottom: 3px;">
<div class="layui-row">
<div class="pay_type_3_div" style="display: none">
<div class="layui-col-md3">
<label class="layui-form-label" style="margin-bottom: 5px">
<span class="require">*</span>首款要求 :
</label>
</div>
<div class="layui-col-md3" style="margin-left: -15px">
<div class="layui-input-inline" style="width: 100px">
<select lay-filter="pay_type_3_type">
<option value="首款比例">首款比例</option>
<option value="首款金额">首款金额</option>
</select>
</div>
</div>
<div class="layui-col-md6">
<div class="layui-input-inline" style="width: 100px;margin-left: -20px;">
<input class="layui-input" type="text" name="">
</div>
&nbsp<span class="temp">%</span>
</div>
</div>
<div class="pay_type_1_div" style="display: none">
<div class="layui-row" style="padding-left:80px">
月结&nbsp
<div class="layui-input-inline" style="width: 50px;">
<input class="layui-input" type="text" name="">
</div>
&nbsp天
</div>
</div>
<div class="pay_type_2_div" style="display: none">
</div>
<div style="float: left">
<button type="button" class="layui-btn layui-btn-danger layui-btn-sm delete_pay_type">删除</button>
<button type="button" class="layui-btn layui-btn-sm add_pay_type">新增</button>
</div>
</div>
</div>
</div>
</template>
@include('script.supplier.SupplierPayTypeScript')
storage/app/.gitignore 100644 → 100755
File mode changed
storage/app/public/.gitignore 100644 → 100755
File mode changed
storage/framework/.gitignore 100644 → 100755
File mode changed
storage/logs/.gitignore 100644 → 100755
File mode changed
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