longfenglin 1 год назад
Родитель
Сommit
f28fe16038
3 измененных файлов с 15 добавлено и 7 удалено
  1. 1 1
      api/pda/picking.js
  2. 13 6
      pages/pda/picking/details.vue
  3. 1 0
      utils/request.js

+ 1 - 1
api/pda/picking.js

@@ -52,7 +52,7 @@ export async function pickOutInOrder(params) {
 // pda保存
 export async function findVoucherList(params) {
   const data = await postJ(
-   Vue.prototype.apiUrl  + `/pda/mes/workreport/findVoucherList`, params,true,
+   Vue.prototype.apiUrl  + `/pda/mes/workreport/findVoucherList`, params,false,
   );
   if (data.code == 0) {
     return data.data;

+ 13 - 6
pages/pda/picking/details.vue

@@ -121,7 +121,7 @@
 		</view>
 
 		<view class="bottom-wrapper">
-			<view class="btn_box" @click="save">提交</view>
+			<view class="btn_box" @click="save">{{ submitText }}</view>
 		</view>
 
 		<outsourceOrder ref="outsourceRef" @outsourceEmit="outsourceFn"></outsourceOrder>
@@ -178,7 +178,7 @@ export default {
 			isOutsource: 0,
 			clientEnvironmentId: uni.getStorageSync("userInfo") && uni.getStorageSync("userInfo")
 				.clientEnvironmentId, // *1 主环境-601环境   2 soll-索尔环境    3 tg-碳谷环境
-
+			submitText: '提交'
 
 		}
 	},
@@ -346,12 +346,19 @@ export default {
 
 
 			if (this.clientEnvironmentId == 21) {
-
+				this.submitText='领料中'
 				findVoucherList({ workOrderId: this.idsList[0] }).then(res => {
-					uni.navigateTo({
-						url: `/pages/pda/picking/index/index?pickStatus=1`,
+					// uni.navigateTo({
+					// 	url: `/pages/pda/picking/index/index?pickStatus=1`,
+					// });
+					uni.showToast({
+					  title: "领料成功",
+					  mask: true,
+					  duration: 1500,
+					});
+					uni.navigateBack({
+					    delta: 1
 					});
-
 				})
 
 			} else {

+ 1 - 0
utils/request.js

@@ -34,6 +34,7 @@ const http = ({
       url: url,
       data: param,
       header: header,
+	  timeout: 600000,
       ...other,
       complete: (res) => {