Skip to content

黄成意 / php_frq_api

Go to a project
Commit e6cc821d by hcy001
Options

1

parent 4e241ecb
Inline Side-by-side
Showing with 60 additions and 310 deletions
app/Http/Controllers/ApiController.php
......@@ -97,20 +97,20 @@ class ApiController extends Controller
}
//搜索品牌
private function ApiBrandList($request, $id){
(new CommonModel())->BrandList($request->input('k'));
private function ApiBrandList($input, $id){
(new CommonModel())->BrandList($input['k']);
}
//搜索型号
private function ApiSkuList($request, $id){
(new CommonModel())->SkuList($request->input('k'));
private function ApiSkuList($input, $id){
(new CommonModel())->SkuList($input['k']);
}
//搜索采购
private function ApiUserList($request, $id){
(new CommonModel())->UserList($request->input('k'));
private function ApiUserList($input, $id){
(new CommonModel())->UserList($input['k']);
}
//搜索供应商
private function ApiSupplierList($request, $id){
(new CommonModel())->SupplierList($request->input('k'));
private function ApiSupplierList($input, $id){
(new CommonModel())->SupplierList($input['k']);
}
//添加询价
......@@ -212,5 +212,12 @@ class ApiController extends Controller
Export((new InquiryItemsReportModel())->updateReport($input));
}
//获取客户信息
public function ApiGetUser($input, $id)
{
(new CommonModel())->getUser($input["k"],$input["types"]);
}
}
app/Model/CommonModel.php
......@@ -9,6 +9,20 @@ use DB;
//公共模型
class CommonModel extends Model
{
//搜索用户或者公司
public function getUser($k,$types=1)
{
$dbspu = DB::connection("liexin");
if ($types == 2) { #搜索公司
$brandInfo = $dbspu->select("select com_id as value,com_name as name from lie_user_company where com_name like '%".$k."%' limit 10");
echo json_encode($brandInfo,JSON_UNESCAPED_UNICODE) ;
exit();
}else{
$brandInfo = $dbspu->select("select user_id as value,user_name as name from lie_user_main where user_name like '%".$k."%' or mobile like '%".$k."%' limit 10");
echo json_encode($brandInfo,JSON_UNESCAPED_UNICODE) ;
exit();
}
}
//搜索联营品牌
public function BrandList($k,$types=1)
{
......
app/Model/InquiryModel.php
......@@ -32,7 +32,7 @@ class InquiryModel extends Model
$list = $rqpConn->table('inquiry as a')
->join('inquiry_items as b','a.id','=','b.inquiry_id')
->select(DB::Raw("lie_a.inquiry_sn,lie_a.currency,lie_a.status as status_a,lie_a.customer_name,lie_a.create_name,lie_a.create_time as inquiry_ctime,lie_b.*"))
->select(DB::Raw("lie_a.inquiry_sn,lie_a.currency,lie_a.status as status_a,lie_a.com_name,lie_a.user_name,lie_a.create_name,lie_a.create_time as inquiry_ctime,lie_b.*"))
->where(function ($query) use ($input) {
foreach ($input as $k => $v){
$v = trim($v);
......@@ -76,9 +76,7 @@ class InquiryModel extends Model
$list = $list->where('a.create_uid', $user_id)->whereIn('a.status', [-1,1]);
break;
case "2": //我的已关闭询价
$list = $list->where('a.create_uid', $user_id)->whereIn("a.status",[-1]);
break;
$list = $list->where('a.create_uid', $user_id)->where("b.status",-1);
case "3": //所有询价
$perm = new PermController;
$role = $perm->getUserRole($user_id,$user_name); // 用户角色
......@@ -100,6 +98,7 @@ class InquiryModel extends Model
if (!$list) return [20001, '没有数据'];
$QuoteModel = new QuoteModel();
$InquiryItemsUrgeModel = new InquiryItemsUrgeModel;
......@@ -113,6 +112,8 @@ class InquiryModel extends Model
$v['create_time'] = timeToDate($v['create_time']); //创建时间
$v["customer_name"] = $v['com_name'] == "" ? $v['user_name'] : $v['com_name'] ;
$currency_sign = $v['currency'] == 1 ? '￥' : '$';
$v['target_price'] = $currency_sign.$v['target_price']; // 客户目标报价
......@@ -169,7 +170,7 @@ class InquiryModel extends Model
->where('b.status', 1); // 待报价
}
$list = $list->select(DB::Raw("lie_a.inquiry_sn,lie_a.currency,lie_a.status as status_a,lie_a.customer_name,lie_a.create_name,lie_a.create_time as inquiry_ctime,lie_b.*"))
$list = $list->select(DB::Raw("lie_a.inquiry_sn,lie_a.currency,lie_a.status as status_a,lie_a.user_name,lie_a.com_name,lie_a.create_name,lie_a.create_time as inquiry_ctime,lie_b.*"))
->where(function ($query) use ($input, $type) {
foreach ($input as $k => $v){
$v = trim($v);
......@@ -234,6 +235,7 @@ class InquiryModel extends Model
$count = $QuoteModel->whereIn("status",QuoteMap::$status_used)->count();
$v['status_val'] = $v['status_val']."（".$count."）";
}
$v["customer_name"] = $v['com_name'] == "" ? $v['user_name'] : $v['com_name'] ;
$v['create_time'] = timeToDate($v['create_time']); //创建时间
......@@ -317,17 +319,24 @@ class InquiryModel extends Model
//从草稿生成正式询价单
public function addInquiry($input){
if (empty($input["inquiry_id"])) return [1001,"缺少询价单号"];
if (empty($input["customer_name"])) return [1001,"请选择询价客户名称"];
if (empty($input["user"])) return [1002,"请选择客户"];
if (empty($input["delivery_place"])) return [1002,"请选择交货地"];
$user = \GuzzleHttp\json_decode($input["user"],true);
$data = [
"status"=>1, #启用
"remark"=>$input["remark"],
"delivery_place"=>$input["delivery_place"],
"customer_uid"=>$input["customer_uid"],
"customer_name"=>$input["customer_name"],
"user_types"=>$input["user_types"], //询价客户类型： 1 个人 2 公司
"create_time"=>time(),
"update_time"=>time(),
];
if ($input["user_types"] == 1){ #个人询价
$data["user_id"] = $user[0]["value"];
$data["user_name"] = $user[0]["name"];
}else{
$data["com_id"] = $user[0]["value"];
$data["com_name"] = $user[0]["name"];
}
$check = $inqueryId=$this->where("id",$input["inquiry_id"])->update($data);
return [0,"新增询价成功"];
}
......
config/database.php
......@@ -88,6 +88,18 @@ return [
'prefix' => 'lie_',
'strict' => false,
],
'liexin' => [ //liexin 数据库
'driver' => 'mysql',
'host' => env('DB_HOST_LIEXIN', ''),
'database' => env('DB_DATABASE_LIEXIN', ''),
'username' => env('DB_USERNAME_LIEXIN', ''),
'password' => env('DB_PASSWORD_LIEXIN', ''),
'port' => env('DB_PORT_LIEXIN', 3306),
'charset' => 'utf8',
'collation' => 'utf8_unicode_ci',
'prefix' => 'lie_',
'strict' => false,
],
'ass' => [ //ass数据库
'driver' => 'mysql',
'host' => env('DB_POOL_HOST', ''),
......
public/pdf/1.js deleted 100644 → 0
/*
*
* INSPINIA - Responsive Admin Theme
* version 2.4
*
*/
$(document).ready(function () {
// Add body-small class if window less than 768px
if ($(this).width() < 769) {
$('body').addClass('body-small')
} else {
$('body').removeClass('body-small')
}
// MetsiMenu
$('#side-menu').metisMenu();
// Collapse ibox function
$('.collapse-link').click(function () {
var ibox = $(this).closest('div.ibox');
var button = $(this).find('i');
var content = ibox.find('div.ibox-content');
content.slideToggle(200);
button.toggleClass('fa-chevron-up').toggleClass('fa-chevron-down');
ibox.toggleClass('').toggleClass('border-bottom');
setTimeout(function () {
ibox.resize();
ibox.find('[id^=map-]').resize();
}, 50);
});
// Close ibox function
$('.close-link').click(function () {
var content = $(this).closest('div.ibox');
content.remove();
});
// Fullscreen ibox function
$('.fullscreen-link').click(function () {
var ibox = $(this).closest('div.ibox');
var button = $(this).find('i');
$('body').toggleClass('fullscreen-ibox-mode');
button.toggleClass('fa-expand').toggleClass('fa-compress');
ibox.toggleClass('fullscreen');
setTimeout(function () {
$(window).trigger('resize');
}, 100);
});
// Close menu in canvas mode
$('.close-canvas-menu').click(function () {
$("body").toggleClass("mini-navbar");
SmoothlyMenu();
});
// Run menu of canvas
$('body.canvas-menu .sidebar-collapse').slimScroll({
height: '100%',
railOpacity: 0.9
});
// Open close right sidebar
$('.right-sidebar-toggle').click(function () {
$('#right-sidebar').toggleClass('sidebar-open');
});
// Initialize slimscroll for right sidebar
$('.sidebar-container').slimScroll({
height: '100%',
railOpacity: 0.4,
wheelStep: 10
});
// Open close small chat
$('.open-small-chat').click(function () {
$(this).children().toggleClass('fa-comments').toggleClass('fa-remove');
$('.small-chat-box').toggleClass('active');
});
// Initialize slimscroll for small chat
$('.small-chat-box .content').slimScroll({
height: '234px',
railOpacity: 0.4
});
// Small todo handler
$('.check-link').click(function () {
var button = $(this).find('i');
var label = $(this).next('span');
button.toggleClass('fa-check-square').toggleClass('fa-square-o');
label.toggleClass('todo-completed');
return false;
});
// Minimalize menu
$('.navbar-minimalize').click(function () {
$("body").toggleClass("mini-navbar");
SmoothlyMenu();
});
// Tooltips demo
$('.tooltip-demo').tooltip({
selector: "[data-toggle=tooltip]",
container: "body"
});
// Move modal to body
// Fix Bootstrap backdrop issu with animation.css
$('.modal').appendTo("body");
// Full height of sidebar
function fix_height() {
var heightWithoutNavbar = $("body > #wrapper").height() - 61;
$(".sidebard-panel").css("min-height", heightWithoutNavbar + "px");
var navbarHeigh = $('nav.navbar-default').height();
var wrapperHeigh = $('#page-wrapper').height();
if (navbarHeigh > wrapperHeigh) {
$('#page-wrapper').css("min-height", navbarHeigh + "px");
}
if (navbarHeigh < wrapperHeigh) {
$('#page-wrapper').css("min-height", $(window).height() + "px");
}
if ($('body').hasClass('fixed-nav')) {
if (navbarHeigh > wrapperHeigh) {
$('#page-wrapper').css("min-height", navbarHeigh - 60 + "px");
} else {
$('#page-wrapper').css("min-height", $(window).height() - 60 + "px");
}
}
}
fix_height();
// Fixed Sidebar
$(window).bind("load", function () {
if ($("body").hasClass('fixed-sidebar')) {
$('.sidebar-collapse').slimScroll({
height: '100%',
railOpacity: 0.9
});
}
});
// Move right sidebar top after scroll
$(window).scroll(function () {
if ($(window).scrollTop() > 0 && !$('body').hasClass('fixed-nav')) {
$('#right-sidebar').addClass('sidebar-top');
} else {
$('#right-sidebar').removeClass('sidebar-top');
}
});
$(window).bind("load resize scroll", function () {
if (!$("body").hasClass('body-small')) {
fix_height();
}
});
$("[data-toggle=popover]")
.popover();
// Add slimscroll to element
$('.full-height-scroll').slimscroll({
height: '100%'
})
});
// Minimalize menu when screen is less than 768px
$(window).bind("resize", function () {
if ($(this).width() < 769) {
$('body').addClass('body-small')
} else {
$('body').removeClass('body-small')
}
});
// Local Storage functions
// Set proper body class and plugins based on user configuration
$(document).ready(function () {
if (localStorageSupport) {
var collapse = localStorage.getItem("collapse_menu");
var fixedsidebar = localStorage.getItem("fixedsidebar");
var fixednavbar = localStorage.getItem("fixednavbar");
var boxedlayout = localStorage.getItem("boxedlayout");
var fixedfooter = localStorage.getItem("fixedfooter");
var body = $('body');
if (fixedsidebar == 'on') {
body.addClass('fixed-sidebar');
$('.sidebar-collapse').slimScroll({
height: '100%',
railOpacity: 0.9
});
}
if (collapse == 'on') {
if (body.hasClass('fixed-sidebar')) {
if (!body.hasClass('body-small')) {
body.addClass('mini-navbar');
}
} else {
if (!body.hasClass('body-small')) {
body.addClass('mini-navbar');
}
}
}
if (fixednavbar == 'on') {
$(".navbar-static-top").removeClass('navbar-static-top').addClass('navbar-fixed-top');
body.addClass('fixed-nav');
}
if (boxedlayout == 'on') {
body.addClass('boxed-layout');
}
if (fixedfooter == 'on') {
$(".footer").addClass('fixed');
}
}
});
// check if browser support HTML5 local storage
function localStorageSupport() {
return (('localStorage' in window) && window['localStorage'] !== null)
}
// For demo purpose - animation css script
function animationHover(element, animation) {
element = $(element);
element.hover(
function () {
element.addClass('animated ' + animation);
},
function () {
//wait for animation to finish before removing classes
window.setTimeout(function () {
element.removeClass('animated ' + animation);
}, 2000);
});
}
function SmoothlyMenu() {
if (!$('body').hasClass('mini-navbar') || $('body').hasClass('body-small')) {
// Hide menu in order to smoothly turn on when maximize menu
$('#side-menu').hide();
// For smoothly turn on menu
setTimeout(
function () {
$('#side-menu').fadeIn(400);
}, 200);
} else if ($('body').hasClass('fixed-sidebar')) {
$('#side-menu').hide();
setTimeout(
function () {
$('#side-menu').fadeIn(400);
}, 100);
} else {
// Remove all inline style from jquery fadeIn function to reset menu state
$('#side-menu').removeAttr('style');
}
}
// Dragable panels
function WinMove() {
var element = "[class*=col]";
var handle = ".ibox-title";
var connect = "[class*=col]";
$(element).sortable(
{
handle: handle,
connectWith: connect,
tolerance: 'pointer',
forcePlaceholderSize: true,
opacity: 0.8
})
.disableSelection();
}
vendor/laravel/framework/src/Illuminate/Database/Connection.php
......@@ -111,7 +111,7 @@ class Connection implements ConnectionInterface
*
* @var bool
*/
protected $loggingQueries = false; //debug
protected $loggingQueries = true; //debug
/**
* Indicates if the connection is in a "dry run".
......
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