修改检验

common/basic.js

@@ -877,5 +877,17 @@ export function updateTitle(title) {
 }
 
 export function clearTirmAndWrap(content) {
-	return content.replace(/<\/?.+?\/?>|\r|\n|\s*/g,'')
+	return content.replace(/<\/?.+?\/?>|\r|\n|\s*/g, '')
+}
+
+export function navigateBack(backIndex) {
+	let canNavBack = getCurrentPages()
+	console.log("返回",canNavBack.length )
+	if (canNavBack && canNavBack.length - 1 > backIndex) {
+		uni.navigateBack({
+			delta: backIndex
+		})
+	} else {
+		history.back();
+	}
 }

pages/customerReturn/job/returnDetail.vue

@@ -359,11 +359,10 @@
 						this.managementList = res.list;
 						var params = this.setParams()
 						console.log("提交参数", JSON.stringify(params));
-						customerReturnJobSubmit(this.id, params).then(res => {
+						customerReturnJobSubmit(params).then(res => {
 							uni.hideLoading()
 							if (res.data) {
 								this.showCommitSuccessMessage("提交成功<br>生成客户退货记录:" + res.data)
-
 							} else {
 								this.showErrorMessage("提交失败[" + res.msg + "]")
 							}

pages/inspect/job/inspectDetail.vue

@@ -42,6 +42,7 @@
 		goHome,
 		getCurrDateTime,
 		getPackingNumberAndBatch,
+		navigateBack
 	} from '@/common/basic.js';
 	import {
 		getInventoryStatusName,
@@ -312,8 +313,12 @@
 					this.showErrorMessage(e.message);
 				}
 			},
+			commit(){
+				this.showCommitSuccessMessage("提交成功")
+			},
 
-			commit() {
+			commits() {
+				
 				this.scanCount = getScanCount(this.subList);
 				if (this.scanCount == 0) {
 					this.showErrorMessage("扫描数为0,请先扫描")
@@ -476,9 +481,15 @@
 
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					uni.navigateTo({
-						url: './inspectJob'
-					})
+					// let canNavBack = getCurrentPages()
+					// if( canNavBack && canNavBack.length>1) {  
+					//     uni.navigateBack({
+					// 	delta:2
+					// }) 
+					// } else {  
+					//     history.back();  
+					// }
+					navigateBack(2);
 				})
 
 			},

pages/inspect/job/inspectResult.vue

@@ -157,7 +157,8 @@
 	} from '@/common/directory.js';
 	
 	import {
-		goHome
+		goHome,
+		navigateBack
 	} from '@/common/basic.js';
 
 	export default {
@@ -382,7 +383,7 @@
 					} else {
 						//报废数大于0，进入详情
 						//进入下一页面
-						uni.navigateTo({
+						uni.redirectTo({
 							url: './inspectDetail?id=' + this.id +
 								'&status=' + this.status +
 								'&failedQty=' + this.jobContent.failedQty +
@@ -419,7 +420,7 @@
 						//部分合格
 					} else if (this.nextAction == "PARTIAL_OK") {
 						//进入下一页面
-						uni.navigateTo({
+						uni.redirectTo({
 							url: './inspectDetail?id=' + this.id +
 								'&status=' + this.status +
 								'&failedQty=' + this.jobContent.failedQty +
@@ -475,9 +476,7 @@
 			},
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					uni.navigateTo({
-						url: './inspectJob'
-					})
+					navigateBack(1)
 				})
 			},
 			showErrorMessage(message) {

pages/inspect/request/inspectRequestDetail.vue

@@ -5,10 +5,10 @@
 			<scroll-view scroll-y="true" class="page-main-scroll">
 				<view class="" style="background-color: #fff; padding-left: 20rpx;padding-right: 20rpx; padding-top: 10rpx;padding-bottom: 10rpx;">
 					<view class="" style="font-size: 35rpx;">
-						单据号 : {{jobContent.number}}
+						单据号 : {{requestContent.number}}
 					</view>
 					<view class="" style="font-size: 35rpx;">
-						<text>供应商代码 :  {{jobContent.supplierCode}} </text>
+						<text>供应商代码 :  {{requestContent.supplierCode}} </text>
 					</view>
 				</view>
 				<u-line />
@@ -93,7 +93,7 @@
 						that.showMessage('未获取到详情');
 					} else {
 					if (res.data.subList.length > 0) {
-						that.jobContent = res.data;
+						that.requestContent = res.data;
 						that.subList = res.data.subList;
 						that.detailSource = getDataSource(that.subList)
 						// that.subList = res.data[0];

static/config.json

@@ -18,7 +18,7 @@
 
 		"request_url": {
 			"name": "request_url",
-			"value": "http://192.168.0.178:12080/admin-api",
+			"value": "http://dev.ccwin-in.com:25100/api/admin-api",
 			"dev2": "http://192.168.0.157:12080/admin-api",
 			"chefang": "http://192.168.0.178:12080/admin-api",
 			"chenxinming": "http://192.168.0.230:12080/admin-api",