增加 一个收款 绑定多个发票

index - stat.html

@@ -9,223 +9,7 @@
 	<link rel=stylesheet href=css/global.css>
 	<script src=js/jquery-1.7.1.min.js></script>
 	<script src=js/global.js></script>
-<script src="http://s1.bdstatic.com/r/www/cache/ecom/esl/1-6-10/esl.js"></script>
-	<script type="text/javascript">
-        // 路径配置
-        require.config({
-            paths:{
-                'echarts' : 'http://echarts.baidu.com/build/echarts'
-            }
-        });
-
-        // 使用
-        require(
-            [
-                'echarts',
-                'echarts/chart/pie', // 使用柱状图就加载bar模块，按需加载
-                'echarts/chart/bar'
-            ],
-            function(ec) {
-                //1 最近30天客户数量与记录趋势//
-                // 基于准备好的dom，初始化echarts图表
-                var myChart = ec.init(document.getElementById('chartContainer1'));
-                var option = {
-                          color:['#e9af68','#57b7b6','#e4575a','#959eac','#ffa500',
-                          '#d38b70','#8fb7cf','#cd5c5c','#5c616b','#40e0d0',
-                          '#1e90ff','#ff6347','#7b68ee','#00fa9a','#ffd700',
-                          '#6699FF','#ff6666','#3cb371','#b8860b','#30e0e0'],
-                          tooltip : {
-                              trigger: 'axis',
-                              formatter: "{b} <br/>{a}：{c} 位<br/>{a1}：{c1} 条"
-                          },
-                          legend: {
-                              data:['添加客户数','添加客户记录数']
-                          },
-                          toolbox: {
-                              show : true,
-                              feature : {
-                                  magicType : {show: true, type: ['line', 'bar']}
-                              }
-                          },
-                          calculable : true,
-                          xAxis : [
-                              {
-                                  type : 'category',
-                                  boundaryGap : false,
-                                  data : ['6-1','6-2','6-3','6-4','6-5','6-6','6-7','6-8','6-9','6-10','6-11','6-12','6-13','6-14','6-15','6-16','6-17','6-18','6-19','6-20','6-21','6-22','6-23','6-24','6-25','6-26','6-27','6-28','6-29','6-30']
-                              }
-                          ],
-                          yAxis : [
-                              {		color:'#000',
-                                  type : 'value',
-                                  axisLabel : {
-                                      formatter: '{value}'
-                                  },
-                                  itemStyle: {
-                                      normal: {
-                                          lineStyle: {
-                                              color:'#000000'
-                                          }
-                                      }
-                                  },
-                                  splitArea : {show : true}
-                              }
-                          ],
-                          series : [
-                              {
-                                  name:'添加客户数',
-                                  type:'line',
-                                  data:[10, 10, 30, 40, 50, 60, 80, 85, 85, 140, 10, 10, 30, 40, 50, 60, 80, 85, 85, 100, 10, 10, 30, 40, 50, 60, 80, 85, 85, 100],
-											            markPoint : {
-											                data : [
-											                    {type : 'max', name: '最大值'},
-											                    {type : 'min', name: '最小值'}
-											                ]
-											            },
-                              },
-                              {
-                                  name:'添加客户记录数',
-                                  type:'line',
-                                  data:[10, 10, 0, 20, 10, 10, 10, 10, 5, 15, 10, 10, 60, 20, 10, 10, 10, 10, 5, 15, 10, 10, 0, 20, 10, 10, 10, 10, 5, 15],
-                                  markPoint : {
-											                data : [
-											                    {type : 'max', name: '最大值'},
-											                    {type : 'min', name: '最小值'}
-											                ]
-											            },
-                              },
-                          ]
-                      };
-
-                // 为echarts对象加载数据
-                myChart.setOption(option);
-                //1 最近30天客户数量与记录趋势//
-                //2 最近30天客户数量地域//
-                // 基于准备好的dom，初始化echarts图表
-                var myChart = ec.init(document.getElementById('chartContainer2'));
-                var option = {
-                	color:['#e9af68','#57b7b6','#e4575a','#959eac','#ffa500',
-                          '#d38b70','#8fb7cf','#cd5c5c','#5c616b','#40e0d0',
-                          '#1e90ff','#ff6347','#7b68ee','#00fa9a','#ffd700',
-                          '#6699FF','#ff6666','#3cb371','#b8860b','#30e0e0'],
-                          title : {
-                              text: '30天客户分布',
-                              textAlign:"left",
-                              textStyle:{
-																fontSize: 12,
-																color:"#666",
-																fontWeight:"normal"
-																}
-                          },
-
-    tooltip : {
-        trigger: 'item',
-        formatter: "{a} <br/>{b} : {c} ({d}%)"
-    },
-    series : [
-        {
-            name:'客户所在地区',
-            type:'pie',
-            radius : '80%',
-            center: ['50%', '50%'],
-            data:[
-                {value:335, name:'广东省'},
-                {value:310, name:'四川省'},
-                {value:234, name:'山东省'},
-                {value:135, name:'甘肃省'},
-                {value:1548, name:'重庆'},
-                {value:148, name:'安徽省'},
-                {value:148, name:'浙江省'},
-                {value:148, name:'广西省'},
-                {value:148, name:'北京'},
-                {value:148, name:'湖南'},
-                {value:148, name:'湖北'},
-                {value:148, name:'内蒙古'}
-            ]
-        }
-    ]
-};
-                // 为echarts对象加载数据
-                myChart.setOption(option);
-
-                //2 客户地区分布//
-                //3 最近30天客户数量地域//
-                // 基于准备好的dom，初始化echarts图表
-                var myChart = ec.init(document.getElementById('chartContainer3'));
-                var option = {
-                          title : {
-                              text: '30天单位分布',
-                              textAlign:"left",
-                              textStyle:{
-																fontSize: 12,
-																color:"#666",
-																fontWeight:"normal"
-																}
-                          },
-    tooltip : {
-        trigger: 'item',
-        formatter: "{a} <br/>{b} : {c} ({d}%)"
-    },
-    calculable : false,
-    series : [
-        {
-            name:'单位性质',
-            type:'pie',
-            selectedMode: 'single',
-            radius :"40%",
-            itemStyle : {
-                normal : {
-                    label : {
-                        position : 'inner'
-                    },
-                    labelLine : {
-                        show : false
-                    }
-                }
-            },
-            data:[
-                {value:35, name:'设计'},
-                {value:79, name:'造价管理'},
-                {value:35, name:'业主'},
-                {value:79, name:'交通局'},
-                {value:35, name:'公路局'},
-                {value:79, name:'审计'},
-                {value:35, name:'财政'},
-                {value:79, name:'审核'},
-                {value:35, name:'施工'},
-                {value:79, name:'咨询'},
-                {value:120, name:'招标标代理', selected:true}
-            ]
-        },
-        {
-            name:'单位所在地区',
-            type:'pie',
-            radius : [90, 120],
-            data:[
-                {value:335, name:'广东省'},
-                {value:310, name:'四川省'},
-                {value:234, name:'山东省'},
-                {value:135, name:'甘肃省'},
-                {value:1548, name:'重庆'},
-                {value:148, name:'安徽省'},
-                {value:148, name:'浙江省'},
-                {value:148, name:'广西省'},
-                {value:148, name:'北京'},
-                {value:148, name:'湖南'},
-                {value:148, name:'湖北'},
-                {value:148, name:'内蒙古'}
-            ]
-        }
-    ]
-};
-
-                // 为echarts对象加载数据
-                myChart.setOption(option);
-
-                //3 单位地区分布//
-            }
-        );
-    </script>
+	<script src=js/echarts.min.js></script>
 </head>
 <body>
 	<div class="mainLayout">
