Browse Source

评价功能、付款功能

luyanan 8 years ago
parent
commit
06edfcc0ec
3 changed files with 178 additions and 29 deletions
  1. 17 20
      src/main/webapp/js/popup.js
  2. 155 8
      src/main/webapp/js/workspace.js
  3. 6 1
      src/main/webapp/workspaces.html

+ 17 - 20
src/main/webapp/js/popup.js

@ -247,13 +247,13 @@ function CommentInfo() {
247 247
		PopHtml += '<div class="resoutit">评价<div class="showinfor">评价后可看到对方对您的评价</div></div>';
248 248
		PopHtml += '<div class="commentbox"><table class="commentcon">';
249 249
		//星级评价
250
		PopHtml += '<tr><th class="resouinfotype" scope="row">总体评价</th><td><div class="resouinforcon"><div class="evastarbox2"><span class="evastar2"></span><span class="evastar2"></span><span class="evastar2"></span><span class="evastar2"></span><span class="evastar2"></span></div></div></td></tr>';
250
		PopHtml += '<tr><th class="resouinfotype" scope="row">总体评价</th><td><div class="resouinforcon"><div class="evastarbox2" id="startbox"><span class="evastar2"></span><span class="evastar2"></span><span class="evastar2"></span><span class="evastar2"></span><span class="evastar2"></span></div></div></td></tr>';
251 251
		//评价内容
252
		PopHtml += '<tr> <th class="resouinfotype" scope="row">评价内容</th> <td><div class="resouinforcon"><textarea class="frmtype"></textarea></div></td></tr>';
252
		PopHtml += '<tr> <th class="resouinfotype" scope="row">评价内容</th> <td><div class="resouinforcon"><textarea class="frmtype"id="discussContent"></textarea></div></td></tr>';
253 253
		PopHtml += '<tr> <th class="resouinfotype" scope="row"></th><td><div class="resouinforcon"><div class="wordlimit">字数限制为5~200个</div></div></td> </tr>';
254 254
		PopHtml += '</table>';
255 255
		//按钮
256
		PopHtml += '<table class="btntab"><tr><td><div class="addrebtn" style="text-align:center;"><input type="button" value="发表评论" class="frmtype frmbtn"></div> </td> </tr></table>';
256
		PopHtml += '<table class="btntab"><tr><td><div class="addrebtn" style="text-align:center;"><input type="button" value="发表评论" class="frmtype frmbtn"id="discuss"></div> </td> </tr></table>';
257 257
		PopHtml += ' </div> </div>';
258 258
		/*查看评价信息*/
259 259
		PopHtml += '<div class="sqlcomment">';
@ -352,20 +352,20 @@ function PaymentInfo() {
352 352
		PopHtml += '<th><div class="resouinforcon">付款方</div></th>';
353 353
		PopHtml += '<td><div class="resouinforcon"><input type="text" class="frmtype"></div></td>';
354 354
		PopHtml += '<th><div class="resouinforcon">支付方式</div></th>';
355
		PopHtml += '<td><div class="resouinforcon"><input type="text" class="frmtype"></div></td>';
355
		PopHtml += '<td><div class="resouinforcon"><input type="text" class="frmtype"id="isonline""></div></td>';
356 356
		PopHtml += '</tr>';
357 357

358 358
		PopHtml += '<tr>';
359 359
		PopHtml += '<th><div class="resouinforcon">金额</div></th>';
360
		PopHtml += '<td><div class="resouinforcon"><input type="number" class="frmtype"></div></td>';
360
		PopHtml += '<td><div class="resouinforcon"><input type="number" class="frmtype"id="paidMoney"></div></td>';
361 361
		PopHtml += '<th><div class="resouinforcon">状态</div></th>';
362 362
		PopHtml += '<td><div class="resouinforcon"><input type="text" class="frmtype"></div></td>';
363 363
		PopHtml += '</tr>';
364 364

365 365
		PopHtml += '<tr>';
366 366
		PopHtml += '<th><div class="resouinforcon">备注</div></th>';
367
		PopHtml += '<td colspan="2"><div class="resouinforcon"><textarea class="frmtype"></textarea></div></td>';
368
		PopHtml += '<td><div class="resouinforcon"><div class="addrebtn" style="text-align:center;"><input type="button" value="添加" class="frmtype frmbtn"> </div></div></td>';
367
		PopHtml += '<td colspan="2"><div class="resouinforcon"><textarea class="frmtype"id="remark"></textarea></div></td>';
368
		PopHtml += '<td><div class="resouinforcon"><div class="addrebtn" style="text-align:center;"><input type="button" value="添加" class="frmtype frmbtn " id="addm"/></div></div></td>';
369 369
		PopHtml += ' </tr></table></div>';
370 370
		/*款项记录*/
371 371
		PopHtml += '<div class="paymentbox"> ';
@ -470,25 +470,22 @@ function DetailInfo(){
470 470
		PopHtml += '<div class="worktit">款项记录</div>';
471 471
		/*添加款项记录*/
472 472
		PopHtml += '<div class="payaddbox1">';
473
		PopHtml += '<table><tr>';
474
		PopHtml += '<th><div class="resouinforcon">付款方</div></th>';
475
		PopHtml += '<td><div class="resouinforcon"><input type="text" class="frmtype"></div></td>';
473
		PopHtml += '<table><tr >';
474
		//PopHtml += '<th><div class="resouinforcon">付款方</div></th>';
475
		//PopHtml += '<td><div class="resouinforcon"><input type="text" class="frmtype" id="profeessorId"></div></td>';
476 476
		PopHtml += '<th><div class="resouinforcon">支付方式</div></th>';
477
		PopHtml += '<td><div class="resouinforcon"><input type="text" class="frmtype"></div></td>';
478
		PopHtml += '</tr>';
479

480
		PopHtml += '<tr>';
477
		PopHtml += '<td><div class="resouinforcon"><select class="frmtype" id="isOnline"><option value="1" selected>线上支付</option><option value="0">线下支付</option></select></div></td>';
481 478
		PopHtml += '<th><div class="resouinforcon">金额</div></th>';
482
		PopHtml += '<td><div class="resouinforcon"><input type="number" class="frmtype"></div></td>';
483
		PopHtml += '<th><div class="resouinforcon">状态</div></th>';
484
		PopHtml += '<td><div class="resouinforcon"><input type="text" class="frmtype"></div></td>';
479
		PopHtml += '<td><div class="resouinforcon"><input type="number" class="frmtype" id="paidMoney"></div></td>';
480
		//PopHtml += '<th><div class="resouinforcon">状态</div></th>';
481
		//PopHtml += '<td><div class="resouinforcon"><input type="text" class="frmtype" id="payStatus"></div></td>';
485 482
		PopHtml += '</tr>';
486 483

487 484
		PopHtml += '<tr>';
488 485
		PopHtml += '<th><div class="resouinforcon">备注</div></th>';
489
		PopHtml += '<td colspan="2"><div class="resouinforcon"><textarea class="frmtype"></textarea></div></td>';
490
		PopHtml += '<td><div class="resouinforcon"><div class="addrebtn" style="text-align:center;"><input type="button" value="添加" class="frmtype frmbtn"> </div></div></td>';
491
		PopHtml += ' </tr></table></div>';
486
		PopHtml += '<td colspan="3"><div class="resouinforcon"><textarea class="frmtype" id="payRemark"></textarea></div></td></tr>';
487
		PopHtml += '<tr><td colspan="4"><div class="resouinforcon"><div class="addrebtn" style="text-align:center;"><input type="button" value="添加" class="frmtype frmbtn" id="panaddbtn"> </div></div></td></tr>';
488
		PopHtml += ' </table></div>';
492 489
		/*款项记录*/
493 490
		PopHtml += '<div class="paymentbox1"> ';
494 491
		PopHtml += '<table><tr>';

+ 155 - 8
src/main/webapp/js/workspace.js

@ -452,7 +452,7 @@ $.ajax({
452 452
	                    stringContent +='<td>'+data.data[i].operationStatus+'</td>'
453 453
	                    stringContent +='<td>'+data.data[i].dealTime+'</td>'      
454 454
	                    stringContent +='<td>'+data.data[i].dealPrice+'</td>'     
455
	                    stringContent +='<td> - </td>'       
455
	                    stringContent +='<td>'+data.data[i].payMethod+'</td>'       
456 456
	                    stringContent +='<td> - </td>'        
457 457
	                    stringContent +='<td class="loginStatus">修改申请</td></tr>'
458 458
	                   $(".worktabb").append( stringContent);
@ -469,7 +469,11 @@ $.ajax({
469 469
								$(".loginStatus").eq(i).text("对方已回复");
470 470
							  break;
471 471
							case 3:
472
								$(".loginStatus").eq(i).text("合作");
472
								var string='<span>合作进行中</span><br/>'
473
									string+='<span class="detailm"resourId='+data.data[i].resource.resourceId+' operationStatus='+data.data[i].operationStatus+' operationId='+data.data[i].operationId+'>查看详情</span><br />'
474
								string+='<span class="payMonety"resourId='+data.data[i].resource.resourceId+' operationStatus='+data.data[i].operationStatus+' operationId='+data.data[i].operationId+'>付款</span><br />'
475
								string+='<span class="stopcoo"resourId='+data.data[i].resource.resourceId+' operationStatus='+data.data[i].operationStatus+' operationId='+data.data[i].operationId+'>中止合作</span>'
476
								$(".loginStatus").eq(i).html(string);								
473 477
							  break;
474 478
							case 4:
475 479
								$(".loginStatus").eq(i).text("本人拒绝合作");
@ -477,6 +481,13 @@ $.ajax({
477 481
							case 5:
478 482
								$(".loginStatus").eq(i).text("对方拒绝合作");
479 483
							  break;
484
							case 6:
485
								var string='<span>本人中止合作</span><br/>'
486
								string+='<span class="detailm"resourId='+data.data[i].resource.resourceId+' operationStatus='+data.data[i].operationStatus+' operationId='+data.data[i].operationId+'>查看详情</span><br />'
487
								string+='<span class=" discuss"resourceId='+data.data[i].resource.resourceId+' operationStatus='+data.data[i].operationStatus+' operationId='+data.data[i].operationId+'>评价</span><br />'
488
								string+='<span class="complain"resourId='+data.data[i].resource.resourceId+' operationStatus='+data.data[i].operationStatus+' operationId='+data.data[i].operationId+'>投诉</span>'
489
								$(".loginStatus").eq(i).html(string);
490
							  break;
480 491
							default:							  
481 492
							}	
482 493
					}
@ -488,12 +499,122 @@ $.ajax({
488 499
	},
489 500
	"error":function(){$.MsgBox.Alert('message','failddd')}
490 501
});
491

492

493

494

502
//付款
503
function payMoney(id){
504
	$.ajax({"url" : "/ajax/payhistory",
505
		"type" : "POST",
506
		"success" : function(rdata) 
507
		{
508
			if (rdata.success) 
509
			{
510
					location.reload(true);
511
			}
512
			else 
513
			{
514
				alert("jjj");
515
			}
516
		},
517
		"data" :{"operationId":id,"paidMoney":$("#paidMoney"),
518
				"remark":$("#remark").val(),
519
				"isonline":1},			
520
		"contentType" :"application/x-www-form-urlencoded",
521
		dataType : "json"
522
	});
523
}
524
$(".workmysrc").on("click",".payMonety",function(){
525
	 DetailInfo();
526
	 var op=$(this).attr("operationId");
527
	 //$(".paymentbox1").css("display","none");
528
	 $("#panaddbtn").click(function(){
529
		 alert("jjj");
530
		  //payMoney(op);
531
		 $.ajax({"url" : "/ajax/payhistory",
532
				"type" : "POST",
533
				"success" : function(rdata) 
534
				{
535
					if (rdata.success) 
536
					{
537
							//location.reload(true);
538
					}
539
					else 
540
					{
541
						alert("jjj");
542
					}
543
				},
544
				"data" :{"operationId":op,"paidMoney":$("#paidMoney").val(),
545
						"remark":$("#payRemark").val(),"payStatus":$("#payStatus").val(),"professorId":userid,
546
						"isonline":$("#isOnline").find("option:selected").val()},			
547
				"contentType" :"application/x-www-form-urlencoded",
548
				dataType : "json"
549
			});
550
		 });
551
});
552
//中止合作
553
$(".workmysrc").on("click",".stopcoo",function(){
554
	 var op=$(this).attr("operationId");
555
	 upStatus(op,6);
556
});
557
//评论
558
var start;
559
$(".workmysrc").on("click",".discuss",function(){
560
	var resourceId=$(this).attr("resourceId");	
561
	var operationId=$(this).attr("operationId");
562
	CommentInfo();
563
	$(".evastar2").click(function(){
564
		$(".evastar2").removeClass('span');
565
		start=$(this).index()+1;
566
		for(var i=0;i<start;i++){
567
			if(i<start){
568
				$(".evastar2").eq(i).addClass("span");
569
			}
570
			else{
571
				$(".evastar2").eq(i).removeClass('span');
572
			}
573
		}
574
	})
575
	$("#discuss").click(function(){
576
		//discussContent(resourceId,operationId,start,userid);
577
		$.ajax({	
578
			"url":"/ajax/assess",
579
			"type":"post",
580
			"async": true,
581
			"data":{"operationId":operationId,"professorId":userid,"resourceId":resourceId,"starLevel":start,"descp":$("#discussContent").val()},
582
			"success":function(data){
583
			if(data.success)
584
				{
585
					console.log(data);
586
				}
587
				else
588
				{
589
					console.log("系统异常!");
590
				}
591
			},
592
			"beforeSend":function(){console.log(this.data)},
593
			"error":function(){$.MsgBox.Alert('message','failddd')}
594
			});
595
	})
596
})
597
function discussContent(){
598
	$.ajax({	
599
"url":"/ajax/assess",
600
"type":"post",
601
"async": true,
602
"data":{"operationId":operationId,"professorId":userid,"resourceId":resourceId,"starLeval":start,"descp":$("#discussContent").val()},
603
"success":function(data){
604
if(data.success)
605
	{
606
		console.log(data);
607
	}
608
	else
609
	{
610
		console.log("系统异常!");
611
	}
612
},
613
"error":function(){$.MsgBox.Alert('message','failddd')}
614
});
615
}
495 616
//我的需求中修改申请,对方已经回复(合作),我拒绝合作或者约对方合作
496
$(".workmysrc").on("click",".loginStatus",function(){
617
$(".workmysrc").on("click",".detailm",function(){
497 618
//	$(".blackcover").show();
498 619
//	$(".resouapply").show();
499 620
	ResourceApply();
@ -505,7 +626,7 @@ $(".workmysrc").on("click",".loginStatus",function(){
505 626
	{
506 627
		$(".btnboxup").css({"display":"none"});
507 628
		$(".applysure").css({"display":"none"});
508
		$(".dealTime").replaceWith("<input type='text' class='dealTime'>");
629
		$(".dealTime").replaceWith("<input type='text'colspan='2'class='dealTime'>");
509 630
		ajaxGet(operationId);
510 631
		//if($(".dealTime").val()!=""&&$(".detail").val()!="")
511 632
		//{
@ -580,7 +701,33 @@ $(".workmysrc").on("click",".loginStatus",function(){
580 701
		$(".applysure").css({"display":"none"});
581 702
		ajaxGet(operationId);
582 703
	}
704
	if(flag==1&&operationStatus==6){
705
		$(".btnboxup").css({"display":"none"});
706
		$(".btnboxdown").css({"display":"none"});
707
		$(".applysure").css({"display":"none"});
708
		ajaxGet(operationId);
709
		discussGetContent(operationId);
710
	}
583 711
})
712
//获取评论
713
function discussGetContent(operationId){
714
	$.ajax({	
715
	"url":"/ajax/assess/qaoper",
716
	"type":"get",
717
	"async": true,
718
	"data":{"operationId":operationId},		
719
	"success":function(data){
720
		if(data.success){
721
				console.log(data);
722
			}
723
			else
724
			{
725
				console.log("系统异常!");
726
			}
727
	},
728
	"error":function(){$.MsgBox.Alert('message','failddd')}
729
	});
730
}
584 731
//更新状态
585 732
function upStatus(operationId,n){
586 733
	$.ajax({"url" : "/ajax/operation/operationStatus",

+ 6 - 1
src/main/webapp/workspaces.html

@ -5,6 +5,11 @@
5 5
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
6 6
<meta http-equiv="X-UA-Compatible" content="IE=edge">
7 7
<title>科袖-我的工作台</title>
8
<style>			
9
#startbox .span{
10
	background: url(../images/evastar.png) 0 0px no-repeat;
11
	}
12
	</style>	
8 13
<link type="text/css" href="css/bootstrap.min.css" rel="stylesheet">
9 14
<link type="text/css" href="css/reset.css" rel="stylesheet" />
10 15
<link type="text/css" href="css/common.css" rel="stylesheet">
@ -24,7 +29,7 @@
24 29
<script type="text/javascript" src="js/workspace.js"></script>
25 30
</head>
26 31

27
<body onload="DetailInfo();">
32
<body>
28 33

29 34
<div id="header">
30 35
	<a href="index.html" alt="科袖" class="logo"></a>