15807800591 hace 2 años
padre
commit
c3e02e17b1

+ 5 - 1
js/app.js

@@ -1,6 +1,7 @@
 var urls = function() {
 	//var host = "http://192.168.100.3:7979";
-	var host = "http://192.168.0.101:7979";
+	//var host = "http://192.168.0.101:7979";
+    var host = "http://192.168.0.106:7979";
 	//var host = "http://192.168.1.7:7979";
 	//var host = "http://106.55.241.82:7979";
 	//var host = "http://192.168.5.104:8080/djfp";
@@ -63,6 +64,9 @@ var urls = function() {
 		"qr_finance": host + "/app/parttime/qr_finance", //确认打款
 		"add_evaluate": host + "/app/parttime/add_evaluate", //评价
 		
+		"user_payapp": host + "/app/finance/user_payapp", //用户请款列表
+		
+		
 		"contract_templete_list": host + "/app/contract/templete/list", //合同模板列表
 		"finance_list": host + "/app/finance/list", //资金流水
 		"chart_list": host + "/app/finance/chart_list", //统计图

+ 2 - 2
pages/bill/list.html

@@ -63,8 +63,8 @@
 									</div>
 								</div>
 								<div class="sm3">
-									<div class="money" v-if="item.pay_mode=='收款方'" style="color: #4CAF50;">+{{item.amount}}元</div>
-									<div class="money" v-if="item.pay_mode=='付款方'" style="color: #F44336;">-{{item.amount}}元</div>
+									<div class="money" v-if="item.type=='0'" style="color: #4CAF50;">+{{item.amount}}元</div>
+									<div class="money" v-if="item.type=='1'" style="color: #F44336;">-{{item.amount}}元</div>
 								</div>
 								<div class="clear"></div>
 							</div>

+ 5 - 0
pages/parttime/detail.html

@@ -105,6 +105,7 @@
 					mui.plusReady(function() {
 						request(urls().parttime_detail, {id: plus.webview.currentWebview().param.id}, function(res) {
 							vm.item = res;
+							console.log("gfgh12==="+JSON.stringify(vm.item));
 							//vm.item.mTime = vm.item.mTime.substring(0, 11)
 							plus.nativeUI.closeWaiting();
 						})
@@ -122,9 +123,13 @@
 							mui.alert("企业用户不允许投递简历");
 							return;
 						}
+							console.log("gfgh1==="+JSON.stringify(vm.item));
 						vm.resume = getResume();
+						console.log("resume1==="+JSON.stringify(vm.resume));
 						vm.resume.parttime_id = vm.item.id;
 						vm.resume.recruit_id=vm.item.publisher;
+						console.log("resume==="+JSON.stringify(vm.resume));
+						console.log("gfgh1==="+JSON.stringify(vm.item));
 						deleteEmptyProperty(vm.resume);
 						request(urls().parttime_delivery, vm.resume, function(res) {
 							plus.nativeUI.closeWaiting();

+ 0 - 172
pages/parttimeapp/detail.html

@@ -1,172 +0,0 @@
-<!doctype html>
-<html>
-
-	<head>
-		<meta charset="UTF-8">
-		<title>职位详情</title>
-		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
-		<link href="../../css/mui.min.css" rel="stylesheet" />
-		<link href="../../css/animate.min.css" rel="stylesheet" />
-		<style>
-		   .mui-bar-nav~.mui-content{padding-top: 55px;margin-bottom: 50px;}
-		   .ht{margin-top: 11px;padding: 5px;background-color: #fffbee;color: #ed9f2b;font-size: 11px;}
-		   .warn{display: block;padding-top: 11px;text-align: center;}
-		   .name{font-weight: bold;font-size: 17px;}
-           .icon{font-size:20px;}
-		   .right{float: right;color: #FF5722;}
-		   .yh{font-size: 11px;padding: 5px 0px 0px 0px;color: darkgray;}
-		   .yh .sp{padding-right: 15px;}
-		   .sps{background: #00B5AD;padding: 1px 6px;border-radius: 3px;color: white;text-align: center;}
-		   .s{color: darkgray;font-size: 12px;}
-		   .row{font-size: 14px;padding-top: 10px;}
-		   .sm2{color: #4c4848;}
-           .dc{padding-right: 10px;font-size: 12px;}
-           .i{color: #00a0ea;}
-           .item{border-top: 1px solid #ececec;margin-top: 10px;padding-top: 15px;font-size: 14px;}
-           .dd{padding:5px;margin:0;border: 0;}
-           .dz{font-size: 12px;color: darkgray;}
-           .gs{padding-top: 11px;font-size: 48px;display: block;color: #00a0ea;}
-           .nr{font-size: 13px;color: #4a4747;}
-		   .lyy{float: right;margin-top: 15px;font-size: 15px;color: orange;}
-           .footer{color: white;position: fixed;background-color: #00a0ea;padding-top: 15px;width: 100%;bottom: 0;height: 52px;text-align: center;}
-		  [v-cloak] {display: none;}
-		</style>
-	</head>
-	<body>
-		<div id="app" v-cloak>
-			<header class="mui-bar mui-bar-nav">
-				<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
-				<h1 class="mui-title">职位详情</h1>
-			</header>
-			<div class="mui-content animated fadeInUp">
-				<div class="ht">凡是要求缴纳费用请提高警惕,谨防受骗!</div>
-				<div class="model">
-					<div class="content" style="margin-top: -5px;">
-						<span class="name">{{item.parttime_title}}</span><span class="right">{{item.salary}}</span>
-						<div class="yh">
-							<span class="sp">更新:{{item.publish_date}}</span>
-							<span class="sp" style="color: #18c31f;"><i class="icon" style="font-size: 13px;">&#xe7a1;</i> 通过审核</span>
-							<span class="sp">申请:{{item.hire_num}} 人</span>
-							<span class="sps" style="background: #FF5722;" v-show="item.hire_num>5">多人竞争</span>
-							<span class="sps" style="background: #00a0ea;" v-show="item.hire_num<5&&item.hire_num>0">机会大</span>
-							<span class="sps" style="background: #009688;" v-show="item.hire_num==0">争先锋</span>
-						</div>
-						<div class="row">
-							<div class="sm2">要求:</div>
-							<div class="sm8">
-								<span class="dc"><i class="icon i">&#xe624;</i> 招{{item.hire_num}}人</span>
-								<span class="dc"><i class="icon i">&#xe65e;</i> {{item.settlement}}</span>
-								<span class="dc"><i class="icon i">&#xe662;</i> {{item.remark}}</span>
-							</div>
-							<div class="clear"></div>
-						</div>
-						<div class="row">
-							<div class="sm2">福利:</div>
-							<div class="sm8" style="font-size: 12px;">
-								{{item.parttime_describe}}
-							</div>
-							<div class="clear"></div>
-						</div>
-					</div>
-				</div>
-				<div class="model">
-					<div class="item dd">工作地点 <i class="icon right" style="color: darkgray;font-size: 15px;">&#xe61c;</i><span class="right s">{{item.address}}</span></div>
-				</div>
-				<div class="model">
-					<div class="content">
-						<div class="row" style="padding: 0;">
-							<div class="sm2"><i class="icon gs">&#xe724;</i></div>
-							<div class="sm8">{{item.work_region}} <br><span class="dz">{{item.address}}</span></div>
-							<div class="clear"></div>
-						</div>
-						<div class="item">公司电话 <i class="icon right" style="color: darkgray;font-size: 15px;">&#xe61c;</i><a class="right s" :href=" 'tel:'+item.phone">{{item.contact_info}}</a></div>
-					</div>
-				</div>
-				<div class="model">
-					<div class="bod">
-						<span><i class="icon i" style="padding-right:5px;">&#xe660;</i>职位要求</span>
-					</div>
-					<div class="content nr" v-html="item.parttime_describe"></div>
-				</div>
-			</div>
-			<div class="model">
-				<div class="mui-input-row">
-					<label>合同内容条款 <span>*</span></label>
-					<textarea rows="3"  placeholder="输入兼职描述"> 根据《中华人民共和国劳动法》、《中华人民共和国劳动合同法》和有关法律、法规,甲乙双方经平等自愿、协商一致签订本合同,共同遵守。</textarea>
-				</div>
-			</div>
-		<!--
-			<div class="model" v-for="(item,index) in item.list">
-				<div class="item dd">{{item.mz}} {{item.phone}}
-				<div class="lyy"  @click="contract(item)"  v-if="item.state=='0' && item.contract=='0'">发送合同</div>
-				<div class="lyy"  style="color: #00B5AD;"  v-else-if="item.state=='0' && item.contract=='1'">合同已发送</div>
-				</div>
-			</div>
-			-->
-			
-			
-			
-			
-			<div class="footer" @click="deliver()"><i class="icon">&#xe61a;</i> {{msg}}</div> 
-		</div>
-		<script src="../../js/mui.min.js"></script>
-		<script src="../../js/app.js"></script>
-		<script src="../../js/vue.min.js"></script>
-		<script type="text/javascript">
-			var vm = new Vue({
-				el: "#app",
-				data: {
-					item: {},
-					resume: {},
-					msg: '确认合同'
-				},
-				mounted: function() {
-					mui.plusReady(function() {
-						request(urls().parttime_detail, {id: plus.webview.currentWebview().param.id}, function(res) {
-							vm.item = res;
-							
-							//vm.item.mTime = vm.item.mTime.substring(0, 11)
-							plus.nativeUI.closeWaiting();
-						})
-					})
-				},
-				methods: {
-					
-					
-					//详情
-					contract: function(id) {
-						open('detail', 'contract.html', id, 'slide-in-bottom');
-					},
-					
-					//投递简历
-					deliver: function() {
-						if(!hasLogin()) {
-							mui.toast("请先登录")
-							open('login', '/pages/user/login.html', null, 'slide-in-bottom');
-							return;
-						}
-						if(getUser().mType==1){
-							mui.alert("企业用户不允许投递简历");
-							return;
-						}
-						//vm.resume = getResume();
-						vm.resume.parttime_id = vm.item.id;
-						vm.resume.trustee=getUser().id;
-						//deleteEmptyProperty(vm.resume);
-						request(urls().qr_contract, vm.resume, function(res) {
-							plus.nativeUI.closeWaiting();
-							if(res.result == true) {
-								vm.msg = '已确认'
-								mui.toast('确认成功');
-								open('jz_list', '/tab/jz_list.html', {}, 'slide-in-bottom');
-							} else {
-								mui.alert(res.msg);
-							}
-						})
-					}
-				}
-			})
-		</script>
-	</body>
-
-</html>

+ 11 - 7
pages/parttimeapp/finance.html

@@ -3,7 +3,7 @@
 
 	<head>
 		<meta charset="UTF-8">
-		<title>职位详情</title>
+		<title>付款申请</title>
 		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 		<link href="../../css/mui.min.css" rel="stylesheet" />
 		<link href="../../css/animate.min.css" rel="stylesheet" />
@@ -36,7 +36,7 @@
 		<div id="app" v-cloak>
 			<header class="mui-bar mui-bar-nav">
 				<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
-				<h1 class="mui-title">职位详情</h1>
+				<h1 class="mui-title">付款申请</h1>
 			</header>
 			<div class="mui-content animated fadeInUp">
 				<div class="ht">凡是要求缴纳费用请提高警惕,谨防受骗!</div>
@@ -50,10 +50,10 @@
 							<input type="text" v-model="item.Payee" placeholder="输入收款方"
 								oninput="if(value.length>30)value=value.substr(0,30)">
 						</div>
-						<div class="row">
+						<!--<div class="row">
 							<label>收款日期 <span>*</span></label>
 							<input type="date" v-model="item.pay_date" placeholder="输入收款日期">
-						</div>
+						</div>-->
 						<div class="row">
 							<label>金额 <span>*</span></label>
 							<input type="number" v-model="item.amount" placeholder="输入金额"
@@ -144,7 +144,7 @@
 						open('detail', 'contract.html', id, 'slide-in-bottom');
 					},
 					
-					//投递简历
+					//申请请款
 					deliver: function() {
 						if(!hasLogin()) {
 							mui.toast("请先登录")
@@ -158,14 +158,18 @@
 						//vm.resume = getResume();
 						//vm.resume.parttime_id = vm.item.id;
 						vm.item.userId=getUser().id;
+						vm.item.type=0;
+						vm.item.state=0;
+						
 						//deleteEmptyProperty(vm.resume);
+						console.log("vm.item===" + JSON.stringify(vm.item));
 						request(urls().finance_app, vm.item, function(res) {
 							plus.nativeUI.closeWaiting();
 							if(res.result == true) {
 								vm.msg = '已申请'
 								mui.toast('申请成功');
-								//plus.webview.getWebviewById("my_parttimeapp").reload(true);
-								open('jz_list', '/tab/jz_list.html', {}, 'slide-in-bottom');
+								plus.webview.getWebviewById("app_parttime_list").reload(true);
+								//open('jz_list', '/tab/jz_list.html', {}, 'slide-in-bottom');
 							} else {
 								mui.alert(res.msg);
 							}

+ 1 - 1
pages/parttimeapp/my_parttimeapp.html

@@ -120,7 +120,7 @@
 					},
 					//详情
 					detail: function(id) {
-						open('detail', 'detail.html', id, 'slide-in-bottom');
+						open('detail', 'contract_detail.html', id, 'slide-in-bottom');
 					},//详情
 					finance: function(id) {
 						open('finance', 'finance.html', id, 'slide-in-bottom');

+ 10 - 8
pages/parttimerec/contract.html

@@ -38,19 +38,20 @@
 						<div class="input-group">
 							合同接收人: {{items.mz}}
 						</div>
+						
+						<div class="row mb6">
+							<label>合同名称</label>
+							<input type="tel" v-model="item.contract_content" placeholder="输入合同名称">
+							<div class="clear"></div>
+						</div>
 						<div class="row mb6" style="margin-top: -10px;">
 							<label>合同金额</label>
 							<input type="tel" v-model="item.contract_amount" placeholder="输入合同金额">
 							<div class="clear"></div>
 						</div>
 						<div class="row mb6">
-							<label>合同内容</label>
-							<textarea rows="3" v-model="item.contract_content" placeholder="输入合同内容"> </textarea>
-							<div class="clear"></div>
-						</div>
-						<div class="row mb6">
-							<label>备注</label>
-							<textarea rows="3" v-model="item.remark" placeholder="输入备注"> </textarea>
+							<label>附加条款</label>
+							<textarea rows="3" v-model="item.remark" placeholder="附加条款"> </textarea>
 							<div class="clear"></div>
 						</div>
 						<div class="row">
@@ -93,7 +94,7 @@
 							vm.items = plus.webview.currentWebview().param;
 							vm.item.trustee = plus.webview.currentWebview().param.userId;
 							vm.item.parttime_id = plus.webview.currentWebview().param.parttime_id;
-							vm.item.client_status = 1; //发送表示委托人同意
+							//vm.item.client_status = 1; //发送表示委托人同意
 							
 							//获取合同列表
 							request(urls().contract_templete_list, {}, function(res) {
@@ -113,6 +114,7 @@
 							mui.alert('请选择合同模板');
 							return;
 						}
+						this.item.status=0;
 						request(urls().send_contract, this.item, function(res) {
 							if (res.result == true) {
 								mui.toast("操作成功");

+ 17 - 11
pages/parttimerec/detail.html

@@ -92,8 +92,8 @@
 		
 			<div class="model" v-for="(item,index) in item.list">
 				<div class="item dd">{{item.mz}} {{item.phone}}
-				<div class="lyy"  @click="contract(item)"  v-if="item.state=='0' && item.contract=='0'">发送合同</div>
-				<div class="lyy"  style="color: #00B5AD;"  v-else-if="item.state=='0' && item.contract=='1'">合同已发送</div>
+				<div class="lyy"  @click="contract(item,0)"  v-if="item.state=='0' && item.contract=='0'">发送合同</div>
+				<div class="lyy"   @click="contract(item,1)" style="color: #00B5AD;"  v-else-if="item.state=='0' && item.contract=='1'">合同已发送</div>
 				<div class="lyy"  style="color: #98ff72;" v-if="item.state=='1' && item.finance=='0'">待请款</div>
 				<div class="lyy" @click="qrdk(item)" style="color: #00B5AD;"  v-if="item.state=='1' && item.finance=='1'">请款中请确认打款</div>
 				<div class="lyy"  style="color: #0000ff;"  v-if="item.state=='2' && item.finance=='2'">已完成</div>
@@ -131,17 +131,23 @@
 				methods: {
 					
 					
-					//详情
-					contract: function(id) {
+					//合同详情
+					contract: function(id,index) {
+						
+						if(index == 0) {
 						open('detail', 'contract.html', id, 'slide-in-bottom');
+						}
+						if(index == 1) {
+						open('detail', 'contract_detail.html', id, 'slide-in-bottom');
+						}
 					},
 					//详情
 					qrdk: function(item) {
-						console.log("items==="+JSON.stringify(item));
-						vm.qitem.parttime_id=item.parttime_id;
-						vm.qitem.userId=item.userId;
-						if(confirm("请确认已经向盖用户打款!!")){
-							
+						//console.log("items==="+JSON.stringify(item));
+						//vm.qitem.parttime_id=item.parttime_id;
+						//vm.qitem.userId=item.userId;
+						//if(confirm("请确认向该用户打款!!")){
+						/*	
 							request(urls().qr_finance, vm.qitem, function(res) {
 								plus.nativeUI.closeWaiting();
 								if(res.result == true) {
@@ -154,8 +160,8 @@
 						}else{
 							console.log("取消确认======")
 						}
-						
-						//open('detail', 'contract.html', id, 'slide-in-bottom');
+						*/
+						open('user_pay', 'user_pay.html', item, 'slide-in-bottom');
 					},
 					//投递简历
 					deliver: function() {