@@ -493,4 +277,196 @@
 </div>
     <!--弹出内容-->
 <script type="text/javascript">autoFlashHeight();</script>
+
+	<script type="text/javascript">
+                //1 最近30天客户数量与记录趋势//
+                // 基于准备好的dom，初始化echarts图表
+                var myChart = echarts.init(document.getElementById('chartContainer1'));
+                var option = {
+							    color:['#e9af68','#57b7b6','#e4575a','#959eac','#ffa500',
+							                          '#d38b70','#8fb7cf','#cd5c5c','#5c616b','#40e0d0',
+							                          '#1e90ff','#ff6347','#7b68ee','#00fa9a','#ffd700',
+							                          '#6699FF','#ff6666','#3cb371','#b8860b','#30e0e0'],
+							    tooltip: {
+							        trigger: 'axis'
+							    },
+							    legend: {
+							        data:['添加客户数','添加客户记录数']
+							    },
+							    grid: {
+							        left: '3%',
+							        right: '4%',
+							        bottom: '3%',
+							        containLabel: true
+							    },
+							    toolbox: {
+							        feature: {
+							            magicType : {show: true, type: ['line', 'bar']}
+							        }
+							    },
+							    xAxis: {
+							        type: 'category',
+							        boundaryGap: false,
+							        data: ['6-1','6-2','6-3','6-4','6-5','6-6','6-7','6-8','6-9','6-10','6-11','6-12','6-13','6-14','6-15','6-16','6-17','6-18','6-19','6-20','6-21','6-22','6-23','6-24','6-25','6-26','6-27','6-28','6-29','6-30']
+							    },
+							    yAxis: {
+							        type: 'value'
+							    },
+							    series: [
+							        {
+							            name:'添加客户数',
+							            type:'line',
+							            stack: '总量',
+							            data:[10, 10, 30, 40, 50, 60, 80, 85, 85, 140, 10, 10, 30, 40, 50, 60, 80, 85, 85, 100, 10, 10, 30, 40, 50, 60, 80, 85, 85, 100],
+							            markPoint : {
+																		                data : [
+																		                    {type : 'max', name: '最大值'},
+																		                    {type : 'min', name: '最小值'}
+																		                ]
+																		            },
+							        },
+							        {
+							            name:'添加客户记录数',
+							            type:'line',
+							            stack: '总量',
+							            data:[10, 10, 0, 20, 10, 10, 10, 10, 5, 15, 10, 10, 60, 20, 10, 10, 10, 10, 5, 15, 10, 10, 0, 20, 10, 10, 10, 10, 5, 15],
+							            markPoint : {
+																		                data : [
+																		                    {type : 'max', name: '最大值'},
+																		                    {type : 'min', name: '最小值'}
+																		                ]
+																		            },
+							        }
+							    ]
+							};
+
+                // 为echarts对象加载数据
+                myChart.setOption(option);
+                //1 最近30天客户数量与记录趋势//
+                //2 最近30天客户数量地域//
+                // 基于准备好的dom，初始化echarts图表
+                var myChart = echarts.init(document.getElementById('chartContainer2'));
+                var option = {
+                	color:['#e9af68','#57b7b6','#e4575a','#959eac','#ffa500',
+                          '#d38b70','#8fb7cf','#cd5c5c','#5c616b','#40e0d0',
+                          '#1e90ff','#ff6347','#7b68ee','#00fa9a','#ffd700',
+                          '#6699FF','#ff6666','#3cb371','#b8860b','#30e0e0'],
+                          title : {
+                              text: '30天客户分布',
+                              textAlign:"left",
+                              textStyle:{
+																fontSize: 12,
+																color:"#666",
+																fontWeight:"normal"
+																}
+                          },
+
+					    tooltip : {
+					        trigger: 'item',
+					        formatter: "{a} <br/>{b} : {c} ({d}%)"
+					    },
+					    series : [
+					        {
+					            name:'客户所在地区',
+					            type:'pie',
+					            radius : '80%',
+					            center: ['50%', '50%'],
+					            data:[
+					                {value:335, name:'广东省'},
+					                {value:310, name:'四川省'},
+					                {value:234, name:'山东省'},
+					                {value:135, name:'甘肃省'},
+					                {value:1548, name:'重庆'},
+					                {value:148, name:'安徽省'},
+					                {value:148, name:'浙江省'},
+					                {value:148, name:'广西省'},
+					                {value:148, name:'北京'},
+					                {value:148, name:'湖南'},
+					                {value:148, name:'湖北'},
+					                {value:148, name:'内蒙古'}
+					            ]
+					        }
+					    ]
+					};
+                // 为echarts对象加载数据
+                myChart.setOption(option);
+
+                //2 客户地区分布//
+
+                //3 最近30天客户数量地域//
+                // 基于准备好的dom，初始化echarts图表
+                var myChart = echarts.init(document.getElementById('chartContainer3'));
+                var option = {
+                          title : {
+                              text: '30天单位分布',
+                              textAlign:"left",
+                              textStyle:{
+																fontSize: 12,
+																color:"#666",
+																fontWeight:"normal"
+																}
+                          },
+						    tooltip : {
+						        trigger: 'item',
+						        formatter: "{a} <br/>{b} : {c} ({d}%)"
+						    },
+						    calculable : false,
+						    series : [
+						        {
+						            name:'单位性质',
+						            type:'pie',
+						            selectedMode: 'single',
+						            radius :"40%",
+						            itemStyle : {
+						                normal : {
+						                    label : {
+						                        position : 'inner'
+						                    },
+						                    labelLine : {
+						                        show : false
+						                    }
+						                }
+						            },
+						            data:[
+						                {value:35, name:'设计'},
+						                {value:79, name:'造价管理'},
+						                {value:35, name:'业主'},
+						                {value:79, name:'交通局'},
+						                {value:35, name:'公路局'},
+						                {value:79, name:'审计'},
+						                {value:35, name:'财政'},
+						                {value:79, name:'审核'},
+						                {value:35, name:'施工'},
+						                {value:79, name:'咨询'},
+						                {value:120, name:'招标标代理', selected:true}
+						            ]
+						        },
+						        {
+						            name:'单位所在地区',
+						            type:'pie',
+						            radius : [90, 120],
+						            data:[
+						                {value:335, name:'广东省'},
+						                {value:310, name:'四川省'},
+						                {value:234, name:'山东省'},
+						                {value:135, name:'甘肃省'},
+						                {value:1548, name:'重庆'},
+						                {value:148, name:'安徽省'},
+						                {value:148, name:'浙江省'},
+						                {value:148, name:'广西省'},
+						                {value:148, name:'北京'},
+						                {value:148, name:'湖南'},
+						                {value:148, name:'湖北'},
+						                {value:148, name:'内蒙古'}
+						            ]
+						        }
+						    ]
+						};
+
+                // 为echarts对象加载数据
+                myChart.setOption(option);
+
+                //3 单位地区分布//
+
+    </script>
 </body>

