Skip to content

Y
yhwx
提交 3b11caaa authored 作者: 窦斌's avatar 窦斌
浏览文件
操作

Merge branch 'master' of http://gitlab.bluearp.com/ldj/yhwx

上级 81fe0fe0 823cf623
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 136 行增加 和 93 行删除
app/ExcelTemp/ExcelTemp.php
浏览文件 @ 3b11caaa
......@@ -7,18 +7,18 @@ trait ExcelTemp
{
$action = [
['action_name' => '订单列表', 'action_value' => 'WashOrderindex'],//订单管理
['action_name' => '采购管理', 'action_value' => 'PurchaseOrderindex'],//采购管理
['action_name' => '调拨单', 'action_value' => 'TransferringOrdersindex'],//调拨单
// ['action_name' => '采购管理', 'action_value' => 'PurchaseOrderindex'],//采购管理
// ['action_name' => '调拨单', 'action_value' => 'TransferringOrdersindex'],//调拨单
['action_name' => '绩效明细-工单', 'action_value' => 'OrderPerformance'],//工单绩效管理
['action_name' => '绩效明细-技师', 'action_value' => 'TechnicianPerformance'],//技师绩效管理
['action_name' => '绩效明细-详情', 'action_value' => 'DetailPerformance'],//详情绩效管理
['action_name' => '应收应付', 'action_value' => 'receivablePayindex'],//应收应付
['action_name' => '商品列表', 'action_value' => 'GoodsListindex'],//商品
// ['action_name' => '商品列表', 'action_value' => 'GoodsListindex'],//商品
['action_name' => '会员客户', 'action_value' => 'MemberListindex'],//会员客户
['action_name' => '销售员绩效', 'action_value' => 'ProPerformanceordersp'],//销售员绩效
// ['action_name' => '销售员绩效', 'action_value' => 'ProPerformanceordersp'],//销售员绩效
['action_name' => '工单列表', 'action_value' => 'WashWork'],//工单列表
['action_name' => '售后列表', 'action_value' => 'WashAfterSales'],//售后列表
['action_name' => '罚单列表', 'action_value' => 'WashViolation'],//罚单列表
// ['action_name' => '售后列表', 'action_value' => 'WashAfterSales'],//售后列表
// ['action_name' => '罚单列表', 'action_value' => 'WashViolation'],//罚单列表
];
return $action;
}
......@@ -29,30 +29,30 @@ trait ExcelTemp
'WashOrderindex' => [//订单管理
['field_name' => '订单单号', 'field_value' => 'ord_order_number'],
['field_name' => '订单状态', 'field_value' => 'ord_wor_state'],
['field_name' => '订单来源', 'field_value' => 'ord_source'],
['field_name' => '商品名称', 'field_value' => 'orgo_goo_name'],
['field_name' => '商品单位', 'field_value' => 'orgo_goo_unit'],
['field_name' => '商品数量', 'field_value' => 'orgo_goo_quantity'],
['field_name' => '检索编码', 'field_value' => 'orgo_goo_goods_encode'],
['field_name' => '仓库', 'field_value' => 'ord_ware_id'],
['field_name' => '订单总额(元)', 'field_value' => 'ord_order_price'],
['field_name' => '实付金额(元)', 'field_value' => 'ord_actual_price'],
['field_name' => '结算状态', 'field_value' => 'ord_state'],
['field_name' => '结算方式', 'field_value' => 'ord_payment_way'],
['field_name' => '结算时间', 'field_value' => 'ord_settlement_time'],
['field_name' => '会员姓名', 'field_value' => 'orcl_name'],
['field_name' => '会员电话', 'field_value' => 'orcl_phone'],
['field_name' => '下单金额', 'field_value' => 'ord_order_price'],
['field_name' => '订单金额', 'field_value' => 'ord_actual_price'],
['field_name' => '保险公司', 'field_value' => 'orcl_business_name'],
['field_name' => '定损员姓名', 'field_value' => 'orcl_buac_name'],
['field_name' => '定损员电话', 'field_value' => 'orcl_buac_phone'],
['field_name' => '4S店名称', 'field_value' => 'orcl_4sname'],
['field_name' => '4S店联系人', 'field_value' => 'orcl_name'],
['field_name' => '4S店联系电话', 'field_value' => 'orcl_phone'],
['field_name' => '车牌号', 'field_value' => 'orcl_car_num'],
['field_name' => '品牌车系', 'field_value' => 'orcl_car_brand_series'],
['field_name' => '客户类型', 'field_value' => 'ord_type'],//
['field_name' => '客户来源', 'field_value' => 'orcl_mem_source'], //
['field_name' => '车主姓名', 'field_value' => 'orcl_carowner_name'],//
['field_name' => '车主电话', 'field_value' => 'orcl_carowner_phone'],//
['field_name' => '销售人', 'field_value' => 'orcl_sales_adm_id'],//
['field_name' => '录单人', 'field_value' => 'ord_create_id'],//
['field_name' => '预约时间', 'field_value' => 'orcl_appoint_time'],//
['field_name' => '创建时间', 'field_value' => 'ord_create_time'],//
['field_name' => '施工门店', 'field_value' => 'ord_shop_id'],//
['field_name' => '创建时间', 'field_value' => 'ord_create_time'],
['field_name' => '开票状态', 'field_value' => 'ord_openbill'],
// ['field_name' => '会员姓名', 'field_value' => 'orcl_name'],
// ['field_name' => '会员电话', 'field_value' => 'orcl_phone'],
// ['field_name' => '车牌号', 'field_value' => 'orcl_car_num'],
// ['field_name' => '品牌车系', 'field_value' => 'orcl_car_brand_series'],
// ['field_name' => '客户类型', 'field_value' => 'ord_type'],//
// ['field_name' => '客户来源', 'field_value' => 'orcl_mem_source'], //
// ['field_name' => '车主姓名', 'field_value' => 'orcl_carowner_name'],//
// ['field_name' => '车主电话', 'field_value' => 'orcl_carowner_phone'],//
// ['field_name' => '销售人', 'field_value' => 'orcl_sales_adm_id'],//
// ['field_name' => '录单人', 'field_value' => 'ord_create_id'],//
// ['field_name' => '预约时间', 'field_value' => 'orcl_appoint_time'],//
// ['field_name' => '创建时间', 'field_value' => 'ord_create_time'],//
// ['field_name' => '施工门店', 'field_value' => 'ord_shop_id'],//
],
/*'PurchaseOrderindex' => [//采购管理
......@@ -196,21 +196,22 @@ trait ExcelTemp
],
'MemberListindex' => [//会员客户
['field_name' => '会员姓名', 'field_value' => 'mem_name'],
['field_name' => '性别', 'field_value' => 'mem_sex'],
['field_name' => '联系电话', 'field_value' => 'mem_phone'],
['field_name' => '4S店名称', 'field_value' => 'mem_4sname'],
['field_name' => '4S店联系人', 'field_value' => 'mem_name'],
// ['field_name' => '性别', 'field_value' => 'mem_sex'],
['field_name' => '4S店联系电话', 'field_value' => 'mem_phone'],
['field_name' => '联系地址', 'field_value' => 'mem_address'],
['field_name' => '车牌号', 'field_value' => 'mem_car_num'],
['field_name' => '品牌车系', 'field_value' => 'mem_car_series'],
['field_name' => '会员级别', 'field_value' => 'mem_bership'],
['field_name' => '会员等级', 'field_value' => 'mem_level'],
['field_name' => '生日', 'field_value' => 'mem_birthday'],
['field_name' => '来源', 'field_value' => 'mem_source'],
// ['field_name' => '车牌号', 'field_value' => 'mem_car_num'],
// ['field_name' => '品牌车系', 'field_value' => 'mem_car_series'],
// ['field_name' => '会员级别', 'field_value' => 'mem_bership'],
// ['field_name' => '会员等级', 'field_value' => 'mem_level'],
// ['field_name' => '生日', 'field_value' => 'mem_birthday'],
// ['field_name' => '来源', 'field_value' => 'mem_source'],
['field_name' => '欠款金额', 'field_value' => 'mem_arrears'],
['field_name' => '余额', 'field_value' => 'mem_rec_banlance'],
['field_name' => '积分', 'field_value' => 'mem_points'],
// ['field_name' => '余额', 'field_value' => 'mem_rec_banlance'],
// ['field_name' => '积分', 'field_value' => 'mem_points'],
['field_name' => '创建人', 'field_value' => 'mem_create_id'],
['field_name' => '邀请人', 'field_value' => 'mem_fid'],
// ['field_name' => '邀请人', 'field_value' => 'mem_fid'],
],
'ProPerformanceordersp' => [//销售员绩效
......
app/Http/Controllers/Api/ExcelInfo/ExceloutController.php
浏览文件 @ 3b11caaa
......@@ -105,11 +105,7 @@ class ExceloutController extends Controller
if ($v['ord_wor_state'] == '1') {
$rs[$k][$kg] = '待派单';
} elseif ($v['ord_wor_state'] == '2') {
if($v['orcl_appoint_time'] == '0000-00-00 00:00:00'){
$rs[$k][$kg] = '未预约';
}else{
$rs[$k][$kg] = '服务中';
}
$rs[$k][$kg] = '服务中';
} elseif ($v['ord_wor_state'] == '4') {
$rs[$k][$kg] = '待评价';
} elseif ($v['ord_wor_state'] == '20') {
......@@ -150,7 +146,7 @@ class ExceloutController extends Controller
if ($v['ord_payment_way'] == 0) {
$rs[$k][$kg] = '暂不结算';
} elseif ($v['ord_payment_way'] == 1) {
$rs[$k][$kg] = '现金';
$rs[$k][$kg] = '结算';
} elseif ($v['ord_payment_way'] == 2) {
$rs[$k][$kg] = '支付宝';
} elseif ($v['ord_payment_way'] == 3) {
......@@ -228,6 +224,8 @@ class ExceloutController extends Controller
// ->where('shop_id', $v['ord_shop_id'] )
// ->value('shop_store_name');
$rs[$k][$kg] = $ord_address_name;
} elseif($vg=='ord_openbill'){//是否开票1未开票2已开票
$rs[$k][$kg] = ($v['ord_openbill'] == 1)?'未开票':'已开票';
} else{
$rs[$k][$kg] = "\t".$v[$vg];
}
......
app/Http/Controllers/Api/PublicsManage/PublicSearchController.php
浏览文件 @ 3b11caaa
......@@ -73,7 +73,11 @@ class PublicSearchController extends Controller
$user_info = Common::getUserInfo($request['api_token']);
$search_data = $request->all();
$public_search = new PublicSearch;
$list_data = $public_search->searchTechnician($user_info, $search_data, 10);
if (isset($request['noPage']) && $request['noPage'] == 1) {
$list_data = $public_search->searchTechnician($user_info, $search_data, 0);
} else {
$list_data = $public_search->searchTechnician($user_info, $search_data, 10);
}
return response()->json(['code'=>200, 'msg'=>'success', 'data'=>$list_data['data_info']]);
}
......@@ -306,6 +310,11 @@ class PublicSearchController extends Controller
->where('sepr_state', 1) //状态1启用2停用
->where('sepr_delete', 1) //是否删除：1正常2已删除
->select($fields)
->where(function ($query) use ($request) { //服务项目名称
if (!empty($request['sepr_class_id'])) {
$query->whereIn('sepr_class_id', $request['sepr_class_id']);
}
})
->where(function ($query) use ($request) { //服务项目名称
if (!empty($request['keywords'])) {
$query->where('sepr_name', 'like', '%' . $request['keywords'] . '%');
......
app/Http/Controllers/Api/Verify/MemberManage/VerifyMemberListController.php
浏览文件 @ 3b11caaa
......@@ -63,14 +63,14 @@ class VerifyMemberListController extends Controller
// 数据验证
$validator = Validator::make($data, [
'mem_name' => 'required|max:20',
'mem_sex' => [
'required',
Rule::in(['1', '2', '3']),
], //mem_sex为1或者2
// 'mem_sex' => [
// 'required',
// Rule::in(['1', '2', '3']),
// ], //mem_sex为1或者2
'mem_phone' => ['required', 'regex:/^1[3456789]\d{9}$/'],
'mem_birthday' => 'sometimes|alpha_dash|max:5|min:5',
'mem_car_num' => 'required|max:10',
'mem_car_series' => 'required|max:30',
// 'mem_birthday' => 'sometimes|alpha_dash|max:5|min:5',
// 'mem_car_num' => 'required|max:10',
// 'mem_car_series' => 'required|max:30',
// 'mem_province' => 'required|max:50',
// 'mem_city' => 'required|max:50',
// 'mem_county' => 'required|max:50',
......
app/Http/Controllers/Api/Workbench/CashierDeskController.php
浏览文件 @ 3b11caaa
......@@ -3583,7 +3583,7 @@ class CashierDeskController extends Controller
$query->where('mem_id', $search_data['mem_id']);
}
})
->select('mem_id', 'mem_name', 'mem_phone', 'mem_province', 'mem_city', 'mem_county', 'mem_address', 'mem_bership', 'mem_car_num', 'mem_source', 'mem_car_series', 'mem_sex', 'mem_birthday', 'mem_rec_banlance', 'mem_gift_banlance', 'mem_level', 'mem_salesman_id')
->select('mem_id', 'mem_name', 'mem_phone', 'mem_province', 'mem_city', 'mem_county', 'mem_address', 'mem_bership', 'mem_car_num', 'mem_source', 'mem_car_series', 'mem_sex', 'mem_birthday', 'mem_rec_banlance', 'mem_gift_banlance', 'mem_level', 'mem_salesman_id', 'mem_4sname')
->paginate(30);
$data = $list->items();
//查找折扣
......@@ -3631,10 +3631,10 @@ class CashierDeskController extends Controller
->where('buac_del', 1)
->where('bucl_del', 1)
->where('bucl_state', 1)
->where('buac_state', 1)
->where(function ($query) use ($search_data) {
if (!empty($search_data['search_data'])) {
$query->where('bucl_name', 'like', '%' . $search_data['search_data'] . '%')
->orwhere('buac_name', 'like', '%' . $search_data['search_data'] . '%')
$query->where('buac_name', 'like', '%' . $search_data['search_data'] . '%')
->orwhere('buac_phone', 'like', '%' . $search_data['search_data'] . '%');
}
})
......
app/Http/Controllers/Mounting/Operation/BusinessController.php
浏览文件 @ 3b11caaa
......@@ -63,7 +63,7 @@ class BusinessController extends Controller
}
// 查询字段
$field_columns = ['buac_id', 'buac_name', 'buac_phone', 'buac_create_time', 'buac_create_adm_id', 'buac_sex'];
$field_columns = ['buac_id', 'buac_name', 'buac_phone', 'buac_create_time', 'buac_create_adm_id', 'buac_sex', 'buac_state'];
$user_info = LoginUserService::getUser();
$search_data = $this->dataService->accIndex($user_info, $request->all(), 10, $field_columns);
if (empty($search_data)) {
......@@ -626,4 +626,27 @@ class BusinessController extends Controller
return response()->json(['code' => 200, 'msg' => '暂无此会员', 'data' =>'']);
}
}
/**
* 停启用保险公司员工
* @authors ldj
* @email 909490343@qq.com
* @date 2026-02-05
* @param Request $request [description]
* @return [type] [description]
*/
public function editAccState(Request $request)
{
// 获取当前操作账号信息
$user_info = Common::getUserInfo($request['api_token']);
if (empty($request['buac_id'])) {
return response()->json(['code' => 500, 'msg' => '请选择定损员', 'data' =>[]]);
}
$result = BusinessService::editAccState($request);
if ($result) {
return response()->json(['code' => 200, 'msg' => '操作成功', 'data' => $result]);
} else {
return response()->json(['code' => 200, 'msg' => '操作失败', 'data' =>'']);
}
}
}
\ No newline at end of file
app/Http/Requests/Validators/Business/WashOrderBasicValidator.php
浏览文件 @ 3b11caaa
......@@ -46,11 +46,11 @@ class WashOrderBasicValidator extends FormRequest
'orcl_carowner_phone.max' => '车主电话长度超过最大限制',
'ord_payment_way.required' => '请选择结算方式',
'ord_type.required' => '请选择买家类型',
'ord_address.required' => '请选择施工门店',
'ord_address_type.required' => '请选择施工门店',
'ord_address_id.required' => '请选择施工门店',
'ord_address_id.integer' => '请选择施工门店',
'ord_address_id.min' => '请选择施工门店',
// 'ord_address.required' => '请选择施工门店1',
// 'ord_address_type.required' => '请选择施工门店2',
// 'ord_address_id.required' => '请选择施工门店3',
// 'ord_address_id.integer' => '请选择施工门店4',
// 'ord_address_id.min' => '请选择施工门店5',
'ord_address.max' => '地址长度超过最大限制',
'ord_client_id.required' => '请选择客户信息',
'ord_client_id.integer' => '数据类型不正确',
......@@ -77,15 +77,14 @@ class WashOrderBasicValidator extends FormRequest
'orcl_phone' => ['sometimes', 'required','regex:/^1[3456789]\d{9}$/'],// 客户手机号
'orcl_carowner_name' => 'sometimes|required|max:20', //车主姓名
'orcl_carowner_phone' => 'sometimes|required|max:11', //车主电话
'ord_address' => 'required|max:255',
'ord_address_type' => 'required|integer|min:1',
'ord_address_id' => 'required|integer|min:1',
'ord_client_id' => 'sometimes|required|integer|min:1',
'ware_id' => 'sometimes|required|integer|min:1',
// 'ord_address' => 'required|max:255',
// 'ord_address_type' => 'required|integer|min:1',
// 'ord_address_id' => 'required|integer|min:1',
// 'ord_client_id' => 'sometimes|required|integer|min:1',
// 'ware_id' => 'sometimes|required|integer|min:1',
'goods_data' => 'required',
'ord_add_work_state' => 'required',
], $messages);
// 判断数据验证是否成功
if ($validator->fails()) {
$messages = $validator->errors()->all();
......
app/Http/Requests/Validators/Business/WashOrderValidator.php
浏览文件 @ 3b11caaa
......@@ -90,9 +90,9 @@ class WashOrderValidator extends FormRequest
'orcl_phone' => ['required','regex:/^1[3456789]\d{9}$/'],// 客户手机号
'orcl_carowner_name' => 'required|max:20', //车主姓名
'orcl_carowner_phone' => 'required|max:11', //车主电话
'ord_address' => 'required|max:255',
'ord_address_type' => 'required',
'ord_address_id' => 'required',
// 'ord_address' => 'required|max:255',
// 'ord_address_type' => 'required',
// 'ord_address_id' => 'required',
'ord_client_id' => 'required|integer|min:0',
'reli_id' => 'sometimes|nullable|integer|min:0',
], $messages);
......@@ -185,10 +185,10 @@ class WashOrderValidator extends FormRequest
'ord_address' => 'required|max:255',
'ord_address_type' => 'required',
'ord_address_id' => 'required',
'orcl_name' => 'required|max:20', //客户姓名
'orcl_carowner_name' => 'required|max:20', //车主姓名
'orcl_carowner_phone' => 'sometimes|max:11', //车主电话
'orcl_channel_unit' => 'sometimes|required_if:ord_type,2|max:50',
// 'orcl_name' => 'required|max:20', //客户姓名
// 'orcl_carowner_name' => 'required|max:20', //车主姓名
// 'orcl_carowner_phone' => 'sometimes|max:11', //车主电话
// 'orcl_channel_unit' => 'sometimes|required_if:ord_type,2|max:50',
'ord_client_id' => 'required|integer|min:0',
// 'orcl_check_car_state' => [//是否验车：1是2否
// 'required',
......
app/Http/Requests/Validators/Operation/BusinessValidator.php
浏览文件 @ 3b11caaa
......@@ -101,8 +101,8 @@ class BusinessValidator extends FormRequest
// 数据验证
$validator = Validator::make($data, [
'bucl_name' => 'required|max:20', //客户姓名
'bucl_user_name' => 'required|max:20', //车主姓名
'bucl_user_phone' => 'required|max:11', //车主电话
// 'bucl_user_name' => 'required|max:20', //车主姓名
// 'bucl_user_phone' => 'required|max:11', //车主电话
// 'bucl_province' => 'required|max:50',
// 'bucl_city' => 'required|max:50',
// 'bucl_county' => 'required|max:50',
......@@ -131,7 +131,7 @@ class BusinessValidator extends FormRequest
// 数据验证
$validator = Validator::make($data, [
'bucl_id' => 'required', //企业客户id
'buac_password' => 'required', //客户密码
// 'buac_password' => 'required', //客户密码
'buac_name' => 'required|max:20', //客户姓名
'buac_phone' => 'required|max:11', //车主电话
], $messages);
......
app/Requests/Validators/Business/WashOrderValidator.php
浏览文件 @ 3b11caaa
......@@ -184,7 +184,7 @@ class WashOrderValidator extends FormRequest
'ord_city' => 'required|max:50',
'ord_county' => 'required|max:50',
'ord_address' => 'required|max:255',
'orcl_name' => 'required|max:20', //客户姓名
// 'orcl_name' => 'required|max:20', //客户姓名
// 'orcl_phone' => ['sometimes','regex:/^1[3456789]\d{9}$/'],// 客户手机号
// 'orcl_car_num' => 'sometimes|required_if:ord_type,1|max:10',//客户车牌号
// 'orcl_province' => 'required|max:50',
......
app/Services/Operation/BusinessService.php
浏览文件 @ 3b11caaa
......@@ -146,7 +146,7 @@ class BusinessService extends Service
foreach ($list_items as $key => $value) {
// 创建人
if ($value->buac_create_adm_id) {
$list_items[$key]->buac_create_adm_name = $find_adm[$value->buac_create_adm_id];
$list_items[$key]->buac_create_adm_name = isset($find_adm[$value->buac_create_adm_id]) ? $find_adm[$value->buac_create_adm_id]:'';
} else {
$list_items[$key]->buac_create_adm_name = '';
}
......@@ -237,8 +237,8 @@ class BusinessService extends Service
$data['bucl_create_id'] = $user_info->adm_id;
$data['bucl_update_id'] = $user_info->adm_id;
$data['bucl_name'] = $request['bucl_name']; //企业客户名称
$data['bucl_user_phone'] = $request['bucl_user_phone']; //联系人电话
$data['bucl_user_name'] = $request['bucl_user_name']; //联系人名称
$data['bucl_user_phone'] = $request['bucl_user_phone']??''; //联系人电话
$data['bucl_user_name'] = $request['bucl_user_name']??''; //联系人名称
$data['bucl_create_time'] = date('Y-m-d H:i:s');
$data['bucl_update_time'] = date('Y-m-d H:i:s');
$data['bucl_province'] = isset($request['bucl_province']) ? $request['bucl_province'] : ''; //省
......@@ -302,15 +302,17 @@ class BusinessService extends Service
}
$bucl_id = Business::insertGetId($data);
$password = md5('123456' . 'faster123456');
$new_data['buac_cid'] = $user_info->adm_cid;
$new_data['buac_shop_id'] = $user_info->adm_shop_id;
$new_data['buac_create_adm_id'] = $user_info->adm_id;
$new_data['buac_bucl_id'] = $bucl_id; //企业客户id
$new_data['buac_name'] = $request['bucl_user_name']; //企业客户名称
$new_data['buac_phone'] = $request['bucl_user_phone']; //联系人电话
$new_data['buac_password'] = $password; //密码
$new_data['buac_create_time'] = date('Y-m-d H:i:s');
DB::table('business_account')->insertGetId($new_data);
if ($request['bucl_user_name'] || $request['bucl_user_phone']) {
$new_data['buac_cid'] = $user_info->adm_cid;
$new_data['buac_shop_id'] = $user_info->adm_shop_id;
$new_data['buac_create_adm_id'] = $user_info->adm_id;
$new_data['buac_bucl_id'] = $bucl_id; //企业客户id
$new_data['buac_name'] = $request['bucl_user_name']??''; //企业客户名称
$new_data['buac_phone'] = $request['bucl_user_phone']??''; //联系人电话
$new_data['buac_password'] = $password; //密码
$new_data['buac_create_time'] = date('Y-m-d H:i:s');
DB::table('business_account')->insertGetId($new_data);
}
return $bucl_id;
}
......@@ -476,4 +478,14 @@ class BusinessService extends Service
return $data;
}
/**
* 修改保险公司员工停启用
*/
public static function editAccState($request){
$data['buac_state'] = $request['state'];
$data['buac_update_time'] = date('Y-m-d H:i:s');
$res = DB::table('business_account')->where('buac_id', $request['buac_id'])->update($data);
return $res;
}
}
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论