Skip to content

杨树贤 / liexin_supplier

Go to a project
Commit 1c64b640 by 杨树贤
Options

增删改查逻辑

parent 734dceb1
Inline Side-by-side
Showing with 145 additions and 146 deletions
app/Http/Controllers/Api/PurchaseRemarkApiController.php
...@@ -5,12 +5,9 @@ namespace App\Http\Controllers\Api; ...@@ -5,12 +5,9 @@ namespace App\Http\Controllers\Api;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Http\Services\LogService; use App\Http\Services\LogService;
use App\Http\Services\PurchaseRemarkService; use App\Http\Services\PurchaseRemarkService;
use App\Http\Services\SupplierAuditService;
use App\Http\Transformers\PurchaseRemarkTransformer; use App\Http\Transformers\PurchaseRemarkTransformer;
use App\Http\Validators\PurchaseRemarkValidator;
use App\Model\LogModel; use App\Model\LogModel;
use App\Model\PurchaseRemarksModel; use App\Model\PurchaseRemarkModel;
use App\Model\SupplierChannelModel;
use Illuminate\Http\Request; use Illuminate\Http\Request;
class PurchaseRemarkApiController extends Controller class PurchaseRemarkApiController extends Controller
...@@ -25,9 +22,9 @@ class PurchaseRemarkApiController extends Controller ...@@ -25,9 +22,9 @@ class PurchaseRemarkApiController extends Controller
{ {
$supplierId = $request->get('supplier_id'); $supplierId = $request->get('supplier_id');
$limit = $request->get('limit', 10); $limit = $request->get('limit', 10);
$model = new PurchaseRemarksModel(); $model = new PurchaseRemarkModel();
$model->where('supplier_id', $supplierId)->paginate(); $model->where('supplier_id', $supplierId)->paginate();
$list = $model->where('supplier_id', $supplierId)->orderBy('attachment_id', 'desc') $list = $model->where('supplier_id', $supplierId)->orderBy('id', 'desc')
->paginate($limit)->toArray(); ->paginate($limit)->toArray();
$transformer = new PurchaseRemarkTransformer(); $transformer = new PurchaseRemarkTransformer();
$list['data'] = $transformer->transformList($list['data']); $list['data'] = $transformer->transformList($list['data']);
...@@ -37,73 +34,61 @@ class PurchaseRemarkApiController extends Controller ...@@ -37,73 +34,61 @@ class PurchaseRemarkApiController extends Controller
//保存附件信息 //保存附件信息
public function SavePurchaseRemark($request) public function SavePurchaseRemark($request)
{ {
//先去表单验证
$validator = new PurchaseRemarkValidator(); $id = $request->input('id');
$validateResult = $validator->checkSave($request); $participateContent = $request->input('participate_content');
if ($validateResult) { $startTime = $request->input('start_time');
$this->response(-1, $validateResult); $endTime = $request->input('end_time');
$supplierId = $request->input('supplier_id');
$remark = $request->input('remark');
if (!$supplierId) {
$this->response(-1,'供应商id不能为空');
} }
$attachment = $request->only([ if (!$participateContent) {
'field_name', $this->response(-1,'参与内容不能为空');
'validity_type', }
'validity_period', if (!$startTime || !$endTime) {
'description', $this->response(-1,'开始和结束时间都不能为空');
'file_name', }
'file_url',
if (!$remark) {
$this->response(-1,'备注内容不能为空');
}
$remark = $request->only([
'id',
'supplier_id', 'supplier_id',
'attachment_id', 'participate_content',
'start_time',
'end_time',
'description',
'remark',
]); ]);
$attachmentService = new PurchaseRemarkService(); $remarkService = new PurchaseRemarkService();
$supplierId = $attachmentService->saveAttachment($attachment); $result = $remarkService->savePurchaseRemark($id,$remark);
if (!$supplierId) { if (!$result) {
$this->response(-1, '操作失败'); $this->response(-1, '操作失败');
} else { } else {
$canIgnoreAudit = (new SupplierAuditService())->checkCanIgnoreSupplierAudit($supplierId);
if (!$canIgnoreAudit) {
SupplierChannelModel::where('supplier_id', $supplierId)->update([
'update_time' => time(),
'status' => SupplierChannelModel::STATUS_PENDING,
]);
}
$logService = new LogService(); $logService = new LogService();
$content = !empty($attachment['attachment_id']) ? '修改附件信息' : '添加附件信息'; $content = !empty($remark['id']) ? '修改采购备注' : '添加采购备注';
$remark = json_encode($attachment); $remark = json_encode($remark);
$logService->AddLog($attachment['supplier_id'], LogModel::UPDATE_OPERATE, '修改供应商基本资料', $content, $remark); $logService->AddLog($remark['supplier_id'], LogModel::UPDATE_OPERATE, $content, $content, $remark);
$this->response(0, '保存成功'); $this->response(0, '保存成功');
} }
} }
//判断是否要进入审核中状态,因为部分字段修改是不需要走审核的
private function checkNeedAudit($oldAttachment, $newAttachment)
{
$notNeedAuditField = [
'remark',
];
$diff = array_diff($oldAttachment, $newAttachment);
unset($diff['update_time']);
$changeField = array_keys($diff);
foreach ($changeField as $filed) {
//只要有一个不存在于不需要审核的字段,就返回需要审核
if (!in_array($filed, $notNeedAuditField)) {
return true;
}
}
return false;
}
//删除 //删除
public function DeletePurchaseRemark($request) public function DeletePurchaseRemark($request)
{ {
$attachmentId = $request->get('attachment_id'); $id = $request->get('id');
$model = new PurchaseRemarksModel(); $model = new PurchaseRemarkModel();
$attachment = $model->where('attachment_id', $attachmentId)->first()->toArray(); $remark = $model->where('id', $id)->first()->toArray();
$result = $model->where('attachment_id', $attachmentId)->delete(); $result = $model->where('id', $id)->delete();
if ($result) { if ($result) {
$logService = new LogService(); $logService = new LogService();
$content = "删除附件信息 : " . $attachment['type_name']; $content = "删除采购备注";
$remark = json_encode($attachment); $logService->AddLog($remark['supplier_id'], LogModel::UPDATE_OPERATE, '删除采购备注', $content);
$logService->AddLog($attachment['supplier_id'], LogModel::UPDATE_OPERATE, '删除附件信息', $content, $remark);
$this->response(0, '操作成功'); $this->response(0, '操作成功');
} }
$this->response(-1, '操作失败'); $this->response(-1, '操作失败');
......
app/Http/Controllers/PurchaseRemarkController.php
...@@ -2,16 +2,8 @@ ...@@ -2,16 +2,8 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\Http\Services\RoleService;
use App\Http\Services\SupplierContactService;
use App\Http\Services\SupplierService;
use App\Http\Services\SupplierStatisticsService;
use App\Http\Services\ViewCheckService;
use App\Model\IntracodeModel;
use App\Model\PurchaseRemarkModel; use App\Model\PurchaseRemarkModel;
use App\Model\SupplierChannelModel;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
class PurchaseRemarkController extends Controller class PurchaseRemarkController extends Controller
{ {
...@@ -42,29 +34,17 @@ class PurchaseRemarkController extends Controller ...@@ -42,29 +34,17 @@ class PurchaseRemarkController extends Controller
} }
//供应商详情 //保存采购备注
public function AddPurchaseRemark($request) public function SavePurchaseRemark($request)
{ {
$this->data['title'] = '添加附件'; $id = $request->get('id');
return $this->view('添加附件'); if (!empty($id)) {
} $model = new PurchaseRemarkModel();
$remark = $model->where('id', $id)->first()->toArray();
//供应商详情 $this->data['remark'] = $remark;
public function UpdatePurchaseRemark($request)
{
$attachmentId = $request->get('attachment_id');
if (!empty($attachmentId)) {
$model = new PurchaseRemarksModel();
$attachment = $model->where('attachment_id', $attachmentId)->first()->toArray();
$attachment['validity_period'] = $attachment['validity_start'] ? date('Y-m-d',
$attachment['validity_start']) . '~' . date('Y-m-d', $attachment['validity_start']) : '';
$this->data['attachment'] = $attachment;
} }
$this->data['title'] = '修改附件'; $this->data['title'] = '保存采购备注';
$this->data['view'] = 'AddPurchaseRemark'; $this->data['view'] = 'SavePurchaseRemark';
return $this->view('修改附件'); return $this->view('保存采购备注');
} }
} }
\ No newline at end of file
app/Http/Services/PurchaseRemarkService.php
...@@ -4,44 +4,23 @@ ...@@ -4,44 +4,23 @@
namespace App\Http\Services; namespace App\Http\Services;
//后台用户相关信息服务
use App\Model\PurchaseRemarkModel; use App\Model\PurchaseRemarkModel;
//用于判断是否已经查看的服务 //采购备注服务
class PurchaseRemarkService class PurchaseRemarkService
{ {
public function getPurchaseRemark($supplierId) public function savePurchaseRemark($remarkId,$remark)
{ {
$remakeModel = new PurchaseRemarkModel(); $remarkModel = new PurchaseRemarkModel();
return $remakeModel->where('supplier_id', $supplierId)->get()->toArray(); if (empty($remarkId)) {
} $remark['create_uid'] = request()->user->userId;
$remark['create_name'] = request()->user->name;
public function savePurchaseRemark($remake) $remark['create_time'] = time();
{ return $remarkModel->insertGetId($remark);
if ($remake['validity_period']) {
$validityPeriod = explode('~', $remake['validity_period']);
$remake['validity_start'] = strtotime(trim($validityPeriod[0]));
$remake['validity_end'] = strtotime(trim($validityPeriod[1]));
}
if ($remake['validity_type'] == 1) {
$remake['validity_start'] = $remake['validity_end'] = 0;
}
$remake['type_name'] = array_get(config('fixed.FileNameMapping'), $remake['field_name']);
unset($remake['validity_period']);
$remakeId = $remake['attachment_id'];
if (empty($remake['description'])) {
unset($remake['description']);
}
$remakeModel = new PurchaseRemarkModel();
if (empty($remakeId)) {
$remake['create_uid'] = request()->user->userId;
$remake['create_name'] = request()->user->name;
$remake['create_time'] = time();
return $remakeModel->insertGetId($remake);
} else { } else {
$remake['update_time'] = time(); $remark['update_time'] = time();
return $remakeModel->where('attachment_id', $remakeId)->update($remake)?$remake['supplier_id']:0; return $remarkModel->where('id', $remarkId)->update($remark)?$remarkId:0;
} }
} }
......
app/Http/Transformers/PurchaseRemarkTransformer.php
...@@ -17,6 +17,7 @@ class PurchaseRemarkTransformer ...@@ -17,6 +17,7 @@ class PurchaseRemarkTransformer
if (!$remark) { if (!$remark) {
continue; continue;
} }
$remark['participate_type_name'] = array_get(config('field.PurchaseRemarkParticipateType'), $remark['participate_type'],'无');
$remark['create_time'] = $remark['create_time'] ? date('Y-m-d H:i:s', $remark['create_time'] = $remark['create_time'] ? date('Y-m-d H:i:s',
$remark['create_time']) : ''; $remark['create_time']) : '';
$remark['update_time'] = $remark['update_time'] ? date('Y-m-d H:i:s', $remark['update_time'] = $remark['update_time'] ? date('Y-m-d H:i:s',
......
app/Http/routes.php
...@@ -30,6 +30,7 @@ Route::group(['middleware' => ['web', 'menu']], function () { ...@@ -30,6 +30,7 @@ Route::group(['middleware' => ['web', 'menu']], function () {
Route::match(['get', 'post'], '/sku/{key}', 'SkuController@Entrance'); Route::match(['get', 'post'], '/sku/{key}', 'SkuController@Entrance');
Route::match(['get', 'post'], '/log/{key}', 'LogController@Entrance'); Route::match(['get', 'post'], '/log/{key}', 'LogController@Entrance');
Route::match(['get', 'post'], '/supplier_apply/{key}', 'SupplierApplyController@info'); Route::match(['get', 'post'], '/supplier_apply/{key}', 'SupplierApplyController@info');
Route::match(['get', 'post'], '/purchase_remark/{key}', 'PurchaseRemarkController@info');
}); });
Route::group(['middleware' => ['web'], 'namespace' => 'Api'], function () { Route::group(['middleware' => ['web'], 'namespace' => 'Api'], function () {
...@@ -50,6 +51,7 @@ Route::group(['middleware' => ['web'], 'namespace' => 'Api'], function () { ...@@ -50,6 +51,7 @@ Route::group(['middleware' => ['web'], 'namespace' => 'Api'], function () {
Route::match(['get', 'post'], '/api/supplier_examination/{key}', 'SupplierExaminationApiController@Entrance'); Route::match(['get', 'post'], '/api/supplier_examination/{key}', 'SupplierExaminationApiController@Entrance');
Route::match(['get', 'post'], '/api/sku_upload_log/{key}', 'SkuUploadLogApiController@Entrance'); Route::match(['get', 'post'], '/api/sku_upload_log/{key}', 'SkuUploadLogApiController@Entrance');
Route::match(['get', 'post'], '/api/supplier_apply/{key}', 'SupplierApplyApiController@Entrance'); Route::match(['get', 'post'], '/api/supplier_apply/{key}', 'SupplierApplyApiController@Entrance');
Route::match(['get', 'post'], '/api/purchase_remark/{key}', 'PurchaseRemarkApiController@Entrance');
//单独的统计接口 //单独的统计接口
Route::match(['get', 'post'], '/statisticsSkuNumber', function () { Route::match(['get', 'post'], '/statisticsSkuNumber', function () {
(new \App\Http\Services\DataService())->statisticsSkuNumber(); (new \App\Http\Services\DataService())->statisticsSkuNumber();
......
config/field.php
...@@ -249,4 +249,11 @@ return [ ...@@ -249,4 +249,11 @@ return [
3 => 5, 3 => 5,
0 => 5, 0 => 5,
], ],
//采购备注参与类型
'PurchaseRemarkParticipateType' => [
1 => '全渠道参与',
2 => '型号',
3 => '品牌',
],
]; ];
\ No newline at end of file
resources/views/script/SavePurchaseRemarkScript.blade.php 0 → 100644
<script>
layui.use(['table', 'form', 'element', 'table', 'layer', 'admin', 'xmSelect'], function () {
let admin = layui.admin;
let form = layui.form;
let element = layui.element;
let xmSelect = layui.xmSelect;
form.on('submit(savePurchaseRemark)', function (data) {
let url = '/api/purchase_remark/SavePurchaseRemark';
let res = ajax(url, data.field);
if (!res) {
layer.msg('网络错误，请重试', {icon: 6});
} else {
if (res.err_code === 0) {
admin.closeThisDialog();
parent.layer.msg(res.err_msg, {icon: 6});
} else {
parent.layer.msg(res.err_msg, {icon: 5});
}
}
return false;
});
form.on('submit(cancel)', function (data) {
admin.closeThisDialog();
});
form.on('submit(delete)', function (data) {
layer.confirm('确定要删除该条采购备注吗?', function (index) {
let id = data[0].id;
let res = ajax('/api/purchase_remark/DeletePurchaseRemark', {id: id})
if (res.err_code === 0) {
layer.msg(res.err_msg, {icon: 6})
setTimeout(function () {
admin.closeThisDialog();
},1000);
} else {
layer.msg(res.err_msg, {icon: 5})
}
});
});
});
</script>
\ No newline at end of file
resources/views/script/supplier/SupplierRulerScript.blade.php
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
layui.use(['table', 'form', 'element', 'layer', 'admin', 'laydate', 'xmSelect'], function () { layui.use(['table', 'form', 'element', 'layer', 'admin', 'laydate', 'xmSelect'], function () {
let admin = layui.admin; let admin = layui.admin;
let form = layui.form; let form = layui.form;
let table = layui.table;
let layDate = layui.laydate; let layDate = layui.laydate;
let element = layui.element; let element = layui.element;
let xmSelect = layui.xmSelect; let xmSelect = layui.xmSelect;
...@@ -135,7 +136,7 @@ ...@@ -135,7 +136,7 @@
cols: [[ cols: [[
{field: 'participate_type_name', title: '参与类型', align: 'center', width: 140}, {field: 'participate_type_name', title: '参与类型', align: 'center', width: 140},
{field: 'participate_content', title: '传真', align: 'center', width: 140}, {field: 'participate_content', title: '传真', align: 'center', width: 140},
{field: 'duration', title: '开始时间 - 截至时间', align: 'center', width: 200}, {field: 'duration', title: '开始时间 - 截至时间', align: 'center', width: 300},
{field: 'remark', title: '备注内容', align: 'center'}, {field: 'remark', title: '备注内容', align: 'center'},
]], ]],
id: 'purchaseRemarkList', id: 'purchaseRemarkList',
...@@ -143,11 +144,11 @@ ...@@ -143,11 +144,11 @@
}); });
//新增联系方式 //新增联系方式
$("#add_purchase_remark").click(function () { $("#savePurchaserRemark").click(function () {
let supplierId = getQueryVariable('supplier_id'); let supplierId = getQueryVariable('supplier_id');
layer.open({ layer.open({
type: 2, type: 2,
content: '/purchase_remark/AddPurchaseRemark?view=iframe&supplier_id=' + supplierId, content: '/purchase_remark/SavePurchaseRemark?view=iframe&supplier_id=' + supplierId,
area: ['600px', '525px'], area: ['600px', '525px'],
title: '新增采购备注', title: '新增采购备注',
end: function () { // 监听弹窗关闭 end: function () { // 监听弹窗关闭
......
resources/views/web/SavePurchaseRemark.blade.php 0 → 100644
<style>
.layui-form-item {
margin-bottom: 5px;
}
</style>
<div class="layui-card">
<div class="layui-card-body">
<form class="layui-form" action="">
<div class="layui-form-item">
@inject('singleSelectPresenter','App\Presenters\SingleSelectPresenter')
{!! $singleSelectPresenter->render('participate_type','参与类型 :',!empty($remark)?$remark['participate_type']:1,config('field.PurchaseRemarkParticipateType'),['required'=>true]) !!}
</div>
<div class="layui-form-item">
<div align="center" style="margin-top: 20px">
<button type="button" class="layui-btn layui-btn-info submit-loading" lay-submit lay-filter="load">确认</button>
<button type="button" class="layui-btn layui-btn-primary" lay-filter="cancel">关闭</button>
<button type="button" class="layui-btn layui-btn-danger" lay-filter="delete">删除</button>
</div>
</div>
</form>
</div>
</div>
\ No newline at end of file
resources/views/web/supplier/SupplierRuler.blade.php
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<b>采购备注<span style="color: orange;margin-left: 10px">PS：设置后的备注信息，将会应用在【询报价系统】供销售看到；</span></b> <b>采购备注<span style="color: orange;margin-left: 10px">PS：设置后的备注信息，将会应用在【询报价系统】供销售看到；</span></b>
</blockquote> </blockquote>
<div class="layui-form-item"> <div class="layui-form-item">
<button class="layui-btn layui-btn-sm" id="addPurchaserRemark">添加备注</button> <button class="layui-btn layui-btn-sm" type="button" id="savePurchaserRemark">添加备注</button>
<table class="layui-table" lay-filter="purchaseRemarkList" id="purchaseRemarkList"></table> <table class="layui-table" lay-filter="purchaseRemarkList" id="purchaseRemarkList"></table>
</div> </div>
...@@ -76,28 +76,7 @@ ...@@ -76,28 +76,7 @@
<div style="margin-bottom: 300px"></div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">商品总价不满</label>
<div class="layui-input-inline" style="width: 100px;">
<input class="layui-input" type="text" name="cn[max]" id="cn_max"
value="{{$supplier['extra_fee']['cn']['max'] or ''}}"
lay-verify="num">
</div>
<div class="layui-form-label" style="width: 100px;margin-left: -20px">元（人民币）,收取</div>
<div class="layui-input-inline" style="width: 100px;">
<input class="layui-input" type="text" name="cn[price]"
value="{{$supplier['extra_fee']['cn']['price'] or ''}}"
lay-verify="float" value="">
</div>
<div class="layui-form-label" style="width: 40px;margin-left: -20px">元运费</div>
<div class="layui-input-inline" style="width: 100px;">
<input type="checkbox" title="全渠道收费" lay-skin="primary" lay-filter="cn_filter">
</div>
</div>
</div>
<blockquote class="layui-elem-quote layui-text"> <blockquote class="layui-elem-quote layui-text">
<b>采购附加费设置</b> <b>采购附加费设置</b>
...@@ -142,7 +121,6 @@ ...@@ -142,7 +121,6 @@
</div> </div>
</div> </div>
</div> </div>
<blockquote class="layui-elem-quote layui-text"> <blockquote class="layui-elem-quote layui-text">
<b>采购价格系数调整</b> <b>采购价格系数调整</b>
</blockquote> </blockquote>
......
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