更新

common/http.js

@@ -59,8 +59,11 @@ borrowing_list: ip +
 runViewDialogConfirmScript: ip + '/runtime/views/selectbox/runViewDialogConfirmScript?',
 
 
-	eq_list: ip + '/runtime/__gAPYBW4YxB3UePM3lqO/views/__WLVxKX6e0Pq0cTwdNUQ/documents?',
-	re_list: ip + '/runtime/__gAPYBW4YxB3UePM3lqO/views/__ajlFXbohdIXtn7ErzZq/documents?',
+	eq_list: ip + '/runtime/__gAPYBW4YxB3UePM3lqO/views/__WLVxKX6e0Pq0cTwdNUQ/documents?',//借用选择列表
+	re_list: ip + '/runtime/__gAPYBW4YxB3UePM3lqO/views/__ajlFXbohdIXtn7ErzZq/documents?',//归还选择列表
+	boor_list: ip + '/runtime/__gAPYBW4YxB3UePM3lqO/views/__xjFSxNZjnkBHIWEYKar/documents?',//设备借用列表子表
+    ghlis_list: ip + '/runtime/__gAPYBW4YxB3UePM3lqO/views/__X1qStasuORL3244AFFq/documents?',//设备借用列表子表
+
 }
 /**
  * 封装的http请求wt_

pages/login.vue

@@ -41,11 +41,11 @@
 			};
 		},
 		onLoad(e) {
-	if (e.loginNo != undefined) {
-	this.item.username=e.loginNo;
-	this.item.password=e.password;
-	this.login();
-	}
+			if (e.loginNo != undefined) {
+				this.item.username = e.loginNo;
+				this.item.password = e.password;
+				this.login();
+			}
 			//刷新
 			uni.$on('index', res => {
 				//this.refresh();

pages/model/borrowing.vue

@@ -8,7 +8,7 @@
 				<text class="icon code">&#xe60e;</text>
 			</view>
 		</view>
-		<view class="form_group"  v-if="op == '设备借用11'">
+		<view class="form_group" v-if="op == '设备借用11'">
 			<view class="lable">设备所属部门</view>
 			<view class="tag">
 				<view class="span">
@@ -19,21 +19,15 @@
 				<text class="icon more">&#xe631;</text>
 			</view>
 		</view>
-		<view class="form_group" v-if="op == '设备借用'">
+		<view class="form_group">
 			<view class="lable">借用人</view>
 			<view class="tag">
 				<input v-model="item.borrower" placeholder="输入借用人" />
 				<text class="icon more">&#xe631;</text>
 			</view>
 		</view>
-		<view class="form_group" v-if="op == '设备归还'">
-			<view class="lable">归还者</view>
-			<view class="tag">
-				<input v-model="item.ghz" placeholder="归还者" />
-				<text class="icon more">&#xe631;</text>
-			</view>
-		</view>
-		<view class="form_group" v-if="op == '设备借用'">
+		
+		<view class="form_group">
 			<view class="lable">借用人部门</view>
 			<view class="tag">
 				<text class="span">{{ item.UNIT }}</text>
@@ -48,7 +42,7 @@
 			</view>
 		</view>
 		<view class="vtitle">借用设备信息</view>
-		<view v-for="(item, index) in list" :key="index" class="item">
+		<view v-for="(item, index) in list" :key="index" class="item" v-if="id ==null">
 			<view class="form_group">
 				<view class="lable">序号</view>
 				<view class="tag">
@@ -95,6 +89,54 @@
 				<button class="btn del" @click="del(item)">移除</button>
 			</view>
 		</view>
+
+		<view v-for="(item, index) in list" :key="index" class="item" v-else>
+			<view class="form_group">
+				<view class="lable">序号</view>
+				<view class="tag">
+					<text class="span">{{ index + 1 }}</text>
+				</view>
+			</view>
+			<view class="form_group">
+				<view class="lable">计量编号</view>
+				<view class="tag">
+					<text class="span">{{ item.items.__9ahUISXb1tM05xyD8UZ.value }}</text>
+				</view>
+			</view>
+			<view class="form_group">
+				<view class="lable">设备名称</view>
+				<view class="tag">
+					<text class="span">{{ item.items.__XrMyKpQJ7SfuTIhC0sk.value }}</text>
+				</view>
+			</view>
+			<view class="form_group">
+				<view class="lable">型号规格</view>
+				<view class="tag">
+					<text class="span">{{ item.items.__u8C4lICfaKzYYXt29WH.value }}</text>
+				</view>
+			</view>
+			<view class="form_group">
+				<view class="lable">测量范围</view>
+				<view class="tag">
+					<text class="span">{{ item.items.__aFNTBUh2rsvSMhRBU3Y.value }}</text>
+				</view>
+			</view>
+			<view class="form_group">
+				<view class="lable">最大允许误差</view>
+				<view class="tag">
+					<text class="span">{{ item.items.__J7HDuFkewsz1IRUnFKD.value }}</text>
+				</view>
+			</view>
+			<view class="form_group">
+				<view class="lable">内部编号</view>
+				<view class="tag">
+					<text class="span">{{ item.items.__F9KplKpwzKDy4ZQZMtI.value }}</text>
+				</view>
+			</view>
+			<view class="form_group">
+				<!--	<button class="btn del" @click="del(item)">移除</button> -->
+			</view>
+		</view>
 		<u-empty v-if="list.length == 0"></u-empty>
 		<view class="footer">
 			<view class="flex">
@@ -185,7 +227,7 @@
 					viewId: '__WLVxKX6e0Pq0cTwdNUQ'
 				},
 				item: {},
-				op: '设备归还',
+				op: '设备借用',
 				current: 0,
 				code: '',
 				list: [],
@@ -193,7 +235,7 @@
 				bshow: false,
 				itemt: {},
 				up: {},
-					id: '',
+				id: '',
 				content: '标题',
 				nextNodes: [],
 				backNodes: [],
@@ -213,7 +255,7 @@
 							tel: "",
 							remarks: ""
 						},
-						
+
 					},
 					fieldId: "__0TQu1UrRbMZVX1UvtBL",
 					formId: "__w9J1gxcIWgXmNw6pE1F",
@@ -233,7 +275,7 @@
 						}
 					}); */
 				this.getDocuments();
