Skip to content

T
tl_estate
Commit c9106ecc authored by zw's avatar zw
Browse files
Options

Merge branch '1224-v3.0.3' into test

# Conflicts: # application/index/view/performance_ranking/performance_ranking.html # public/app/dist/index.html # public/app/dist/static/css/app.4f568cb9a5b022cb1426b7a078f4a466.css # public/app/dist/static/css/app.5ab84730046ae4475f21a1adba4a2d7e.css # public/app/dist/static/css/app.e35b08aaf11a10e5da9733ce5314e040.css # public/app/dist/static/js/app.97f570d50bfe395922d8.js
parents f19a74f2 9f3c88bc
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1220 additions and 305 deletions
application/api/controller/Index.php
View file @ c9106ecc
......@@ -37,9 +37,9 @@ class Index extends Basic
$journalAccounts = new OrderModel();
$turnover = $journalAccounts->getTurnover();
$result['averagePrice'] = $user_count;
$result['turnover'] = $turnover * 4;//不要问为什么乘以9，产品说怎么搞就怎么搞 181220改为4
// $result['turnover'] = $turnover * 4;//不要问为什么乘以9，产品说怎么搞就怎么搞 181220改为4
$result['turnover'] = $turnover * 2;//不要问为什么又改成2，产品说怎么搞就怎么搞 2018-12-26 16:36:59
return $this->response("request success", "200", $result);
}
/**
......
application/api_broker/controller/HomePageLog.php
View file @ c9106ecc
......@@ -208,6 +208,11 @@ class HomePageLog extends Basic
$where_["a.store_id"] = $params["store_id"];
}
//经纪人id
if (!empty($params["agent_id"]) && !empty($params["agent_id"])) {
$where_["f.agent_id"] = $params["agent_id"];
}
if (!empty($params["name_or_phone"])) {
if ((preg_match("/^1\d{10}$/", $params['name_or_phone']) == 1)) {
$agent_params["phone"] = array( "eq", trim($params["name_or_phone"]) );
......
application/api_broker/controller/OrderLog.php
View file @ c9106ecc
......@@ -30,7 +30,6 @@ class OrderLog extends Basic
{
private $o_march_in_model;
private $o_refund_model;
private $service_;
private $verifyService_;
......@@ -38,7 +37,6 @@ class OrderLog extends Basic
{
parent::__construct($request);
$this->o_march_in_model = new OMarchInModel();
$this->o_refund_model = new ORefundModel();
$this->service_ = new OrderLogService();
$this->verifyService_ = new VerifyRepetitionService();
}
......@@ -308,38 +306,7 @@ class OrderLog extends Basic
}
}
/**
* 新增退款申请
* @return \think\Response
*/
public function refund()
{
$params = $this->params;
if (!isset($params["agent_id"]) || !isset($params["agent_name"]) || !isset($params["report_id"]) || !isset($params["order_id"]) || !isset($params["order_no"])
|| !isset($params["refund_money"])) {
return $this->response("101", "请求参数错误");
}
/* $params = array(
"agent_id" => 1,//退款经纪人id
"agent_name" => 1,//退款经纪人id
"report_id" => 1,//报备id
"order_id" => 1, //关联order表id
"order_no" => "12312312312312", //订单no
"refund_money" => 1200, //退款金额 存分
"name" => "qweqwe", //收款人姓名
"bank" => "asdasdasd", //收款人银行
"card_no" => "123123123123", //银行卡号
"remark" => "没什么备注",
"remark_img" => "12312312312"
);*/
//todo 判断此单是否有付款
$is_ok = $this->o_refund_model->addRefund($params);
if ($is_ok > 0) {
return $this->response("200", "request success", []);
}
return $this->response("101", "request faild");
}
/**
* 成交报告
......
application/api_broker/controller/PayLog.php
View file @ c9106ecc
......@@ -53,9 +53,9 @@ class PayLog extends Basic
public function adjustment()
{
$params = $this->params;
/* $params = array(
"pay_id" => 1,
);*/
/* $params = array(
"pay_id" => 1,
);*/
if (empty($params["pay_id"])) {
return $this->response("101", "请求参数错误");
}
......@@ -63,7 +63,103 @@ class PayLog extends Basic
if ($result == -1) {
return $this->response("101", "不存在此条记录");
}
return $this->response("200","success",["residue_money"=>$result]);
return $this->response("200", "success", ["residue_money" => $result]);
}
/**
* 新增或编辑退款申请
* @return \think\Response
* @throws \think\Exception
*/
public function refund()
{
$params = $this->params;
if (!isset($params["agent_id"]) || !isset($params["agent_name"]) || !isset($params["report_id"]) ||
!isset($params["order_id"]) || !isset($params["order_no"]) || !isset($params["name"]) || !isset($params["phone"])
|| !isset($params["refund_money"]) || !isset($params["bank"]) || !isset($params["card_no"])
|| !isset($params["receipt_number"]) || !isset($params["type"])
|| !isset($params["refund_cause"]) || !isset($params["refund_way"])) {
return $this->response("101", "请求参数错误");
}
/* $params = array(
"agent_id" => 1,//退款经纪人id
"agent_name" => 1,//退款经纪人id
"report_id" => 1,//报备id
"order_id" => 1, //关联order表id
"order_no" => "12312312312312", //订单no
"refund_money" => 1200, //退款金额
"name" => "qweqwe", //收款人姓名
"phone" => "123123123", //收款人电话
"bank" => "asdasdasd", //收款人银行
"card_no" => "123123123123", //银行卡号
"remark" => "没什么备注", //其他说明
"remark_img" => "12312312312",
"receipt_number" => "12312312312",
"type" => "12312312312", //退款类型:0退意向金1意向金转定2退保管金3保管金转定4退中介费5退案场费
"refund_cause" => "12312312312", //退款原因
"pay_log_id" => 1, //支付id
"refund_way" => 0, //退款方式:0银行卡
);*/
$refund_id = isset($params["refund_id"]) ? $params["refund_id"] : 0;
if($refund_id == 0 && !isset($params["remark_img"])){
return $this->response("101", "请上传图片");
}
$agent_id = $params["agent_id"];
$agent_name = $params["agent_name"];
$report_id = $params["report_id"];
$order_id = $params["order_id"];
$order_no = $params["order_no"];
$refund_money = $params["refund_money"];
$name = $params["name"];
$phone = $params["phone"];
$bank = $params["bank"];
$card_no = $params["card_no"];
$receipt_number = $params["receipt_number"];
$type = $params["type"];
$refund_cause = $params["refund_cause"];
$pay_log_id = $params["pay_log_id"];
$refund_way = $params["refund_way"];
$remark = isset($params["remark"]) ? $params["remark"] : "";
$remark_img = isset($params["remark_img"]) ? json_decode($params["remark_img"], true) : "";
$del_img =isset($params["del_img"]) ? $params["del_img"] : "";
//todo 判断此单是否有付款
$is_ok = $this->service_->addRefund($agent_id, $agent_name, $report_id, $order_id, $order_no, $refund_money, $name,
$phone, $bank, $card_no, $receipt_number, $type, $refund_cause, $pay_log_id, $refund_way, $remark, $remark_img
,$refund_id,$del_img);
if ($is_ok > 0) {
return $this->response("200", "request success", []);
} elseif ($is_ok == -2) {
return $this->response("101", "退款金不能大于剩余的支付金额");
}
return $this->response("101", "request faild");
}
/**
* @return \think\Response
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function getRefund(){
$params = $this->params;
/* $params = array(
"refund_id" =>1
);*/
if(!isset($params["refund_id"])){
return $this->response("101","请求参数错误");
}
$result = $this->service_->getRefundDetail($params["refund_id"]);
if($result["code"] == 200){
return $this->response("200","success",$result["data"]);
}elseif($result["code"] == 101){
return $this->response("101",$result["msg"]);
}
}
}
\ No newline at end of file
application/api_broker/controller/User.php
View file @ c9106ecc
......@@ -188,6 +188,8 @@ class User extends Basic
$return_user_list[$k]['is_can_look'] = $user_service->isUserAgentDirector($v["agent_id"],$this->agentId);
$return_user_list[$k]['user_phone'] = substr_replace($return_user_list[$k]['user_phone'], '****', 3, 4);
$return_user_list[$k]['site_ids_name'] = $user_service->userSiteName($v["site_ids"]);
}
......
application/api_broker/service/OrderLogService.php
View file @ c9106ecc
......@@ -12,6 +12,7 @@ use app\model\OPayLogAdjustment;
use app\model\OPayLogModel;
use app\model\OrderModel;
use app\model\ORealIncome;
use app\model\ORefundLogModel;
use app\model\ORefundModel;
use app\model\OReportModel;
use app\model\OTaxes;
......@@ -116,7 +117,7 @@ class OrderLogService
*/
public function addCollectingBill($agent_id, $agent_name, $report_id, $order_id, $order_no, $collecting_bill, $house_number,
$industry_type, $remark, $transfer_img, $source, $income_time, $is_dividend,
$last_transfer_time, $pay_id,$receipt_number,$transfer_name)
$last_transfer_time, $pay_id, $receipt_number, $transfer_name)
{
$bill_arr = $params = [];
$father_id = 0;
......@@ -124,32 +125,32 @@ class OrderLogService
$type = 0;
foreach ($collecting_bill as $collecting) {
if (isset($collecting["type"]) && isset($collecting["pay_type"]) && isset($collecting["money"])) {
if (!$this->verifyType($collecting["type"], $collecting["pay_type"],$receipt_number)) {
if (!$this->verifyType($collecting["type"], $collecting["pay_type"], $receipt_number)) {
return -1;
}
$money = $collecting["money"];
$type = $collecting["type"];
if($pay_id > 0){
$is_ok = $this->verifyMoney($pay_id,$money);
if($is_ok != 0){
return $is_ok;
}
if ($pay_id > 0) {
$is_ok = $this->verifyMoney($pay_id, $money);
if ($is_ok != 0) {
return $is_ok;
}
}
if ($father_id == 0) {
$params = $this->collectingBillBin($father_id, $collecting, $agent_id, $agent_name, $report_id,
$order_id, $order_no,$house_number, $industry_type, $remark, $transfer_img, $source, $income_time,
$is_dividend, $last_transfer_time,$receipt_number,$transfer_name);
$order_id, $order_no, $house_number, $industry_type, $remark, $transfer_img, $source, $income_time,
$is_dividend, $last_transfer_time, $receipt_number, $transfer_name);
$father_id = $this->payLogModel->insertPayLog($params);
} else {
array_push($bill_arr, $this->collectingBillBin($father_id, $collecting, $agent_id, $agent_name,
$report_id, $order_id, $order_no,$house_number, $industry_type, $remark, $transfer_img, $source,
$income_time, $is_dividend, $last_transfer_time,$receipt_number,$transfer_name));
$report_id, $order_id, $order_no, $house_number, $industry_type, $remark, $transfer_img, $source,
$income_time, $is_dividend, $last_transfer_time, $receipt_number, $transfer_name));
}
}
}
if ($father_id > 0) {
//保存图片
if($transfer_img){
if ($transfer_img) {
$oImgModel = new OImg();
$oImgModel->addImgAll($father_id, 2, $transfer_img);
}
......@@ -175,10 +176,11 @@ class OrderLogService
* @param $money
* @return int
*/
private function verifyMoney($pay_id,$money){
private function verifyMoney($pay_id, $money)
{
$payLogService = new PayLogService();
$residue_money = $payLogService->adjustment($pay_id);
if($residue_money < $money){
if ($residue_money < $money) {
return -2;
}
return 0;
......@@ -190,7 +192,7 @@ class OrderLogService
* @param $receipt_number
* @return bool
*/
private function verifyType($type, $pay_type,$receipt_number)
private function verifyType($type, $pay_type, $receipt_number)
{
switch ($pay_type) {
......@@ -219,14 +221,14 @@ class OrderLogService
}
switch ($type) {
case 10:
/* if(empty($receipt_number)){
return false;
}*/
/* if(empty($receipt_number)){
return false;
}*/
break;
case 30:
/* if(empty($receipt_number)){
return false;
}*/
/* if(empty($receipt_number)){
return false;
}*/
break;
case 20:
break;
......@@ -274,7 +276,7 @@ class OrderLogService
*/
private function collectingBillBin($father_id, $collecting_arr, $agent_id, $agent_name, $report_id, $order_id,
$order_no, $house_number, $industry_type, $remark, $transfer_img, $source,
$income_time, $is_dividend, $last_transfer_time,$receipt_number,$transfer_name)
$income_time, $is_dividend, $last_transfer_time, $receipt_number, $transfer_name)
{
$arr["report_id"] = $report_id;
......@@ -456,11 +458,11 @@ class OrderLogService
$field_march_in = "id,reception_id,reception_name,report_id,order_no,march_in_remark,march_in_img,march_in_area,create_time";
$marchInData = $oMarchInModel->selectMarchInByOrderNo($field_march_in, ["order_id" => $order_id]);
if (count($marchInData) > 0) {
/* foreach ($marchInData as $k => $v) {
$v["step_name"] = "march_in";
$v["img_path"] = CHAT_IMG_URL;
$result[$sort++] = $v;
}*/
/* foreach ($marchInData as $k => $v) {
$v["step_name"] = "march_in";
$v["img_path"] = CHAT_IMG_URL;
$result[$sort++] = $v;
}*/
foreach ($marchInData as $k => $v) {
$v["step_name"] = "march_in";
......@@ -545,6 +547,7 @@ class OrderLogService
$oRefundModel = new ORefundModel();
$oBargainModel = new OBargainModel();
$oPayLogAdjustmentModel = new OPayLogAdjustment();
$oRefundLogModel = new ORefundLogModel();
$orderData = $orderModel->selectOrderByOrderId("a.f_id,a.house_title,b.internal_address", ["order_id" => $order_id]);
......@@ -606,13 +609,15 @@ class OrderLogService
}
//退款
$field_refund = "id,report_id,agent_id,agent_name,order_no,order_id,refund_money,status,name,bank,card_no,
remark,remark_img,create_time";
$refundData = $oRefundModel->selectRefundByOrderNo($field_refund, ["order_id" => $order_id]);
$field_refund = "a.id,a.report_id,a.agent_id,a.agent_name,a.order_no,a.order_id,a.refund_money,a.status,a.name
,a.phone,a.bank,a.card_no, a.remark,a.receipt_number,a.type,a.refund_cause,a.pay_log_id,a.refund_way,
a.create_time,b.income_time";
$refundData = $oRefundModel->selectRefundDetailByOrderNo($field_refund, ["order_id" => $order_id]);
if (count($refundData) > 0) {
foreach ($refundData as $k => $v) {
$v["step_name"] = "refund";
$v["img_path"] = CHAT_IMG_URL;
$v["img"] = $this->getOImg($v["id"], 3);
$result[$sort++] = $v;
}
}
......@@ -628,15 +633,29 @@ class OrderLogService
$result[$sort++] = $v2;
}
}
//调整
$field_adjustment = "a.id,a.paylog_id,a.new_paylog_id,a.type,a.money,a.create_time,a.update_time,c.name";
$adjustmentData = $oPayLogAdjustmentModel->getAdjustmentListByOrderId($field_adjustment, ["order_id" => $order_id]);
if (count($adjustmentData) > 0) {
foreach ($adjustmentData as $k2 => $v2) {
$v2["step_name"] = "adjustment";
$result[$sort++] = $v2;
}
}
//退款审核
$field_turn_down = "id,refund_id,status,remark,operation_id,operation_name,create_time";
$turn_down["order_id"] = $order_id;
$turn_down["status"] = array("in", ("2,4"));
$turn_down["is_del"] = 0;
$turnDownData = $oRefundLogModel->getListAll($field_turn_down, $turn_down);
if (count($turnDownData) > 0) {
foreach ($turnDownData as $k2 => $v2) {
$v2["step_name"] = "refund_check";
$v2["img_path"] = CHAT_IMG_URL;
$v2["img"] = $this->getOImg($v2["id"], 4);
$result[$sort++] = $v2;
}
}
return $this->sortByTime($result);
}
......
application/api_broker/service/PayLogService.php
View file @ c9106ecc
......@@ -2,8 +2,10 @@
namespace app\api_broker\service;
use app\model\OImg;
use app\model\OPayLogAdjustment;
use app\model\OPayLogModel;
use app\model\ORefundModel;
/**
* Created by PhpStorm.
......@@ -16,11 +18,13 @@ class PayLogService
{
private $payLogModel;
private $payLogAdjustmentModel;
private $oRefundModel;
public function __construct()
{
$this->payLogModel = new OPayLogModel();
$this->payLogAdjustmentModel = new OPayLogAdjustment();
$this->oRefundModel = new ORefundModel();
}
public function getBeForNum($order_id)
......@@ -45,11 +49,15 @@ class PayLogService
$pay_log_arr = $pay_log_arr[0];
$where_["paylog_id"] = $pay_id;
$where_["is_del"] = 0;
$where_["is_del"] = 0;
//调整
$adjustment_sum = $this->payLogAdjustmentModel->getAdjustmentSum("money", $where_);
//减去退款
$refund_params["pay_log_id"] = $pay_id;
$refund_params["status"] = array("neq", 4);
$refund_sum = $this->oRefundModel->getRefundSum("refund_money", $refund_params);
$residue_money = $pay_log_arr["money"] - $adjustment_sum;
$residue_money = $pay_log_arr["money"] - $adjustment_sum - $refund_sum;
return $residue_money;
}
......@@ -126,4 +134,176 @@ class PayLogService
return $arr;
}
/**
* 退款
* @param $agent_id
* @param $agent_name
* @param $report_id
* @param $order_id
* @param $order_no
* @param $refund_money
* @param $name
* @param $phone
* @param $bank
* @param $card_no
* @param $receipt_number
* @param $type
* @param $refund_cause
* @param $pay_log_id
* @param $refund_way
* @param $remark
* @param $remark_img
* @return int|string
* @throws \think\Exception
*/
public function addRefund($agent_id, $agent_name, $report_id, $order_id, $order_no, $refund_money, $name,
$phone, $bank, $card_no, $receipt_number, $type, $refund_cause, $pay_log_id,
$refund_way, $remark, $remark_img, $refund_id, $del_img)
{
//验证金额是否合法
$payLogService = new PayLogService();
$residue_money = $payLogService->adjustment($pay_log_id);
if ($residue_money < $refund_money) {
return -2;
}
$insert_id = 0;
$arr = $this->refundBin($agent_id, $agent_name, $report_id, $order_id, $order_no, $refund_money, $name,
$phone, $bank, $card_no, $receipt_number, $type, $refund_cause, $pay_log_id,$refund_way, $remark,$refund_id);
if ($refund_id <= 0) {
$insert_id = $this->oRefundModel->addRefund($arr);
} else {
$insert_id = $this->oRefundModel->updateRefund($arr);
$insert_id = $refund_id;
}
if ($insert_id > 0 && $remark_img) {
$this->addOImg($insert_id, 3, $remark_img);
}
if($del_img){
$this->delOImg(3,$del_img);
}
return $insert_id;
}
/**
* @param $agent_id
* @param $agent_name
* @param $report_id
* @param $order_id
* @param $order_no
* @param $refund_money
* @param $name
* @param $phone
* @param $bank
* @param $card_no
* @param $receipt_number
* @param $type
* @param $refund_cause
* @param $pay_log_id
* @param $refund_way
* @param $remark
* @return mixed
*/
private function refundBin($agent_id, $agent_name, $report_id, $order_id, $order_no, $refund_money, $name,
$phone, $bank, $card_no, $receipt_number, $type, $refund_cause, $pay_log_id,
$refund_way, $remark,$refund_id)
{
if($refund_id > 0){ //修改
$arr["id"] = $refund_id;
}else{
$arr["create_time"] = date("Y-m-d H:i:s", time());
}
$arr["report_id"] = $report_id;
$arr["agent_id"] = $agent_id;
$arr["agent_name"] = $agent_name;
$arr["order_no"] = $order_no;
$arr["order_id"] = $order_id;
$arr["refund_money"] = $refund_money;
$arr["name"] = $name;
$arr["phone"] = $phone;
$arr["status"] = 0;
$arr["bank"] = $bank;
$arr["card_no"] = $card_no;
$arr["remark"] = $remark;
$arr["receipt_number"] = $receipt_number;
$arr["type"] = $type;
$arr["refund_cause"] = $refund_cause;
$arr["pay_log_id"] = $pay_log_id;
$arr["refund_way"] = $refund_way;
$arr["update_time"] = date("Y-m-d H:i:s", time());
return $arr;
}
/**
* @param $id
* @param $type
* @param $transfer_img
* @throws \think\Exception
*/
private function addOImg($id, $type, $transfer_img)
{
$oImgModel = new OImg();
$oImgModel->addImgAll($id, $type, $transfer_img);
}
/**
* @param $id
* @param $img_type
* @return false|\PDOStatement|string|\think\Collection
*/
private function getOImg($id, $img_type)
{
//查询图片
$oImgModel = new OImg();
$params["img_id"] = $id;
$params["img_type"] = $img_type;
$img_arr = $oImgModel->getImgList($params);
return $img_arr;
}
/**
* @param $type
* @param $del_img
*/
private function delOImg($type, $del_img){
$oImgModel = new OImg();
$ids = rtrim($del_img, ",");
$where_["id"] = array("in",$ids);
$where_["img_type"] = $type;
$params["img_status"] = 1;
$oImgModel->updateImgs($where_, $params);
}
/**
* @param $refund_id
* @return array
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function getRefundDetail($refund_id)
{
$field = "a.id,a.report_id,a.agent_id,a.agent_name,a.order_no,a.order_id,a.refund_money,a.status,a.name
,a.phone,a.bank,a.card_no, a.remark,a.receipt_number,a.type,a.refund_cause,a.pay_log_id,a.refund_way,
a.create_time,b.income_time";
$params["id"] = $refund_id;
$params["is_del"] = 0;
$result = $this->oRefundModel->selectRefundDetailByOrderNo($field, $params);
if (count($result) > 0) {
$item = $result[0];
$item["img_path"] = CHAT_IMG_URL;
$item["img_arr"] = $this->getOImg($item["id"], 3);
return ["code" => 200, "data" => $item];
} else {
return ["code" => 101, "msg" => "没有找到此条退款数据"];
}
}
}
\ No newline at end of file
application/api_broker/service/PerformanceService.php
View file @ c9106ecc
......@@ -837,10 +837,9 @@ class PerformanceService
* 团队人数
* @param $id
* @param $type
* @param $start_time
* @param $end_time
* @param $page_no
* @param $page_size
* @param $site_id
* @return array
*/
public function getTeamNumPcInfo($id, $type, $page_no, $page_size,$site_id)
......
application/app_broker/view/index/timeline_pc.html
View file @ c9106ecc
......@@ -30,7 +30,10 @@
<p v-if="item.step_name==='financial' && item.status == '3' && item.audit_level == '3'">财务部 三审转到一级审核</p>
<p v-if="item.step_name==='financial' && item.status == '4'">财务部 成交报告已撤销</p>
</h6>
<h6 v-else>{{switchTitle(item.step_name)}}</h6>
<h6 v-else>{{switchTitle2(item.step_name,item.status)}}</h6>
<p v-if="item.step_name==='refund_check' && item.status*1 == 4">备注：<span>{{item.remark}}</span></p>
<p v-if="item.step_name==='refund_check' && item.status*1 == 4">操作人：<span>{{item.operation_name}}</span></p>
<p v-if="item.step_name==='adjustment'">调整ID：<span>{{item.id}}</span></p>
<p v-if="item.step_name==='adjustment'">调整前收款ID：<span>{{item.paylog_id}}</span></p>
......@@ -80,11 +83,13 @@
<a href="javascript:;" class="click-big-img-a"><img :src="item.img_path+item2.img_name"></a>
</li>
</ol>
<p v-if="item.step_name==='refund'">退款金额：<span class="span-active">{{item.refund_money}}元</span></p>
<p v-if="item.step_name==='refund'" class="yinhangka-info">退款银行卡信息</p>
<p v-if="item.step_name==='refund'">姓名：<span>{{item.agent_name}}</span></p>
<p v-if="item.step_name==='refund'">银行及支行：<span>{{item.bank}}</span></p>
<p v-if="item.step_name==='refund'">卡号：<span>{{item.card_no}}</span></p>
<p v-if="item.step_name==='refund'">退款ID：<span class="span-active">{{item.id}}</span></p>
<p v-if="item.step_name==='refund'">要退金额的收款ID：<span class="span-active">{{item.pay_log_id}}</span></p>
<p v-if="item.step_name==='refund'">要退款类型：<span class="span-active">{{switchRefundTypeStr(item.type)}}</span></p>
<p v-if="item.step_name==='refund'">退款账户：<span class="span-active">{{item.card_no}}</span></p>
<p v-if="item.step_name==='refund'">开户行：<span class="span-active">{{item.bank}}</span></p>
<p v-if="item.step_name==='refund'">户名：<span class="span-active">{{item.name}}</span></p>
<p v-if="item.step_name==='refund'">收款人手机：<span class="span-active">{{item.phone}}</span></p>
<p v-if="item.step_name==='bargain'">成交类型：<span>{{switchTradeType(item.trade_type)}}</span></p>
<p v-if="item.step_name==='bargain'">商铺号：<span>{{item.house_number}}</span></p>
<p v-if="item.step_name==='bargain'">业态/品牌：<span>{{item.industry_type}}</span></p>
......@@ -112,6 +117,11 @@
<a href="javascript:;" class="click-big-img-a"><img :src="item.img_path+item.explain_img"></a>
</li>
</ol>
<ol v-if="item.step_name==='refund_check' && item.status*1 == 2" class="li-img-list">
<li v-for="(item2, idnex2) in item.img">
<a href="javascript:;" class="click-big-img-a"><img :src="item.img_path+item2.img_name"></a>
</li>
</ol>
<p v-if="item.step_name==='march_in'" class="li-caozuoren">操作人：<span>{{item.reception_name}}</span></p>
<p v-if="item.step_name==='follow_up_log'" class="li-caozuoren">操作人：<span>{{item.agent_name}}</span></p>
<p v-if="item.step_name==='pay_log'" class="li-caozuoren">操作人：<span>{{item.list[0].agent_name}}</span></p>
......@@ -121,7 +131,12 @@
<!--<p v-if="item.step_name==='financial' && item.status == '4' ">备注：<span>{{item.remark}}</span></p>-->
<p v-if="item.step_name==='financial'" class="li-caozuoren">操作人：<span>{{item.audit_name}}</span></p>
<p v-if="item.step_name==='adjustment'" class="li-caozuoren">操作人：<span>{{item.name}}</span></p>
<p v-if="item.step_name==='refund_check' && item.status*1 == 2">操作人：<span>{{item.operation_name}}</span></p>
<ol v-if="item.step_name==='refund'" class="li-img-list">
<li v-for="(item2, idnex2) in item.img">
<a href="javascript:;" class="click-big-img-a"><img :src="item.img_path+item2.img_name"></a>
</li>
</ol>
</div>
</div>
</div>
......
application/index/controller/Finance.php
View file @ c9106ecc
This diff is collapsed.
application/index/controller/ImageDepot.php
View file @ c9106ecc
......@@ -8,6 +8,7 @@ use app\index\service\ImageDepotService;
use app\index\service\UserService;
use app\model\GBusinessDistrict;
use app\model\GImageDepot;
use think\Cache;
use think\Log;
/**
......@@ -173,21 +174,16 @@ class ImageDepot extends Basic
}
public function getUserMacAddress($mac_address){
echo 'Mac地址：'.$mac_address;
}
public function ceshi(){
$time = time();
$begin_date = date("Y-m-d H:i:s", $time - 1800);
$end_date = date("Y-m-d H:i:s", $time);
public function ceshi()
{
$num = 82.997128371823;
$num_ex = explode('.',$num);
dump($num_ex);
dump(substr($num,0,-6));
}
echo $time . '</br>';
echo $begin_date . '</br>';
echo $end_date . '</br>';
}
}
application/index/controller/MarchIn.php
View file @ c9106ecc
......@@ -35,7 +35,6 @@ class MarchIn extends Basic
return view('marchin/marchin_list');
}
$result = '';
$params = $this->params;
$checkResult = $this->validate($params, "VerifyValidate.select");
......@@ -88,6 +87,11 @@ class MarchIn extends Basic
if (isset($params['shop_type']) && $params['shop_type'] != -1) {
$where['f.shop_type'] = $params['shop_type'] ;
}
//10.带看ID
if (!empty($params['order_id'])) {
$where['a.order_id'] = $params['order_id'] ;
}
//搜索条件 end
$fields_evaluate = 'a.id,a.report_id,a.order_id,d.user_name,d.user_phone,a.create_time,d.report_agent_name,';
......
application/index/controller/Remark.php
View file @ c9106ecc
......@@ -43,14 +43,22 @@ class Remark extends Basic
if($this->params['pageNo'] == 1 && !$is_check){
return $this->response("101", "请勿频繁请求");
}
$u_phone_follow = new UPhoneFollowPp($this->siteId);
$user_service = new UserService();
$clientService = new ClientService();
$m_agent_phone = new AAgentsPhone();
$m_user = new Users();
$m_label = new ULabels();
$m_agent = new AAgents();
$redis = RedisExt::getRedis();
$data['status'] = 200;
$data['msg'] = '';
$agent_where = [];
$agent_where = $where = [];
$pageNo = empty($this->params['pageNo']) ? 1 : $this->params['pageNo'];
$pageSize = empty($this->params['pageSize']) ? 15 : $this->params['pageSize'];
$u_phone_follow = new UPhoneFollowPp($this->siteId);
if (!empty($this->params['start_date']) && empty($this->params['end_date'])) {
$where['create_time'] = ['> time', $this->params['start_date'] . ' 00:00:00'];
}
......@@ -67,17 +75,9 @@ class Remark extends Basic
$where['content'] = ['LIKE', "%{$this->params['content']}%"];
}
//跟进人名字
if (!empty($this->params['remark_name'])) {
if (mb_strlen($this->params['remark_name']) < 2) {
return $this->response(101, '名字长度不足2位');
}
$agent_where['name'] = ['LIKE', '%' . $this->params['remark_name'] . '%'];
}
//跟进人手机号
if (!empty($this->params['remark_phone'])) {
$agent_where['phone'] = $this->params['remark_phone'];
//跟进人id
if (!empty($this->params['agent_id'])) {
$agent_where['id'] = $this->params['agent_id'];
}
//跟进人门店
......@@ -90,18 +90,6 @@ class Remark extends Basic
$agent_where['district_id'] = $this->params['remark_district_id'];
}
/*if (!empty($this->params['province'])) {
$where['province'] = $this->params['province'];
}
if (!empty($this->params['city'])) {
$where['city'] = $this->params['city'];
}*/
/*if ($this->city != '全部') {
$where['city'] = $this->city;
}*/
if (!empty($this->params['disc'])) {
$where['disc'] = $this->params['disc'];
}
......@@ -111,52 +99,48 @@ class Remark extends Basic
}
if (!empty($agent_where)) {
$m_agent = new AAgents();
$agent_id_arr = $m_agent->getAgentById('id', $agent_where);
$agent_id = $m_agent->getAgentsByWhereColumn($agent_where, 'id');
if (empty($agent_id_arr)) {
if (empty($agent_id)) {
$data['data']['list'] = [];
return $this->response(200, '', $data); //处理经纪人空数据
} else {
$agent_id = [];
foreach ($agent_id_arr as $K => $v) {
$agent_id[] = $v['id'];
}
$where['agent_id'] = ['in', $agent_id];
}
}
$field = 'id,user_id,create_time,content,user_status,labels_id,agent_id as f_agent_id';
$data['data']['list'] = $u_phone_follow->getFollowList($pageNo, $pageSize, $order_ = 'id desc', $field, $where);
$redis = RedisExt::getRedis();
$field = 'id,user_id,create_time,content,user_status,labels_id,agent_id';
$list = $u_phone_follow->getFollowList($pageNo, $pageSize, $order_ = 'id desc', $field, $where);
$label_data = $m_label->getColumn('id,name', ['type'=>1]); //获取标签
foreach ($list as $k => $v) {
if (!empty($v['user_id'])) {
$user_data = $m_user->getUserById('user_name,user_phone,vip,agent_id,create_time', $v['user_id']);
$list[$k]['user_name'] = $user_data['user_name'];
$list[$k]['user_phone'] = $user_data['user_phone'];
$list[$k]['u_create_time'] = $user_data['create_time'];
$list[$k]['vip'] = $user_data['vip'];
$list[$k]['agent_id'] = $user_data['agent_id']; //客户客方
}
foreach ($data['data']['list'] as $k => $v) {
//dump($v);
//查询客户是否在保护期内
//判断客户是否超过24小时保护期间 0：保护器内 1：超过保护期
$user_service = new UserService();
$is_outstrip_twenty_four_hours = $user_service->isUserProtect($v["user_id"]);
$data['data']['list'][$k]['is_outstrip_twenty_four_hours'] = $is_outstrip_twenty_four_hours;
$list[$k]['is_outstrip_twenty_four_hours'] = $is_outstrip_twenty_four_hours;
/* 判断当天被拨打是否超过5次,同时判断是否当前经纪人跟当前客户是否有电话绑定 start*/
//0允许拨打 1不允许拨打
$is_outpace_call_num = 0;
$clientService = new ClientService();
if (!$clientService->dialTotal($v["user_id"])) {
$is_outpace_call_num = 1;
}
$model = new AAgents();
$result = $model->searchAgentsByKeyword("id,name,phone", [ "id" => $this->params["agent_id"]]);
//$call = new CallPhoneService();
//$result = $call->getBindNum($v['user_phone'],$result[0]['phone']);
$phone = $m_agent->getAgentsById($this->userId, 'phone');
if ($is_outpace_call_num == 1 ) {
$is_privacy = $redis->get('s_is_privacy');//判断是否当前经纪人跟当前客户是否有电话绑定 从redis查询
if (empty($result[0]['phone'])) {
$m_agent_phone = new AAgentsPhone();
$agent_phone = $m_agent_phone->getList(1,1,'','phone', ['agent_id'=>$this->userId]);
$phone = $agent_phone[0]['phone'];
} else {
$phone = $result[0]['phone'];
if (empty($phone)) {
$phone = $m_agent_phone->getAgentsByWhere(['agent_id'=>$this->userId], 'phone');
}
$call_key = 'call_'.$this->userId.'_'.$phone.'_'.$v['user_phone'].'_'.$is_privacy;
$redis_res = $redis->get($call_key);
......@@ -165,12 +149,14 @@ class Remark extends Basic
$is_outpace_call_num = 1;
}
}
$data['data']['list'][$k]['is_outpace_call_num'] = $is_outpace_call_num;
$list[$k]['is_outpace_call_num'] = $is_outpace_call_num;
/* 判断当天被拨打是否超过5次,同时判断是否当前经纪人跟当前客户是否有电话绑定 end*/
$data['data']['list'][$k]['user_phone'] = substr_replace($data['data']['list'][$k]['user_phone'], '****', 3, 4);
$list[$k]['user_phone'] = substr_replace($list[$k]['user_phone'], '****', 3, 4);
$list[$k]['admin'] = $m_agent->getAgentsById($v['agent_id'], 'name');
$data[$k]['label_name'] = array_key_exists($v['labels_id'], $label_data) ? $label_data[$v['labels_id']] : '';
}
$data['data']['list'] = $list;
$data['data']['total'] = 40000;
return $this->response(200, '成功', $data);
}
......
application/index/service/UserService.php
View file @ c9106ecc
......@@ -463,8 +463,9 @@ class UserService
/**
* 查询客户是否被经纪人收藏
* @param $open_id
* @return bool
* @param $agent_id
* @param $user_id
* @return int
*/
public function isCollect($agent_id,$user_id){
$is_collect = 2;
......@@ -481,8 +482,33 @@ class UserService
return $is_collect;
}
/**
* 根据站点id组装站点名字
* @param string $site
* @return string
*/
public function userSiteName($site='10001,10002'){
if(!$site){
return '';
}
$site_name = [];
foreach (explode(',',$site) as $k => $v){
switch ($v) {
case 10001 :
$site_name[] = '上海市';
break;
case 10002 :
$site_name[] = '杭州市';
break;
case 10003 :
$site_name[] = '深圳市';
break;
default :
}
}
return implode(',',$site_name);
}
}
\ No newline at end of file
application/index/view/finance/daily_list.html
View file @ c9106ecc
......@@ -81,6 +81,11 @@
<input class="form-control btn4" value="" data-rule-phoneus="false" data-rule-required="false" id="create_time" name="start_date" type="date">
<span class="fore-span margin-left-10">至</span>
<input class="form-control btn4" value="" data-rule-phoneus="false" data-rule-required="false" id="end_time" name="end_date" type="date">
<select class="form-control btn2 margin-top-ld" id="my-review">
<option value="-1">我是否审核过</option>
<option value="1">我审核过</option>
<option value="0">我未审核过</option>
</select>
<input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="financial_id" placeholder="财务日报ID" type="text" value="">
<select name="district_id" class="form-control btn4">
<option value="">提交人所在部门</option>
......@@ -92,9 +97,7 @@
<input class="form-control" data-rule-phoneus="false" data-rule-required="false" id="partical_name" placeholder="提交人姓名" type="text" value="">
<ul class="user-ul"></ul>
</div>
<!--<input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="agent_name" placeholder="提交人姓名" type="text" value="">-->
<!--<input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="agent_phone" placeholder="提交人手机号" type="text" value="">-->
<!--<input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="bargain_id" placeholder="成交报告ID" type="text" value="">-->
<div style="float: left;margin-top: 10px;">
<span class="btn btn-info btn3 search" id="maintable_search">搜索</span>
<span class="btn btn-info btn3" id="maintable_reset">重置</span>
......@@ -154,7 +157,7 @@
</div><br />
<div>
账上保管金：<span class="total_custody_recorded"></span>元（保管金入账：<span class="intention_recorded"></span>元，保管金调整：<span class="intention_adjustment"></span>元，保管金退款：<span class="custody_refund"></span>元）
账上保管金：<span class="total_custody_recorded"></span>元（保管金入账：<span class="custody_recorded"></span>元，保管金调整：<span class="custody_adjustment"></span>元，保管金退款：<span class="custody_refund"></span>元）
</div><br />
<div>
待处理款项总计：<span class="wait_total_fee"></span>元
......
application/index/view/finance/getCollection.html
View file @ c9106ecc
......@@ -207,6 +207,13 @@
.hide {
display: none !important;
}
.result {
width:130px;
height:auto;
float:left;
text-align:center;
color:red;
}
.result>img,.result2>img{
width: 120px;
height: 120px;
......@@ -225,6 +232,15 @@
width: 80px;
}
#file_input3 {
opacity: 0;
position: absolute;
top: 0;
left: 145px;
height: 35px;
width: 100px;
}
.out-style {
position: absolute;
top: 0;
......@@ -762,7 +778,7 @@
<option value="40">地产转账</option>
<option value="41">世家公账</option>
<option value="42">3000账号</option>
<option value="50">50现金</option>
<option value="50">现金</option>
<option value="60">其他</option>
</select>
</div>
......@@ -836,6 +852,164 @@
<div id="img_mask_area" title="点击任意位置可关闭">
<img />
</div>
<!--退款-->
<div class="modal fade" id="modal-back" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog modal-body-width">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h4 class="modal-title">退款 </h4>
</div>
<div class="modal-body modal-body-height">
<form class="">
<div class="col-xs-12">
<div class="col-xs-12">
<div class="form-group">
<strong><span class="col-xs-2 ld-Marheight">退款最大金额:</span></strong>
<span id="could_price_back" class="col-xs-6 ld-Marheight"></span>
</div>
</div>
<div class="col-xs-6">
<div class="form-group">
<strong><span class="col-xs-4 ld-Marheight">退款类型:</span></strong>
<div class="col-xs-6">
<select class="form-control" id="back_type">
<option class="" value="-1">请选择退款类型</option>
<option class="type_yixiang" value="0">退意向金</option>
<option class="type_yixiang" value="1">意向金转定</option>
<option class="type_baoguan" value="2">退保管金</option>
<option class="type_baoguan" value="3">保管金转定</option>
<option class="type_zhongjie" value="4">退中介费</option>
<option class="type_anchang" value="5">退案场费</option>
</select>
</div>
</div>
</div>
<div class="col-xs-6">
<div class="form-group">
<strong><span class="col-xs-4 ld-Marheight">退款金额(元):</span></strong>
<div class="col-xs-6"><input class="form-control" type="text" value="0" id="back_price" /></div>
<!--<strong><span class="col-xs-2 ld-Marheight">元</span></strong>-->
</div>
</div>
<div class="col-xs-6">
<div class="form-group">
<strong><span class="col-xs-4 ld-Marheight">退款凭证编号:</span></strong>
<div class="col-xs-6"><input class="form-control" type="text" value="" id="back_no" /></div>
<!--<strong><span class="col-xs-2 ld-Marheight">元</span></strong>-->
</div>
</div>
<div class="col-xs-12 rep">
<div class="form-group">
<strong><span class="col-xs-2 ld-Marheight">退款原因:</span></strong>
<div class="col-xs-9" style="padding:0px 10px 0px 5px;">
<input class="form-control" type="text" value="" id="back_reason" data-status="200" autocomplete="off" />
<!--<ul class="reportArea" style="display:none" data-status="100" ></ul>-->
</div>
</div>
</div>
<div class="col-xs-6">
<div class="form-group">
<strong><span class="col-xs-4 ld-Marheight">入账类型:</span></strong>
<span id="back_into_type" class="col-xs-6 ld-Marheight"></span>
</div>
</div>
<div class="col-xs-6">
<div class="form-group">
<strong><span class="col-xs-4 ld-Marheight">商铺地址:</span></strong>
<span id="back_shop_addr" class="col-xs-6 ld-Marheight"></span>
</div>
</div>
<div class="col-xs-6">
<div class="form-group">
<strong><span class="col-xs-4 ld-Marheight">退款方式:</span></strong>
<span id="back_price_type" class="col-xs-6 ld-Marheight">银行卡</span>
</div>
</div>
<div class="col-xs-6">
<div class="form-group">
<strong><span class="col-xs-4 ld-Marheight">退款账户:</span></strong>
<div class="col-xs-6"><input class="form-control" type="text" value="" id="back_price_user" /></div>
</div>
</div>
<div class="col-xs-6">
<div class="form-group">
<strong><span class="col-xs-4 ld-Marheight">开户行:</span></strong>
<div class="col-xs-6"><input class="form-control" type="text" value="" id="back_bank" /></div>
</div>
</div>
<div class="col-xs-6">
<div class="form-group">
<strong><span class="col-xs-4 ld-Marheight">户名:</span></strong>
<div class="col-xs-6"><input class="form-control" type="text" value="" id="back_bank_name" /></div>
</div>
</div>
<div class="col-xs-6">
<div class="form-group">
<strong><span class="col-xs-4 ld-Marheight">收款人手机:</span></strong>
<div class="col-xs-6"><input class="form-control" type="text" value="" id="back_phone" /></div>
</div>
</div>
<div class="col-xs-12">
<div class="form-group">
<strong><span class="col-xs-2 ld-Marheight">其他说明:</span></strong>
<div class="col-xs-9" style="padding:0px 10px 0px 5px;">
<input class="form-control" type="text" value="" id="back_others" data-status="200" autocomplete="off" />
<!--<ul class="reportArea" style="display:none" data-status="100" ></ul>-->
</div>
</div>
</div>
<!--上传图片-->
<div class="col-xs-12" style="margin-top:20px;">
<div class="col-xs-12" style="padding-left:30px;">
<label>上传资料图片:</label>
</div>
<div class="col-xs-12">
<div class="file-upload-area p-a-0 ">
<ul class="img-pre-ul" id="fujian_ul"></ul>
<div class="btn-area">
<input class="btn btn-default" type="file" id="file_input3" data-limittop="10" /> <!--修改上传文件的最大数字-->
<button class="btn btn-default" style="margin-left : 144px;">选择图片</button>
</div>
<div class="col-xs-12 p-t-10" id="container_body_img_area3">
</div>
</div>
</div>
</div>
<div class="col-xs-12" style="padding:10px;">
<strong><span style="margin-left:1rem;">退意向金：收款人身份证、收款人银行卡、意向金收条、转账截图。</span></strong>
</div>
<div class="col-xs-12" style="padding:10px;">
<strong><span style="margin-left:1rem;">意向金转定：收款人身份证、收款人银行卡、意向金收条、转账截图、居间协议、客户的授权委托书。</span></strong>
</div>
<div class="col-xs-12" style="padding:10px;">
<strong><span style="margin-left:1rem;">退保管金：收款人身份证、收款人银行卡、转账截图、客户授权委托书。</span></strong>
</div>
<div class="col-xs-12" style="padding:10px;">
<strong><span style="margin-left:1rem;">保管金转定：收款人身份证、收款人银行卡、转账截图、居间协议、客户授权委托书、房东授权委托书。</span></strong>
</div>
<div class="col-xs-12" style="padding:10px;">
<strong><span style="margin-left:1rem;">退佣金：分部老总给施总申请截图、分红已退回公司的转账截图、收款人身份证、收款人银行卡。</span></strong>
</div>
</div>
</form>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary submit_edit" id="back_saveChangeBtn"> 提交 </button>
</div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal -->
</div>
<!-- /#删除模态框 -->
<div class="modal fade" id="modal-delete" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
......
application/index/view/houses/HouseFollowUp.html
View file @ c9106ecc
......@@ -61,6 +61,23 @@
overflow: hidden;
display: none;
}
/*跟进人 下拉式搜索*/
.user-ul-liu{
height: auto;
float: left;
position: relative;
left: -40px;
}
.user-ul-liu li{
list-style: none;
line-height: 30px;
}
.left-phone-liu{
float: left;
margin-top: 7px;
margin-left: 10px;
}
</style>
<div id="page-content-wrapper">
<div class="container">
......@@ -96,7 +113,11 @@
<select class="form-control btn4 ld-Marheight input" name="" id="guest_stores" value="">
</select>
<!--<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="user_name" placeholder="跟进人姓名" type="text" value="">-->
<input class="form-control btn4 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="user_phone" placeholder="跟进人姓名/电话" type="text" value="">
<!--<input class="form-control btn4 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="user_phone" placeholder="跟进人姓名/电话" type="text" value="">-->
<div class="left-phone-liu">
<input class="form-control" data-rule-phoneus="false" data-rule-required="false" id="partical_name" placeholder="跟进人姓名" type="text" value="">
<ul class="user-ul-liu"></ul>
</div>
<!--<div class="clear"></div>-->
<!--<select class="form-control btn2 ld-Marheight" id="shop_city_id">
......@@ -105,7 +126,9 @@
<option value="330100">杭州市</option>
</select>-->
<div class="clear">
</div>
<span class="btn btn-info btn3 ld-Marheight" id="search">搜索</span>
<span class="btn btn-info btn3 ld-Marheight" id="reset">重置</span>
</form>
......
application/index/view/houses/edit.html
View file @ c9106ecc
......@@ -343,8 +343,10 @@
<select class="form-control" name="zujinType" id="zujinType">
<option value="1" selected="selected">月租金</option>
<option value="2">营业额扣点</option>
<option value="3">每平方米租金</option>
<option value="3">每平方米日租金</option>
<option value="4">年租金</option>
<option value="5">每平方米月租金</option>
</select>
</div>
<div class="form-group">
......
application/index/view/houses/houseList.html
View file @ c9106ecc
......@@ -238,7 +238,7 @@
<option value="" selected="selected">业态筛选</option>
</select>
<input class="form-control btn2 " data-rule-phoneus="false" data-rule-required="false" id="id" placeholder="商铺编号" type="text" value="">
<input class="form-control btn2 " data-rule-phoneus="false" data-rule-required="false" id="internal_title" placeholder="对内商铺名称" type="text" value="">
<input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="shop_address" placeholder="商铺地址" type="text" value="">
<input class="form-control btn2 " data-rule-phoneus="false" data-rule-required="false" id="landlord_phone" placeholder="房东手机号" type="tel" value="">
<div class="clear">
......@@ -272,7 +272,7 @@
<option value="0">否</option>
</select>
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="shop_address" placeholder="商铺地址" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="internal_title" placeholder="对内商铺名称" type="text" value="">
<!--新加筛选-->
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="internal_title_open" placeholder="对外商铺名称" type="text" value="">
......
application/index/view/marchin/marchin_list.html
View file @ c9106ecc
......@@ -75,7 +75,7 @@
<option value="0">商场</option>
<option value="1">街铺</option>
</select>
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="bargain_id" placeholder="带看订单ID" type="text" value="">
<span class="btn btn-info btn3 ld-Marheight" id="search">搜索</span>
<span class="btn btn-info btn3 ld-Marheight" id="reset">重置</span>
</form>
......
application/index/view/performance_ranking/performance_ranking.html
View file @ c9106ecc
......@@ -127,6 +127,18 @@
border-radius: .05rem;
/*margin-top:0.05rem;*/
float:right;
}
.more-news-long-1 {
/*width : 0.8rem !important;*/
/*height : .3rem;*/
background-color: #FF9318;
font-family: PingFangSC-Medium;
font-size: 11px;
color: #ffffff;
border-radius: .05rem;
/*margin-top:0.05rem;*/
/*float:right;*/
padding : 1px 5px !important
}
.title-time{
font-family: PingFangSC-Medium;
......@@ -294,7 +306,7 @@
<div class="area-title p-a-15 p-b-10">
<a><span id="table-title" class="active table-choose">职称</span></a>
<a><span id="group-title" class="table-choose left-padding ">团队</span></a>
<a><span id="initOder" style="font-size:15px;">加载排名</span></a>
<a><span class="btn more-news-long-1" id="initOder" style="font-size:15px;">加载</span></a>
<a><span class="title-time" id="table-time"></span></a>
</div>
......
application/index/view/remark/remark_follow_index.html
View file @ c9106ecc
......@@ -338,6 +338,22 @@
font-weight: 600;
cursor: pointer;
}
/*下拉式*/
.user-ul-liu{
height: auto;
float: left;
position: relative;
left: -40px;
}
.user-ul-liu li{
list-style: none;
line-height: 30px;
}
.left-phone-liu{
float: left;
margin-top: 15px;
margin-left: 10px;
}
</style>
<div id="page-content-wrapper">
<div class="container">
......@@ -365,9 +381,15 @@
<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="end_date" name="end_date" type="date">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="customer_name_id" placeholder="客户编号" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="follow_content" placeholder="跟进内容" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="remark_name" placeholder="跟进人姓名" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="remark_phone" placeholder="跟进人手机号" type="text" value="">
<div class="left-phone-liu">
<input class="form-control" data-rule-phoneus="false" data-rule-required="false" id="partical_name" placeholder="跟进人姓名" type="text" value="">
<ul class="user-ul-liu"></ul>
</div>
<!--<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="remark_name" placeholder="跟进人姓名" type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="remark_phone" placeholder="跟进人手机号" type="text" value="">-->
<div class="clear">
</div>
<select class="form-control btn4 ld-Marheight input" name="" id="district_id">
<option value="">跟进人所在部门</option>
</select>
......
application/model/GHouses.php
View file @ c9106ecc
......@@ -1634,6 +1634,16 @@ class GHouses extends BaseModel
->value($field);
}
/**
* @param $field
* @param $where
* @return mixed
*/
public function getHouseColumn($field, $where) {
return $this->where($where)
->column($field);
}
/**
* @param $field
* @param $where_
......
application/model/ODaily.php
View file @ c9106ecc
......@@ -89,4 +89,39 @@ class ODaily extends BaseModel
return 0;
}
}
/**
* @param int $pageNo
* @param int $pageSize
* @param string $order_
* @param string $field
* @param string $params
* @return false|\PDOStatement|string|\think\Collection
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function getDailyLogList($pageNo = 1, $pageSize = 15, $order_ = 'id desc', $field = '', $params = '') {
return $this->alias('a')
->field($field)
->join('o_daily_log b', 'a.id=b.daily_id', 'left')
->where($params)
->order($order_)
->limit($pageSize)
->group('a.id')
->page($pageNo)
->select();
}
/**
* @param $params
* @return int|string
*/
public function getDailyLogTotal($params) {
return $this->alias('a')
->join('o_daily_log b', 'a.id=b.daily_id', 'left')
->where($params)
->group('a.id')
->count();
}
}
\ No newline at end of file
application/model/OImg.php
View file @ c9106ecc
......@@ -97,6 +97,24 @@ class OImg extends BaseModel
}
}
/**
* 批量删除
* @param $where
* @param $params
* @return int|string
*/
public function updateImgs($where,$params)
{
Db::startTrans();
try {
$id = $this->db_->where($where)->update($params);
Db::commit();
return $id;
} catch (\Exception $e) {
Db::rollback();
return 0;
}
}
/**
* 根据id和类型获取图片
......
application/model/OPayLogAdjustment.php
View file @ c9106ecc
......@@ -172,4 +172,16 @@ class OPayLogAdjustment extends BaseModel{
return 0;
}
}
/**
* @param $field
* @param $where
* @return float|int
*/
public function sumMoney($field, $where) {
return $this->db_->alias('a')
->join('o_paylog b','a.new_paylog_id=b.id', 'left')
->where($where)
->sum($field);
}
}
\ No newline at end of file
application/model/OPayLogModel.php
View file @ c9106ecc
......@@ -531,7 +531,7 @@ class OPayLogModel extends Model
*/
public function sumBargainPrice($field, $where) {
return $this->db_->alias('a')
->join('o_bargain b','a.id=b.order_id')
->join('o_bargain b','a.order_id=b.order_id', 'left')
->where($where)
->sum($field);
}
......@@ -539,22 +539,21 @@ class OPayLogModel extends Model
/**
* @param string $field
* @param array $where
* @param int $type 1 调整前 0调整后
* @return float|int|string
*/
public function sumAdjustment(string $field, array $where, int $type = 1) {
if ($type) {
$field = $this->db_->alias('a')
->join('o_paylog_adjustment b','a.id=b.paylog_id')
->where($where)
->sum($field);
} else {
$field = $this->db_->alias('a')
->join('o_paylog_adjustment b','a.id=b.new_paylog_id')
->where($where)
->sum($field);
}
public function sumPayLogAdjustment(string $field, array $where) {
return $this->db_->alias('a')
->join('o_paylog_adjustment b','a.id=b.paylog_id','left')
->where($where)
->sum($field);
}
return $field;
/**
* @param string $field
* @param array $where
* @return float|int
*/
public function sumPayLog(string $field, array $where) {
return $this->db_->where($where)->sum($field);
}
}
\ No newline at end of file
application/model/ORefundLogModel.php 0 → 100644
View file @ c9106ecc
<?php
/**
* Created by PhpStorm.
* User: 43897
* Date: 2018/12/25
* Time: 13:54
*/
namespace app\model;
use think\Db;
class ORefundLogModel extends BaseModel
{
protected $table = "o_refund_log";
private $db_;
public function __construct($data = [])
{
parent::__construct($data);
$this->db_=Db::name($this->table);
}
/**
* @param $data
* @return int|string
*/
public function insertData($data) {
return $this->db_->insertGetId($data);
}
/**
* @param $data
* @param $where
* @return int|string
* @throws \think\Exception
* @throws \think\exception\PDOException
*/
public function updateData($data, $where) {
return $this->db_->where($where)->update($data);
}
/**
* @param $field
* @param $where
* @return false|\PDOStatement|string|\think\Collection
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function getListAll($field, $where) {
return $this->field($field)
->where($where)
->select();
}
}
\ No newline at end of file
application/model/ORefundModel.php
View file @ c9106ecc
......@@ -28,47 +28,28 @@ class ORefundModel extends Model{
* @return int|string
*/
public function addRefund($params){
$refund_arr = [];
if(isset($params["agent_id"])){
$refund_arr["agent_id"] = $params["agent_id"];
}
if(isset($params["agent_name"])){
$refund_arr["agent_name"] = $params["agent_name"];
}
if(isset($params["report_id"])){
$refund_arr["report_id"] = $params["report_id"];
}
if(isset($params["order_id"])){
$refund_arr["order_id"] = $params["order_id"];
}
if(isset($params["order_no"])){
$refund_arr["order_no"] = $params["order_no"];
}
if(isset($params["refund_money"])){
$refund_arr["refund_money"] = $params["refund_money"];
}
if(isset($params["name"])){
$refund_arr["name"] = $params["name"];
}
if(isset($params["bank"])){
$refund_arr["bank"] = $params["bank"];
}
if(isset($params["card_no"])){
$refund_arr["card_no"] = $params["card_no"];
}
if(isset($params["remark"])){
$refund_arr["remark"] = $params["remark"];
}
if(isset($params["remark_img"])){
$refund_arr["remark_img"] = $params["remark_img"];
}
$refund_arr["create_time"] = date("Y-m-d H:i:s",time());
$refund_arr["update_time"] = date("Y-m-d H:i:s",time());
Db::startTrans();
try {
$id = $this->db_->insertGetId($params);
Db::commit();
return $id;
} catch (\Exception $e) {
Db::rollback();
return 0;
}
}
/**
* @param $params
* @return int|string
*/
public function updateRefund($params){
$where_["id"] = $params["id"];
unset($params["id"]);
Db::startTrans();
try {
$id = $this->db_->insert($refund_arr);
$id = $this->db_->where($where_)->update($params);
Db::commit();
return $id;
} catch (\Exception $e) {
......@@ -102,6 +83,15 @@ class ORefundModel extends Model{
if (isset($params["agent_id"])) {
$where_["agent_id"] = $params["agent_id"];
}
if (isset($params["id"])) {
$where_["id"] = $params["id"];
}
if (isset($params["is_del"])) {
$where_["is_del"] = $params["is_del"];
}
if (isset($params["status"])) {
$where_["status"] = $params["status"];
}
return $this->db_
->field($filed)
......@@ -109,6 +99,33 @@ class ORefundModel extends Model{
->select();
}
/**
* @param $filed
* @param $params
* @return false|\PDOStatement|string|\think\Collection
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function selectRefundDetailByOrderNo($filed , $params)
{
$where_ = [];
if (isset($params["order_id"])) {
$where_["a.order_id"] = $params["order_id"];
}
if (isset($params["id"])) {
$where_["a.id"] = $params["id"];
}
return $this->db_
->field($filed)
->alias("a")
->join("o_paylog b","a.pay_log_id = b.id","left")
->where($where_)
->select();
}
/**
* 查询退款记录带分页
*
......@@ -203,14 +220,17 @@ class ORefundModel extends Model{
* @throws \think\exception\DbException
*/
public function getCheckRefundList($pageNo = 1, $pageSize = 15, $order_ = 'id desc', $field = '', $params = '') {
return Db::table($this->table)
->alias('a')
return $this->db_->alias('a')
->field($field)
->join('o_report b', 'a.report_id = b.id', 'left')
->join('o_financial_audit c', 'a.order_id=c.order_id', 'left')
->join('o_order b', 'a.order_id = b.id', 'left')
->join('a_agents c', 'a.agent_id = c.id', 'left')
->join('o_paylog d', 'a.pay_log_id = d.id', 'left')
->join('o_refund_log e', 'a.id = e.refund_id', 'left')
->where($params)
->limit($pageSize)
->page($pageNo)
->order($order_)
->group('a.id')
->select();
}
......@@ -221,10 +241,78 @@ class ORefundModel extends Model{
* @return int|string
*/
public function getCheckRefundListTotal($params) {
return Db::table($this->table)
->alias('a')
->join('o_report b', 'a.report_id = b.id', 'left')
->join('o_financial_audit c', 'a.order_id=c.order_id', 'left')
return $this->db_->alias('a')
->join('o_order b', 'a.order_id = b.id', 'left')
->join('a_agents c', 'a.agent_id = c.id', 'left')
->join('o_paylog d', 'a.pay_log_id = d.id', 'left')
->join('o_refund_log e', 'a.id = e.refund_id', 'left')
->where($params)
->group('a.id')
->count();
}
public function getRefundSum($field, $params)
{
$data = $this->db_
->where($params)
->sum($field);
return $data;
}
/**
* @param $params
* @return float|int
*/
public function getSumMoney($params) {
$refund_money = $this->db_->alias('a')
->field('a.refund_money')
->join('o_order b', 'a.order_id = b.id', 'left')
->join('a_agents c', 'a.agent_id = c.id', 'left')
->join('o_paylog d', 'a.pay_log_id = d.id', 'left')
->join('o_refund_log e', 'a.id = e.refund_id', 'left')
->where($params)
->group('a.id')
->select();
$price = 0;
foreach ($refund_money as $v) {
$price += $v['refund_money'];
}
return $price;
}
/**
* @param $data
* @param $where
* @return ORefundModel
*/
public function updateData($data, $where) {
return $this->where($where)->update($data);
}
/**
* @param $field
* @param $where
* @return float|int
*/
public function sumBargainPrice($field, $where) {
return $this->db_->alias('a')
->join('o_bargain b','a.order_id=b.order_id')
->where($where)
->sum($field);
}
/**
* @param $field
* @param $where
* @return array|false|\PDOStatement|string|Model
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function getFind($field, $where) {
return $this->db_->field($field)
->where($where)
->find();
}
}
\ No newline at end of file
application/model/ULabels.php
View file @ c9106ecc
......@@ -3,9 +3,18 @@
namespace app\model;
use think\Db;
class ULabels extends BaseModel
{
protected $table = "u_labels";
private $db_;
public function __construct($data = [])
{
parent::__construct($data);
$this->db_ = Db::name($this->table);
}
/**
* @param $where
......@@ -17,7 +26,7 @@ class ULabels extends BaseModel
public function uleList($where)
{
$r= $this->where($where)->select();
$r= $this->db_->where($where)->select();
return $r;
}
......@@ -30,7 +39,7 @@ class ULabels extends BaseModel
* @throws \think\exception\DbException
*/
public function repetition($name,$key){
$r=$this->field($name)
$r=$this->db_->field($name)
->where($name,'=',$key)
->select();
//$this->getLastSql();
......@@ -41,9 +50,16 @@ class ULabels extends BaseModel
}
}
/**
* @param $id
* @return false|\PDOStatement|string|\think\Collection
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function get_labelsname($id)
{
$u_labels = db('u_labels')
$u_labels = $this->db_
->where('id',$id)
->field('id,name')
//->limit($pagesize)
......@@ -52,4 +68,14 @@ class ULabels extends BaseModel
return $u_labels;
}
/**
* @param $field
* @param $where
* @return array
*/
public function getColumn($field, $where) {
return $this->db_->where($where)
->column($field);
}
}
application/model/UPhoneFollowPp.php
View file @ c9106ecc
......@@ -201,45 +201,12 @@ class UPhoneFollowPp extends BaseModel
* @throws \think\exception\DbException
*/
public function getFollowList($pageNo = 1, $pageSize = 15, $order_ = 'id desc', $field = '', $params = '') {
$data = $this->UPhoneFollowPp->field($field)
return $this->UPhoneFollowPp->field($field)
->where($params)
->order($order_)
->limit($pageSize)
->page($pageNo)
->select();
//echo $this->getLastSql();
$m_label = new ULabels();
$m_user = new Users();
$m_agent = new AAgents();
$label_data = $m_label->field('id,name')->where('type', 1)->select();
foreach ($data as $k => $v) {
if (!empty($v['f_agent_id'])) {
$data[$k]['admin'] = $m_agent->getAgentsById($v['f_agent_id'], 'name');
}
if (!empty($v['user_id'])) {
$user_data = $m_user->getUserById('user_name,user_phone,vip,agent_id,create_time', $v['user_id']);
$data[$k]['user_name'] = $user_data['user_name'];
$data[$k]['user_phone'] = $user_data['user_phone'];
$data[$k]['u_create_time'] = $user_data['create_time'];
$data[$k]['vip'] = $user_data['vip'];
$data[$k]['agent_id'] = $user_data['agent_id']; //客户客方
}
if (!isset($v['labels_id'])) {
continue;
}
foreach ($label_data as $k2=>$v2) {
if ($v2['id'] == $v['labels_id']) {
$data[$k]['label_name'] = $v2['name'];
}
}
}
return $data;
}
/**
......
application/route.php
View file @ c9106ecc
......@@ -228,11 +228,7 @@ Route::group('index', [
'backOutTwo/:check_status' => ['index/Finance/reportList', ['method' => 'get'], ['check_status' => 7]], //财务 成交报告-待撤销-第二级数据
'backOutThree/:check_status' => ['index/Finance/reportList', ['method' => 'get'], ['check_status' => 8]], //财务 成交报告-待撤销-第三级数据
'reportListUndone/:check_status' => ['index/Finance/reportList', ['method' => 'get'], ['check_status' => 6]], //财务 成交报告-已撤销
'refundListAttache/:check_status' => ['index/Finance/refundList', ['method' => 'get|post'], ['check_status' => 0]], //退款列表-专员审核
'refundListManager/:check_status' => ['index/Finance/refundList', ['method' => 'get|post'], ['check_status' => 1]], //退款列表-财务经理
'refundListMajordomo/:check_status' => ['index/Finance/refundList', ['method' => 'get|post'], ['check_status' => 2]], //退款列表-总监审核
'refundListCashier/:check_status' => ['index/Finance/refundList', ['method' => 'get|post'], ['check_status' => 3]], //退款列表-出纳审核
'refundOrderList' => ['index/Finance/refundOrderList', ['method' => 'get']], //财务 已退款
'refundList' => ['index/Finance/refundList', ['method' => 'get']], //退款列表-专员审核
'checkReportAttache/:check_status' => ['index/Finance/checkReport', ['method' => 'post'], ['check_status' => 1]], //审核成交报告-第一级审核
'checkReportManager/:check_status' => ['index/Finance/checkReport', ['method' => 'post'], ['check_status' => 2]], //审核成交报告-第二级审核
'checkReportMajordomo/:check_status' => ['index/Finance/checkReport', ['method' => 'post'], ['check_status' => 3]], //审核成交报告-第三级审核
......@@ -283,6 +279,9 @@ Route::group('index', [
'getAdjustmentDetail' => ['index/Finance/getAdjustmentDetail', ['method' => 'get']],//调整详情
'getPayLogTotalPrice' => ['index/Finance/getPayLogTotalPrice', ['method' => 'get']],//佣金统计
'delPayLog' => ['index/Finance/delPayLog', ['method' => 'POST']],//删除收款
'refundPayLog' => ['index/Finance/refundPayLog', ['method' => 'POST']],//退款
'checkRefund' => ['index/Finance/checkRefund', ['method' => 'POST']],//退款审核
'refundDetail' => ['index/Finance/refundDetail', ['method' => 'GET']],//退款详情
'performanceInfo' => ['index/PerformanceInfo/performanceInfo', ['method' => 'post|get']],//业绩明细
'getPerformanceInfoExcel' => ['index/PerformanceInfo/getPerformanceInfoExcel', ['method' => 'post|get']],//业绩明细
......@@ -350,7 +349,6 @@ Route::group('index', [
'getImageDepotById' => ['index/ImageDepot/getImageDepotById', ['method' => 'get | post']],//根据ID获取记录
'delImageDepot' => ['index/ImageDepot/delImageDepot', ['method' => 'get | post']],//删除
'ceshi' => ['index/ImageDepot/ceshi', ['method' => 'get | post']],//
'getUserMacAddress/:mac_address' => ['index/ImageDepot/getUserMacAddress', ['method' => 'get | post']],//
//运营数相关接口
'operationChatUserNum' => ['index/OperationData/chatUserNum', ['method' => 'get | post']],
......@@ -563,7 +561,8 @@ Route::group('broker', [
'savePosBillMessage' => ['api_broker/OrderLog/savePosBillMessage', ['method' => 'get|post']],
'collectingBill' => ['api_broker/OrderLog/collectingBill', ['method' => 'get|post']],
'collectingBillV2' => ['api_broker/OrderLog/collectingBillV2', ['method' => 'get|post']],
'refund' => ['api_broker/OrderLog/refund', ['method' => 'get|post']],
'refund' => ['api_broker/PayLog/refund', ['method' => 'get|post']],
'getRefund' => ['api_broker/PayLog/getRefund', ['method' => 'get|post']],
'bargain' => ['api_broker/OrderLog/bargain', ['method' => 'get|post']],
'statusBargain' => ['api_broker/OrderLog/statusBargain', ['method' => 'get|post']],
'getIsAccountStatement' => ['api_broker/OrderLog/getIsAccountStatement', ['method' => 'get|post']],
......
public/app/dist/index.html
View file @ c9106ecc
......@@ -23,4 +23,4 @@
if(!doc.addEventListener) return;
win.addEventListener(resizeEvt, recalc, false);
doc.addEventListener('DOMContentLoaded', recalc, false);
})(document, window);</script><link href=./static/css/app.4f568cb9a5b022cb1426b7a078f4a466.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.74698e64579a16bcf167.js></script><script type=text/javascript src=./static/js/app.97f570d50bfe395922d8.js></script></body></html>
\ No newline at end of file
})(document, window);</script><link href=./static/css/app.e35b08aaf11a10e5da9733ce5314e040.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.74698e64579a16bcf167.js></script><script type=text/javascript src=./static/js/app.53e39b8f4edd727f0c55.js></script></body></html>
\ No newline at end of file
public/app/dist/static/js/app.53e39b8f4edd727f0c55.js 0 → 100644
View file @ c9106ecc
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/images/icon_Culture@2x.png
View replaced file @ f19a74f2 View file @ c9106ecc
public/app/images/icon_Culture@2x.png

1.89 KB | W: | H:

public/app/images/icon_Culture@2x.png

1.23 KB | W: | H:

public/app/images/icon_Culture@2x.png
public/app/images/icon_Culture@2x.png
public/app/images/icon_Culture@2x.png
public/app/images/icon_Culture@2x.png
  • 2-up
  • Swipe
  • Onion skin
public/app/images/icon_all@2x.png
View replaced file @ f19a74f2 View file @ c9106ecc
public/app/images/icon_all@2x.png

1.73 KB | W: | H:

public/app/images/icon_all@2x.png

2.3 KB | W: | H:

public/app/images/icon_all@2x.png
public/app/images/icon_all@2x.png
public/app/images/icon_all@2x.png
public/app/images/icon_all@2x.png
  • 2-up
  • Swipe
  • Onion skin
public/app/images/icon_course@2x.png
View replaced file @ f19a74f2 View file @ c9106ecc
public/app/images/icon_course@2x.png

2.59 KB | W: | H:

public/app/images/icon_course@2x.png

2.48 KB | W: | H:

public/app/images/icon_course@2x.png
public/app/images/icon_course@2x.png
public/app/images/icon_course@2x.png
public/app/images/icon_course@2x.png
  • 2-up
  • Swipe
  • Onion skin
public/app/images/icon_leader@2x.png
View replaced file @ f19a74f2 View file @ c9106ecc
public/app/images/icon_leader@2x.png

2.09 KB | W: | H:

public/app/images/icon_leader@2x.png

2.26 KB | W: | H:

public/app/images/icon_leader@2x.png
public/app/images/icon_leader@2x.png
public/app/images/icon_leader@2x.png
public/app/images/icon_leader@2x.png
  • 2-up
  • Swipe
  • Onion skin
public/app/images/icon_mark@2x.png
View replaced file @ f19a74f2 View file @ c9106ecc
public/app/images/icon_mark@2x.png

1.87 KB | W: | H:

public/app/images/icon_mark@2x.png

1.49 KB | W: | H:

public/app/images/icon_mark@2x.png
public/app/images/icon_mark@2x.png
public/app/images/icon_mark@2x.png
public/app/images/icon_mark@2x.png
  • 2-up
  • Swipe
  • Onion skin
public/app/images/icon_note@2x.png
View replaced file @ f19a74f2 View file @ c9106ecc
public/app/images/icon_note@2x.png

2.15 KB | W: | H:

public/app/images/icon_note@2x.png

2.9 KB | W: | H:

public/app/images/icon_note@2x.png
public/app/images/icon_note@2x.png
public/app/images/icon_note@2x.png
public/app/images/icon_note@2x.png
  • 2-up
  • Swipe
  • Onion skin
public/app/images/icon_personnel@2x.png
View replaced file @ f19a74f2 View file @ c9106ecc
public/app/images/icon_personnel@2x.png

2.49 KB | W: | H:

public/app/images/icon_personnel@2x.png

2.42 KB | W: | H:

public/app/images/icon_personnel@2x.png
public/app/images/icon_personnel@2x.png
public/app/images/icon_personnel@2x.png
public/app/images/icon_personnel@2x.png
  • 2-up
  • Swipe
  • Onion skin
public/app/images/icon_study@2x.png
View replaced file @ f19a74f2 View file @ c9106ecc
public/app/images/icon_study@2x.png

1.75 KB | W: | H:

public/app/images/icon_study@2x.png

2.05 KB | W: | H:

public/app/images/icon_study@2x.png
public/app/images/icon_study@2x.png
public/app/images/icon_study@2x.png
public/app/images/icon_study@2x.png
  • 2-up
  • Swipe
  • Onion skin
public/app/images/icon_train@2x.png
View replaced file @ f19a74f2 View file @ c9106ecc
public/app/images/icon_train@2x.png

2.1 KB | W: | H:

public/app/images/icon_train@2x.png

3.59 KB | W: | H:

public/app/images/icon_train@2x.png
public/app/images/icon_train@2x.png
public/app/images/icon_train@2x.png
public/app/images/icon_train@2x.png
  • 2-up
  • Swipe
  • Onion skin
public/app/images/icon_update@2x.png
View replaced file @ f19a74f2 View file @ c9106ecc
public/app/images/icon_update@2x.png

2.16 KB | W: | H:

public/app/images/icon_update@2x.png

2.16 KB | W: | H:

public/app/images/icon_update@2x.png
public/app/images/icon_update@2x.png
public/app/images/icon_update@2x.png
public/app/images/icon_update@2x.png
  • 2-up
  • Swipe
  • Onion skin
public/app/js/detaila_tl.js
View file @ c9106ecc
......@@ -101,6 +101,11 @@
_tempStr = response.data.rent_price + '元/年';
$(".pu_price").html(_tempStr);
}else if(response.data.rent_type == '5') {
$(".pu_price_type").html("租金");
_tempStr = response.data.rent_price + '元/月/m²';
$(".pu_price").html(_tempStr);
};
line_a = '<p class="a_fonta">' + title + '</p>';
$(".line_a").html(line_a);
......
public/app/js/detaila_tuiguang.js
View file @ c9106ecc
......@@ -93,6 +93,11 @@
_tempStr = response.data.rent_price + '元/年';
$(".pu_price").html(_tempStr);
}else if(response.data.rent_type == '5') {
$(".pu_price_type").html("租金");
_tempStr = response.data.rent_price + '元/月/m²';
$(".pu_price").html(_tempStr);
};
line_a = '<p class="a_fonta">' + title + '</p>';
$(".line_a").html(line_a);
......
public/app/js/shop_detail_pc.js
View file @ c9106ecc
......@@ -477,8 +477,11 @@ require(['vue', 'css!style/shop_detail_pc.css', 'jquery0325', 'common'], functio
return '营业额扣点 ：' + _this.d.rent_price + '%';
}else if(_this.d.rent_type == '3') {
return '租金均价 ：' + _this.d.rent_price + '元/天/m²';
} else {
} else if(_this.d.rent_type == '4') {
return '租金均价 ：' + _this.d.rent_price + '元/年';
}else{
return '租金均价 ：' + _this.d.rent_price + '元/月/m²';
}
},
dealArea: function() {
......
public/app/js/timeline_pc.js
View file @ c9106ecc
......@@ -66,7 +66,7 @@ require(['vue', 'css!style/timeline_pc.css', 'jquery0325', 'common'],function(Vu
case 'pay_log':
return '收款';
case 'refund':
return '退款';
return '提交退款';
case 'bargain':
return '成交报告';
case 'adjustment' :
......@@ -75,6 +75,38 @@ require(['vue', 'css!style/timeline_pc.css', 'jquery0325', 'common'],function(Vu
return '未定义';
}
},
switchTitle2: function(str,str2){
if(str == 'report'){
return '约带看';
};
if(str == 'march_in'){
return '进场';
};
if(str == 'follow_up_log'){
return '跟进';
};
if(str == 'pay_log'){
return '收款';
};
if(str == 'refund'){
return '提交退款';
};
if(str == 'bargain'){
return '成交报告';
};
if(str == 'adjustment'){
return '调整';
};
if(str == 'refund_check' && str2*1 == 4){
return '驳回退款';
};
if(str == 'refund_check' && str2*1 == 2){
return '已退款';
}else{
return '未定义';
};
},
hideTel: function(str){
if(str !== '' && str !== null && str !== undefined){
var _arr = String(str).split('');
......@@ -209,7 +241,27 @@ require(['vue', 'css!style/timeline_pc.css', 'jquery0325', 'common'],function(Vu
default:
return '未定义';
}
}
},
switchRefundTypeStr(str){
//退款类型:0 退意向金 1 意向金转定 2 退保管金 3 保管金转定 4 退中介费 5 退案场费',
switch (String(str)){
case '0':
return '退意向金';
case '1':
return '意向金转定';
case '2':
return '退保管金';
case '3':
return '保管金转定';
case '4':
return '退中介费';
case '5':
return '退案场费';
default:
return '未定义';
}
},
}
});
});
public/appnew/src/components/businessCollege/articleList.vue
View file @ c9106ecc
......@@ -59,12 +59,12 @@
};
return {
headerData: {
'title': '商学院',
'title': '同联商学院',
'noborder': false,
'isBack': false
},
token: _token,
seatH: 1.66*4,//占位高度
seatH: 1.58*4,//占位高度
pageSize: 10,
initTabNumMain: 0,
isLoading: false,//是否正在加载
......@@ -162,7 +162,7 @@
if(response.data.code == 200) {
let _data = response.data.data;
let _len = _data.length;//标签个数
_this.seatH = Math.ceil((_len+1)/4)*1.66;
_this.seatH = Math.ceil((_len+1)/4)*1.58;
for(let i = 0;i<_len;i++){
_this.mainData.push({
'isLoadOnce': false,
......@@ -232,7 +232,7 @@
<style scoped>
nav{
width: 7.5rem;
margin-bottom: .2rem;
margin-bottom: .3rem;
}
nav>.nav-main {
background-color: white;
......@@ -245,14 +245,14 @@
}
nav>.nav-main>ul>li {
width: 25%;
height: 1.66rem;
font-size: .28rem;
height: 1.58rem;
font-size: .22rem;
text-align: center;
color: #4c4c4c;
color: #333;
flex-direction: column;
justify-content: center;
border-bottom: 1px solid #f0f0f0;
border-right: 1px solid #f0f0f0;
/*border-bottom: 1px solid #f0f0f0;
border-right: 1px solid #f0f0f0;*/
}
nav>.nav-main>ul>li:nth-of-type(4n){
border-right: none;
......@@ -261,16 +261,18 @@
/*flex: 1;*/
}
nav>.nav-main>ul>li>p:nth-of-type(1){
height: .46rem;
height: .72rem;
}
nav>.nav-main>ul>li>p:nth-of-type(1)>img{
width: .46rem;
width: .72rem;
}
nav>.nav-main>ul>li>p:nth-of-type(2){
color: #4c4c4c;
}
nav>.nav-main>ul>li.active {
background-color: #f7f7f7;
background: rgba(252, 194, 50,.1);
}
</style>
\ No newline at end of file
</style>
public/appnew/src/components/businessCollege/articleListLi.vue
View file @ c9106ecc
......@@ -62,33 +62,47 @@
<style scoped>
li{
padding: 0 .3rem;
background-color: white;
/*background-color: white;*/
}
li>div{
height: 2.2rem;
border-bottom: 1px solid #eee;
height: 2.4rem;
/*border-bottom: 1px solid #eee;*/
background: #fff;
box-sizing: border-box;
border-radius: .05rem;
padding: .36rem .3rem;
margin-bottom:.3rem ;
}
li>div>div:nth-of-type(1){
flex-direction: column;
justify-content: center;
padding-right: .5rem;
/*justify-content: center;*/
padding-right: .38rem;
padding-top: .1rem;
flex: 1;
}
li>div>div:nth-of-type(1)>p:nth-of-type(1){
color: #343434;
font-size: .3rem;
color: #414443 ;
font-size: .28rem;
font-weight: 600;
height: .76rem;
text-overflow: -o-ellipsis-lastline;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
li>div>div:nth-of-type(1)>p:nth-of-type(2){
color: #999;
font-size: .24rem;
padding-top: .2rem;
font-size: .22rem;
padding-top: .46rem;
}
li>div>div:nth-of-type(2){
flex: 2.2rem 0 0;
flex: 1.8rem 0 0;
}
li>div>div:nth-of-type(2)>img{
width: 2.2rem;
height: 1.6rem;
width: 1.7rem;
height: 1.7rem;
object-fit: cover;
}
</style>
\ No newline at end of file
public/appnew/src/components/publicEg/headPublic.vue
View file @ c9106ecc
......@@ -61,10 +61,10 @@
height: .88rem;
background: #fff;
z-index: 100;
border-bottom: 1px solid #CCC;
box-shadow: 0 2px 4px 0 rgba(186,186,186,0.15);
}
header.no-border{
border-bottom: none;
box-shadow: none;
}
header .ps-back {
position: absolute;
......
public/appnew/src/components/shop/shopList.vue
View file @ c9106ecc
......@@ -570,6 +570,9 @@
if(item.rent_type == 4){
_rent_type ='' + item.rent_price;
};
if(item.rent_type == 5){
_rent_type ='' + item.rent_price;
};
return _rent_type;
},
selesctRentType(item){
......@@ -586,6 +589,9 @@
if(item.rent_type == 4){
_rent_type_item ='元/年';
};
if(item.rent_type == 5){
_rent_type_item ='元/月/m²';
};
return _rent_type_item;
},
resetConditions(){
......
public/resource/js/RemarkFollowIndex.js
View file @ c9106ecc
......@@ -44,6 +44,7 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css'
customerInfo: {},
agent_id_call:"",//拨打电话 相关
agent_id_call_vip:"",
agent_id_phone:'',
init: function() {
//初始化dot
$("body").append(template);
......@@ -241,6 +242,7 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css'
$("#reset").click(function() {
document.getElementById("form_search").reset();
user.agent_id_phone='';//重置搜索
$('#guest_stores').html('');
$('#guest_stores2').html('');
});
......@@ -261,7 +263,7 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css'
user.getGenjinLabel();
});
$(document).delegate(".add_alert", "click", function() { //重置搜索
$(document).delegate(".add_alert", "click", function() {
document.getElementById("add_user_form").reset();
});
......@@ -420,6 +422,20 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css'
user.getGenjincon();
}
});
//跟进姓名 下拉式搜索
$(document).on("input", "#partical_name", function() { //手机号新增搜索客方
if($("#partical_name").val() == '') {
user.agent_id_phone='';
$(".user-ul-liu").html('');
} else {
user.search_phone_liu();
}
});
//点击li 列表消失
$(document).delegate(".addphoneliu", "click", function() { //list消失新增客户 点击li事件 获取id ul消失
user.addphoneliu(this);
});
//跟进姓名 下拉式搜索
$(document).on("input", ".cus_fang", function() { //手机号搜索客方2 编辑
if($(".cus_fang").val() == '') {
user.agent_id2='';
......@@ -1501,6 +1517,8 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css'
params.remark_phone = $.trim($("#remark_phone").val());
params.remark_store_id = $.trim($("#guest_stores").val());
params.remark_district_id = $.trim($("#district_id").val());
params.agent_id = user.agent_id_phone;//跟进人 下拉式搜索
if(params.remark_name.length == 1){
alert('跟进人姓名的搜索必须2字及2字以上');
return;
......@@ -1980,6 +1998,56 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css'
}
});
},
//跟进人 姓名搜索
search_phone_liu: function() { //手机号新增客户
$.ajax({
url: '/index/getBroker_new',
type: 'GET',
async: true,
data: {
"phone": $("#partical_name").val(),
'all' : 1
},
dataType: 'json',
success: function(data) {
if(data.code == 200) {
var user_ul = "";
$.each(data.data, function(i, item) {
if(item.status == 0){
var status=' ';
};
if(item.status == 1){
var status='-长假';
};
if(item.status == 2){
var status='-离职';
};
if(item.status == 3){
var status='-转勤';
};
if(item.status == 4){
var status='-黑名单';
}
user_ul += '<li class="addphoneliu" data-id="' + item.id + '">' + item.id + '-' + item.name + '-' + item.phone + status + '</li>';
});
$(".user-ul-liu").html(user_ul);
} else {
alert(data.msg);
}
}
});
},
//将li里的值 赋给input（分佣方姓名）
addphoneliu: function(obj) {//新增客户 input赋值
var user_ht = $(obj).html()+'';
var user_ht_str=user_ht.substring(0,user_ht.length-3);
$("#partical_name").val(user_ht_str);
$(".user-ul-liu").html('');
user.agent_id_phone = $(obj).attr("data-id");
},
};
return user;
......
public/resource/js/financial_daily_list.js
View file @ c9106ecc
......@@ -12,6 +12,9 @@ define(['doT', 'text!temp/financial_daily_list_template_tpl.html', 'css!style/ho
init: function() {
//初始化dot
$(document.body).append(template);
//初始化财务日报日期
$('#create_time').val(getBeforeDate(1));
$('#end_time').val(getBeforeDate(0));
bargain.getList(1);
bargain.event();
},
......@@ -105,7 +108,13 @@ define(['doT', 'text!temp/financial_daily_list_template_tpl.html', 'css!style/ho
},
//获取一级审核，二级审核，三级审核，结单数据列表共用的方法
getList: function(pageNo){
console.count('bar');
//判断财务日报日期的时间差不能大于7天
if((getTimeStamp($('#end_time').val())*1-getTimeStamp($('#create_time').val())*1)>604800000){
alert('财务日报日期搜索不能大于7天!');
return
}
var params = {
'pageNo': pageNo,
'pageSize': bargain.pageSize,
......@@ -118,6 +127,7 @@ define(['doT', 'text!temp/financial_daily_list_template_tpl.html', 'css!style/ho
'agent_id': bargain.agent_id_phone,
'id': $('#financial_id').val(),
'status': bargain.switchStatus(),
'is_self':$('#my-review').val(),
};
$.ajax({
......
public/resource/js/getCollection.js
View file @ c9106ecc
This diff is collapsed.
public/resource/js/houseFollowUp.js
View file @ c9106ecc
This diff is collapsed.
public/resource/js/marchinList.js
View file @ c9106ecc
This diff is collapsed.
public/resource/js/public.js
View file @ c9106ecc
This diff is collapsed.
public/resource/js/refundList.js
View file @ c9106ecc
This diff is collapsed.
public/resource/js/shop_edit.js
View file @ c9106ecc
This diff is collapsed.
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 to comment