invoice-input-billing-all.html

@@ -164,6 +164,28 @@
 	  					<td></td>
 	  					<td><a href="#claim" data-toggle="modal">设置认领</a><br><a href="#search-invoice" data-toggle="modal">查询发票</a></td>
 	  				</tr>
+						<!--一个收款绑定多个入账 - 发票金额不满足收款金额-->
+	  				<tr>
+	  					<td><b>￥30000.00</b></td>
+	  					<td>李艳芬/鹅蛋山</td>
+						<td>广发银行珠海分行柠溪支行<br>2015-04-12</td>
+	  					<td>张少珊<br>2015-04-12 11:30:02</td>
+	  					<td>张少珊 转入 刘飞<br>2015-04-12 11:30:02</td>
+	  					<td>张少珊 入账<br>2015-04-12 11:30:02</td>
+	  					<td><a href="#invoiced" data-toggle="modal">#F20160316001</a>,<a href="#invoiced" data-toggle="modal">#F20160316003</a></td>
+	  					<td><a href="#billeidt" data-toggle="modal">解绑</a><br><a href="#search-invoice" data-toggle="modal">查询发票</a></td>
+	  				</tr>
+						<!--一个收款绑定多个入账 - 发票金额满足收款金额-->
+	  				<tr>
+	  					<td><b>￥30000.00</b></td>
+	  					<td>李艳芬/鹅蛋山</td>
+						<td>广发银行珠海分行柠溪支行<br>2015-04-12</td>
+	  					<td>张少珊<br>2015-04-12 11:30:02</td>
+	  					<td>张少珊 转入 刘飞<br>2015-04-12 11:30:02</td>
+	  					<td>张少珊 入账<br>2015-04-12 11:30:02</td>
+	  					<td><a href="#invoiced" data-toggle="modal">#F20160316001</a>,<a href="#invoiced" data-toggle="modal">#F20160316003</a></td>
+	  					<td><a href="#billeidt" data-toggle="modal">解绑</a></td>
+	  				</tr>
 		  		</table>
 					</div>
 		  						<!--翻页-->