-			} else{
+			} else {
 				this.empty();
 			}
 			//选中审批人员监听函数,其它类型的参考这个
@@ -267,8 +309,8 @@
 						const tempFilePaths = res.tempFilePaths[0]; // 获取到二维码图片的链接
 						qrcode.decode(tempFilePaths); // 解析二维码图片
 						qrcode.callback = r => {
-							this.code = r;
-
+							var r1 = r.split('*')[1]
+							this.code = r1;
 							this.geteq.DEVID = this.code;
 							if (this.list.length == 0) {
 								this.getEq();
@@ -288,8 +330,8 @@
 											}
 										});
 									} else {
-										
-								this.getEq();
+
+										this.getEq();
 									}
 								});
 							}
@@ -317,39 +359,39 @@
 				});
 			},
 			//详情
-		getDocuments() {
-			this.http.request({
-				url: this.http.urls.documents + this.id,
-				data: this.item,
-				success: res => {
-					this.item = res.data.data.items;
-					//this.p = res.data.data;
-console.log('res.data.data:' + JSON.stringify(res.data.data));
-				
-					this.iteml = res.data.data;
-
-					this.items.applicationId = '__gAPYBW4YxB3UePM3lqO';
-					this.items.docId = this.iteml.id;
-					this.items.id = this.iteml.id;
-					this.items.formId = this.iteml.formid;
-					this.items.parentId = '';
-					this.items.subSelects = [];
-					this.items.templateForm = '';
-					this.items.viewId = '';
-					this.items.document.items = this.item;
-					this.items.document.applicationId = '__gAPYBW4YxB3UePM3lqO';
-					this.items.document.exparams = {};
-					this.items.document.formId = this.iteml.formid;
-					this.items.document.id = this.iteml.id;
-					this.items.document.parentId = '';
-					this.items.document.sign = '';
-					this.items.document.stateId = this.iteml.stateid;
-					this.items.document.subDocuments = [];
-					this.items.document.templateForm = '';
-					this.items.document.versions = '0';
-				}
-			});
-		},
+			getDocuments() {
+				this.http.request({
+					url: this.http.urls.documents + this.id,
+					data: this.item,
+					success: res => {
+						this.item = res.data.data.items;
+						//this.p = res.data.data;
+						//console.log('res.data.data:' + JSON.stringify(res.data.data));
+						this.boor_list();
+						this.iteml = res.data.data;
+
+						this.items.applicationId = '__gAPYBW4YxB3UePM3lqO';
+						this.items.docId = this.iteml.id;
+						this.items.id = this.iteml.id;
+						this.items.formId = this.iteml.formid;
+						this.items.parentId = '';
+						this.items.subSelects = [];
+						this.items.templateForm = '';
+						this.items.viewId = '';
+						this.items.document.items = this.item;
+						this.items.document.applicationId = '__gAPYBW4YxB3UePM3lqO';
+						this.items.document.exparams = {};
+						this.items.document.formId = this.iteml.formid;
+						this.items.document.id = this.iteml.id;
+						this.items.document.parentId = '';
+						this.items.document.sign = '';
+						this.items.document.stateId = this.iteml.stateid;
+						this.items.document.subDocuments = [];
+						this.items.document.templateForm = '';
+						this.items.document.versions = '0';
+					}
+				});
+			},
 			getEq() {
 				this.http.request({
 					url: this.http.urls.eq_list +
@@ -362,10 +404,27 @@ console.log('res.data.data:' + JSON.stringify(res.data.data));
 						if (res.data.errcode == 0) {
 
 							res.data.data.data.forEach(item => {
-								//console.log('res2:' + JSON.stringify(res));
-							//	this.runViewDialogConfirmScript.docId=this.bitem.id ;
-								//this.runViewDialogConfirmScript._selects=item.docId;
-								//this.runViewDialogConfirm();
+
+								this.list.push(item);
+							});
+						}
+					}
+				});
+			},
+
+			boor_list() {
+				this.http.request({
+					url: this.http.urls.boor_list +
+						'parentId=' +
+						this.id,
+
+					method: 'POST',
+					success: res => {
+						console.log('res2:' + JSON.stringify(res));
+						if (res.data.errcode == 0) {
+
+							res.data.data.data.forEach(item => {
+
 								this.list.push(item);
 							});
 						}
@@ -484,20 +543,21 @@ console.log('res.data.data:' + JSON.stringify(res.data.data));
 					method: 'POST',
 					success: res => {
 						console.log('validate1:' + JSON.stringify(res));
-                       this.updateparent(this.btitem.parentId,this.btitem.id);
+						this.updateparent(this.btitem.parentId, res.data.data.id);
 					}
 				});
 			},
-			updateparent(parent,id) {
-			
-			
+			updateparent(parent, id) {
+
+
 				this.http.request({
-					url: this.http.urls.ip2+'/liug/app?parent='+parent+'&id='+id+'&table=tlk_tool_borrowing',
-					
+					url: this.http.urls.ip2 + '/liug/app?parent=' + parent + '&id=' + id +
+						'&table=tlk_tool_borrowing',
+
 					method: 'POST',
 					success: res => {
 						console.log('validate1:' + JSON.stringify(res));
-			
+
 					}
 				});
 			},
@@ -598,8 +658,10 @@ console.log('res.data.data:' + JSON.stringify(res.data.data));
 									}
 								}
 							});
