Skip to content

T
tospur
Commit b5e69f11 by felix
Options

每日一更

parent 97a51cd8
Showing with 283 additions and 202 deletions
wp-content/plugins/tospur/Admin/newHouseList.php
...@@ -318,10 +318,12 @@ class newHouseList extends UGEN_List_Table ...@@ -318,10 +318,12 @@ class newHouseList extends UGEN_List_Table
if (isset($_REQUEST["organization"]) && $_REQUEST["organization"] != -1) { if (isset($_REQUEST["organization"]) && $_REQUEST["organization"] != -1) {
$params[] = $_REQUEST["organization"]; $params[] = $_REQUEST["organization"];
$sql = $sql . " and subsidiaryId=%d "; $sql = $sql . " and subsidiaryId=%d ";
} else if (trim($_REQUEST["searchText"]) != NULL) { }
if (trim($_REQUEST["searchText"]) != NULL) {
$params[] = '%' . $_REQUEST['searchText'] . '%'; $params[] = '%' . $_REQUEST['searchText'] . '%';
$sql = $sql . " and name like %s"; $sql = $sql . " and name like %s";
} else if (trim($_REQUEST["stuff"]) != NULL) { }
if (trim($_REQUEST["stuff"]) != NULL) {
$params[] = '%' . $_REQUEST['stuff'] . '%'; $params[] = '%' . $_REQUEST['stuff'] . '%';
$sql = $sql . " and consul_name like %s"; $sql = $sql . " and consul_name like %s";
} }
......
wp-content/plugins/tospur/Admin/rentHouseList.php
...@@ -349,10 +349,12 @@ class rentHouseList extends UGEN_List_Table ...@@ -349,10 +349,12 @@ class rentHouseList extends UGEN_List_Table
if (isset($_REQUEST["organization"]) && $_REQUEST["organization"] != -1 && $_REQUEST["organization"] != 0) { if (isset($_REQUEST["organization"]) && $_REQUEST["organization"] != -1 && $_REQUEST["organization"] != 0) {
$params[] = $_REQUEST["organization"]; $params[] = $_REQUEST["organization"];
$sql = $sql . " and subsidiaryId=%d "; $sql = $sql . " and subsidiaryId=%d ";
} else if (trim($_REQUEST["searchText"] != NULL)) { }
if (trim($_REQUEST["searchText"] != NULL)) {
$params[] = '%' . $_REQUEST['searchText'] . '%'; $params[] = '%' . $_REQUEST['searchText'] . '%';
$sql = $sql . " and name like %s"; $sql = $sql . " and name like %s";
} else if (trim($_REQUEST["stuff"] != NULL)) { }
if (trim($_REQUEST["stuff"] != NULL)) {
$params[] = '%' . $_REQUEST['stuff'] . '%'; $params[] = '%' . $_REQUEST['stuff'] . '%';
$sql = $sql . " and consul_name like %s"; $sql = $sql . " and consul_name like %s";
} }
......
wp-content/plugins/tospur/Admin/secHandHouseList.php
...@@ -375,10 +375,12 @@ class secHandHouseList extends UGEN_List_Table ...@@ -375,10 +375,12 @@ class secHandHouseList extends UGEN_List_Table
if (isset($_REQUEST["organization"]) && $_REQUEST["organization"] != -1 && $_REQUEST["organization"] != 0) { if (isset($_REQUEST["organization"]) && $_REQUEST["organization"] != -1 && $_REQUEST["organization"] != 0) {
$params[] = $_REQUEST["organization"]; $params[] = $_REQUEST["organization"];
$sql = $sql . " and subsidiaryId=%d "; $sql = $sql . " and subsidiaryId=%d ";
} else if (trim($_REQUEST["searchText"] != NULL)) { }
if (trim($_REQUEST["searchText"] != NULL)) {
$params[] = '%' . $_REQUEST['searchText'] . '%'; $params[] = '%' . $_REQUEST['searchText'] . '%';
$sql = $sql . " and name like %s"; $sql = $sql . " and name like %s";
} else if (trim($_REQUEST["stuff"] != NULL)) { }
if (trim($_REQUEST["stuff"] != NULL)) {
$params[] = '%' . $_REQUEST['stuff'] . '%'; $params[] = '%' . $_REQUEST['stuff'] . '%';
$sql = $sql . " and consul_name like %s"; $sql = $sql . " and consul_name like %s";
} }
......
wp-content/plugins/tospur/Admin/views/TCSyncView.html
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
</select> </select>
</div><br/><br/> </div><br/><br/>
<div class="form-group"> <div class="form-group">
<input type="submit" value="同步" class="btn btn-success"> <input type="submit" value="同步" class="btn btn-info">
</div> </div>
</form> </form>
</body> </body>
\ No newline at end of file
wp-content/plugins/tospur/Admin/views/addConsultant.html
...@@ -37,8 +37,8 @@ ...@@ -37,8 +37,8 @@
init_modal_myConsultantList(addConsultant); init_modal_myConsultantList(addConsultant);
$("#consultantImg").on("click",".consultantCancel",function(){ $("#consultantImg").on("click",".consultantCancel",function(){
$(this).parents("p").remove(); $(this).parent().parent().remove();
if( $("#consultantImg > p").length == 0){ if( $("#consultantImg > div").length == 0){
$("#subsidiaryId").remove(); $("#subsidiaryId").remove();
} }
}); });
...@@ -46,29 +46,28 @@ ...@@ -46,29 +46,28 @@
}); });
//点击模态框中的置业顾问后显示 //点击模态框中的置业顾问后显示
function addConsultant(data){ function addConsultant(data){
var row = $("<div>").addClass("row").css("margin-bottom","10px"); var div = $("<div>").css({"display":"inline-block","margin-right":"10px"});
var left = $("<div>").addClass("col-md-3"); var p1 = $("<p>");
var img = $("<img>").attr({"src":data.imageUrl,"height":100,"width":100,"style":"margin-right:50px"}); var img = $("<img>").attr({"src":data.imageUrl,"height":100,"width":100});
left.append(img); p1.append(img);
var mid = $("<div>").addClass("col-md-3"); div.append(p1);
var label = $("<label>").append(data.name); var p2 = $("<p>").css({"margin-top":"3px"});
mid.append(label); var label = $("<label>").html(data.name);
var right = $("<div>").addClass("col-md-3"); p2.append(label);
if ('{{role}}' == 'jl') { if ('{{role}}' == 'jl') {
var cancel = $("<input>").attr({ var cancel = $("<input>").attr({
"type": "button", "type": "button",
"value": "删除" "value": "删除"
}).addClass("btn btn-info consultantCancel"); }).addClass("btn btn-info btn-xs consultantCancel").css({"float":"right"});
right.append(cancel); p2.append(cancel);
} }
div.append(p2);
var recommendConsultant = $("<input>").attr({"type":"hidden","name":"data[recConsultant][]","value":data.id}); var recommendConsultant = $("<input>").attr({"type":"hidden","name":"data[recConsultant][]","value":data.id});
row.append(left).append(mid).append(right); div.append(recommendConsultant);
var p = $("<p>").append(row).append(recommendConsultant);
var subsidiaryId = $("<input>").attr({"type":"hidden","value":data.subsidiaryId,"id":"subsidiaryId"}); var subsidiaryId = $("<input>").attr({"type":"hidden","value":data.subsidiaryId,"id":"subsidiaryId"});
if($("#consultantImg > p").length == 0){ $("#consultantImg").append(div);
$("#consultantImg").append(p).append(subsidiaryId); if($("#consultantImg > div").length == 0){
}else{ $("#consultantImg").append(subsidiaryId);
$("#consultantImg").append(p);
} }
{% if (house_type == 1 or house_type == 2 or page == 'customer' or page == 'view_house') %} {% if (house_type == 1 or house_type == 2 or page == 'customer' or page == 'view_house') %}
controlCommand("consultantImg",1,1); controlCommand("consultantImg",1,1);
......
wp-content/plugins/tospur/Admin/views/addFeature.html
<table class="form-table" style="margin-bottom: 15px;"> <div class="row form-group">
<tbody> <div class="col-xs-6">
<tr> <div class="input-group">
<td style="width: 75px;padding: 10px 0;"> <span class="input-group-addon color-red">特色</span>
<label class="control-label color-red">特色筛选:</label> <input type="button" class="btn btn-success" id="addFeatureBtn" value="添加特色" />
</td> </div>
<td> <div id="feature" class="input-group" style="margin-left: 68px;margin-top: 10px;">
<div id="feature"></div> </div>
</td> </div>
</tr> </div>
<tr>
<td style="display: inline;padding: 10px 0;margin-left: 75px;">
<button type="button" class="btn btn-success" id="addFeatureBtn">
添加特色
</button>
</td>
</tr>
</tbody>
</table>
<script> <script>
$(document).ready(function () { $(document).ready(function () {
...@@ -42,12 +33,21 @@ ...@@ -42,12 +33,21 @@
} }
}); });
}); });
$("#feature").on("click",".featureCancel",function(){
var removeItem = $(this).parent().parent().find("input").val();
$.grep(featureArray, function(value) {
return value != removeItem;
});
$(this).parent().parent().parent().remove();
});
}); });
function addFeature(id, value) { function addFeature(id, value) {
var houseFeature = $("<input>").attr({"type": "hidden", "name": "data[houseFeature][]", "value": id}); var houseTag = $("<input>").attr({"type": "hidden", "name": "data[houseTag][]", "value": id});
var cancel = $("<span>").attr("aria-hidden", "true").addClass("glyphicon glyphicon-remove featureCancel "); var cancel = $("<span>").attr("aria-hidden", "true").addClass("glyphicon glyphicon-remove featureCancel ").css({"top":"3px","margin-left":"10px"});
var span = $("<span>").attr("style", "margin-right:5px").append(value); var span = $("<span>").attr("style", "margin-right:5px").addClass("label label-info").append(value);
var divCol = $("<div>").append(houseFeature).append(span).append(cancel).addClass("col-md-3").attr("style", "margin-bottom:10px"); var h = $("<h4>");
h.append(span.append(cancel));
var divCol = $("<div>").append(houseTag).append(h).addClass("col-md-2").attr("style", "margin-bottom:10px");
$("#feature").append(divCol); $("#feature").append(divCol);
} }
</script> </script>
\ No newline at end of file
wp-content/plugins/tospur/Admin/views/addTag.html
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<h4 class="modal-title"></h4> <h4 class="modal-title"></h4>
</div> </div>
<div id="featureTable"> <div id="featureTable">
<table class="table" id="tagList"> <table class="table" id="tagList" style="table-layout:fixed;">
</table> </table>
</div> </div>
</div> </div>
...@@ -42,19 +42,25 @@ ...@@ -42,19 +42,25 @@
url: "/tospur/wp-admin/admin-ajax.php", url: "/tospur/wp-admin/admin-ajax.php",
data: "action=searchTagOrFeature&type=" + search_type, data: "action=searchTagOrFeature&type=" + search_type,
success: function (data) { success: function (data) {
var tr; var tr,lastIndex;
$.each(data, function (index, item) { $.each(data, function (index, item) {
if (index % 4 == 0) { if (index % 4 == 0) {
tr = $('<tr>'); tr = $('<tr>');
} }
tr.append('<td><span id="' + item.id + '">' + item.value + '</span></td>'); tr.append('<td><span id="' + item.id + '">' + item.value + '</span></td>');
tagList.append(tr); tagList.append(tr);
lastIndex = index;
}); });
for(var i = 0;i<=4-tr.find("td").length;i++){
tr.append('<td></td>');
}
} }
}); });
}); });
tagList.on("click", "tr > td > span", function () { tagList.on("click", "tr > td > span", function () {
search_callback($(this).attr('id'), $(this).text()); if($(this).attr('id') != null){
search_callback($(this).attr('id'), $(this).text());
}
}); });
existsCancel(); existsCancel();
}); });
......
wp-content/plugins/tospur/Admin/views/commissionList.html
<div class="wrap"> <div class="wrap">
<h2>收佣进度表</h2> <h2>收佣进度表</h2>
<form method="get"> <form method="get" class="form-horizontal">
<input type="hidden" name="page" value="commissionList"> <input type="hidden" name="page" value="commissionList">
{% import "selectOrganization.html" as macro %} {% import "selectOrganization.html" as macro %}
{{ macro.selectOrganization("commission") }} {{ macro.selectOrganization("commission") }}
<div id="search_form"> <div class="row" id="search_form">
<label for="year" class="hidden"></label> <div class="col-md-2">
<select name="year" id="year"> <div class="input-group">
<option value="2015">2015</option> <span class="input-group-addon">年份</span>
<option value="2016">2016</option> <label for="year" class="hidden"></label>
</select> <select name="year" id="year" class="form-control widthAuto">
<label for="month" class="hidden"></label> <option value="2015">2015</option>
<select name="month" id="month"> <option value="2016">2016</option>
<option value="-1">请选择月份</option> </select>
<option value="1">一月</option> </div>
<option value="2">二月</option> </div>
<option value="3">三月</option> <div class="col-md-2">
<option value="4">四月</option> <div class="input-group">
<option value="5">五月</option> <span class="input-group-addon">月份</span>
<option value="6">六月</option> <select name="month" id="month" class="form-control widthAuto">
<option value="7">七月</option> <option value="-1">请选择月份</option>
<option value="8">八月</option> <option value="1">一月</option>
<option value="9">九月</option> <option value="2">二月</option>
<option value="10">十月</option> <option value="3">三月</option>
<option value="11">十一月</option> <option value="4">四月</option>
<option value="12">十二月</option> <option value="5">五月</option>
</select> <option value="6">六月</option>
<label for="search_consultant_name" class="hidden"></label> <option value="7">七月</option>
<input type="text" placeholder="请输入置业顾问" name="search_consultant_name" id="search_consultant_name" <option value="8">八月</option>
value="{{ req.search_consultant_name }}"> <option value="9">九月</option>
<option value="10">十月</option>
<option value="11">十一月</option>
<option value="12">十二月</option>
</select>
<label for="month" class="hidden"></label>
</div>
</div>
<div class="col-md-2">
<div class="input-group">
<span class="input-group-addon">置业顾问</span>
<label for="search_consultant_name" class="hidden"></label>
<input type="text" class="form-control" name="search_consultant_name" id="search_consultant_name"
value="{{ req.search_consultant_name }}">
</div>
</div>
<input type="submit" id="submit" class="btn btn-success" value="搜索"> <input type="submit" id="submit" class="btn btn-success" value="搜索">
</div> </div>
</form> </form>
......
wp-content/plugins/tospur/Admin/views/css/public.css
...@@ -42,13 +42,20 @@ p[class^=col-]{ ...@@ -42,13 +42,20 @@ p[class^=col-]{
/*#the-list > tr >.column-id{*/ /*#the-list > tr >.column-id{*/
/*border-left: 0px;*/ /*border-left: 0px;*/
/*}*/ /*}*/
.wp-list-table > thead > tr > th > a > span,
.wp-list-table > tfoot > tr > th > a > span{
font-weight:bold;
}
.striped>tbody> {
background-color: #fff;
}
/*#cb,.wp-list-table > tfoot > tr > .column-cb{*/ /*#cb,.wp-list-table > tfoot > tr > .column-cb{*/
/*border-right: 0px;*/ /*border-right: 0px;*/
/*}*/ /*}*/
.color-red{ .color-red{
color: red; color: red;
font-weight: bold;
} }
.nav-tabs>li.active>a, .nav-tabs>li.active>a:focus, .nav-tabs>li.active>a:hover{ .nav-tabs>li.active>a, .nav-tabs>li.active>a:focus, .nav-tabs>li.active>a:hover{
...@@ -78,4 +85,24 @@ p[class^=col-]{ ...@@ -78,4 +85,24 @@ p[class^=col-]{
th.sortable a span, th.sorted a span{ th.sortable a span, th.sorted a span{
float: none; float: none;
}
#wpcontent,body{
background-color: #fff;
}
select.form-control{
height:34px;
}
span.input-group-addon{
width:83px;
}
div.input-group{
width:100%;
}
.widthAuto.widthAuto,
span.widthAuto{
width:auto;
} }
\ No newline at end of file
wp-content/plugins/tospur/Admin/views/customer.html
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<body> <body>
<h2 class="title">{{ title }}</h2> <h2 class="title">{{ title }}</h2>
<div class="alert alert-danger" role="alert" id="error" style="display:none;"></div> <div class="alert alert-danger" role="alert" id="error" style="display:none;"></div>
<form action="" method="POST" enctype="multipart/form-data" id="customerForm" class="form-inline"> <form action="" method="POST" enctype="multipart/form-data" id="customerForm" class="form-horizontal">
<div class="row"> <div class="row">
<div class="col-md-11"> <div class="col-md-11">
<ul class="nav nav-tabs" role="tablist"> <ul class="nav nav-tabs" role="tablist">
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<a href="#customer" aria-controls="customer" role="tab" data-toggle="tab">客户信息</a> <a href="#customer" aria-controls="customer" role="tab" data-toggle="tab">客户信息</a>
</li> </li>
<li role="presentation"> <li role="presentation">
<a href="#customer_tracking" aria-controls="customer_tracking" role="tab" data-toggle="tab">房源跟进</a> <a href="#customer_tracking" aria-controls="customer_tracking" role="tab" data-toggle="tab">客户跟进</a>
</li> </li>
{% if role != 'zygw' %} {% if role != 'zygw' %}
<li role="presentation"> <li role="presentation">
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
errorLabelContainer: error, errorLabelContainer: error,
submitHandler: function (form) { submitHandler: function (form) {
var consultantImg = $('#consultantImg'); var consultantImg = $('#consultantImg');
if (consultantImg.length == 1 && consultantImg.find('p').length == 0) { if (consultantImg.length == 1 && consultantImg.find('div').length == 0) {
error.html('<label class="my-error-class">请选择置业顾问</label>'); error.html('<label class="my-error-class">请选择置业顾问</label>');
error.show(); error.show();
} else { } else {
......
wp-content/plugins/tospur/Admin/views/customerInfo.html
<br> <br>
<div class="row addBorder"> <div class="row form-group">
<div class="col-md-6"> <div class="col-md-4">
<label for="name" class="color-red">姓名：</label> <div class="input-group">
<input type="text" name="name" id="name" value="{{ result.name }}" class="form-control"> <span class="input-group-addon color-red">姓名</span>
<input type="text" name="name" id="name" value="{{ result.name }}" class="form-control">
</div>
</div> </div>
<div class="col-md-6"> <div class="col-md-4">
<label for="customer_type">等级：</label> <div class="input-group">
<select name="customer_type" id="customer_type" class="form-control"> <span class="input-group-addon color-red">电话</span>
{% for item in customer_type %} <input type="text" name="phone" id="phone" value="{{ result.phone }}" class="form-control">
<option{% if(item.id == result.customer_type) %} selected="selected"{% endif %} value="{{ item.id }}">{{ item.value }}</option> </div>
{% endfor %}
</select>
</div> </div>
</div> <div class="col-md-4">
<br> <div class="input-group">
<div class="row addBorder"> <span class="input-group-addon">等级</span>
<div class="col-md-8"> <select name="customer_type" id="customer_type" class="form-control">
<label for="phone" class="color-red">电话：</label> {% for item in customer_type %}
<input type="text" name="phone" id="phone" value="{{ result.phone }}" class="form-control"> <option{% if(item.id == result.customer_type) %} selected="selected"{% endif %} value="{{ item.id }}">{{ item.value }}</option>
{% endfor %}
</select>
</div>
</div> </div>
</div> </div>
<br> <br>
<div class="row addBorder"> <div class="row form-group">
<div class="col-md-8"> <div class="col-md-6">
<label for="customer_remark">客户备注：</label><br> <div class="input-group">
<textarea name="customer_remark" id="customer_remark" rows="5" cols="50" class="form-control">{{ result.customer_remark }}</textarea> <span class="input-group-addon">客户备注</span>
<textarea name="customer_remark" id="customer_remark" rows="5" cols="50" class="form-control">{{ result.customer_remark }}</textarea>
</div>
</div> </div>
</div> </div>
wp-content/plugins/tospur/Admin/views/customerTrackingList.html
...@@ -3,29 +3,43 @@ ...@@ -3,29 +3,43 @@
<form method="get" id="search_form"> <form method="get" id="search_form">
<input type="hidden" name="page" value="customerTrackingList"> <input type="hidden" name="page" value="customerTrackingList">
{% if role != 'zygw' %}
<div> {% import "selectOrganization.html" as macro %}
{% if role != 'zygw' %} {{ macro.selectOrganization("customerTracking") }}
{% import "selectOrganization.html" as macro %} {% endif %}
{{ macro.selectOrganization("customerTracking") }} <div class="row">
{% endif %} <div class="col-md-2">
<label for="status_type" class="hidden"></label> <div class="input-group">
<select name="status_type" id="status_type"> <span class="input-group-addon">跟进类型</span>
<option value="-1">跟进类型</option> <label for="status_type" class="hidden"></label>
{% for item in status %} <select name="status_type" id="status_type" class="form-control widthAuto">
<option <option value="-1">请选择</option>
{{ item.id == (req.status_type) ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option> {% for item in status %}
{% endfor %} <option
</select> {{ item.id == (req.status_type) ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
<label for="search_consultant_name" class="hidden"></label> {% endfor %}
<input type="text" placeholder="请输入置业顾问" name="search_consultant_name" id="search_consultant_name" </select>
value="{{ req.search_consultant_name }}"> </div>
<label>日期:</label> </div>
<label for="search_min_time" class="hidden"></label> <div class="col-md-2">
<input type="date" name="search_min_time" id="search_min_time" value="{{ req.search_min_time }}"> <div class="input-group">
— <span class="input-group-addon">置业顾问</span>
<label for="search_max_time" class="hidden"></label> <label for="status_type" class="hidden"></label>
<input type="date" name="search_max_time" id="search_max_time" value="{{ req.search_max_time }}"> <label for="search_consultant_name" class="hidden"></label>
<input class="form-control" type="text" name="search_consultant_name" id="search_consultant_name"
value="{{ req.search_consultant_name }}">
</div>
</div>
<div class="col-md-4">
<div class="input-group">
<span class="input-group-addon">日期</span>
<label for="search_min_time" class="hidden"></label>
<input class="form-control" type="date" name="search_min_time" id="search_min_time" value="{{ req.search_min_time }}">
<span class="input-group-addon">~</span>
<label for="search_max_time" class="hidden"></label>
<input class="form-control" type="date" name="search_max_time" id="search_max_time" value="{{ req.search_max_time }}">
</div>
</div>
<input type="submit" id="submit" class="btn btn-success" value="搜索"> <input type="submit" id="submit" class="btn btn-success" value="搜索">
</div> </div>
</form> </form>
......
wp-content/plugins/tospur/Admin/views/js/public.js
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
} }
function existsCancel(){ function existsCancel(){
$("#preview,#houseImg,#feature,#mark").on("click",".existsCancel,.featureCancel",function(){ $("#preview,#houseImg").on("click",".existsCancel,.featureCancel",function(){
$(this).parent().remove(); $(this).parent().remove();
}); });
} }
...@@ -93,14 +93,14 @@ ...@@ -93,14 +93,14 @@
//控制推荐房源与置业顾问的个数 //控制推荐房源与置业顾问的个数
function controlCommand(id,number,type){ function controlCommand(id,number,type){
var num = $("#"+id+" > p").length; var num = $("#"+id+" > div").length;
if(num>number){ if(num>number){
if(type==0){ if(type==0){
alert("最多只能推荐3个房源"); alert("最多只能推荐3个房源");
}else if(type==1){ }else if(type==1){
alert("您只能推荐一位置业顾问"); alert("您只能推荐一位置业顾问");
} }
$("#"+id).find("p:last-child").remove(); $("#"+id).find("div:last-child").remove();
} }
} }
......
wp-content/plugins/tospur/Admin/views/macro.html
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
{% for item in list %} {% for item in list %}
<tr> <tr>
<td class="col-md-2 text-center">{{ item.status_name }}</td> <td class="col-md-2 text-center">{{ item.status_name }}</td>
<td class="col-md-3 text-center">{{ item.name }}</td> <td class="col-md-3 text-center">{% if item.name %}{{item.name}}{% else %}{{ item.display_name }}{% endif %}</td>
<td class="col-md-3 text-center">{{ item.time }}</td> <td class="col-md-3 text-center">{{ item.time }}</td>
<td class="col-md-4 text-center">{{ item.description }}</td> <td class="col-md-4 text-center">{{ item.description }}</td>
</tr> </tr>
......
wp-content/plugins/tospur/Admin/views/newhouse.html
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
alert("请选择房源相册"); alert("请选择房源相册");
return false; return false;
} }
if($("#consultantImg > p").length == 0){ if($("#consultantImg > div").length == 0){
alert("请选择置业顾问"); alert("请选择置业顾问");
return false; return false;
} }
......
wp-content/plugins/tospur/Admin/views/progressList.html
...@@ -65,8 +65,8 @@ ...@@ -65,8 +65,8 @@
<input type="hidden" name="week" id="week" style="display: none"> <input type="hidden" name="week" id="week" style="display: none">
</div> </div>
</div> </div>
<input type="submit" id="submit" class="button action" value="搜索"> <input type="submit" id="submit" class="btn btn-success" value="搜索">
<a class="button action" href="{{ url }}&action=statistics">即时统计</a> <a class="btn btn-success" href="{{ url }}&action=statistics">即时统计</a>
</form> </form>
{{ function("addProgressTable") }} {{ function("addProgressTable") }}
</div> </div>
......
wp-content/plugins/tospur/Admin/views/recConsultant.html
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
consultantArray.push(Number($(item).val())); consultantArray.push(Number($(item).val()));
}); });
if($.inArray(Number($(this).data().id),consultantArray) == -1){ if($.inArray(Number($(this).data().id),consultantArray) == -1){
if (confirm('是否确定选择职业顾问')) { if (confirm('设置'+$(this).data().name+'为置业顾问吗？')) {
callback($(this).data()); callback($(this).data());
} }
}else{ }else{
......
wp-content/plugins/tospur/Admin/views/recommendHouse.html
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<select id="myModal_cityId" class="form-control"> <select id="myModal_cityId" class="form-control">
<option value="-1"> 城市</option> <option value="-1"> 城市</option>
{% for item in city %} {% for item in city %}
<option value="{{ item.id }}">{{ item.value }}</option> <option {% if cityId %}{{ item.id == cityId ?"selected":"" }}{% else %}{{ item.id == 2 ?"selected" }}{% endif %} value="{{ item.id }}">{{ item.value }}</option>
{% endfor %} {% endfor %}
</select> </select>
</div> </div>
...@@ -103,19 +103,19 @@ ...@@ -103,19 +103,19 @@
//增加！=null 时因为在添加合同模块中调用这个方法，合同模块没有这个baseCity的Id //增加！=null 时因为在添加合同模块中调用这个方法，合同模块没有这个baseCity的Id
if( $("#baseCity").val() != null && $("#baseCity").val()!= -1){ if( $("#baseCity").val() != null && $("#baseCity").val()!= -1){
var cityId = $("#baseCity").val(); var cityId = $("#baseCity").val();
searchCity(cityId,area);
searchAcreage(cityId, acreage);
//城市联动房子价格
{% if house_type == 0 %}
searchPrice(cityId,price)
{% elseif house_type == 1 %}
searchTotalPrice(cityId, price);
{% else %}
searchRentalPrice(cityId,price);
{% endif %}
}else{ }else{
var cityId = city.val(); var cityId = city.val();
} }
searchCity(cityId,area);
searchAcreage(cityId, acreage);
//城市联动房子价格
{% if house_type == 0 %}
searchPrice(cityId,price)
{% elseif house_type == 1 %}
searchTotalPrice(cityId, price);
{% else %}
searchRentalPrice(cityId,price);
{% endif %}
city.val(cityId); city.val(cityId);
city.change(function(){ city.change(function(){
var cityId = city.val(); var cityId = city.val();
......
wp-content/plugins/tospur/Admin/views/rentHouse.html
...@@ -202,7 +202,7 @@ ...@@ -202,7 +202,7 @@
errorContainer: "#messageBox1", errorContainer: "#messageBox1",
errorLabelContainer: "#messageBox1", errorLabelContainer: "#messageBox1",
submitHandler: function (form) { submitHandler: function (form) {
if($("#consultantImg > p").length == 0){ if($("#consultantImg > div").length == 0){
alert("请选择置业顾问"); alert("请选择置业顾问");
return false; return false;
} }
......
wp-content/plugins/tospur/Admin/views/save_customer_tracking.html
{% if function('current_user_can', 'zygw') %}
<style> <style>
.customer_tracking h2 { .customer_tracking h2 {
margin-bottom: 30px; margin-bottom: 30px;
...@@ -19,7 +18,6 @@ ...@@ -19,7 +18,6 @@
} }
</style> </style>
<div class="customer_tracking"> <div class="customer_tracking">
<h2>新增客户跟踪</h2>
<h4 class="addBorder">跟进记录</h4> <h4 class="addBorder">跟进记录</h4>
<p class="addBorder"> <p class="addBorder">
<span class="color-red">跟进类型：</span> <span class="color-red">跟进类型：</span>
...@@ -40,5 +38,4 @@ ...@@ -40,5 +38,4 @@
<label for="description"></label> <label for="description"></label>
</span> </span>
</p> </p>
</div> </div>
{% endif %} \ No newline at end of file
\ No newline at end of file
wp-content/plugins/tospur/Admin/views/secHandHouse.html
...@@ -211,7 +211,7 @@ ...@@ -211,7 +211,7 @@
errorContainer: "#messageBox1", errorContainer: "#messageBox1",
errorLabelContainer: "#messageBox1", errorLabelContainer: "#messageBox1",
submitHandler: function (form) { submitHandler: function (form) {
if($("#consultantImg > p").length == 0){ if($("#consultantImg > div").length == 0){
alert("请选择置业顾问"); alert("请选择置业顾问");
return false; return false;
} }
......
wp-content/plugins/tospur/Admin/views/selectOrganization.html
{% macro selectOrganization(prefix) %} {% macro selectOrganization(prefix) %}
{% set organization = function('SearchDao::searchOrganization')|json_encode() %} {% set organization = function('SearchDao::searchOrganization')|json_encode() %}
<div id="{{ prefix }}_organization" style="margin-bottom: 10px;"> {% set quyu = function('SearchDao::searchOrganization',1) %}
<label>部门:</label> <div class="row" id="{{ prefix }}_organization">
<label for="{{ prefix }}_depth_1" class="hidden"></label> <div class="col-md-12">
<select data-depth="1" id="{{ prefix }}_depth_1"> <div class="input-group">
<option value="-1">请选择</option> <span class="input-group-addon">部门</span>
</select> <label for="{{ prefix }}_depth_1" class="hidden"></label>
<label for="{{ prefix }}_depth_2" class="hidden"></label> <select data-depth="1" id="{{ prefix }}_depth_1" class="form-control widthAuto">
<select data-depth="2" id="{{ prefix }}_depth_2" class="hidden"> <option value="-1">请选择</option>
<option value="-1">请选择</option> </select>
</select> <label for="{{ prefix }}_depth_2" class="hidden"></label>
<label for="{{ prefix }}_depth_3" class="hidden"></label> <select data-depth="2" id="{{ prefix }}_depth_2" class="form-control widthAuto">
<select data-depth="3" id="{{ prefix }}_depth_3" class="hidden"> <option value="-1">请选择</option>
<option value="-1">请选择</option> </select>
</select> <label for="{{ prefix }}_depth_3" class="hidden"></label>
<label for="{{ prefix }}_depth_4" class="hidden"></label> <select data-depth="3" id="{{ prefix }}_depth_3" class="form-control widthAuto">
<select data-depth="4" id="{{ prefix }}_depth_4" class="hidden"> <option value="-1">请选择</option>
<option value="-1">请选择</option> </select>
</select> <label for="{{ prefix }}_depth_4" class="hidden"></label>
<select data-depth="4" id="{{ prefix }}_depth_4" class="form-control widthAuto hidden">
<option value="-1">请选择</option>
</select>
</div>
</div>
</div> </div>
<br />
<script> <script>
$(document).ready(function () { $(document).ready(function () {
var organization = eval('{{ organization }}'); var organization = eval('{{ organization }}');
...@@ -30,6 +36,9 @@ ...@@ -30,6 +36,9 @@
} }
select.append('<option value="' + item.Id + '" data-parent="' + item.ParentId + '" ' + css + '>' + item.Name + '</option>'); select.append('<option value="' + item.Id + '" data-parent="' + item.ParentId + '" ' + css + '>' + item.Name + '</option>');
}); });
$("#{{ prefix }}_depth_1").find("option[value='1']").attr("selected","selected").show();
$("#{{ prefix }}_depth_2").find("option[value='6']").attr("selected","selected").show();
$("#{{ prefix }}_depth_3").find("option[value='28']").attr("selected","selected").show();
$.each($('#{{ prefix }}_organization select[data-depth]:not(:last)'), function (index, item) { $.each($('#{{ prefix }}_organization select[data-depth]:not(:last)'), function (index, item) {
var next_depth = Number($(item).data('depth')) + 1; var next_depth = Number($(item).data('depth')) + 1;
......
wp-content/plugins/tospur/Admin/views/weixin.html
<div class="row form-group"> <div class="row form-group">
<div class="col-xs-4"> <div class="col-xs-4">
<label for="housename" class="control-label color-red">微信标题:</label> <div class="input-group">
<p class="col-xs-7"> <span class="input-group-addon color-red">微信标题</span>
<input name="housename" id="housename" type="text" value="{{result.name}}" class="form-control" > <input name="housename" id="housename" type="text" value="{{result.name}}" class="form-control" >
</p> </div>
</div> </div>
{% if house_type == 0 %} {% if house_type == 0 %}
<div class="col-xs-4"> <div class="col-xs-4">
<label for="average_price" class="control-label color-red">均价:</label> <div class="input-group">
<p class="col-xs-6"> <span class="input-group-addon color-red">均价</span>
<input name="average_price" id="average_price" type="text" value="{{result.average_price}}" class="form-control"> <input name="average_price" id="average_price" type="text" value="{{result.average_price}}" class="form-control">
</p> <span class="input-group-addon">元</span>
<p class="col-xs-1" style="margin-top: 10px"> </div>
&nbsp;元
</p>
</div> </div>
{% endif %} {% endif %}
</div> </div>
<table class="form-table" style="margin-bottom: 15px;"> <div class="row form-group">
<tbody> <div class="col-xs-6">
<tr> <div class="input-group">
<td style="width: 75px;padding: 10px 0;"> <span class="input-group-addon">标签</span>
<label class="control-label">标签:</label> <input type="button" class="btn btn-success" id="addTagBtn" value="添加" />
</td> </div>
<td> <div id="mark" class="input-group" style="margin-left: 68px;margin-top: 10px;">
<div id="mark"></div> </div>
</td> </div>
</tr> </div>
<tr>
<td style="display: inline;padding: 10px 0;margin-left: 75px;">
<button type="button" class="btn btn-success" id="addTagBtn">
标签
</button>
</td>
</tr>
</tbody>
</table>
<script> <script>
$(document).ready(function () { $(document).ready(function () {
...@@ -61,12 +50,21 @@ ...@@ -61,12 +50,21 @@
} }
}); });
}); });
$("#mark").on("click",".featureCancel",function(){
var removeItem = $(this).parent().parent().find("input").val();
$.grep(tagArray, function(value) {
return value != removeItem;
});
$(this).parent().parent().parent().remove();
});
}); });
function addTag(id, value) { function addTag(id, value) {
var houseTag = $("<input>").attr({"type": "hidden", "name": "data[houseTag][]", "value": id}); var houseTag = $("<input>").attr({"type": "hidden", "name": "data[houseTag][]", "value": id});
var cancel = $("<span>").attr("aria-hidden", "true").addClass("glyphicon glyphicon-remove featureCancel "); var cancel = $("<span>").attr("aria-hidden", "true").addClass("glyphicon glyphicon-remove featureCancel ").css({"top":"3px","margin-left":"10px"});
var span = $("<span>").attr("style", "margin-right:5px").append(value); var span = $("<span>").attr("style", "margin-right:5px").addClass("label label-info").append(value);
var divCol = $("<div>").append(houseTag).append(span).append(cancel).addClass("col-md-3").attr("style", "margin-bottom:10px"); var h = $("<h4>");
h.append(span.append(cancel));
var divCol = $("<div>").append(houseTag).append(h).addClass("col-md-2").attr("style", "margin-bottom:10px");
$("#mark").append(divCol); $("#mark").append(divCol);
} }
</script> </script>
\ No newline at end of file
wp-content/plugins/tospur/Dao/CustomerTrackingDao.php
...@@ -41,9 +41,10 @@ class CustomerTrackingDao ...@@ -41,9 +41,10 @@ class CustomerTrackingDao
public static function search($house_id, $origin) public static function search($house_id, $origin)
{ {
$sql = 'SELECT tct.*,ts.status_name,tc.name FROM ' . Config::TOSPUR_CUSTOMER_TRACKING_TABLE . ' tct' . $sql = 'SELECT tct.*,ts.status_name,tc.name,wu.display_name FROM ' . Config::TOSPUR_CUSTOMER_TRACKING_TABLE . ' tct' .
' left join (SELECT * FROM ' . Config::TOSPUR_STATUS_TABLE . ' where status_type = 3) as ts on tct.status_type = ts.status_id' . ' left join (SELECT * FROM ' . Config::TOSPUR_STATUS_TABLE . ' where status_type = 3) as ts on tct.status_type = ts.status_id' .
' left join ' . Config::TOSPUR_CONSULTANT . ' tc on tct.consultant_id = tc.id' . ' left join ' . Config::TOSPUR_CONSULTANT . ' tc on tct.consultant_id = tc.id' .
' left join wp_users wu on wu.id = tct.consultant_id '.
' where tct.house_id = ' . $house_id . ' and tct.origin = ' . $origin; ' where tct.house_id = ' . $house_id . ' and tct.origin = ' . $origin;
$result = DBManager::get_results($sql); $result = DBManager::get_results($sql);
return $result; return $result;
......
wp-content/plugins/tospur/Dao/InsertDao.php
...@@ -17,7 +17,7 @@ class InsertDao{ ...@@ -17,7 +17,7 @@ class InsertDao{
public static function setHouseNumber($houseId,$houseType,$cityId){ public static function setHouseNumber($houseId,$houseType,$cityId){
switch($houseType){ switch($houseType){
case 0: case 0:
$prefix = "xf"; $prefix = "XF";
break; break;
case 1: case 1:
$prefix = "CS"; $prefix = "CS";
......
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