借用归还报错解决

common/http.js

@@ -2,10 +2,10 @@
 //const ip2 = 'http://192.168.0.251/liug';
 //const ip = 'http://106.55.241.82:8888/obpm';
 //const ip2 = 'http://106.55.241.82:8888/liug';
-//const ip = 'https://tdm.liugong.com/obpm';
-//const ip2 = 'https://tdm.liugong.com/liug';
-const ip = 'https://tdmtest.liugong.com/obpm';
-const ip2 = 'https://tdmtest.liugong.com/liug';
+const ip = 'https://tdm.liugong.com/obpm';
+const ip2 = 'https://tdm.liugong.com/liug';
+// const ip = 'https://tdmtest.liugong.com/obpm';
+// const ip2 = 'https://tdmtest.liugong.com/liug';
 
 
 /**
@@ -96,7 +96,7 @@ const request = (opt) => {
 	opt.loading = opt.loading || 'true';
 	opt.success = opt.success || function() {};
 	console.log("**************************************参数调式***************************************************");
-	console.log("请求地址:" + opt.url + " 请求参数:" + JSON.stringify(opt.data)+JSON.stringify(opt.header));
+	//console.log("请求地址:" + opt.url + " 请求参数:" + JSON.stringify(opt.data)+JSON.stringify(opt.header));
 	console.log("************************************************************************************************");
 	if (opt.loading == 'true') {
 		uni.showLoading({

pages/model/borrowing.vue

@@ -151,14 +151,15 @@
 			<view class="popup">
 				<u-divider text="提交流程面板"></u-divider>
 				<scroll-view scroll-y="true" style="height: 450rpx;">
-					<view v-for="(item, index) in nextNodes" :key="index" class="bitem" @click="bselect(item, 'nextNodes')">
+					<view v-for="(item, index) in nextNodes" :key="index" class="bitem"
+						@click="bselect(item, 'nextNodes')">
 						<view class="icon select check" v-if="item.check">&#xe600;</view>
 						<view class="icon select" v-else>&#xe8bb;</view>
 						<view class="title">{{ item.name }}</view>
 					</view>
-					
-				<textarea placeholder="意见" style="height: 120px;" maxlength="200" v-model="itemt.attitude" />
-					
+
+					<textarea placeholder="意见" style="height: 120px;" maxlength="200" v-model="itemt.attitude" />
+
 				</scroll-view>
 				<view class="confrim-btn"><button class="btn" @click="submit()">确定</button></view>
 			</view>
@@ -167,13 +168,14 @@
 			<view class="popup">
 				<u-divider text="回退流程面板"></u-divider>
 				<scroll-view scroll-y="true" style="height: 450rpx;">
-					<view v-for="(item, index) in backNodes" :key="index" class="bitem" @click="bselect(item, 'backNodes')">
+					<view v-for="(item, index) in backNodes" :key="index" class="bitem"
+						@click="bselect(item, 'backNodes')">
 						<view class="icon select check" v-if="item.check">&#xe600;</view>
 						<view class="icon select" v-else>&#xe8bb;</view>
 						<view class="title">{{ item.name }}</view>
 					</view>
 					<textarea placeholder="意见" style="height: 120px;" maxlength="200" v-model="itemt.attitude" />
-						
+
 				</scroll-view>
 				<view class="confrim-btn"><button class="btn" @click="workflowsback()">确定</button></view>
 			</view>
@@ -182,308 +184,214 @@
 	</view>
 </template>
 <script>
-import mumuGetQrcode from '@/uni_modules/mumu-getQrcode/components/mumu-getQrcode/mumu-getQrcode.vue';
-export default {
-	components: {
-		mumuGetQrcode
-	},
-	data() {
-		return {
-			sm:false,//扫码
-			array1: ['类型1', '类型2', '类型3', '类型4'], //实验类型1
-			bitem: {
-				applicationId: '__gAPYBW4YxB3UePM3lqO',
-				exparams: {},
-				formId: '__0FLGNncOS1lz0T9jsFn',
-				id: '__79Wtw03ya4dJUDGPyAN',
-				isRelate: 'undefined',
-				parentId: '',
-				sign: '',
-				subDocuments: [],
-				templateForm: '',
-				versions: '0'
-			},
-			btitem: {
-				applicationId: '__gAPYBW4YxB3UePM3lqO',
-				exparams: {},
-				formId: '__0FLGNncOS1lz0T9jsFn',
-				id: '__79Wtw03ya4dJUDGPyAN',
-				isRelate: 'undefined',
-				parentId: '',
-				sign: '',
-				subDocuments: [],
-				templateForm: '',
-				versions: '0'
-			},
-			geteq: {
-				DEVID: '202209211603170016',
-				allow: 'false',
-				appId: '__gAPYBW4YxB3UePM3lqO',
-				datetime: '1670485443880',
-				detp: '',
-				fieldid: '__iLwKGJTxD89ZKnFzo2Y',
-				formId: '__w9J1gxcIWgXmNw6pE1F',
-				isEdit: 'true',
-				mutil: 'true',
-				parentId: '__NYI0rVs0LXbiW21z6Nv',
-				searchForm: 'false',
-				selectOne: 'false',
-				viewId: '__WLVxKX6e0Pq0cTwdNUQ'
-			},
-			item: {},
-			op: '设备借用',
-			current: 0,
-			code: '',
-			list: [],
-			show: false,
-			bshow: false,
-			itemt: {},
-			up: {},
-			id: '',
-			content: '标题',
-			nextNodes: [],
-			backNodes: [],
-			items: {
-				document: {
-					items: {}
-				}
-			},
-			runViewDialogConfirmScript: {
-				docId: "__DIl607e1fsiknRgGRQj",
-				document: {
-					items: {
-						group: "",
-						depttool: "",
-						UNIT: "柳工",
-						borrower: "",
-						tel: "",
-						remarks: ""
-					},
-
+	import mumuGetQrcode from '@/uni_modules/mumu-getQrcode/components/mumu-getQrcode/mumu-getQrcode.vue';
+	export default {
+		components: {
+			mumuGetQrcode
+		},
+		data() {
+			return {
+				sm: false, //扫码
+				array1: ['类型1', '类型2', '类型3', '类型4'], //实验类型1
+				bitem: {
+					applicationId: '__gAPYBW4YxB3UePM3lqO',
+					exparams: {},
+					formId: '__0FLGNncOS1lz0T9jsFn',
+					id: '__79Wtw03ya4dJUDGPyAN',
+					isRelate: 'undefined',
+					parentId: '',
+					sign: '',
+					subDocuments: [],
+					templateForm: '',
+					versions: '0'
 				},
-				fieldId: "__0TQu1UrRbMZVX1UvtBL",
-				formId: "__w9J1gxcIWgXmNw6pE1F",
-				viewId: "__WLVxKX6e0Pq0cTwdNUQ",
-				_selects: "__sIJiL5GlxEYoL095Vo9",
-			},
-		};
-	},
-	onLoad(e) {
-		this.op = e.op;
-		this.id = e.id;
-		if (e.ste == 1) {
-			/* this.http.request({
-					url: this.http.urls.xxxx + e.id,
-					success: res => {
-						this.item = res.data.data;
+				btitem: {
+					applicationId: '__gAPYBW4YxB3UePM3lqO',
+					exparams: {},
+					formId: '__0FLGNncOS1lz0T9jsFn',
+					id: '__79Wtw03ya4dJUDGPyAN',
+					isRelate: 'undefined',
+					parentId: '',
+					sign: '',
+					subDocuments: [],
+					templateForm: '',
+					versions: '0'
+				},
+				geteq: {
+					DEVID: '202209211603170016',
+					allow: 'false',
+					appId: '__gAPYBW4YxB3UePM3lqO',
+					datetime: '1670485443880',
+					detp: '',
+					fieldid: '__iLwKGJTxD89ZKnFzo2Y',
+					formId: '__w9J1gxcIWgXmNw6pE1F',
+					isEdit: 'true',
+					mutil: 'true',
+					parentId: '__NYI0rVs0LXbiW21z6Nv',
+					searchForm: 'false',
+					selectOne: 'false',
+					viewId: '__WLVxKX6e0Pq0cTwdNUQ'
+				},
+				item: {},
+				op: '设备借用',
+				current: 0,
+				code: '',
+				list: [],
+				show: false,
+				bshow: false,
+				itemt: {},
+				up: {},
+				id: '',
+				content: '标题',
+				nextNodes: [],
+				backNodes: [],
+				items: {
+					document: {
+						items: {}
 					}
-				}); */
-			this.getDocuments();
-		} else {
-			this.empty();
-		}
-		//选中审批人员监听函数,其它类型的参考这个
-		uni.$on('select', res => {
-			console.log('asd:' + JSON.stringify(res));
-		});
-	},
-	onReady() {
-		uni.setNavigationBarTitle({
-			title: this.op
-		});
-	},
-	methods: {
-		//提交或回退
-		bselect(e, tag) {
-			this[tag].forEach(item => {
-				item.check = false;
-			});
-			e.check = true;
-			this.itemt.nextNodeIds = [];
-			this.itemt.nextNodeIds.push(e.id);
-			this.$forceUpdate();
-		}, //详情
-		qr() {
-			// 调用uni提供的调用相机api
-			uni.chooseImage({
-				sizeType: ['original'],
-				sourceType: ['camera'],
-				count: 1,
-				success: res => {
-					const tempFilePaths = res.tempFilePaths[0]; // 获取到二维码图片的链接
-					qrcode.decode(tempFilePaths); // 解析二维码图片
-					qrcode.callback = r => {
-						var r1 = r.split('*')[1]
-						this.code = r1;
-						if (!this.code) {
-							uni.showModal({
-								title: '提示',
-								content: '该二维码无法识别！！',
-								showCancel: false,
-								success: res => {
-									if (res.confirm) {
-										//	uni.navigateBack();
-									}
-								}
-							});
+				},
+				runViewDialogConfirmScript: {
+					docId: "__DIl607e1fsiknRgGRQj",
+					document: {
+						items: {
+							group: "",
+							depttool: "",
+							UNIT: "柳工",
+							borrower: "",
+							tel: "",
+							remarks: ""
+						},
 
-							return;
-						}
-						this.geteq.DEVID = this.code;
-						if (this.list.length == 0) {
-							this.getEq();
-						} else {
-							this.list.forEach(item => {
-
-								if (item.items.__2sfNVgOh5Bzq6lXRVuM.value == this.geteq
-									.DEVID) {
-									uni.showModal({
-										title: '提示',
-										content: '该设备已经选择过了',
-										showCancel: false,
-										success: res => {
-											if (res.confirm) {
-												//	uni.navigateBack();
-											}
-										}
-									});
-								} else {
+					},
+					fieldId: "__0TQu1UrRbMZVX1UvtBL",
+					formId: "__w9J1gxcIWgXmNw6pE1F",
+					viewId: "__WLVxKX6e0Pq0cTwdNUQ",
+					_selects: "__sIJiL5GlxEYoL095Vo9",
+				},
+			};
+		},
+		onLoad(e) {
+			this.op = e.op;
+			this.id = e.id;
+			console.log('e=======:' + JSON.stringify(e));
+			
 
-									this.getEq();
-								}
-							});
+			if (e.ste == 1) {
+				/* this.http.request({
+						url: this.http.urls.xxxx + e.id,
+						success: res => {
+							this.item = res.data.data;
 						}
+					}); */
+				this.getDocuments();
+			} else {
+				this.empty();
+			}
+			//选中审批人员监听函数,其它类型的参考这个
+			uni.$on('select', res => {
 
-						console.log('asd:' + r);
-						this.$forceUpdate();
-					};
-				}
 			});
 		},
-		//扫码成功
-		qrcodeSucess(data) {
-			this.sm=false;
-			uni.showModal({
-				title: '成功',
-				content: data //识别的数据
+		onReady() {
+			uni.setNavigationBarTitle({
+				title: this.op
 			});
-			
-			
-			
-			
-			
-			var r1 = data.split('*')[1]
-			this.code = r1;
-			
-			
-			this.geteq.DEVID = this.code;
-			if (this.list.length == 0) {
-				this.getEq();
-			} else {
-				this.list.forEach(item => {
-			
-					if (item.items.__2sfNVgOh5Bzq6lXRVuM.value == this.geteq
-						.DEVID) {
-						uni.showModal({
-							title: '提示',
-							content: '该设备已经选择过了',
-							showCancel: false,
-							success: res => {
-								if (res.confirm) {
-									//	uni.navigateBack();
-								}
+		},
+		methods: {
+			//提交或回退
+			bselect(e, tag) {
+				this[tag].forEach(item => {
+					item.check = false;
+				});
+				e.check = true;
+				this.itemt.nextNodeIds = [];
+				this.itemt.nextNodeIds.push(e.id);
+				this.$forceUpdate();
+			}, //详情
+			qr() {
+				// 调用uni提供的调用相机api
+				uni.chooseImage({
+					sizeType: ['original'],
+					sourceType: ['camera'],
+					count: 1,
+					success: res => {
+						const tempFilePaths = res.tempFilePaths[0]; // 获取到二维码图片的链接
+						qrcode.decode(tempFilePaths); // 解析二维码图片
+						qrcode.callback = r => {
+							var r1 = r.split('*')[1]
+							this.code = r1;
+							if (!this.code) {
+								uni.showModal({
+									title: '提示',
+									content: '该二维码无法识别！！',
+									showCancel: false,
+									success: res => {
+										if (res.confirm) {
+											//	uni.navigateBack();
+										}
+									}
+								});
+
+								return;
 							}
-						});
-					} else {
-			
-						this.getEq();
+							this.geteq.DEVID = this.code;
+							if (this.list.length == 0) {
+								this.getEq();
+							} else {
+								this.list.forEach(item => {
+
+									if (item.items.__2sfNVgOh5Bzq6lXRVuM.value == this.geteq
+										.DEVID) {
+										uni.showModal({
+											title: '提示',
+											content: '该设备已经选择过了',
+											showCancel: false,
+											success: res => {
+												if (res.confirm) {
+													//	uni.navigateBack();
+												}
+											}
+										});
+									} else {
+
+										this.getEq();
+									}
+								});
+							}
+
+							console.log('asd:' + r);
+							this.$forceUpdate();
+						};
 					}
 				});
-			}
-			
-			
-		},
-		qrcodeError(err) {
-			console.log(err);
-			uni.showModal({
-				title: '摄像头授权失败',
-				content: '摄像头授权失败，请检测当前浏览器是否有摄像头权限。',
-				success: res => {
-					console.log('asd:' + JSON.stringify(res));
-					this.sm=false;
-				}
-			});
-		},
-		//选择结果形式
-		change(e) {
-			this.current = e;
-			console.log('aa:' + this.radio[this.current].name);
-		},
-		//选择实验类型
-		bindChange(e, type) {
-			this.item[type] = this.array1[e.target.value];
-			this.$forceUpdate();
-		},
-		//选择审批人员
-		select() {
-			uni.navigateTo({
-				url: '/pages/index/select'
-			});
-		},
-		//详情
-		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 +
-					'parentId=' +
-					this.geteq.parentid,
-				data: this.geteq,
-				method: 'POST',
-				success: res => {
-					//console.log('res2:' + JSON.stringify(res.data.data.data));
-					if (res.data.errcode == 0) {
-
-						if (res.data.data.data.length>0) {
-							res.data.data.data.forEach(item => {
+			},
+			//扫码成功
+			qrcodeSucess(data) {
+				this.sm = false;
+				uni.showModal({
+					title: '成功',
+					content: data //识别的数据
+				});
 
-								this.list.push(item);
-							});
-						}else{
+
+
+
+
+				var r1 = data.split('*')[1]
+				this.code = r1;
+
+
+				this.geteq.DEVID = this.code;
+				if (this.list.length == 0) {
+					this.getEq();
+				} else {
+					this.list.forEach(item => {
+
+						if (item.items.__2sfNVgOh5Bzq6lXRVuM.value == this.geteq
+							.DEVID) {
 							uni.showModal({
 								title: '提示',
-								content: '该设备不在该部门或者正在在借用中',
+								content: '该设备已经选择过了',
 								showCancel: false,
 								success: res => {
 									if (res.confirm) {
@@ -491,321 +399,421 @@ export default {
 									}
 								}
 							});
+						} else {
+
+							this.getEq();
 						}
+					});
+				}
+
 
+			},
+			qrcodeError(err) {
+				console.log(err);
+				uni.showModal({
+					title: '摄像头授权失败',
+					content: '摄像头授权失败，请检测当前浏览器是否有摄像头权限。',
+					success: res => {
+						console.log('asd:' + JSON.stringify(res));
+						this.sm = false;
 					}
-				}
-			});
-		},
+				});
+			},
+			//选择结果形式
+			change(e) {
+				this.current = e;
+				console.log('aa:' + this.radio[this.current].name);
+			},
+			//选择实验类型
+			bindChange(e, type) {
+				this.item[type] = this.array1[e.target.value];
+				this.$forceUpdate();
+			},
+			//选择审批人员
+			select() {
+				uni.navigateTo({
+					url: '/pages/index/select'
+				});
+			},
+			//查看借用详情
+			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 +
+						'parentId=' +
+						this.geteq.parentid,
+					data: this.geteq,
+					method: 'POST',
+					success: res => {
+						//console.log('res2:' + JSON.stringify(res.data.data.data));
+						if (res.data.errcode == 0) {
+
+							if (res.data.data.data.length > 0) {
+								res.data.data.data.forEach(item => {
+
+									this.list.push(item);
+								});
+							} else {
+								uni.showModal({
+									title: '提示',
+									content: '该设备不在该部门或者正在在借用中',
+									showCancel: false,
+									success: res => {
+										if (res.confirm) {
+											//	uni.navigateBack();
+										}
+									}
+								});
+							}
 
-		boor_list() {
-			this.http.request({
-				url: this.http.urls.boor_list +
-					'parentId=' +
-					this.id,
+						}
+					}
+				});
+			},
+			//查看详情时获取子表信息
+			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) {
+					method: 'POST',
+					success: res => {
+						console.log('res2:' + JSON.stringify(res));
+						if (res.data.errcode == 0) {
 
-						res.data.data.data.forEach(item => {
+							res.data.data.data.forEach(item => {
 
-							this.list.push(item);
-						});
+								this.list.push(item);
+							});
+						}
 					}
+				});
+			},
+			//创建表单获取初始数据
+			empty() {
+				var url = '';
+				if (this.op == '设备借用') {
+					url = this.http.urls.borr_empty;
+				} else {
+					url = this.http.urls.return_empty;
 				}
-			});
-		},
-		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 => {
-					this.item = res.data.data.items;
-					this.bitem.id = res.data.data.id;
-					this.bitem.formId = res.data.data.formid;
-					this.bitem.versions = res.data.data.versions;
-					this.geteq.parentid = res.data.data.id;
-
-
-
-					//创建时组建提交流程面板请求数据
-					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';
-					//console.log('res2:' + JSON.stringify(res.data.data));
-				}
-			});
-		},
-		//移除借用设备信息
-		del(item) {
-			this.list.splice(this.list.indexOf(item), 1);
-		},
+				this.http.request({
+					url: url,
+					data: this.item,
 
-		tool_borrowing_empty() {
-			this.list.forEach(item => {
+					success: res => {
+						this.item = res.data.data.items;
+						this.bitem.id = res.data.data.id;
+						this.bitem.formId = res.data.data.formid;
+						this.bitem.versions = res.data.data.versions;
+						this.geteq.parentid = res.data.data.id;
+
+
+
+						//创建时组建提交流程面板请求数据
+						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';
+						//console.log('res2:' + JSON.stringify(res.data.data));
+					}
+				});
+			},
+			//移除借用设备信息
+			del(item) {
+				this.list.splice(this.list.indexOf(item), 1);
+			},
 
+			tool_borrowing_empty() {
+				this.list.forEach(item => {
 
 
 
-				this.http.request({
-					url: this.http.urls.tool_borrowing_empty,
-					data: this.item,
 
-					success: res => {
-						console.log('tool_borrowing_empty:' + JSON.stringify(res));
-						//this.item = res.data.data.items;
-						console.log('this.bitem:' + JSON.stringify(this.bitem));
-						this.btitem.id = res.data.data.id;
-						this.btitem.formId = res.data.data.formid;
-						this.btitem.versions = res.data.data.versions;
-						this.btitem.parentId = this.bitem.id;
-						//this.btitem.parent=this.bitem.id;
-						this.btitem.items = res.data.data.items;
-
-						this.btitem.items.HERST = item.items.__SH6ZSHZMqHeGHDFLAaO.value; //
-						this.btitem.items.TYPBZ = item.items.__drInpQcmkMf2iWseaRR.value; //
-						this.btitem.items.EQKTX = item.items.__FwAgiHdxI4bCZaKNs4A.value; //
-						this.btitem.items.FBL = item.items.__Tyyw12PleIHLPjjJWsV.value; //
-						this.btitem.items.TPLNR = item.items.__a7cgJzxvCbcNNH0KjCn.value; //
-						this.btitem.items.EQUNR = item.items.__b5UmDDfLaCJJdn5F4JF.value; //
-						this.btitem.items.NUMBER = item.items.__2sfNVgOh5Bzq6lXRVuM.value;
-						this.btitem.items.CLFW = item.items.__XcfZD8dzEQb5qURydpP.value; //
-						this.btitem.items.borrowing_date = this.util.getDate('time'); //借用日期
-						this.btitem.items.ZQDDJ = item.items.__Rhr5ihIebMolSIr8CKn.value; //
-						this.btitem.items.ZDYXWC = item.items.__ARvSmuzLwNLg6TlB4tV.value; //
-						this.btitem.items.STTXU = item.items.__SBtfwetYprHFQ5J2MAn.value; //
-						this.btitem.items.SERGE = item.items.__qyobrAFN4PtseWXiY5A.value; //
-						this.btitem.items.INTNUM = item.items.__BEViJOuGBdPWSxES5Z5.value; //
-						this.btitem.items.NPLDA = item.items.__R8QpJNSHAVFaYwHnVCo.value; //
-						//this.btitem.items.toolstate=0;//借用日期
-
-
-						this.btitem.items.DEVID = item.items.__2sfNVgOh5Bzq6lXRVuM.value;
-						console.log('this.btitem1:' + JSON.stringify(this.btitem));
-						this.validate();
+					this.http.request({
+						url: this.http.urls.tool_borrowing_empty,
+						data: this.item,
 
+						success: res => {
+							console.log('tool_borrowing_empty:' + JSON.stringify(res));
+							//this.item = res.data.data.items;
+							console.log('this.bitem:' + JSON.stringify(this.bitem));
+							this.btitem.id = res.data.data.id;
+							this.btitem.formId = res.data.data.formid;
+							this.btitem.versions = res.data.data.versions;
+							this.btitem.parentId = this.bitem.id;
+							//this.btitem.parent=this.bitem.id;
+							this.btitem.items = res.data.data.items;
+
+							this.btitem.items.HERST = item.items.__SH6ZSHZMqHeGHDFLAaO.value; //
+							this.btitem.items.TYPBZ = item.items.__drInpQcmkMf2iWseaRR.value; //
+							this.btitem.items.EQKTX = item.items.__FwAgiHdxI4bCZaKNs4A.value; //
+							this.btitem.items.FBL = item.items.__Tyyw12PleIHLPjjJWsV.value; //
+							this.btitem.items.TPLNR = item.items.__a7cgJzxvCbcNNH0KjCn.value; //
+							
+							this.btitem.items.EQUNR = item.items.__b5UmDDfLaCJJdn5F4JF.value; //
+							this.btitem.items.NUMBER = item.items.__2sfNVgOh5Bzq6lXRVuM.value;
+							this.btitem.items.CLFW = item.items.__XcfZD8dzEQb5qURydpP.value; //
+							this.btitem.items.borrowing_date = this.util.getDate('time'); //借用日期
+							this.btitem.items.ZQDDJ = item.items.__Rhr5ihIebMolSIr8CKn.value; //
+							this.btitem.items.ZDYXWC = item.items.__ARvSmuzLwNLg6TlB4tV.value; //
+							this.btitem.items.STTXU = item.items.__SBtfwetYprHFQ5J2MAn.value; //
+							this.btitem.items.SERGE = item.items.__qyobrAFN4PtseWXiY5A.value; //
+							this.btitem.items.INTNUM = item.items.__BEViJOuGBdPWSxES5Z5.value; //
+							this.btitem.items.NPLDA = item.items.__R8QpJNSHAVFaYwHnVCo.value; //
+							//this.btitem.items.toolstate=0;//借用日期
+
+
+							this.btitem.items.DEVID = item.items.__2sfNVgOh5Bzq6lXRVuM.value;
+							console.log('this.btitem1:' + JSON.stringify(this.btitem));
+							this.validate();
+
+
+							console.log('保存子表数据========:' + JSON.stringify(res.data.data));
+						}
+					});
 
-						//console.log('res2:' + JSON.stringify(res.data.data));
-					}
 				});
-
-			});
-		},
-		//提交
-		validate() {
-
-
-			this.http.request({
-				url: this.http.urls.validate +
-					'?parentId=' +
-					this.btitem.parentId,
-				data: this.btitem,
-				method: 'POST',
-				success: res => {
-					console.log('validate1:' + JSON.stringify(res));
-					this.updateparent(this.btitem.parentId, res.data.data.id);
-				}
-			});
-		},
-		updateparent(parent, id) {
+			},
+			//提交
+			validate() {
 
 
-			this.http.request({
-				url: this.http.urls.update_parent + 'parent=' + parent + '&id=' + id +
-					'&table=tlk_tool_borrowing',
+				this.http.request({
+					url: this.http.urls.validate +
+						'?parentId=' +
+						this.btitem.parentId,
+					data: this.btitem,
+					method: 'POST',
+					success: res => {
+						console.log('validate101:' + JSON.stringify(res));
+						this.updateparent(this.btitem.parentId, res.data.data.id);
+					}
+				});
+			},
+			updateparent(parent, id) {
 
-				method: 'POST',
-				success: res => {
-					console.log('validate1:' + JSON.stringify(res));
 
-				}
-			});
-		},
-		//提交流程面板
-		submission() {
-
-			//this.validatet();
-			this.http.request({
-				url: this.http.urls.documents + this.bitem.id + '/panels/submission',
-				data: this.items,
-
-				method: 'POST',
-				success: res => {
-					//this.item=res.data.data;
-					//console.log('zx22:' + JSON.stringify(res));
-					this.show = true;
-
-					this.title = res.data.data.name;
-					this.nextNodes = res.data.data.nextNodes;
-					this.itemt.flowId = res.data.data.flowId;
-					this.itemt.flowType = '80';
-					this.itemt.currentNodeId = res.data.data.currentNodeId;
-					this.itemt.attitude = '';
-					this.itemt.signature = '';
-					this.itemt.submitTo = '';
-					this.itemt.circulatorInfo = '';
-					this.itemt.subFlowApproverInfo = '';
-					this.itemt.subFlowApproverInfoAll = '';
-					this.itemt.document = this.items.document;
-					//this.content=res.data.data.formname;
-				}
-			});
-		}, //提交流程
-		submit() {
-			//this.itemt.document.items.purpose="试验目的5656";
-			//this.itemt.document.items.title="标题5656";
+				this.http.request({
+					url: this.http.urls.update_parent + 'parent=' + parent + '&id=' + id +
+						'&table=tlk_tool_borrowing',
 
-			if (this.itemt.document.items.borrower == '' || this.itemt.document.items.borrower == null) {
-				uni.showModal({
-					title: '提示',
-					content: '请填写借用人',
-					showCancel: false,
+					method: 'POST',
 					success: res => {
-						if (res.confirm) {
-							//uni.navigateBack();
-						}
+						console.log('validate102:' + JSON.stringify(res));
+
 					}
 				});
+			},
+			//提交流程面板
+			submission() {
 
-				return;
-			}
-			if (this.itemt.document.items.tel == '' || this.itemt.document.items.tel == null) {
-				uni.showModal({
-					title: '提示',
-					content: '请填写手机号',
-					showCancel: false,
+				//this.validate();
+				this.http.request({
+					url: this.http.urls.documents + this.bitem.id + '/panels/submission',
+					data: this.items,
+
+					method: 'POST',
 					success: res => {
-						if (res.confirm) {
-							//uni.navigateBack();
-						}
+						//this.item=res.data.data;
+						//console.log('zx22:' + JSON.stringify(res));
+						this.show = true;
+
+						this.title = res.data.data.name;
+						this.nextNodes = res.data.data.nextNodes;
+						this.itemt.flowId = res.data.data.flowId;
+						this.itemt.flowType = '80';
+						this.itemt.currentNodeId = res.data.data.currentNodeId;
+						this.itemt.attitude = '';
+						this.itemt.signature = '';
+						this.itemt.submitTo = '';
+						this.itemt.circulatorInfo = '';
+						this.itemt.subFlowApproverInfo = '';
+						this.itemt.subFlowApproverInfoAll = '';
+						this.itemt.document = this.items.document;
+						//this.content=res.data.data.formname;
 					}
 				});
+			}, //提交流程
+			submit() {
+				//this.itemt.document.items.purpose="试验目的5656";
+				//this.itemt.document.items.title="标题5656";
 
-				return;
-			}
+				if (this.itemt.document.items.borrower == '' || this.itemt.document.items.borrower == null) {
+					uni.showModal({
+						title: '提示',
+						content: '请填写借用人',
+						showCancel: false,
+						success: res => {
+							if (res.confirm) {
+								//uni.navigateBack();
+							}
+						}
+					});
 
+					return;
+				}
+				if (this.itemt.document.items.tel == '' || this.itemt.document.items.tel == null) {
+					uni.showModal({
+						title: '提示',
+						content: '请填写手机号',
+						showCancel: false,
+						success: res => {
+							if (res.confirm) {
+								//uni.navigateBack();
+							}
+						}
+					});
 
+					return;
+				}
 
 
 
-			this.itemt.applicationId = '__gAPYBW4YxB3UePM3lqO';
-			this.itemt.docId = this.iteml.id;
-			this.itemt.id = this.iteml.id;
-			this.itemt.formId = this.iteml.formid;
-			this.itemt.parentId = '';
-			this.itemt.subFlowApprover = [];
-			this.itemt.subSelects = [];
-			this.itemt.submitTo = [];
-			this.itemt.templateForm = '';
-			this.itemt.viewId = '';
-			this.http.request({
-				url: this.http.urls.documents + this.id + '/workflows/submit',
-				data: this.itemt,
 
-				method: 'PUT',
-				success: res => {
-					//this.item=res.data.data;
-					console.log('zx22:' + JSON.stringify(res));
-					if (res.data.errcode == 0) {
+				this.tool_borrowing_empty();
+				this.itemt.applicationId = '__gAPYBW4YxB3UePM3lqO';
+				this.itemt.docId = this.iteml.id;
+				this.itemt.id = this.iteml.id;
+				this.itemt.formId = this.iteml.formid;
+				this.itemt.parentId = '';
+				this.itemt.subFlowApprover = [];
+				this.itemt.subSelects = [];
+				this.itemt.submitTo = [];
+				this.itemt.templateForm = '';
+				this.itemt.viewId = '';
+				this.http.request({
+					url: this.http.urls.documents + this.id + '/workflows/submit',
+					data: this.itemt,
 
-						uni.showModal({
-							title: '提示',
-							content: res.data.data,
-							showCancel: false,
-							success: res => {
-								if (res.confirm) {
-									uni.navigateBack();
+					method: 'PUT',
+					success: res => {
+						//this.item=res.data.data;
+						console.log('zx22:' + JSON.stringify(res));
+						if (res.data.errcode == 0) {
+
+							uni.showModal({
+								title: '提示',
+								content: res.data.data,
+								showCancel: false,
+								success: res => {
+									if (res.confirm) {
+										uni.navigateBack();
+									}
 								}
-							}
-						});
-						if (this.id == null) {
-							this.tool_borrowing_empty();
+							});
+							//if (this.id == null) {
+							//this.tool_borrowing_empty();
+							//}
+
+						} else {
+							uni.showModal({
+								title: '提示',
+								content: res.data.errmsg,
+								showCancel: false,
+								success: res => {
+									if (res.confirm) {
+										//uni.navigateBack();
+									}
+								}
+							});
+
 						}
 
-					} else {
+
+						this.show = false;
+
+						this.title = res.data.data.name;
+						this.nextNodes = res.data.data.nextNodes;
+
+					}
+				});
+			}, //刷新数据
+			//提交
+			add() {
+				this.http.request({
+					url: this.http.urls.user_task_add,
+					data: this.item,
+					method: 'POST',
+					success: res => {
 						uni.showModal({
 							title: '提示',
-							content: res.data.errmsg,
+							content: '提交成功',
 							showCancel: false,
 							success: res => {
 								if (res.confirm) {
-									//uni.navigateBack();
+									uni.navigateBack();
 								}
 							}
 						});
-
 					}
-
-
-					this.show = false;
-
-					this.title = res.data.data.name;
-					this.nextNodes = res.data.data.nextNodes;
-
-				}
-			});
-		}, //刷新数据
-		//提交
-		add() {
-			this.http.request({
-				url: this.http.urls.user_task_add,
-				data: this.item,
-				method: 'POST',
-				success: res => {
-					uni.showModal({
-						title: '提示',
-						content: '提交成功',
-						showCancel: false,
-						success: res => {
-							if (res.confirm) {
-								uni.navigateBack();
-							}
-						}
-					});
-				}
-			});
+				});
+			}
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-.page {
-	padding-bottom: 80px;
-}
-
-.item {
-	margin-bottom: 10px;
-}
-
-.del {
-	width: 70%;
-	background-color: #e64340;
-}
-</style>
+	.page {
+		padding-bottom: 80px;
+	}
+
+	.item {
+		margin-bottom: 10px;
+	}
+
+	.del {
+		width: 70%;
+		background-color: #e64340;
+	}
+</style>

pages/model/return.vue

@@ -281,6 +281,7 @@
 		onLoad(e) {
 			this.op = e.op;
 			this.id = e.id;
+		
 			if (e.ste == 1) {
 				/* this.http.request({
 						url: this.http.urls.xxxx + e.id,
@@ -660,7 +661,7 @@
 			//提交流程面板
 			submission() {
 
-				//this.validatet();
+				this.validate();
 				this.http.request({
 					url: this.http.urls.documents + this.bitem.id + '/panels/submission',
 					data: this.items,
@@ -700,7 +701,7 @@
 							if (res.confirm) {
 								//uni.navigateBack();
 							}
-							this.ghls_empty();
+							
 						}
 					});
 
@@ -725,7 +726,7 @@
 */
 
 
-
+this.ghls_empty();
 				this.itemt.applicationId = '__gAPYBW4YxB3UePM3lqO';
 				this.itemt.docId = this.iteml.id;
 				this.itemt.id = this.iteml.id;