Skip to content

T
tl_estate
Commit 81bfcea0 authored by xishifeng's avatar xishifeng
Browse files
Options

暂存4

parent 1d5495b8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 119 additions and 108 deletions
public/resource/css/report_list.css
View file @ 81bfcea0
#note_text { /*
width: 80%; * id为pagediv的无法修改，与分页插件有关
margin-left: 48px; maintable-
margin-top: -20px; detail-modal-
} detail-modal-bargaininfo-
detail-modal-maid-
#note_text_re { detail-modal-tax-
width: 80%; pass-modal-
margin-left: 48px; *
margin-top: -20px; *
} *
* */
.Tswitch_one {
display: none;
/*详情弹出框*/
.detail-modal-body {
height: 660px;
overflow-y: scroll;
} }
.detail-modal-body-sec+.detail-modal-body-sec{
.Tswitch_two {
display: none; display: none;
} }
/*详情弹出框,成交信息*/
.left { .detail-modal-bargaininfo-main-left {
float: left; float: left;
width: 340px; width: 340px;
line-height: 36px; line-height: 36px;
} }
.left .btn5 { #bargaininfo_is_open,
width: 32% !important; #bargaininfo_type {
} width: 100px !important;
#is_open {
width: 20% !important;
display: inline-block; display: inline-block;
} }
.right { .detail-modal-bargaininfo-main-right {
line-height: 36px; line-height: 36px;
width: 560px; width: 560px;
} }
.bargain-total-yongjin { #bargaininfo_total_commission {
width: 60px; width: 150px;
display: inline-block; display: inline-block;
height: 26px; height: 26px;
padding: 3px 6px padding: 3px 6px
} }
.edit_new { .detail-modal-bargaininfo-form {
float: right;
margin-bottom: 5px;
margin-top: -10px;
}
.form-control-one {
display: inline-block;
width: 40%;
}
#bargain_info_form {
line-height: 48px; line-height: 48px;
width: 620px; width: 620px;
margin: 0 auto; margin: 0 auto;
} }
.modal-body-two { .detail-modal-bargaininfo-commission-inputpar {
height: 660px;
overflow-y: scroll;
}
.clear {
clear: both;
}
.left-deal {
float: left;
}
.clear div {
clear: both;
}
.right-data {
float: right;
}
.right-date {
margin-left: 130px;
}
.Tswitch_three .btn_2 {
width: 80px;
}
/*输入框自定义样式*/
.input-box-0521-par {
float: left; float: left;
width: 100%; width: 100%;
overflow: hidden; overflow: hidden;
clear: both; clear: both;
} }
.input-box-0521 { .detail-modal-bargaininfo-commission-sec {
overflow: hidden; overflow: hidden;
} }
.input-box-0521>label { .detail-modal-bargaininfo-commission-sec>label {
float: left; float: left;
} }
.input-box-0521>label:nth-of-type(2) { .detail-modal-bargaininfo-commission-sec>label:nth-of-type(2) {
margin-left: 50px; margin-left: 50px;
} }
.input-box-0521>div { .detail-modal-bargaininfo-commission-sec>div {
float: left; float: left;
width: 160px; width: 160px;
} }
.input-box-0521>mark { .detail-modal-bargaininfo-commission-sec>mark {
float: left; float: left;
overflow: hidden; overflow: hidden;
background-color: transparent; background-color: transparent;
...@@ -124,64 +83,47 @@ ...@@ -124,64 +83,47 @@
padding-left: 10px; padding-left: 10px;
} }
.input-box-0521>mark>img { .detail-modal-bargaininfo-commission-sec>mark>img {
float: left; float: left;
width: 20px; width: 20px;
} }
#input_yongjin_add_btn { #bargaininfo_commission_add_btn {
width: 100%; width: 100%;
margin-bottom: 20px; margin-bottom: 20px;
} }
#input_yongjin_add_btn>img { #bargaininfo_commission_add_btn>img {
display: block; display: block;
margin: 0 auto; margin: 0 auto;
} }
.modal-dialog-0522 { /*详情弹出框,分佣提成*/
width: 1030px;
}
/*成交信息tab*/
.bargain-info-span-beizhu{
/*display: inline-block;
height: 150px;
line-height: 150px;*/
}
#note_content{
width: 480px;
height: 150px;
}
/*main-table部分,待补充*/ /*详情弹出框,开票税费*/
.maintable-tr-bar{} .detail-modal-tax-table{
.maintable-tr-bar>th:nth-of-type(1){}
/*开票税费tab相关的内容*/
.shuifee-table{
width:600px; width:600px;
} }
.shuifee-table td{ .detail-modal-tax-table td{
line-height: 36px; line-height: 36px;
text-align: center; text-align: center;
} }
.shuifei-main-box{ #tax_main_box{
margin-top: 30px; margin-top: 30px;
} }
.shuifei-main-box>section{ #tax_main_box>section{
overflow: hidden; overflow: hidden;
width: 680px; width: 680px;
margin: 0 auto; margin: 0 auto;
} }
.shuifei-main-box>section+section{ #tax_main_box>section+section{
margin-top: 40px; margin-top: 40px;
} }
.shuifei-main-box>section>div{ #tax_main_box>section>div{
float: left; float: left;
} }
.shuifei-main-box>section>div:nth-of-type(2){ #tax_main_box>section>div:nth-of-type(2){
padding-left: 20px; padding-left: 20px;
padding-top: 50px; padding-top: 50px;
} }
...@@ -195,3 +137,72 @@ ...@@ -195,3 +137,72 @@
text-align: center; text-align: center;
line-height: 40px; line-height: 40px;
} }
/********************/
.edit_new {
float: right;
margin-bottom: 5px;
margin-top: -10px;
}
.form-control-one {
display: inline-block;
width: 40%;
}
/****************************************************************/
/*弹出框,通过*/
#pass_beizhu {
width: 80%;
margin-left: 48px;
margin-top: -20px;
}
.clear {
clear: both;
}
.clear div {
clear: both;
}
.right-data {
float: right;
}
.right-date {
margin-left: 130px;
}
/*输入框自定义样式*/
.modal-dialog-0522 {
width: 1030px;
}
/*成交信息tab*/
.detail-modal-bargaininfo-span-beizhu{
/*display: inline-block;
height: 150px;
line-height: 150px;*/
}
#bargaininfo_beizhu{
width: 480px;
height: 150px;
}
/*main-table部分,待补充*/
.maintable-tr-bar{}
.maintable-tr-bar>th:nth-of-type(1){}
public/resource/js/reportList.js
View file @ 81bfcea0
This diff is collapsed.
public/resource/template/reportList_shuiFee_template_tpl.html
View file @ 81bfcea0
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
[% var getInfoType=function(r){switch(Number(r)){case 1:return"盘方";case 2:return"客方";case 3:return"反签";case 4:return"独家";case 5:return"合作方";default:return"未定义"}}; %] [% var getInfoType=function(r){switch(Number(r)){case 1:return"盘方";case 2:return"客方";case 3:return"反签";case 4:return"独家";case 5:return"合作方";default:return"未定义"}}; %]
<section> <section>
<div> <div>
<table class="shuifee-table table-haveborder"> <table class="detail-modal-tax-table table-haveborder">
<tr> <tr>
<td>开票金额</td> <td>开票金额</td>
<td>[%= it[item]['total_fee'] %]</td> <td>[%= it[item]['total_fee'] %]</td>
......
public/resource/template/reportList_template_tpl.html
View file @ 81bfcea0
...@@ -15,14 +15,14 @@ ...@@ -15,14 +15,14 @@
[% } %] [% } %]
[% if(it["step"]<3) { %] [% if(it["step"]<3) { %]
[% if(check_auth('index/checkReportAttache/0')||check_auth('index/checkReportManager/1')||check_auth('index/checkReportMajordomo/2')||check_auth('index/checkReportCashier/3')) { %] [% if(check_auth('index/checkReportAttache/0')||check_auth('index/checkReportManager/1')||check_auth('index/checkReportMajordomo/2')||check_auth('index/checkReportCashier/3')) { %]
<a class="btn1 btn-success is_pass" href="#modal-pass" data-toggle="modal">通过</a> <a class="btn1 btn-success" href="#modal-pass" data-toggle="modal">通过</a>
[% } %] [% } %]
[% }else if(it["step"]==3) { %] [% }else if(it["step"]==3) { %]
[% if(check_auth('index/toReportListOne')) { %] [% if(check_auth('index/toReportListOne')) { %]
<a class="btn1 btn-success btn-trans-one">转到一级审核</a> <a class="btn1 btn-success maintable-btn-trans-one">转到一级审核</a>
[% } %] [% } %]
[% if(check_auth('index/checkOver')) { %] [% if(check_auth('index/checkOver')) { %]
<a class="btn1 btn-success btn-jiedan">结单</a> <a class="btn1 btn-success maintable-btn-account">结单</a>
[% } %] [% } %]
[% } %] [% } %]
<a class="btn1 btn-success timeline" href="#modal-time" data-toggle="modal">时间轴</a> <a class="btn1 btn-success timeline" href="#modal-time" data-toggle="modal">时间轴</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