新需求，增加域名

pages/particulars/claimExpense/index.vue

@@ -294,7 +294,7 @@
 		</u-modal>
 		<u-modal :show="auditFShow" title="提示" showCancelButton @confirm="check('F')" @cancel="auditFShow = false">
 			<view class="slot-content" style="display: flex; flex-direction: column; align-items: center;">
-				<rich-text nodes="确定要驳回审核吗?"></rich-text>
+				<rich-text nodes="确定要驳回吗?"></rich-text>
 				<input style="margin-top: 20rpx;"
 					selection-start="0"
 					selection-end="9999"
@@ -447,7 +447,6 @@
 							// 角色
 							for (let role of res.data.roleList) {
 								if (role == 'DZ') {
-									console.log(123);
 									this.button = false;
 									this.disabled = true;
 								}
@@ -549,6 +548,14 @@
 						message: "装卸信息提交后才能报账!",
 						iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/warning.png'
 					})
+				} else if (this.formData.ifOrder2ed != 'O' && this.formData.ifOrder2ed != 'S') {
+					this.upAuditShow = false;
+					this.$refs.uToast.show({
+						type: 'warning',
+						icon: false,
+						message: "请先提交报账单!",
+						iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/warning.png'
+					}) 
 				} else {
 					if (type == 'BX') {
 						this.submitShow = true
@@ -764,7 +771,7 @@
 				// 	})
 				// } else if (this.status376 == 2 || this.status376 == 0) {
 					
-				if (this.formData.ifOrder2ed != 'O') {
+				if (this.formData.ifOrder2ed != 'O' && this.formData.ifOrder2ed != 'S') {
 					this.upAuditShow = false;
 					this.$refs.uToast.show({
 						type: 'warning',
@@ -772,7 +779,7 @@
 						message: "请先提交报账单!",
 						iconUrl: 'https://cdn.uviewui.com/uview/demo/toast/warning.png'
 					})
-				} else if (this.formData.ifOrder2ed == 'O') {
+				} else if (this.formData.ifOrder2ed == 'O' || this.formData.ifOrder2ed == 'S') {
 
 					let isMo = false;
 
@@ -950,7 +957,7 @@
 				var data = {
 					orderNo: this.orderNo,
 					entityId: this.formData.entityId,
-					audit2Desc: this.formData.audit2Desc,
+					audit2Desc: this.formData.audit2Desc ? this.formData.audit2Desc : '',
 					lineNo: this.formData.lineNo,
 					auditType: type
 				}
@@ -1057,25 +1064,52 @@
 							// 		console.log('当前位置的纬度：' + res.latitude);
 							// 	}
 							// });
-							let dataForm = {
-								attachId: res.data,
-								longitude: longitude,
-								latitude: latitude,
-								updateDate: dateHHmmss
-							}
+							
+							uni.getLocation({
+								type: 'wgs84',
+								isHighAccuracy: true,
+								geocode: true,
+								success: (map) => {
+									longitude = map.longitude
+									latitude = map.latitude
+									let dataForm = {
+										attachId: res.data,
+										longitude: longitude,
+										latitude: latitude,
+										updateDate: dateHHmmss
+									}
+									// 上传图片
+									pictureUploading(data, dataForm).then(res => {
+										let item = this[`fileList${event.name}`][fileListLen]
+										this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(
+											item, {
+												status: 'success',
+												message: '',
+												url: res.data
+											}))
+										fileListLen++
+									})
+								}
+							});
+							// let dataForm = {
+							// 	attachId: res.data,
+							// 	longitude: longitude,
+							// 	latitude: latitude,
+							// 	updateDate: dateHHmmss
+							// }
 
-							console.log(dataForm);
-							// 上传图片
-							pictureUploading(data, dataForm).then(res => {
-								let item = this[`fileList${event.name}`][fileListLen]
-								this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(
-									item, {
-										status: 'success',
-										message: '',
-										url: res.data
-									}))
-								fileListLen++
-							})
+							// console.log(dataForm);
+							// // 上传图片
+							// pictureUploading(data, dataForm).then(res => {
+							// 	let item = this[`fileList${event.name}`][fileListLen]
+							// 	this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(
+							// 		item, {
+							// 			status: 'success',
+							// 			message: '',
+							// 			url: res.data
+							// 		}))
+							// 	fileListLen++
+							// })
 						}
 
 					})