Skip to content

T
tl_estate
Commit 5756b37b authored by hujun's avatar hujun
Browse files
Options

Merge remote-tracking branch 'origin/0731-v3.3.6' into 0731-v3.3.6

parents e7eebad6 fc34c0ba
Hide whitespace changes
Inline Side-by-side
Showing with 281 additions and 76 deletions
application/index/controller/Finance.php
View file @ 5756b37b
...@@ -4658,6 +4658,10 @@ class Finance extends Basic ...@@ -4658,6 +4658,10 @@ class Finance extends Basic
} }
$num = $m_pay->updatePayLog(['is_del'=>1, 'id'=>$this->params['pay_id']]); $num = $m_pay->updatePayLog(['is_del'=>1, 'id'=>$this->params['pay_id']]);
if ($num > 0) { if ($num > 0) {
//收款记录日志
$s_receipt_operating_records = new ReceiptOperatingRecords();
$s_receipt_operating_records->addOperating($this->userId,1,$this->params['pay_id']);
$code = 200; $code = 200;
} else { } else {
$code = 101; $code = 101;
......
application/index/view/officeBuilding/getCollectionShop.html
View file @ 5756b37b
...@@ -224,7 +224,7 @@ ...@@ -224,7 +224,7 @@
.hide { .hide {
display: none !important; display: none !important;
} }
.result { .result,.result-du-open {
width:130px; width:130px;
height:auto; height:auto;
float:left; float:left;
...@@ -1352,7 +1352,7 @@ ...@@ -1352,7 +1352,7 @@
<div>图片至少1张，最多三张：<span class="text-danger">(必填)</span></div> <div>图片至少1张，最多三张：<span class="text-danger">(必填)</span></div>
<div id="container_body"> <div id="container_body">
<button type="button btn2" class="btn btn-default">上传图片</button> <button type="button btn2" class="btn btn-default">上传图片</button>
<input type="file" id="file_input_pic_open"/> <input type="file" id="file_input_pic_open" multiple="multiple"/>
<div id="container_body_img_open"></div> <div id="container_body_img_open"></div>
</div> </div>
</div> </div>
......
application/index/view/share_office_room/office_detail.html
View file @ 5756b37b
...@@ -284,7 +284,7 @@ ...@@ -284,7 +284,7 @@
</div> </div>
</div> </div>
</div> </div>
<div style="height: 1rem;"></div> <div style="height: 2rem;"></div>
<div class="pc-contact-agent b4_font"> <div class="pc-contact-agent b4_font">
<p class="b4_font_p"> <p class="b4_font_p">
咨询经纪人 咨询经纪人
...@@ -326,8 +326,7 @@ ...@@ -326,8 +326,7 @@
<a href="javascript:;" id="fix_area_bottom_btn"><img src="/app/images/xq_cha@2x.png" /></a> <a href="javascript:;" id="fix_area_bottom_btn"><img src="/app/images/xq_cha@2x.png" /></a>
</div> </div>
<div class="shop-list"> <div class="shop-list">
<img src="/app/images/clik_shop_icon2.png" /> <!--<img src="/app/images/clik_shop_icon2.png" />-->
</div> </div>
<!--点击任意视频 全屏显示（轮播）--> <!--点击任意视频 全屏显示（轮播）-->
......
public/app/css/details_office_tl.css
View file @ 5756b37b
...@@ -450,7 +450,7 @@ body{ ...@@ -450,7 +450,7 @@ body{
height: 2rem; height: 2rem;
width: 1.64rem; width: 1.64rem;
display: none; display: none;
background: url(/app/images/clik_shop_icon1.png) no-repeat 0 0/1.64rem 1.78rem; background: url(/app/images/clik_office_icon1.gif) no-repeat 0 0/1.66rem 1.66rem;
} }
.shop-list>img{ .shop-list>img{
width: .8rem; width: .8rem;
......
public/app/js/detaila_office_tl.js
View file @ 5756b37b
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
(function() { (function() {
console.log($('#open_id').val()); console.log($('#open_id').val());
var jsonObect = JSON.parse($('#open_id').val()); var jsonObect = JSON.parse($('#open_id').val());
// var _shangpuId = getUrlParam('id'); //从url获取的商铺id
var _shangpuId = jsonObect.id; var _shangpuId = jsonObect.id;
var _shangpuName = jsonObect.housename; //从url获取的商铺名 var _shangpuName = jsonObect.housename; //从url获取的商铺名
var _isC = jsonObect.isC; var _isC = jsonObect.isC;
...@@ -12,9 +11,7 @@ ...@@ -12,9 +11,7 @@
var line_a_ulul = ""; var line_a_ulul = "";
var building_id; var building_id;
$.ajax({ $.ajax({
// url: ServerHostTempC+'/office_api/getOfficeRoomInfo',
url:'/office_api/getOfficeRoomInfo', url:'/office_api/getOfficeRoomInfo',
data: { data: {
'id': _shangpuId, 'id': _shangpuId,
}, },
...@@ -153,8 +150,11 @@ ...@@ -153,8 +150,11 @@
if(jsonObect.isC == 0) {//判断b端 还是c端分享(b端) if(jsonObect.isC == 0) {//判断b端 还是c端分享(b端)
_fix_bottom.show(); _fix_bottom.show();
$('.pc-contact-agent').hide(); $('.pc-contact-agent').hide();
$('.shop-list').show();//显示更多办公楼
}else{//c端显示推荐人 }else{//c端显示推荐人
$('.pc-contact-agent').hide(); $('.pc-contact-agent').hide();
$('.shop-list').hide();//显示更多办公楼
$.ajax({ $.ajax({
url: '/api/getBroker', url: '/api/getBroker',
...@@ -188,8 +188,6 @@ ...@@ -188,8 +188,6 @@
}); });
}; };
// $('.shop-list').show();
$("#fix_name").html(_name); $("#fix_name").html(_name);
$("#fix_tel").attr("href", "tel:" + _tel); $("#fix_tel").attr("href", "tel:" + _tel);
if(_name_img){ if(_name_img){
...@@ -279,10 +277,11 @@ ...@@ -279,10 +277,11 @@
}); });
//点击 商铺详情的 更多商铺 //点击 商铺详情的 更多商铺
$('.shop-list').click(function() { $('.shop-list').click(function() {
localStorage.setItem('shop_list_b_user',_name); // localStorage.setItem('shop_list_b_user',_name);
localStorage.setItem('shop_list_b_user_tel',_tel); // localStorage.setItem('shop_list_b_user_tel',_tel);
localStorage.setItem('shop_list_b_user_img',_name_img); // localStorage.setItem('shop_list_b_user_img',_name_img);
location.href = ServerHost + '/app/dist/#/shopList'; //拼接字符串 跳转办公楼列表
location.href = "/app/dist/#/buildList?share=1&isC=0&client=b&name=" + _name +'&tel=' + _tel +'&img=' + _name_img;
}); });
//点击进入楼盘详情 //点击进入楼盘详情
$('.building-detail').click(function() { $('.building-detail').click(function() {
......
public/appnew/src/components/office_building/buildList.vue
View file @ 5756b37b
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<span class="selecter">{{st}}</span> <span class="selecter">{{st}}</span>
</div> </div>
<div style="margin-left:.2rem;float:left;"> <div style="margin-left:.2rem;float:left;">
<input style="width:3.3rem;float:left;height:.62rem;line-height:.62rem;margin-left:.2rem;" placeholder="qinggkghgfj" v-model="searchStr" @keydown="search($event)"/> <input style="width:3.3rem;float:left;height:.62rem;line-height:.62rem;margin-left:.2rem;" :placeholder="'请输入'+st" v-model="searchStr" @keydown="search($event)"/>
</div> </div>
</div> </div>
<div style="float:left;line-height:.62rem;margin-left:.3rem;color:rgba(255,128,24,1);font-size:.32rem;" @click="showSearch=false">取消</div> <div style="float:left;line-height:.62rem;margin-left:.3rem;color:rgba(255,128,24,1);font-size:.32rem;" @click="showSearch=false">取消</div>
...@@ -112,29 +112,105 @@ ...@@ -112,29 +112,105 @@
}, },
getList (no,status) { getList (no,status) {
let that = this ; let that = this ;
console.log(that.searchData) // console.log(that.searchData) ;
that.axios({ let data = {
method: 'get', city :'上海市' ,
url: '/office/getBuildingRoomH5',
responseType: 'json',
data: {
// city :'上海市' ,
// disc : '', // disc : '',
// title :'' ,
// id :'' , // id :'' ,
// business_district_id :'' , // business_district_id :'' ,
// area_start :that.searchData.area ? that.searchData.area[0] : '' , , // area_start :that.searchData.area ? that.searchData.area[0] : '' , ,
// area_end :that.searchData.area ? that.searchData.area[1] : '' ,, // area_end :that.searchData.area ? that.searchData.area[1] : '' ,,
// type :that.searchData.more.officeChoosen.index ? that.searchData.more.officeChoosen.index : '' ,
// price_start :that.searchData.money ? that.searchData.money[0] : '' , // price_start :that.searchData.money ? that.searchData.money[0] : '' ,
// price_end :that.searchData.money ? that.searchData.money[1] : '' , // price_end :that.searchData.money ? that.searchData.money[1] : '' ,
// type :that.searchData.more.officeChoosen.index ? that.searchData.more.officeChoosen.index : '' ,
// is_exclusive_type : that.searchData.more.dujia ? that.searchData.more.dujia : '' , // is_exclusive_type : that.searchData.more.dujia ? that.searchData.more.dujia : '' ,
// agent_start_time :that.searchData.more.startTime ? that.searchData.more.startTime : '' , // agent_start_time :that.searchData.more.startTime ? that.searchData.more.startTime : '' ,
// agent_end_time :that.searchData.more.endTime ? that.searchData.more.endTime : '' , // agent_end_time :that.searchData.more.endTime ? that.searchData.more.endTime : '' ,
// is_rent :that.searchData.more.qiuzu ? that.searchData.more.qiuzu : '' , // is_rent :that.searchData.more.qiuzu ? that.searchData.more.qiuzu : '' ,
// status :that.searchData.more.shangjia ? that.searchData.more.shangjia : '' , // status :that.searchData.more.shangjia ? that.searchData.more.shangjia : '' ,
// shop_sign :that.getsign(that.searchData.more.specialSpan) , // shop_sign :that.getsign(that.searchData.more.specialSpan) ,
}
if (status){
switch ( that.si ){
case 0 :
data.address = that.searchStr;
break ;
case 1 :
data.title = that.searchStr;
break ;
case 2 :
data.landlord_phone = that.searchStr;
break ;
}
}
if (that.searchData.addr != ''){
data.disc = that.searchData.addr ;
}
if ( that.searchData.area && that.searchData.area[0] > -1 ){
if (that.searchData.area[0] > that.searchData.area[1]){
data.area_end = that.searchData.area[0]
} else if ( that.searchData.area[0] == '' && that.searchData.area[1] == '') {
} else {
data.area_start = that.searchData.area[0];
data.area_end = that.searchData.area[1] ;
}
}
if ( that.searchData.money && that.searchData.money[0] > -1){
if (that.searchData.money[0] > that.searchData.money[1]){
data.price_end = that.searchData.money[0]
} else if ( that.searchData.money[0] == '' && that.searchData.money[1] == '') {
} else {
data.price_start = that.searchData.money[0];
data.price_end = that.searchData.money[1] ;
}
}
if( that.searchData.more && that.searchData.more.clicked){
if ( that.searchData.more.officeChoosen != ''){
data.type = that.searchData.more.officeChoosen.index ;
} }
if ( that.searchData.more.dujia != '') {
data.is_exclusive_type = that.searchData.more.dujia;
}
if ( that.searchData.more.startTime != '') {
data.agent_start_time = that.searchData.more.startTime;
}
if ( that.searchData.more.endTime != '') {
data.agent_end_time = that.searchData.more.endTime;
}
if ( that.searchData.more.qiuzu != '' ) {
data.is_rent = that.searchData.more.qiuzu;
}
if ( that.searchData.more.shangjia != '' ) {
data.status = that.searchData.more.shangjia;
}
if ( that.searchData.more.specialSpan != '' ) {
data.shop_sign = that.getsign(that.searchData.more.specialSpan);
}
if ( that.searchData.more.aread1 != '' ){
data.area_start = that.searchData.more.aread1;
}
if ( that.searchData.more.aread2 != '' ){
data.area_end = that.searchData.more.aread2 ;
}
if ( that.searchData.more.pri1 != '' ){
data.price_start = that.searchData.more.pri1;
}
if ( that.searchData.more.pri2 != '' ){
data.price_end = that.searchData.more.pri2 ;
}
if (that.searchData.more.gongkai != ''){
data.is_show = that.searchData.more.gongkai ;
}
}
that.axios({
method: 'get',
url: '/office/getBuildingRoomH5',
responseType: 'json',
data: data
}).then(function(res) { }).then(function(res) {
if(res.data.code == 200) { if(res.data.code == 200) {
console.log(res.data.data); console.log(res.data.data);
......
public/appnew/src/components/office_building/buildSearch.vue
View file @ 5756b37b
This source diff could not be displayed because it is too large. You can view the blob instead.
public/appnew/src/components/receive/receiveDetail.vue
View file @ 5756b37b
...@@ -6,38 +6,37 @@ ...@@ -6,38 +6,37 @@
案场费 案场费
</div> </div>
<div style="font-size:.26rem;font-family:PingFangSC-Semibold;font-weight:400;color:rgba(28,28,28,1);line-height:.50rem;float:right;"> <div style="font-size:.26rem;font-family:PingFangSC-Semibold;font-weight:400;color:rgba(28,28,28,1);line-height:.50rem;float:right;">
带看订单ID：2343 <span class="aaa"></span> 带看订单ID：{{item.order_id}} <span class="aaa"></span>
</div> </div>
</div> </div>
<div style="margin-left:.36rem;width:6.78rem;overflow:hidden;margin-top:.08rem;padding-bottom:.12rem;font-size:.26rem;font-family:PingFangSC-Light;font-weight:300;color:rgba(28,28,28,1);line-height:.52rem;"> <div style="margin-left:.36rem;width:6.78rem;overflow:hidden;margin-top:.08rem;padding-bottom:.12rem;font-size:.26rem;font-family:PingFangSC-Light;font-weight:300;color:rgba(28,28,28,1);line-height:.52rem;">
<div class="leftDiv"> 提交吋囘: 2019.2.1 10:00:00 </div> <div class="woalDiv"> 提交吋间: {{item.create_time}} </div>
<div class="rightDiv"> 入账日期: 2019.2.1 </div> <div class="woalDiv"> 入账日期: {{item.income_time}} </div>
<div class="leftDiv"> 入账金额: 2019.2.1 10:00:00 </div> <div class="leftDiv"> 入账金额: {{item.money}} 元 </div>
<div class="rightDiv"> 提交人: 2019.2.1 </div> <div class="rightDiv"> 提交人: {{item.agent_name}} </div>
<div class="leftDiv"> 来源: 2019.2.1 10:00:00 </div> <div class="leftDiv"> 来源: {{getSource(item.source)}} </div>
<div class="rightDiv"> 状态: 2019.2.1 </div> <div class="rightDiv"> 状态: {{item.is_dividend==0?'正常':'多收'}} </div>
<div class="leftDiv"> 支付方式: 2019.2.1 10:00:00 </div> <div class="leftDiv"> 支付方式: {{getPayType(item.pay_type)}} </div>
<div class="rightDiv"> 转账户名: 2019.2.1 </div> <div class="rightDiv"> 转账户名: {{item.transfer_name}} </div>
<div class="leftDiv"> 商铺号: 2019.2.1 10:00:00 </div> <div class="leftDiv"> 商铺号: {{item.house_id}} </div>
<div class="rightDiv"> 业态/品牌: 2019.2.1 </div> <div class="rightDiv"> 业态/品牌: {{item.industry_type}} </div>
<div class="woalDiv"> 对应业务员:开发巨大高不可及的干部看见的那个科比你的大 </div> <div class="woalDiv"> 对应业务员:{{item.current_agent_name}} </div>
<div class="leftDiv" v-show="!yixiang"> 对应成交报告ID: {{item.bargain_id}} </div>
<div class="rightDiv" v-show="!yixiang"> 是否分红: {{item.is_dividend==0?'否':'是'}} </div>
<div class="leftDiv" v-show="!yixiang"> 开业确定时间: {{item.open_time}}</div>
<div class="rightDiv" v-show="!yixiang"> 是否开业: {{item.is_open==0?'未开业':'开业'}}</div>
<div class="leftDiv" v-show="!yixiang"> 成交价: {{item.price}} </div>
<div class="rightDiv" v-show="!yixiang"> 之前已收佣: {{item.received_money}} </div>
<div class="leftDiv" v-show="!yixiang"> 对应成交报告ID: 1234 </div> <div class="leftDiv" v-show="anchang || yixiang "> 中介费类型: {{getType(item.type)}} </div>
<div class="rightDiv" v-show="!yixiang"> 是否分红: 是 </div>
<div class="leftDiv" v-show="!yixiang"> 开业确定时间: 2019.2.1 </div>
<div class="rightDiv" v-show="!yixiang"> 是否开业: 是 </div>
<div class="leftDiv" v-show="!yixiang"> 成交价: 10000 </div>
<div class="rightDiv" v-show="!yixiang"> 之前已收佣: 11000 </div>
<div class="leftDiv" v-show="anchang || yixiang "> 中介费类型: 爱的发生大 </div>
<div class="rightDiv" v-show="anchang || yixiang "> 应收金额: 1000 </div> <div class="rightDiv" v-show="anchang || yixiang "> 应收金额: 1000 </div>
<div class="woalDiv" v-show="anchang || yixiang "> 多收金额:1000000</div> <div class="woalDiv" v-show="anchang || yixiang "> 多收金额:1000000</div>
<div class="leftDiv"> 手续费: 2019.2.1 10:00:00 </div> <div class="leftDiv"> 手续费: {{item.transaction_fee}}</div>
<div class="rightDiv"> 实付金额: 2019.2.1 </div> <div class="rightDiv"> 实付金额: {{item.real_money}} </div>
<div class="woalDiv"> 备注:</div> <div class="woalDiv"> 备注:{{item.remark}}</div>
<div class="leftDiv"> 最后转定时间: 2019.2.1 10:00:00 </div> <div class="woalDiv"> 最后转定时间: {{item.last_transfer_time}}</div>
</div> </div>
<div style="margin-left:.36rem;width:6.78rem;overflow:hidden;margin-top:.08rem;padding-bottom:.12rem;border-bottom:1px solid #F8F9FB"> <div style="margin-left:.36rem;width:6.78rem;overflow:hidden;margin-top:.08rem;padding-bottom:.12rem;border-bottom:1px solid #F8F9FB">
<div style="font-size:.36rem;font-family:PingFangSC-Semibold;font-weight:600;color:rgba(28,28,28,1);line-height:.50rem;float:left;"> <div style="font-size:.36rem;font-family:PingFangSC-Semibold;font-weight:600;color:rgba(28,28,28,1);line-height:.50rem;float:left;">
...@@ -45,7 +44,7 @@ ...@@ -45,7 +44,7 @@
</div> </div>
</div> </div>
<div style="margin-left:.36rem;width:6.78rem;overflow:hidden;margin-top:.08rem;padding-bottom:.12rem;"> <div style="margin-left:.36rem;width:6.78rem;overflow:hidden;margin-top:.08rem;padding-bottom:.12rem;">
<div v-for="item,index in images" style="margin-left;margin-right:.135rem;float:left;margin-bottom:.18rem;"> <div v-for="item,index in item.img_arr" style="margin-left;margin-right:.135rem;float:left;margin-bottom:.18rem;">
<img :src="tie" style="width:1.55rem;height:1.15rem;border-radius:.1rem;" /> <img :src="tie" style="width:1.55rem;height:1.15rem;border-radius:.1rem;" />
</div> </div>
<div style="margin-left;margin-right:.135rem;float:left;margin-bottom:.18rem;" @click="addImage"> <div style="margin-left;margin-right:.135rem;float:left;margin-bottom:.18rem;" @click="addImage">
...@@ -53,6 +52,18 @@ ...@@ -53,6 +52,18 @@
<form enctype="multipart/form-data" name="fileinfo"><input id="upload_file" type="file" style="display: none;" accept='image/*' name="file" @change="fileChange($event)"/></form> <form enctype="multipart/form-data" name="fileinfo"><input id="upload_file" type="file" style="display: none;" accept='image/*' name="file" @change="fileChange($event)"/></form>
</div> </div>
</div> </div>
<div style="position: fixed;bottom:0rem;left:0rem;height:1rem;background-color:#ffffff;width:7.5rem;">
<div style="height:.76rem;margin-top:.15rem;">
<div style="margin-left:0.35rem;float:left;width:3.30rem;height:.76rem;background:linear-gradient(90deg,rgba(255,160,40,.1) 0%,rgba(255,128,24,.1) 100%);border-radius:.10rem;font-size:.28rem;font-weight:500;color:rgba(255,128,24,1);text-align:center;line-height:.76rem;">
退款
</div>
<div style="margin-left:.2rem;float:left;width:3.30rem;height:.76rem;background:linear-gradient(90deg,rgba(255,160,40,.1) 0%,rgba(255,128,24,.1) 100%);border-radius:.10rem;font-size:.28rem;font-weight:500;color:rgba(255,128,24,1);text-align:center;line-height:.76rem;">
退款
</div>
</div>
</div>
<div style="width:7.5rem;height:1rem;"></div>
</div> </div>
</template> </template>
...@@ -68,17 +79,104 @@ ...@@ -68,17 +79,104 @@
headerData: { headerData: {
'title': '收款详情', 'title': '收款详情',
'noborder': true, 'noborder': true,
'isBack': false 'isBack': true
}, },
addImg, addImg,
tie : 'http://img.redocn.com/sheji/20141219/zhongguofengdaodeliyizhanbanzhijing_3744115.jpg', tie : 'http://img.redocn.com/sheji/20141219/zhongguofengdaodeliyizhanbanzhijing_3744115.jpg',
images:[,,,,,,,,,], images:[,,,,,,,,,],
files : [] files : [] ,
item : {}
}), }),
mounted () { mounted () {
if ( this.$route.query.from ){
this.headerData.isBack = false ;
};
this.getData();
}, },
methods: { methods: {
getType (t){
let str = '' ;
switch(t-0){
case 10 :
str = '意向金';
break ;
case 20 :
str = '定金';
break ;
case 30 :
str = '保管金';
break ;
case 90 :
str = '佣金';
break ;
case 91 :
str = '中介费';
break ;
case 92 :
str = '案场费';
break ;
}
return str ;
},
getSource (t) {
let str = '' ;
switch(t-0){
case 0 :
str = 'app';
break ;
case 1 :
str = '智能pos机';
break ;
case 2 :
str = '调整';
break ;
}
return str ;
},
getPayType (t){
let str = '' ;
switch(t-0){
case 10 :
str = '支付宝';
break ;
case 20 :
str = '微信';
break ;
case 30 :
str = 'pos机器';
break ;
case 40 :
str = '转账';
break ;
case 50 :
str = '现金';
break ;
case 60 :
str = '其他';
break ;
}
return str ;
},
getData(){
let that = this ;
this.axios({
method: 'get',
// url: '/office/getBuildingRoomH5',
url : '/broker/getPayLogDetail',
responseType: 'json',
data: {
AuthToken : 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJkYXRhIjp7ImlkIjo1NzM5LCJuYW1lIjoiXHU2MDNiXHU2ZDRiXHU4YmQ1MSIsInBob25lIjoiMTU2MDE2NTIzNTMiLCJsZXZlbCI6MzB9LCJ0aW1lU3RhbXBfIjoxNTQxNTc2MzQ3fQ.csvXQnqzLdZ-dW3pVGosyPqbCPWPXyECncwD4dD6M6I',
pay_id : 1132
}
}).then(function(res){
if(res.data.code == 200) {
console.log(res.data.data);
that.item = res.data.data
} else {
layer.tipsX(res.data.msg);
}
})
},
addImage (){ addImage (){
let that = this ; let that = this ;
document.getElementById('upload_file').click(); document.getElementById('upload_file').click();
......
public/resource/js/financial_manager_daily_list.js
View file @ 5756b37b
...@@ -158,6 +158,8 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl ...@@ -158,6 +158,8 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
bargain.house_address_open=$(this).attr("data-house_address"); bargain.house_address_open=$(this).attr("data-house_address");
$('.remark-financial-open').val(''); //置空还有备注 $('.remark-financial-open').val(''); //置空还有备注
$('.result-du-open').remove(); //置空开业图片 $('.result-du-open').remove(); //置空开业图片
$('.type-financial-open').val(''); //置空开业类型
}); });
//收款详情页面 //收款详情页面
...@@ -270,7 +272,6 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl ...@@ -270,7 +272,6 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
for(i = 0;i < imgFiles.length; i++){ for(i = 0;i < imgFiles.length; i++){
formData.append('image['+ i + ']', imgFiles[i]); formData.append('image['+ i + ']', imgFiles[i]);
} }
console.log(formData);
$.ajax({ $.ajax({
type: 'post', type: 'post',
url: ServerHostImageLiu + '/index/uploadImg', url: ServerHostImageLiu + '/index/uploadImg',
......
public/resource/js/getCollectionShop.js
View file @ 5756b37b
define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', 'ckfinder', 'ckfinderStart', "datetimepicker",'pagination', 'bootstrapJs','blow-up'], function(doT, template) { define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', 'ckfinder', 'ckfinderStart', "datetimepicker",'pagination', 'bootstrapJs','blow-up'], function(doT, template) {
var user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo'))); //读取缓存
receiv = { receiv = {
pageNo: 1, pageNo: 1,
/*第几页*/ /*第几页*/
...@@ -34,6 +35,12 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -34,6 +35,12 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
is_baocun_bargainID:0, is_baocun_bargainID:0,
liu_order_id:'', liu_order_id:'',
liu_report_id:'', liu_report_id:'',
pay_log_id_open:'',//开业审核
report_id_open:'',
bargain_id_open:'',
order_id_open:'',
house_id_open:'',
house_address_open:'',
init: function() { init: function() {
//初始化dot //初始化dot
$(document.body).append(template); $(document.body).append(template);
...@@ -154,11 +161,15 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -154,11 +161,15 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
}); });
}); });
//申请开业 //申请开业
$('#file_input_pic_open').on('change', function(){ $('#file_input_pic_open').on('change', function(e){
var _this = $(this); var _this = $(this);
var formData = new FormData(); var formData = new FormData();
formData.append('type', 'chat'); formData.append('type', 'chat');
formData.append('image', _this[0].files[0]); // formData.append('image', _this[0].files[0]);
var imgFiles = _this[0].files;
for(i = 0;i < imgFiles.length; i++){
formData.append('image['+ i + ']', imgFiles[i]);
}
$.ajax({ $.ajax({
type: 'post', type: 'post',
url: ServerHostImageLiu + '/index/uploadImg', url: ServerHostImageLiu + '/index/uploadImg',
...@@ -170,10 +181,23 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -170,10 +181,23 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
beforeSend: function() {}, beforeSend: function() {},
success: function(_data) { success: function(_data) {
if(_data.code == 200) { if(_data.code == 200) {
$('#container_body_img_open').append('<div class="result-du-open"><img data-imgname="{0}" src="{1}" alt=""/> <span class="span-del-open">删除</span></div>'.stringFormatObj({ //图片上传 多张上传
'0': _data.data.img_path, var str_ = '';
'1': _data.data.internet_img_name?urlDeal(_data.data.internet_img_name):_data.data.internet_img_name $.each(_data.data, function(i, item) {
})); str_ += '<div class="result-du-open"><img data-imgname="{0}" src="{1}" alt=""/> <span class="span-del-open">删除</span></div>'.stringFormatObj({
'0': item.img_path,
'1': item.internet_img_name?urlDeal(item.internet_img_name):item.internet_img_name
});
});
$('#container_body_img_open').append(str_);//渲染图片
e.target.value = '';//置空input值 可以上传重复图片
//一次上传一张图片
// $('#container_body_img_open').append('<div class="result-du-open"><img data-imgname="{0}" src="{1}" alt=""/> <span class="span-del-open">删除</span></div>'.stringFormatObj({
// '0': _data.data.img_path,
// '1': _data.data.internet_img_name?urlDeal(_data.data.internet_img_name):_data.data.internet_img_name
// }));
} else { } else {
alert(_data.msg); alert(_data.msg);
}; };
...@@ -199,14 +223,15 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -199,14 +223,15 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
_doc.on('click', '.apply-open', function(e) { _doc.on('click', '.apply-open', function(e) {
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
bargain.pay_log_id_open=$(this).attr("data-pay_log_id"); receiv.pay_log_id_open=$(this).attr("data-pay_log_id");
bargain.report_id_open=$(this).attr("data-report_id"); receiv.report_id_open=$(this).attr("data-report_id");
bargain.bargain_id_open=$(this).attr("data-bargain_id"); receiv.bargain_id_open=$(this).attr("data-bargain_id");
bargain.order_id_open=$(this).attr("data-order_id"); receiv.order_id_open=$(this).attr("data-order_id");
bargain.house_id_open=$(this).attr("data-house_id"); receiv.house_id_open=$(this).attr("data-house_id");
bargain.house_address_open=$(this).attr("data-house_address"); receiv.house_address_open=$(this).attr("data-house_address");
$('.remark-financial-open').val(''); //置空还有备注 $('.remark-financial-open').val(''); //置空还有备注
$('.result-du-open').remove(); //置空开业图片 $('.result-du-open').remove(); //置空开业图片
$('.type-financial-open').val(''); //置空开业类型
}); });
//提交申请开业 //提交申请开业
...@@ -219,12 +244,12 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css', ...@@ -219,12 +244,12 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
imgname[i] = $('.result-du-open>img').eq(i).attr('data-imgname'); imgname[i] = $('.result-du-open>img').eq(i).attr('data-imgname');
}; };
var _data = { var _data = {
pay_log_id: bargain.pay_log_id_open, pay_log_id: receiv.pay_log_id_open,
report_id: bargain.report_id_open, report_id: receiv.report_id_open,
bargain_id: bargain.bargain_id_open, bargain_id: receiv.bargain_id_open,
order_id: bargain.order_id_open, order_id: receiv.order_id_open,
house_id: bargain.house_id_open, house_id: receiv.house_id_open,
house_address: bargain.house_address_open, house_address: receiv.house_address_open,
agent_id: user_info_obj.id, agent_id: user_info_obj.id,
intro:$(".remark-financial-open").val(), intro:$(".remark-financial-open").val(),
type:$(".type-financial-open").val() type:$(".type-financial-open").val()
......
public/resource/template/receivables_template_tpl.html
View file @ 5756b37b
...@@ -32,23 +32,26 @@ ...@@ -32,23 +32,26 @@
<!--<td>[%= it[item]['source_id'] %]</td>--> <!--<td>[%= it[item]['source_id'] %]</td>-->
<td> <td>
<a class="btn1 btn-success timeline" href="#modal-time" data-toggle="modal" data-id='[%= it[item]["order_id"] %]'>时间轴</a>
[% if(it[item]["is_open"] == 0 && check_auth('index/openPayLog')){ %] [% if(it[item]["is_open"] == 0 && check_auth('index/openPayLog')){ %]
[% if(it[item]["type_num"] == 92 || it[item]["type_num"] == 91) { %] [% if(it[item]["type_num"] == 92 || it[item]["type_num"] == 91) { %]
[% if(it[item]["is_check"] == 0) { %] [% if(it[item]["is_check"] == 0) { %]
<a class="btn1 btn-info apply-open is-show-open" href="#modal_open" data-pay_log_id="[%= it[item]['id'] %]" data-report_id="[%= it[item]['report_id'] %]" data-bargain_id="[%= it[item]['bargain_id'] %]" data-order_id="[%= it[item]['order_id'] %]" data-house_id="[%= it[item]['house_id'] %]" data-house_address="[%= it[item]['house_address'] %]" data-toggle="modal">申请开业</a> <a class="btn1 btn-success apply-open is-show-open" href="#modal_open" data-pay_log_id="[%= it[item]['id'] %]" data-report_id="[%= it[item]['report_id'] %]" data-bargain_id="[%= it[item]['bargain_id'] %]" data-order_id="[%= it[item]['order_id'] %]" data-house_id="[%= it[item]['house_id'] %]" data-address="[%= it[item]['house_address'] %]" data-toggle="modal">申请开业</a>
[% } %] [% } %]
[% if(it[item]["is_check"] == 1) { %] [% if(it[item]["is_check"] == 1) { %]
<a class="btn1 btn-default is-show-open" data-pay_log_id="[%= it[item]['id'] %]" data-report_id="[%= it[item]['report_id'] %]" data-bargain_id="[%= it[item]['bargain_id'] %]" data-order_id="[%= it[item]['order_id'] %]" data-house_id="[%= it[item]['house_id'] %]" data-house_address="[%= it[item]['house_address'] %]">开业审核中</a> <a class="btn1 btn-default is-show-open" data-pay_log_id="[%= it[item]['id'] %]" data-report_id="[%= it[item]['report_id'] %]" data-bargain_id="[%= it[item]['bargain_id'] %]" data-order_id="[%= it[item]['order_id'] %]" data-house_id="[%= it[item]['house_id'] %]" data-house_address="[%= it[item]['address'] %]">开业审核中</a>
[% } %] [% } %]
[% } %] [% } %]
[% } %] [% } %]
<a class="btn1 btn-success timeline" href="#modal-time" data-toggle="modal" data-id='[%= it[item]["order_id"] %]'>时间轴</a>
[% if(check_auth('index/getCollectionDetail')) { %] [% if(check_auth('index/getCollectionDetail')) { %]
<a class="btn1 btn-success add-pic" href="#modal-addPic" data-toggle="modal" data-id='[%= it[item]["id"] %]' data-report='[%= it[item]["report_id"] %]' data-order='[%= it[item]["order_id"] %]'>收款详情</a> <a class="btn1 btn-success add-pic" href="#modal-addPic" data-toggle="modal" data-id='[%= it[item]["id"] %]' data-report='[%= it[item]["report_id"] %]' data-order='[%= it[item]["order_id"] %]'>收款详情</a>
[% } %] [% } %]
......
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