bug306(仓库pda)【海运入仓-修改储位】修改储位界面屏蔽<完成入仓>按钮，新增<返回>按钮

src/pages/warehousing/list.vue

@@ -180,7 +180,7 @@
                 });
               } else if (res.confirm) {
                 uni.navigateTo({
-                  url: './warehousing-confirm?orderId=' + data.orderId
+                  url: './warehousing-confirm?orderId=' + data.orderId + '&showSave=false'
                 });
               }
             }

src/pages/warehousing/warehousing-confirm.vue

@@ -208,7 +208,8 @@
     </view>
     <view class="foot-btn">
       <button class="mini-btn" type="primary"  size="mini" @tap="showAddPopup">{{$t('转异')}}</button>
-      <button class="mini-btn" style="color: #007aff" size="mini" @tap="save">{{$t('完成入仓')}}</button>
+      <button class="mini-btn" style="color: #007aff" size="mini" @tap="save" v-if="showSave===true">{{$t('完成入仓')}}</button>
+      <button class="mini-btn" style="color: #007aff" size="mini" @tap="back" v-else>{{$t('返回')}}</button>
     </view>
     <view class="add-popup">
       <uni-popup ref="popup" background-color="#fff">
@@ -301,6 +302,7 @@ export default {
 	  currencyData: [],
 	  orderItemList:[],
 	  adjust:{},
+      showSave: false,
 	  showWarehouseInItemId: null, // 查询入仓详情的商品ID
     }
   },
@@ -329,6 +331,9 @@ export default {
     if ('target' in option) {
       this.target = option.target
     }
+    if ('showSave' in option) {
+      this.showSave = option.showSave
+    }
     const list = this.getDictDatas(this.DICT_TYPE.ORDER_SPECIAL_NEEDS)
     getSpecialListByOrderId({ orderId: this.orderId }).then(data => {
       this.texuList = data.map(v => {
@@ -349,6 +354,9 @@ export default {
     this.getWarehousePictureList()
   },
   methods: {
+  back(){
+    uni.navigateBack()
+  },
 	// 根据入仓记录修改储位，供储位选择页面回调用
 	updateWarehouseInLocation(locationList, extra = null){
 		if(extra && typeof extra == 'string'){

src/pages/warehousingAir/list.vue

@@ -180,7 +180,7 @@
                 });
               } else if (res.confirm) {
                 uni.navigateTo({
-                  url: './warehousing-confirm?orderId=' + data.orderId
+                  url: './warehousing-confirm?orderId=' + data.orderId + '&showSave=false'
                 });
               }
             }

src/pages/warehousingAir/warehousing-confirm.vue

@@ -208,7 +208,8 @@
     </view>
     <view class="foot-btn">
       <button class="mini-btn" type="primary"  size="mini" @tap="showAddPopup">{{$t('转异')}}</button>
-      <button class="mini-btn" style="color: #007aff" size="mini" @tap="save">{{$t('完成入仓')}}</button>
+      <button class="mini-btn" style="color: #007aff" size="mini" @tap="save" v-if="showSave===true">{{$t('完成入仓')}}</button>
+      <button class="mini-btn" style="color: #007aff" size="mini" @tap="back" v-else>{{$t('返回')}}</button>
     </view>
     <view class="add-popup">
       <uni-popup ref="popup" background-color="#fff">
@@ -298,6 +299,7 @@ export default {
       descZh: '',
       exceptionList: [],
       labelList: [{start: 1, end: ''}],
+      showSave: false,
 	  currencyData: [],
 	  orderItemList:[],
 	  adjust:{},
@@ -329,6 +331,9 @@ export default {
     if ('target' in option) {
       this.target = option.target
     }
+    if ('showSave' in option) {
+      this.showSave = option.showSave
+    }
     const list = this.getDictDatas(this.DICT_TYPE.ORDER_SPECIAL_NEEDS)
     getSpecialListByOrderId({ orderId: this.orderId }).then(data => {
       this.texuList = data.map(v => {
@@ -349,6 +354,9 @@ export default {
     this.getWarehousePictureList()
   },
   methods: {
+    back(){
+      uni.navigateBack()
+    },
 	// 根据入仓记录修改储位，供储位选择页面回调用
 	updateWarehouseInLocation(locationList, extra = null){
 		if(extra && typeof extra == 'string'){