+							if (this.id == null) {
+								this.tool_borrowing_empty();
+							}
 
-							this.tool_borrowing_empty();
 						} else {
 							uni.showModal({
 								title: '提示',

pages/model/return.vue

@@ -36,7 +36,7 @@
 			</view>
 		</view>
 		<view class="vtitle">归还设备信息</view>
-		<view v-for="(item, index) in list" :key="index" class="item">
+		<view v-for="(item, index) in list" :key="index" class="item" v-if="id==null">
 			<view class="form_group">
 				<view class="lable">序号</view>
 				<view class="tag">
@@ -83,6 +83,54 @@
 				<button class="btn del" @click="del(item)">移除</button>
 			</view>
 		</view>
+		<view v-for="(item, index) in list" :key="index" class="item" v-else>
+			<view class="form_group">
+				<view class="lable">序号</view>
+				<view class="tag">
+					<text class="span">{{ index + 1 }}</text>
+				</view>
+			</view>
+			<view class="form_group">
+				<view class="lable">计量编号</view>
+				<view class="tag">
+					<text class="span">{{ item.items.__1JzPv6GIMZUCGKYm2gx.value }}</text>
+				</view>
+			</view>
+			<view class="form_group">
+				<view class="lable">设备名称</view>
+				<view class="tag">
+					<text class="span">{{ item.items.__ngDKJEL3uIYQyjjFJMh.value }}</text>
+				</view>
+			</view>
+			<view class="form_group">
+				<view class="lable">型号规格</view>
+				<view class="tag">
+					<text class="span">{{ item.items.__apS4rWwLmvscx5ZUkLQ.value }}</text>
+				</view>
+			</view>
+			<view class="form_group">
+				<view class="lable">测量范围</view>
+				<view class="tag">
+					<text class="span">{{ item.items.__DjZGdE1GZEj1OUWhWuK.value }}</text>
+				</view>
+			</view>
+			<view class="form_group">
+				<view class="lable">制造商</view>
+				<view class="tag">
+					<text class="span">{{ item.items.__1yBwYFItXGQo6CoGTZs.value }}</text>
+				</view>
+			</view>
+			<view class="form_group">
+				<view class="lable">内部编号</view>
+				<view class="tag">
+					<text class="span">{{ item.items.__JjSPjH2TqMtxQjHcTY9.value }}</text>
+				</view>
+			</view>
+			<view class="form_group">
+				<!--<button class="btn del" @click="del(item)">移除</button>-->
+			</view>
+		</view>
+		
 		<u-empty v-if="list.length == 0"></u-empty>
 		<view class="footer">
 			<view class="flex">
@@ -255,7 +303,8 @@
 						const tempFilePaths = res.tempFilePaths[0]; // 获取到二维码图片的链接
 						qrcode.decode(tempFilePaths); // 解析二维码图片
 						qrcode.callback = r => {
-							this.code = r;
+						var r1=r.split('*')[1]
+						this.code = r1;
 
 							this.geteq.DEVID = this.code;
 							if (this.list.length == 0) {
@@ -377,8 +426,7 @@
 				success: res => {
 					this.item = res.data.data.items;
 					//this.p = res.data.data;
-console.log('res.data.data:' + JSON.stringify(res.data.data));
-				
+	this.ghlis_list();
 					this.iteml = res.data.data;
 
 					this.items.applicationId = '__gAPYBW4YxB3UePM3lqO';
@@ -404,6 +452,26 @@ console.log('res.data.data:' + JSON.stringify(res.data.data));
 			});
 		},
 
+
+			ghlis_list() {
+				this.http.request({
+					url: this.http.urls.ghlis_list +
+						'parentId=' +
+						this.id,
+
+					method: 'POST',
+					success: res => {
+						console.log('res2:' + JSON.stringify(res));
+						if (res.data.errcode == 0) {
+
+							res.data.data.data.forEach(item => {
+
+								this.list.push(item);
+							});
+						}
+					}
+				});
+			},
 			ghls_empty() {
 				this.list.forEach(item => {
 
@@ -464,7 +532,7 @@ console.log('res.data.data:' + JSON.stringify(res.data.data));
 					method: 'POST',
 					success: res => {
 						console.log('validate1:' + JSON.stringify(res));
-						this.updateparent(this.btitem.parentId, this.btitem.id);
+						this.updateparent(this.btitem.parentId, res.data.data.id);
 					}
 				});
 			},