@@ -214,7 +236,11 @@
     <h3>收款与发票解绑</h3>
     </div>
     <div class="modal-body">
-			解绑后，发票与收款 可重新进行新的入账。
+			<p>解绑后，发票与收款 可重新进行新的入账。</p>
+			<table class="table table-bordered">
+				<tr><td>#F20160316001</td><td>￥1000.00</td><td>珠海纵横公司</td><td>纵横公路工程造价管理系统V9.0</td><td><input type="radio"></td></tr>
+				<tr><td>#F20160316003</td><td>￥1000.00</td><td>珠海纵横公司</td><td>纵横公路工程造价管理系统V9.0</td><td><input type="radio"></td></tr>
+			</table>
     </div>
 	<div class="modal-footer">
 	    <a href="#" class="button">确认解绑</a>
@@ -338,7 +364,8 @@
 	    <a href="#" class="button">确定</a>
 	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
 	</div>
-			</div></div>
+			</div>
+		</div>
 </div>
     <!--弹出设置认领-->
 <script type="text/javascript">autoFlashHeight();</script>

invoice-input-billing.html

@@ -178,6 +178,23 @@
 								</tbody>
 							</table>
 						</div>
+						<div class="clearfix">
+							<legend><div class="fR"><a href="invoice-input-billing-all.html">查看所有</a></div>部分入账收款（10）</legend>
+							<table class="table table-bordered table-condensed">
+									<tbody>
+									<tr><th class="taC" width="70">收款金额</th><th class="taC">银行到帐信息</th><th class="taC">银行/到帐时间</th><th class="taC">已入账金额</th><th class="taC">剩余入账金额</th><th>已入账开票</th><th class="taC" width="120">绑定发票</th></tr>
+									<tr>
+										<td><b>￥3000.00</b></td>
+										<td>张宇</td>
+										<td>广发银行珠海分行柠溪支行<br>2016-03-03</td>
+										<td><b>￥1000.00</b></td>
+										<td><b>￥1000.00</b></td>
+										<td><a href="#invdetail" data-toggle="modal">#F20160316001</a>,<a href="#invdetail" data-toggle="modal">#F20160316003</a></td>
+										<td><a class="button btn-block" href="#search-invoice" data-toggle="modal">查询发票</a></td>
+									</tr>
+									</tbody>
+								</table>
+						</div>
 					</div>
 				</div>
 			</div>