15807800591 2 年之前
父節點
當前提交
3e6ff72bcc

+ 2 - 0
js/app.js

@@ -59,6 +59,8 @@ var urls = function() {
 		
 		"send_contract": host + "/app/contract/send_contract", //发送合同
 		"qr_contract": host + "/app/contract/qr_contract", //发送合同
+		"u_contract": host + "/app/contract/u_contract", //企业查看发给用户的合同
+		"save_contract": host + "/app/contract/save_contract", //保存合同
 		
 		"finance_app": host + "/app/parttime/app_finance", //申请请款
 		"qr_finance": host + "/app/parttime/qr_finance", //确认打款

+ 3 - 3
pages/parttime/detail.html

@@ -98,7 +98,7 @@
 				el: "#app",
 				data: {
 					item: {},
-					resume: {},
+					resume: {userId:getUser().id},
 					msg: '我要报名'
 				},
 				mounted: function() {
@@ -124,13 +124,13 @@
 							return;
 						}
 							console.log("gfgh1==="+JSON.stringify(vm.item));
-						vm.resume = getResume();
+						//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);
+						//deleteEmptyProperty(vm.resume);
 						request(urls().parttime_delivery, vm.resume, function(res) {
 							plus.nativeUI.closeWaiting();
 							if(res.result == true) {

+ 11 - 1
pages/parttimeapp/contract_detail.html

@@ -55,11 +55,20 @@
 							<div class="clear"></div>
 						</div>
 						<div class="row">
-							<label>请选择合同模板</label>
+							<label>合同模板</label>
 							<div class="clear"></div>
 						</div>
 						<div class="img_list">
 							<div class="row">
+								<div class="sm3" >
+									<img :src="item.contract_url" class="img"  @click.stop="view(item.contract_url)" />
+									<div class="sa" >{{item.title}}</div>
+								</div>
+								<div class="clear"></div>
+							</div>
+						</div>
+						<!--<div class="img_list">
+							<div class="row">
 								<div class="sm3" v-for="(item,index) in contract_list" @click="select(item,index)">
 									<img :src="item.contract_url" class="img" :class="{active:curr==index}" @click.stop="view(item.contract_url)" />
 									<div class="sa" :class="{active:curr==index}">{{item.title}}</div>
@@ -67,6 +76,7 @@
 								<div class="clear"></div>
 							</div>
 						</div>
+						-->
 					</div>
 					<button class="btn" @click="save()"  v-if="item.status!='1' ">保存</button> <button class="btn" @click="ok()" v-if="item.trustee_status!='1' ">确认合同</button>
 				</div>

+ 2 - 0
pages/parttimerec/contract.html

@@ -115,6 +115,8 @@
 							return;
 						}
 						this.item.status=0;
+						this.item.client_status = 0;
+						this.item.trustee_status= 0;
 						request(urls().send_contract, this.item, function(res) {
 							if (res.result == true) {
 								mui.toast("操作成功");

+ 5 - 4
pages/parttimerec/contract_detail.html

@@ -55,14 +55,14 @@
 							<div class="clear"></div>
 						</div>
 						<div class="row">
-							<label>请选择合同模板</label>
+							<label>合同模板</label>
 							<div class="clear"></div>
 						</div>
 						<div class="img_list">
 							<div class="row">
-								<div class="sm3" v-for="(item,index) in contract_list" @click="select(item,index)">
-									<img :src="item.contract_url" class="img" :class="{active:curr==index}" @click.stop="view(item.contract_url)" />
-									<div class="sa" :class="{active:curr==index}">{{item.title}}</div>
+								<div class="sm3" >
+									<img :src="item.contract_url" class="img"  @click.stop="view(item.contract_url)" />
+									<div class="sa" >{{item.title}}</div>
 								</div>
 								<div class="clear"></div>
 							</div>
@@ -151,6 +151,7 @@
 					//	}
 						this.item.status=1;
 						this.item.client_status = 1;
+						
 						request(urls().save_contract, this.item, function(res) {
 							if (res.result == true) {
 								mui.toast("操作成功");

+ 6 - 2
pages/parttimerec/detail.html

@@ -110,7 +110,7 @@
 				<div class="clear"></div>
 			</div>
 			<div class="model" style="padding-bottom: 20px;">
-				<div class="bbcs" v-for="(item,index) in item.list">{{item.mz}} {{item.phone}}
+				<div class="bbcs" v-for="(item,index) in item.list">{{item.nickName}} {{item.account}}
 					<div class="lyy" @click="contract(item,0)" v-if="item.state=='0' && item.contract=='0'">
 						<button class="btn">发送合同</button>
 					</div>
@@ -136,13 +136,17 @@
 					qitem: {}
 				},
 				mounted: function() {
+					
+					
+					mui.plusReady(function() {
 					request(urls().parttime_detail, {
-						id: 18
+						id: plus.webview.currentWebview().param.id
 					}, function(res) {
 						vm.item = res;
 						//vm.item.mTime = vm.item.mTime.substring(0, 11)
 						plus.nativeUI.closeWaiting();
 					})
+					})
 				},
 				methods: {
 					//合同详情

+ 6 - 3
pages/parttimerec/user_pay.html

@@ -43,7 +43,7 @@
 			<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>
+			</header><div class="model" style="padding-bottom: 20px;">></div>
 			<div class="model" style="padding-bottom: 20px;">
 				<div class="bbcs" v-for="(item,index) in item">用户:{{item.nickName}}   联系方式:{{item.account}}    银行卡号:{{item.kh}}
 					<div class="lyy" @click="qrdk(item)" v-if="item.state===0">
@@ -92,7 +92,10 @@
 						}, function(res) {
 							console.log("res===" + JSON.stringify(res));
 							vm.item = res.data;
-
+       //  if (res.result == true) {
+				//				mui.toast("操作成功");
+					//			plus.webview.getWebviewById("user_pay").reload(true);
+					//		}
 							//vm.item.mTime = vm.item.mTime.substring(0, 11)
 							plus.nativeUI.closeWaiting();
 						})
@@ -121,7 +124,7 @@
 								if (res.result == true) {
 									vm.msg = '已打款'
 									mui.toast('已打款');
-
+                      plus.nativeUI.closeWaiting();
 								} else {
 									mui.alert(res.msg);
 								}