更新

common/http.js

@@ -1,5 +1,5 @@
-//const ip = 'http://192.168.0.251/obpm';
-const ip = 'https://tdmtest.liugong.com/obpm';
+const ip = 'http://192.168.0.251/obpm';
+//const ip = 'https://tdmtest.liugong.com/obpm';
 /**
  * 全部接口
  */
@@ -9,21 +9,32 @@ const urls = {
 
 	login: ip + '/runtime/login/loginWithCiphertext2', //用户登陆
 	myprofile: ip + '/runtime/users/myprofile', //用户登陆
-	
+
 	user_register: ip + '/app/user/register', //用户注册
 	accessToken: ip + '/rest/accessToken?secret=11ec-db2f-ca248770-8df3-890eb68cafa4', //用户注册
-   // wt_list:ip + '/runtime/__gAPYBW4YxB3UePM3lqO/views/__km3aURKW95BHxp12XVt/documents?parentId=&sortCol=&sortStatus=&lines=10&treedocid=&parentNodeId=&_docid=&_fieldid=&isRelate=&startDate=&endDate=&parentParam=&isQueryButton=false',
-	wt_list:ip + '/runtime/__gAPYBW4YxB3UePM3lqO/views/__km3aURKW95BHxp12XVt/documents?lines=10&isQueryButton=false',//获取列表数据、更换viewID
-		
-	wt_xqsh:ip + '/runtime/__gAPYBW4YxB3UePM3lqO/views/__MhHakFCgVJAm81MFUnt/documents?lines=10&isQueryButton=false',
-	wt_sysh:ip + '/runtime/__gAPYBW4YxB3UePM3lqO/views/__r4IN5HOqV4HIips1s0Q/documents?lines=10&isQueryButton=false',
-	wt_xqpz:ip + '/runtime/__gAPYBW4YxB3UePM3lqO/views/__yoOF16IOiZdmrbDOujU/documents?lines=10&isQueryButton=false',
-	wt_sypz:ip + '/runtime/__gAPYBW4YxB3UePM3lqO/views/__b6gD17cP1g4gFdTq0Ox/documents?lines=10&isQueryButton=false',
-	wt_rwfp:ip + '/runtime/__gAPYBW4YxB3UePM3lqO/views/__m9w03S06KHbg3KioRIh/documents?lines=10&isQueryButton=false',
-	
+	// wt_list:ip + '/runtime/__gAPYBW4YxB3UePM3lqO/views/__km3aURKW95BHxp12XVt/documents?parentId=&sortCol=&sortStatus=&lines=10&treedocid=&parentNodeId=&_docid=&_fieldid=&isRelate=&startDate=&endDate=&parentParam=&isQueryButton=false',
+	wt_list: ip +
+		'/runtime/__gAPYBW4YxB3UePM3lqO/views/__km3aURKW95BHxp12XVt/documents?lines=10&isQueryButton=false', //获取列表数据、更换viewID
+
+	wt_xqsh: ip +
+		'/runtime/__gAPYBW4YxB3UePM3lqO/views/__MhHakFCgVJAm81MFUnt/documents?lines=10&isQueryButton=false',
+	wt_sysh: ip +
+		'/runtime/__gAPYBW4YxB3UePM3lqO/views/__r4IN5HOqV4HIips1s0Q/documents?lines=10&isQueryButton=false',
+	wt_xqpz: ip +
+		'/runtime/__gAPYBW4YxB3UePM3lqO/views/__yoOF16IOiZdmrbDOujU/documents?lines=10&isQueryButton=false',
+	wt_sypz: ip +
+		'/runtime/__gAPYBW4YxB3UePM3lqO/views/__b6gD17cP1g4gFdTq0Ox/documents?lines=10&isQueryButton=false',
+	wt_rwfp: ip +
+		'/runtime/__gAPYBW4YxB3UePM3lqO/views/__m9w03S06KHbg3KioRIh/documents?lines=10&isQueryButton=false',
+
 	documents: ip + '/runtime/__gAPYBW4YxB3UePM3lqO/documents/', //获取文档详情
-	empty: ip + '/runtime/__gAPYBW4YxB3UePM3lqO/forms/__0FLGNncOS1lz0T9jsFn/empty?formId=__0FLGNncOS1lz0T9jsFn&appId=__gAPYBW4YxB3UePM3lqO', //创建委托单文档
-	validate: ip + 'http://192.168.0.251/obpm/runtime/__gAPYBW4YxB3UePM3lqO/documents/__79Wtw03ya4dJUDGPyAN/validate', //保存文档
+	empty: ip +
+		'/runtime/__gAPYBW4YxB3UePM3lqO/forms/__0FLGNncOS1lz0T9jsFn/empty?formId=__0FLGNncOS1lz0T9jsFn&appId=__gAPYBW4YxB3UePM3lqO', //创建委托单文档
+	validate: ip + '/runtime/__gAPYBW4YxB3UePM3lqO/documents/__79Wtw03ya4dJUDGPyAN/validate', //保存文档
+	borr_empty: ip +
+		'/runtime/__gAPYBW4YxB3UePM3lqO/forms/__w9J1gxcIWgXmNw6pE1F/empty?formId=__w9J1gxcIWgXmNw6pE1F&appId=__gAPYBW4YxB3UePM3lqO', //创建设备借用
+	return_empty: ip +
+		'/runtime/__gAPYBW4YxB3UePM3lqO/forms/__LcDaGhYHt5xOSeHMCs0/empty?formId=__LcDaGhYHt5xOSeHMCs0&appId=__gAPYBW4YxB3UePM3lqO', //创建设备归还
 }
 /**
  * 封装的http请求wt_
@@ -37,7 +48,7 @@ const request = (opt) => {
 	opt.header = opt.header || {
 		"Content-Type": opt.contentType,
 		//"Authorization": getUser().token ? getUser().token : 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE2NzAxMzYzMjEsInN1YiI6IkFpNmhsbGhOalMydWxsOVRLR2IiLCJleHAiOjE2NzAxMzk5MjEsIm5iZiI6MTY3MDEzNjMyMX0.cNQpCWUwVjA2jkrKCnybIfxl6iQQJ-xj3S8dmQSmQ3A',
-        "accessToken": getUser().accessToken || ''
+		"accessToken": getUser().accessToken || ''
 	};
 	opt.loading = opt.loading || 'true';
 	opt.success = opt.success || function() {};

pages/model/return.vue

@@ -4,7 +4,7 @@
 		<view class="form_group">
 			<view class="lable">扫码</view>
 			<view class="tag" @click="qr()">
-				<text class="span" style="width: 90%;">222</text>
+				<text class="span" style="width: 90%;"></text>
 				<text class="icon code">&#xe60e;</text>
 			</view>
 		</view>
@@ -22,6 +22,13 @@
 				<text class="icon more">&#xe631;</text>
 			</view>
 		</view>
+		<view class="form_group" v-if="op=='设备借用'">
+			<view class="lable">借用人部门</view>
+			<view class="tag">
+				<text class="span">{{item.UNIT}}</text>
+				<text class="icon more">&#xe631;</text>
+			</view>
+		</view>
 		<view class="form_group">
 			<view class="lable">手机号</view>
 			<view class="tag" @click="qr()">
@@ -66,6 +73,7 @@ export default {
 	},
 	onLoad(e) {
 		this.op = e.op;
+		this.empty();
 		//选中审批人员监听函数,其它类型的参考这个
 		uni.$on('select', res => {
 			console.log('asd:' + JSON.stringify(res));
@@ -105,26 +113,46 @@ export default {
 				url: '/pages/index/select'
 			});
 		},
-		//提交
-		validate() {
-			this.http.request({
-				url: this.http.urls.user_task_add,
-				data: this.item,
-				method: 'POST',
-				success: res => {
-					uni.showModal({
-						title: '提示',
-						content: '提交成功',
-						showCancel: false,
+		empty() {
+					
+					var url= "";
+					if(this.op=='设备借用'){
+						url=this.http.urls.borr_empty
+					}else{
+						url=this.http.urls.return_empty
+					}
+					this.http.request({
+						url: url,
+						data: this.item,
+		
 						success: res => {
-							if (res.confirm) {
-								uni.navigateBack();
-							}
+								this.item = res.data.data.items;
+							console.log('res2:' + JSON.stringify(this.item ));
+							
+							
 						}
 					});
-				}
-			});
-		}
+				},
+				//提交
+				validate() {
+					this.http.request({
+						url: this.http.urls.validate,
+						data: this.item,
+						method: 'POST',
+						success: res => {
+							uni.showModal({
+								title: '提示',
+								content: '提交成功',
+								showCancel: false,
+								success: res => {
+									if (res.confirm) {
+										uni.navigateBack();
+									}
+								}
+							});
+						}
+					});
+				},
 		//提交
 		add() {
 			this.http.request({