Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 4f18777e by 朱继来
Options

Merge branch 'zjl_erp_syn_20190514' into development

parents 576af68a 29a9b7d9
Inline Side-by-side
Showing with 268 additions and 210 deletions
app/Http/Controllers/OrderController.php
...@@ -1567,6 +1567,27 @@ Class OrderController extends Controller ...@@ -1567,6 +1567,27 @@ Class OrderController extends Controller
} }
} }
// 编辑合同乙方信息
public function editContract(Request $request)
{
if ($request->isMethod('post')) {
$order_id = $request->input('order_id', '');
$data['contract_com_name'] = $request->input('contract_com_name', '');
$data['contract_com_addr'] = $request->input('contract_com_addr', '');
$data['contract_link_name'] = $request->input('contract_link_name', '');
$data['contract_link_tel'] = $request->input('contract_link_tel', '');
DB::connection('order')->transaction(function() use ($request, $order_id, $data) {
DB::connection('order')->table('lie_order_extend')->where('order_id', $order_id)->update($data);
$OrderActionLogModel = new OrderActionLogModel();
$OrderActionLogModel->addLog($order_id, $request->user->userId, 2, '编辑合同乙方信息'); // 操作记录
});
return ['errcode'=>0, 'errmsg'=>'编辑合同成功'];
}
}
public function tempCount(Request $request) public function tempCount(Request $request)
{ {
$current = strtotime(date('Y-m-d', time())); // 当天0点 $current = strtotime(date('Y-m-d', time())); // 当天0点
......
app/Http/routes.php
...@@ -122,6 +122,7 @@ Route::group(['middleware' => 'web'], function () { ...@@ -122,6 +122,7 @@ Route::group(['middleware' => 'web'], function () {
Route::get('/refund_self_export', 'RefundController@refundSelfExport'); Route::get('/refund_self_export', 'RefundController@refundSelfExport');
Route::post('/ajax/offlinePaid', 'OrderController@offlinePaid'); Route::post('/ajax/offlinePaid', 'OrderController@offlinePaid');
Route::post('/ajax/editContract', 'OrderController@editContract');
}); });
// 不需要登陆态 // 不需要登陆态
......
app/Model/OrderModel.php
...@@ -264,9 +264,9 @@ class OrderModel extends Model ...@@ -264,9 +264,9 @@ class OrderModel extends Model
// 标题 // 标题
if ($map['order_goods_type'] == 1) { if ($map['order_goods_type'] == 1) {
$headerCell = ['订单ID', '订单编号', '会员账号', '是否为新订单', '收货人', '下单日期', '下单时间', '客户名称', '平台来源', '商品型号', '制造商', '供应商', '数量', '单价', '均摊后单价', '商品小计', '币种', $sale_name, '商品总额', '运费', '附加费', '优惠券', '订单总额', '订单类型', '订单状态', '发货状态', '收货地址', '发票类型', '发票状态', '发票抬头', '公司注册地址', '公司电话', 'adtags来源', '新用户来源', '取消原因', '推送备注', '是否为测试订单']; $headerCell = ['订单ID', '订单编号', '会员账号', '是否为新订单', '收货人', '下单日期', '下单时间', '客户名称', '平台来源', '商品型号', '制造商', '供应商', '数量', '单价', '均摊后单价', '商品小计', '币种', $sale_name, '商品总额', '运费', '附加费', '优惠券', '订单总额', '付款类型', '订单状态', '发货状态', '收货地址', '发票类型', '发票状态', '发票抬头', '公司注册地址', '公司电话', 'adtags来源', '新用户来源', '取消原因', '推送备注', '是否为测试订单'];
} else { } else {
$headerCell = ['订单ID', '订单编号', '销售类型', '业务类型', '会员账号', '收货人', '下单日期', '下单时间', '客户名称', '平台来源', '商品型号', '制造商', '供应商', '数量', '单价', '均摊后单价', '商品小计', '币种', $sale_name, '商品总额', '运费', '附加费', '优惠券', '订单总额', '订单类型', '订单状态', '发货状态', '收货地址', '发票类型', '发票状态', '发票抬头', '公司注册地址', '公司电话', 'adtags来源', '新用户来源', '取消原因', '推送备注', '是否为测试订单']; $headerCell = ['订单ID', '订单编号', '销售类型', '业务类型', '会员账号', '收货人', '下单日期', '下单时间', '客户名称', '平台来源', '商品型号', '制造商', '供应商', '数量', '单价', '均摊后单价', '商品小计', '币种', $sale_name, '商品总额', '运费', '附加费', '优惠券', '订单总额', '付款类型', '订单状态', '发货状态', '收货地址', '发票类型', '发票状态', '发票抬头', '公司注册地址', '公司电话', 'adtags来源', '新用户来源', '取消原因', '推送备注', '是否为测试订单'];
} }
array_unshift($cellData, $headerCell); array_unshift($cellData, $headerCell);
...@@ -290,25 +290,6 @@ class OrderModel extends Model ...@@ -290,25 +290,6 @@ class OrderModel extends Model
*/ */
public function exportList($order) public function exportList($order)
{ {
// 订单类型
$order_type = array(
'1' => '全款',
'2' => '预付款',
'3' => '账期支付',
);
// 订单状态
$order_status = array(
'-1' => '已取消',
'1' => '待审核',
'2' => '待付款',
'3' => '待付尾款',
'4' => '待发货',
'7' => '部分发货',
'8' => '待收货',
'10' => '交易成功',
);
// 订单发货状态 // 订单发货状态
$shipping_status = array( $shipping_status = array(
'-1' => '未配送', '-1' => '未配送',
...@@ -393,8 +374,8 @@ class OrderModel extends Model ...@@ -393,8 +374,8 @@ class OrderModel extends Model
$tmp[$i]['order_amount'] = $order[$i]['order_amount']; $tmp[$i]['order_amount'] = $order[$i]['order_amount'];
} }
$tmp[$i]['order_type'] = !empty($order[$i]['order_pay_type']) ? $order_type[$order[$i]['order_pay_type']] : '未知'; $tmp[$i]['order_type'] = !empty($order[$i]['order_pay_type']) ? Config('params.order_pay_type')[$order[$i]['order_pay_type']] : '未知';
$tmp[$i]['order_status'] = !empty($order[$i]['status']) ? $order_status[$order[$i]['status']] : '未知'; $tmp[$i]['order_status'] = !empty($order[$i]['status']) ? Config('params.order_status')[$order[$i]['status']] : '未知';
$tmp[$i]['shipping_status'] = !empty($order[$i]['shipping_status']) ? $shipping_status[$order[$i]['shipping_status']] : '无发货信息'; // 发货状态 $tmp[$i]['shipping_status'] = !empty($order[$i]['shipping_status']) ? $shipping_status[$order[$i]['shipping_status']] : '无发货信息'; // 发货状态
$tmp[$i]['address'] = $order[$i]['address']; $tmp[$i]['address'] = $order[$i]['address'];
$tmp[$i]['inv_type'] = $order[$i]['inv_type'] ? $inv_type[$order[$i]['inv_type']] : '未知'; // 发票类型 $tmp[$i]['inv_type'] = $order[$i]['inv_type'] ? $inv_type[$order[$i]['inv_type']] : '未知'; // 发票类型
......
config/params.php
...@@ -12,6 +12,13 @@ ...@@ -12,6 +12,13 @@
10 => '交易成功', 10 => '交易成功',
], ],
'order_pay_type' => [
1 => '全款',
2 => '预付款',
3 => '账期',
4 => '货到付款',
],
// 支付方式 // 支付方式
'order_paid_name' => [ 'order_paid_name' => [
1 => '微信支付', 1 => '微信支付',
......
public/js/order.js
...@@ -809,6 +809,77 @@ ...@@ -809,6 +809,77 @@
}); });
}) })
// 编辑合同信息
$('.contract_info_edit').click(function(){
var order_id = $('input[name=order_id]').val();
var content = $('.contract_info:hidden').html();
layer.open({
area:['500px'],
title: '编辑合同信息',
content: content,
btn: ['确认', '取消'],
btn1: function () {
var contract_com_name = $('.layui-layer-content').find('.contract_com_name').val();
var contract_com_addr = $('.layui-layer-content').find('.contract_com_addr').val();
var contract_link_name = $('.layui-layer-content').find('.contract_link_name').val();
var contract_link_tel = $('.layui-layer-content').find('.contract_link_tel').val();
if (!contract_com_name) {
layer.tips('请填写公司名称', $('.layui-layer-content').find('.contract_com_name'));
return false;
}
if (!contract_com_addr) {
layer.tips('请填写公司地址', $('.layui-layer-content').find('.contract_com_addr'));
return false;
}
if (!contract_link_name) {
layer.tips('请填写联系人', $('.layui-layer-content').find('.contract_link_name'));
return false;
}
if (!contract_link_tel) {
layer.tips('请填写联系电话', $('.layui-layer-content').find('.contract_link_tel'));
return false;
}
var datax = {
order_id: order_id,
contract_com_name : contract_com_name,
contract_com_addr : contract_com_addr,
contract_link_name : contract_link_name,
contract_link_tel : contract_link_tel,
};
$.ajax({
url: '/ajax/editContract',
data: datax,
type:'post',
dataType: 'json',
success:function(resp){
if(resp.errcode == 0){
layer.msg(resp.errmsg || '操作成功');
setTimeout(function(){
location.reload();
}, 1000);
return false;
} else {
layer.alert(resp.errmsg || '网络异常');
}
},
error:function(){
layer.alert('网络异常');
}
});
},
btn2: function (index) {
layer.close(index);
}
})
})
}, },
//物流信息 //物流信息
...@@ -1195,8 +1266,8 @@ ...@@ -1195,8 +1266,8 @@
var val = $(this).val(); var val = $(this).val();
if (val == 2) { if (val == 2) {
$('.show-advance-pay').show(); $('.show-advance-pay').show(); // 定金
$('.show-pay-time').show(); $('.show-pay-time').show(); // 付款时间
} else if (val == 3) { } else if (val == 3) {
$('.show-advance-pay').hide(); $('.show-advance-pay').hide();
$('.show-pay-time').hide(); $('.show-pay-time').hide();
...@@ -1353,6 +1424,17 @@ ...@@ -1353,6 +1424,17 @@
// // } // // }
// }) // })
$('.advance').on('blur',function(){
var val = $(this).val();
if (val == '') {
layer.tips('预付定金不能为空', $(this));
return false;
} else if (val == 0) {
layer.tips('预付定金为0，请更换付款方式：货到深圳仓付款', $(this));
}
})
// 用户来源 -- 其他 // 用户来源 -- 其他
$('input[name="client_source"]').on('click', function(){ $('input[name="client_source"]').on('click', function(){
if($(this).val() == 1){ if($(this).val() == 1){
...@@ -1496,49 +1578,6 @@ ...@@ -1496,49 +1578,6 @@
// 审核不通过 // 审核不通过
if (order_status == -1) { if (order_status == -1) {
$('.input-cancel-reason').click(); $('.input-cancel-reason').click();
// if (reason == null) {
// layer.msg('请选择不通过原因！');
// return false;
// } else if (reason == 1) {
// if ($('#input-reason').val() == '') {
// layer.msg('请填写其他原因！');
// return false;
// }
// }
// // 弹出提示
// layer.open({
// title: '提醒',
// content: '<div>确定审核不通过吗？</div>',
// btn:['取消','确定'],
// yes: function(index, layero){
// layer.close(index);
// },
// btn2: function(index, layero){
// $.ajax({
// url : '/ajaxCheck',
// type: 'post',
// data: $('#checkOrderForm').serialize(),
// dataType: 'json',
// success: function (resp) {
// if(resp.errcode === 0){
// layer.msg(resp.errmsg || '操作成功');
// setTimeout(function(){
// location.reload();
// }, 1000);
// } else {
// layer.alert(resp.errmsg || '网络异常');
// }
// },
// error: function (res) {
// console.log(res);
// }
// })
// }
// });
return false; return false;
} }
...@@ -1546,9 +1585,12 @@ ...@@ -1546,9 +1585,12 @@
if (pay_type == 2) { if (pay_type == 2) {
var deposit_amount = $('input[name=deposit_amount]').val(); var deposit_amount = $('input[name=deposit_amount]').val();
if (!deposit_amount) { if (deposit_amount == '') {
layer.msg('请填写定金金额'); layer.msg('请填写定金金额');
return false; return false;
}else if (deposit_amount == 0) {
layer.msg('定金金额不能为0');
return false;
} }
} }
......
resources/views/detail/changeOrder.blade.php
...@@ -54,6 +54,7 @@ ...@@ -54,6 +54,7 @@
@if ($order_info['sale_type'] == 1) @if ($order_info['sale_type'] == 1)
<label><input class="order_advance_pay" type="radio" name="order_pay_type" value="2">预付首款</label> <label><input class="order_advance_pay" type="radio" name="order_pay_type" value="2">预付首款</label>
<label><input class="order_account_period" type="radio" name="order_pay_type" value="3">账期</label> <label><input class="order_account_period" type="radio" name="order_pay_type" value="3">账期</label>
<label><input class="order_cod" type="radio" name="order_pay_type" value="4">货到深圳仓付款</label>
@endif @endif
</td> </td>
</tr> </tr>
...@@ -64,32 +65,6 @@ ...@@ -64,32 +65,6 @@
<label><input type="radio" name="order_status" class="input-cancel-reason" value="-1" data-oid="{{$order_info['order_id']}}" data-type="3">审核不通过</label> <label><input type="radio" name="order_status" class="input-cancel-reason" value="-1" data-oid="{{$order_info['order_id']}}" data-type="3">审核不通过</label>
</td> </td>
</tr> </tr>
<!-- <tr class="cancle_reason" style="display: none;">
<td class="check-table-title">审核不通过原因：</td>
<td>
<div class="form-group">
<label>常见原因：</label>
<div class="input-radio">
<label class="radio-inline"><input type="radio" name="cancel_reason" value="测试订单">测试订单</label>
<label class="radio-inline"><input type="radio" name="cancel_reason" value="客户没需求">客户没需求</label>
<label class="radio-inline"><input type="radio" name="cancel_reason" value="审核太久">审核太久</label>
<label class="radio-inline"><input type="radio" name="cancel_reason" value="订单信息填错">订单信息填错</label>
<label class="radio-inline"><input type="radio" name="cancel_reason" value="需用优惠券">需用优惠券</label>
</div>
</div>
<div class="multi-reason">
<label><input type="radio" name="reason" value="客户不接受调价">客户不接受调价</label>
<label><input type="radio" name="reason" value="无现货">无现货</label>
<label><input type="radio" name="reason" value="客户不接受附加费">客户不接受附加费</label>
<label><input type="radio" name="reason" value="客户下错单">客户下错单</label>
<label><input type="radio" name="reason" value="1">其他</label>
</div>
<div class="other-reason" style="display: none;">
<textarea name="reason" id="input-reason" placeholder="请填写其他原因"></textarea>
</div>
</td>
</tr> -->
</table> </table>
<hr/> <hr/>
......
resources/views/detail/content.blade.php
...@@ -20,6 +20,9 @@ ...@@ -20,6 +20,9 @@
$action_name = explode('@', $route)[1]; $action_name = explode('@', $route)[1];
?> ?>
<input type="hidden" class="action_type" value="{{$action_name}}"> <input type="hidden" class="action_type" value="{{$action_name}}">
<input type="hidden" name="order_id" value="{{$order_info['order_id']}}">
<input type="hidden" name="user_id" value="{{$order_info['user_id']}}">
<div class="tabs-box table-responsive"> <div class="tabs-box table-responsive">
<table class="table table-bordered order-express"> <table class="table table-bordered order-express">
<?php <?php
...@@ -161,46 +164,34 @@ ...@@ -161,46 +164,34 @@
</tr> </tr>
</table> </table>
<input type="hidden" id="order_id" value="{{$order_info['order_id']}}"> <div class="col-lg-12 col-md-12 col-xs-12">
<input type="hidden" id="user_id" value="{{$order_info['user_id']}}"> <!-- 收货信息 -->
<div class="col-lg-4 col-md-4 col-xs-4">
<table class="table table-bordered"> <table class="table table-bordered">
<tr class="caption"> <caption style="text-align: center; background: #f9f9f9;">收货信息
<th colspan="7" style="text-align: center; background: #f9f9f9;">
收货信息
@if (!$isPage) @if (!$isPage)
<!-- 订单状态小于5 且 更新地址权限存在 显示按钮 --> <!-- 订单状态小于5 且 更新地址权限存在 显示按钮 -->
@if (!isset($_REQUEST['tags'])) @if (!isset($_REQUEST['tags']))
@if (in_array($order_info['status'], array(1, 2, 3, 4)) && in_array('update_address', $userPerms)) @if (in_array($order_info['status'], array(1, 2, 3, 4)) && in_array('update_address', $userPerms))
<a href="/changeShipping/{{$order_info['order_id']}}" class="btn btn-success btn-sm changeBtn">更改收货地址</a> <a href="/changeShipping/{{$order_info['order_id']}}" class="btn btn-success btn-sm changeBtn">编辑</a>
@endif @endif
@elseif (isset($_REQUEST['tags']) && $_REQUEST['tags'] == 'self') @elseif (isset($_REQUEST['tags']) && $_REQUEST['tags'] == 'self')
@if (in_array($order_info['status'], array(1, 2, 4)) && in_array('self_order_update_address', $userPerms)) @if (in_array($order_info['status'], array(1, 2, 4)) && in_array('self_order_update_address', $userPerms))
<a href="/changeShipping/{{$order_info['order_id']}}?tags={{$_REQUEST['tags']}}" class="btn btn-success btn-sm changeBtn">更改收货地址</a> <a href="/changeShipping/{{$order_info['order_id']}}?tags={{$_REQUEST['tags']}}" class="btn btn-success btn-sm changeBtn">编辑</a>
@endif @endif
@elseif (isset($_REQUEST['tags']) && $_REQUEST['tags'] == 'erp') @elseif (isset($_REQUEST['tags']) && $_REQUEST['tags'] == 'erp')
<a href="/changeShipping/{{$order_info['order_id']}}?tags={{$_REQUEST['tags']}}" class="btn btn-success btn-sm changeBtn">更改收货地址</a> <a href="/changeShipping/{{$order_info['order_id']}}?tags={{$_REQUEST['tags']}}" class="btn btn-success btn-sm changeBtn">编辑</a>
@endif @endif
@endif @endif
</th> </caption>
</tr>
<tr> <tr>
<th>订单编号</th> <th width="25%">订单编号</th>
<th>会员账号</th> <td>{{$order_info['order_sn']}}</td>
<th>收货人</th>
<th>联系电话/手机</th>
<th>配送方式</th>
@if ($order_info['order_shipping_type'] == 2)
<th>自提地址</th>
@else
<th>收货地址</th>
@endif
</tr> </tr>
<tr>
<td>
{{$order_info['order_sn']}}
</td>
<tr>
<th>会员账号</th>
<td> <td>
@if ($user_mobile) @if ($user_mobile)
{{$user_mobile}} {{$user_mobile}}
...@@ -208,33 +199,53 @@ ...@@ -208,33 +199,53 @@
{{isset($order_info['user_info']['email']) ? $order_info['user_info']['email'] : ''}} {{isset($order_info['user_info']['email']) ? $order_info['user_info']['email'] : ''}}
@endif @endif
</td> </td>
</tr>
<tr>
<th>收货人</th>
<td>{{$order_address_info['consignee']}}</td> <td>{{$order_address_info['consignee']}}</td>
</tr>
<tr>
<th>联系电话</th>
<td>{{$order_address_info['mobile']}}</td> <td>{{$order_address_info['mobile']}}</td>
</tr>
<tr>
<th>配送方式</th>
<td>
@if ($order_info['order_shipping_type'] == 2) @if ($order_info['order_shipping_type'] == 2)
<td>客户自提</td> 客户自提
<td>{{$order_address_info['address']}}</td>
@else @else
<td>快递送货</td> 快递送货
@endif
</td>
</tr>
<tr>
<th>配送地址</th>
<td> <td>
@if ($order_info['order_shipping_type'] == 2)
{{$order_address_info['address']}}
@else
{{$order_address_info['province_val']}}&nbsp;&nbsp;{{$order_address_info['city_val']}}&nbsp;&nbsp;{{$order_address_info['district_val']}}&nbsp;&nbsp;{{$order_address_info['address']}} {{$order_address_info['province_val']}}&nbsp;&nbsp;{{$order_address_info['city_val']}}&nbsp;&nbsp;{{$order_address_info['district_val']}}&nbsp;&nbsp;{{$order_address_info['address']}}
</td>
@endif @endif
</td>
</tr> </tr>
</table> </table>
</div>
<!-- 发票信息 -->
@if (!empty($order_invoice_info)) @if (!empty($order_invoice_info))
<table class="table table-bordered order-express"> <div class="col-lg-4 col-md-4 col-xs-4">
<tr class="caption"> <table class="table table-bordered">
<th colspan="3" style="text-align: center; background: #f9f9f9;"> <caption style="text-align: center; background: #f9f9f9;">
发票信息 发票信息
@if (!$isPage) @if (!$isPage)
<!-- 发票状态小于2（已发货）且更改权限存在 显示按钮 --> <!-- 发票状态小于2（已发货）且更改权限存在 显示按钮 -->
@if (!isset($_REQUEST['tags'])) @if (!isset($_REQUEST['tags']))
@if(in_array($order_info['status'], [1, 2, 3, 4]) && $order_invoice_info['invoice_status'] < 2 && in_array('update_invoice', $userPerms)) @if(in_array($order_info['status'], [1, 2, 3, 4]) && $order_invoice_info['invoice_status'] < 2 && in_array('update_invoice', $userPerms))
<a href="/changeInvoice/{{$order_info['order_id']}}" class="btn btn-success btn-sm changeBtn">更改发票</a> <a href="/changeInvoice/{{$order_info['order_id']}}" class="btn btn-success btn-sm changeBtn">编辑</a>
@endif @endif
@elseif (isset($_REQUEST['tags']) && $_REQUEST['tags'] == 'self' && !$extend) @elseif (isset($_REQUEST['tags']) && $_REQUEST['tags'] == 'self' && !$extend)
<?php <?php
...@@ -242,35 +253,20 @@ ...@@ -242,35 +253,20 @@
$isChangeInvoice = App\Http\Controllers\isChangeInvoice($order_info['order_sn']); $isChangeInvoice = App\Http\Controllers\isChangeInvoice($order_info['order_sn']);
if ($isChangeInvoice) { if ($isChangeInvoice) {
echo '<a href="/changeInvoice/'.$order_info['order_id'].'?tags='.$_REQUEST['tags'].'" class="btn btn-success btn-sm changeBtn">更改发票</a>'; echo '<a href="/changeInvoice/'.$order_info['order_id'].'?tags='.$_REQUEST['tags'].'" class="btn btn-success btn-sm changeBtn">编辑</a>';
} }
} else { } else {
if ($order_invoice_info['invoice_status'] < 2 && in_array('self_order_update_invoice', $userPerms)) { if ($order_invoice_info['invoice_status'] < 2 && in_array('self_order_update_invoice', $userPerms)) {
echo '<a href="/changeInvoice/'.$order_info['order_id'].'?tags='.$_REQUEST['tags'].'" class="btn btn-success btn-sm changeBtn">更改发票</a>'; echo '<a href="/changeInvoice/'.$order_info['order_id'].'?tags='.$_REQUEST['tags'].'" class="btn btn-success btn-sm changeBtn">编辑</a>';
} }
} }
?> ?>
<!-- in_array($order_info['status'], [1, 2, 3, 4]) && $order_invoice_info['invoice_status'] < 2 && in_array('self_order_update_invoice', $userPerms) --> <!-- in_array($order_info['status'], [1, 2, 3, 4]) && $order_invoice_info['invoice_status'] < 2 && in_array('self_order_update_invoice', $userPerms) -->
@elseif (isset($_REQUEST['tags']) && $_REQUEST['tags'] == 'erp') @elseif (isset($_REQUEST['tags']) && $_REQUEST['tags'] == 'erp')
<a href="/changeInvoice/{{$order_info['order_id']}}?tags={{$_REQUEST['tags']}}" class="btn btn-success btn-sm changeBtn">更改发票</a> <a href="/changeInvoice/{{$order_info['order_id']}}?tags={{$_REQUEST['tags']}}" class="btn btn-success btn-sm changeBtn">编辑</a>
@endif @endif
@endif @endif
</th> </caption>
</tr>
<tr>
<td colspan="3">
<table class="table inv">
<tr>
<th>发票类型</th>
<th>发票抬头</th>
<th>公司注册地址</th>
<th>公司电话</th>
<th>税务登记号</th>
<th>开户银行</th>
<th>银行卡号</th>
<th>开票状态</th>
</tr>
@if ($order_invoice_info['inv_type'] == 1) @if ($order_invoice_info['inv_type'] == 1)
<tr style="text-align: center;"> <tr style="text-align: center;">
...@@ -278,6 +274,7 @@ ...@@ -278,6 +274,7 @@
</tr> </tr>
@else @else
<tr> <tr>
<th width="25%">发票类型</th>
<td> <td>
<?php <?php
switch ($order_invoice_info['inv_type']) { switch ($order_invoice_info['inv_type']) {
...@@ -287,20 +284,72 @@ ...@@ -287,20 +284,72 @@
} }
?> ?>
</td> </td>
</tr>
<tr>
<th>发票抬头</th>
<td>{{$order_invoice_info['tax_title']}}</td> <td>{{$order_invoice_info['tax_title']}}</td>
</tr>
<tr>
<th>公司注册地址</th>
<td>{{$order_invoice_info['company_address']}}</td> <td>{{$order_invoice_info['company_address']}}</td>
</tr>
<tr>
<th>公司电话</th>
<td>{{$order_invoice_info['company_phone']}}</td> <td>{{$order_invoice_info['company_phone']}}</td>
</tr>
<tr>
<th>税务登记号</th>
<td>{{$order_invoice_info['tax_no']}}</td> <td>{{$order_invoice_info['tax_no']}}</td>
</tr>
<tr>
<th>开户银行</th>
<td>{{$order_invoice_info['bank_name']}}</td> <td>{{$order_invoice_info['bank_name']}}</td>
</tr>
<tr>
<th>银行卡号</th>
<td>{{$order_invoice_info['bank_account']}}</td> <td>{{$order_invoice_info['bank_account']}}</td>
</tr>
<tr>
<th>开票状态</th>
<td>{{$order_invoice_info['invoice_status_val']}}</td> <td>{{$order_invoice_info['invoice_status_val']}}</td>
</tr> </tr>
@endif @endif
</table> </table>
</td> </div>
@endif
<!-- 合同乙方信息 -->
<div class="col-lg-4 col-md-4 col-xs-4">
<table class="table table-bordered">
<caption style="text-align: center; background: #f9f9f9;">
合同乙方信息
<!-- 待审核可编辑 -->
@if ($order_info['status'] == 1)
<a href="javascript:;" class="btn btn-success btn-sm changeBtn contract_info_edit">编辑</a>
@endif
</caption>
<tr>
<th width="25%">公司名称</th>
<td>{{ $order_temp_info['contract_com_name'] }}</td>
</tr>
<tr>
<th>公司地址</th>
<td>{{ $order_temp_info['contract_com_addr'] }}</td>
</tr>
<tr>
<th>联系人</th>
<td>{{ $order_temp_info['contract_link_name'] }}</td>
</tr>
<tr>
<th>联系电话</th>
<td>{{ $order_temp_info['contract_link_tel'] }}</td>
</tr> </tr>
</table> </table>
@endif </div>
</div>
<!-- 发票收货地址 --> <!-- 发票收货地址 -->
@if ($order_invoice_address_info) @if ($order_invoice_address_info)
...@@ -854,6 +903,40 @@ ...@@ -854,6 +903,40 @@
</div> </div>
</div> </div>
<style>
.contract_info{ display: none; }
.contractForm input{ width: 240px; height: 34px; }
.contractForm textarea{ width: 240px; padding: 6px 5px; border: 1px solid #ccc; border-radius: 4px; resize: none; }
</style>
<div class="contract_info">
<form class="form-horizontal contractForm">
<div class="form-group">
<label class="col-sm-4 control-label"><i class="text-danger">*</i> 公司名称：</label>
<div class="col-sm-8">
<input type="text" name="contract_com_name" class="form-control contract_com_name" value="{{$order_temp_info['contract_com_name']}}">
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label"><i class="text-danger">*</i> 公司地址：</label>
<div class="col-sm-8">
<textarea name="contract_com_addr" class="form-control contract_com_addr" cols="30" rows="3">{{$order_temp_info['contract_com_addr']}}</textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label"><i class="text-danger">*</i> 联系人：</label>
<div class="col-sm-8">
<input type="text" name="contract_link_name" class="form-control contract_link_name" value="{{$order_temp_info['contract_link_name']}}">
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label"><i class="text-danger">*</i> 联系电话：</label>
<div class="col-sm-8">
<input type="text" name="contract_link_tel" class="form-control contract_link_tel" value="{{$order_temp_info['contract_link_tel']}}">
</div>
</div>
</form>
</div>
<script> <script>
// 退款申请已处理或已拒绝，则隐藏退款按钮 // 退款申请已处理或已拒绝，则隐藏退款按钮
var refund = "{{!empty($order_refund_info) && ($order_refund_info['status'] == -1 || $order_refund_info['status'] == 10) ? false : true}}"; var refund = "{{!empty($order_refund_info) && ($order_refund_info['status'] == -1 || $order_refund_info['status'] == 10) ? false : true}}";
......
resources/views/erpOrder/content.blade.php
...@@ -57,39 +57,6 @@ ...@@ -57,39 +57,6 @@
</select> </select>
</dd> </dd>
</dl> </dl>
<style>
.order_send .btn{padding: 4px 12px;}
</style>
<dl>
<dt>推送业务员：</dt>
<dd>
<select id="order_send" name="order_send" class="form-control order_send selectpicker" title="全部" data-live-search="true">
<optgroup label="在职">
@foreach ($sale_list as $v)
@if ($v->status != 4)
<option value="{{$v->userId}}">{{$v->name}}</option>
@endif
@endforeach
</optgroup>
<optgroup label="离职">
@foreach ($sale_list as $v)
@if ($v->status == 4)
<option value="{{$v->userId}}">{{$v->name}}</option>
@endif
@endforeach
</optgroup>
</select>
<!-- <div class="droplist" data-default="{{$condition['order_send']}}" id="order_send" name="order_send" >
<ul class="dropdown-menu">
<li data-val="" class="active">全部</li>
@foreach ($sale_list as $v)
<li data-val="{{$v->userId}}">{{$v->name}}</li>
@endforeach
</ul>
</div> -->
</dd>
</dl>
</td> </td>
</tr> </tr>
</table> </table>
...@@ -110,7 +77,7 @@ ...@@ -110,7 +77,7 @@
<th class="pl30">会员账号</th> <th class="pl30">会员账号</th>
<th class="pl30">应付金额</th> <th class="pl30">应付金额</th>
<th class="pl30">订单状态</th> <th class="pl30">订单状态</th>
<th class="pl30">订单类型</th> <th class="pl30">付款类型</th>
<th class="pl30">支付方式</th> <th class="pl30">支付方式</th>
<th class="pl30">推送业务员</th> <th class="pl30">推送业务员</th>
<th class="pl30">发货状态</th> <th class="pl30">发货状态</th>
...@@ -152,15 +119,7 @@ ...@@ -152,15 +119,7 @@
} }
?> ?>
</td> </td>
<td class="show-list"> <td class="show-list"> {{ Config('params.order_pay_type')[$v['order_pay_type']] }} </td>
<?php
switch ($v['order_pay_type']) {
case 1: echo "全款";break;
case 2: echo "预付款";break;
case 3: echo "账期";break;
}
?>
</td>
<td class="show-list"><?php print_r(App\Http\Controllers\getPayName($v['order_id'])); ?></td> <td class="show-list"><?php print_r(App\Http\Controllers\getPayName($v['order_id'])); ?></td>
<td class="show-list"> <td class="show-list">
...@@ -304,7 +263,6 @@ ...@@ -304,7 +263,6 @@
<script> <script>
var order_status = "{{$condition['order_status']}}"; var order_status = "{{$condition['order_status']}}";
var order_source = "{{$condition['order_source_pf']}}"; var order_source = "{{$condition['order_source_pf']}}";
var order_send = "{{$condition['order_send']}}";
var manager = "{{$role}}"; var manager = "{{$role}}";
$(".order_status").selectpicker({ $(".order_status").selectpicker({
...@@ -316,10 +274,7 @@ ...@@ -316,10 +274,7 @@
}) })
$('.order_status').selectpicker('val', order_status.split(',')).trigger("change"); $('.order_status').selectpicker('val', order_status.split(',')).trigger("change");
$('#order_send').selectpicker('val', order_send);
$('#order_source').selectpicker('val', order_source); $('#order_source').selectpicker('val', order_source);
$('#order_send').selectpicker('val', order_send);
$.lie.order.index(); $.lie.order.index();
</script> </script>
\ No newline at end of file
resources/views/orderlist/content.blade.php
...@@ -54,9 +54,11 @@ ...@@ -54,9 +54,11 @@
<dt>付款类型：</dt> <dt>付款类型：</dt>
<dd> <dd>
<select id="order_pay_type" name="order_pay_type" class="form-control order_pay_type selectpicker" title="全部" multiple> <select id="order_pay_type" name="order_pay_type" class="form-control order_pay_type selectpicker" title="全部" multiple>
<option value="1">全款</option> @if (Config('params.order_pay_type'))
<option value="2">预付款</option> @foreach (Config('params.order_pay_type') as $k=>$v)
<option value="3">账期</option> <option value="{{$k}}">{{$v}}</option>
@endforeach
@endif
</select> </select>
</dd> </dd>
</dl> </dl>
...@@ -225,7 +227,7 @@ ...@@ -225,7 +227,7 @@
<th class="pl30">订单编号</th> <th class="pl30">订单编号</th>
<th class="pl30">应付金额</th> <th class="pl30">应付金额</th>
<th class="pl30">订单状态</th> <th class="pl30">订单状态</th>
<th class="pl30">订单类型</th> <th class="pl30">付款类型</th>
<th class="pl30">支付方式</th> <th class="pl30">支付方式</th>
<th class="pl30">推送业务员</th> <th class="pl30">推送业务员</th>
@if ($username != 'vpadmin@ichunt.com') @if ($username != 'vpadmin@ichunt.com')
...@@ -270,15 +272,7 @@ ...@@ -270,15 +272,7 @@
} }
?> ?>
</td> </td>
<td class="show-list"> <td class="show-list"> {{ Config('params.order_pay_type')[$v['order_pay_type']] }} </td>
<?php
switch ($v['order_pay_type']) {
case 1: echo "全款";break;
case 2: echo "预付款";break;
case 3: echo "账期";break;
}
?>
</td>
<td class="show-list"><?php print_r(App\Http\Controllers\getPayName($v['order_id'])); ?></td> <td class="show-list"><?php print_r(App\Http\Controllers\getPayName($v['order_id'])); ?></td>
<td class="show-list"><?php print_r(App\Http\Controllers\getSalesName($v['sale_id'])); ?></td> <td class="show-list"><?php print_r(App\Http\Controllers\getSalesName($v['sale_id'])); ?></td>
......
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