Browse Source

fix:待派件

sunChengjie 11 months ago
parent
commit
62213ffe6b
2 changed files with 14 additions and 6 deletions
  1. 11 3
      src/pages/components/Waitsent.vue
  2. 3 3
      src/pages/new/storage.vue

+ 11 - 3
src/pages/components/Waitsent.vue

@@ -35,12 +35,17 @@
                                 </div>
                             </div>
                             <div class="batch-middel-bottom">
-                                <van-button class="batch-middel-bottom-buttom" size="small" plain type="info"
-                                    @click="onReceiving(unfold)">签收
+                                <van-button v-if="unfold.expressStatus !== '2'" class="batch-middel-bottom-buttom"
+                                    size="small" plain type="info" @click="onReceiving(unfold)">签收
                                 </van-button>
-                                <van-button class="batch-middel-bottom-buttom" size="small" plain type="danger"
+                                <van-button v-if="unfold.expressStatus !== '4' && unfold.expressStatus !== '2'"
+                                    class="batch-middel-bottom-buttom" size="small" plain type="danger"
                                     @click="onSureRetention(unfold)">设为滞留</van-button>
                             </div>
+                            <!-- <div class="batch-middel-bottom" v-if="unfold.expressStatus === '2'">
+                                <van-button class="batch-middel-bottom-buttom" size="small" plain type="info">已签收
+                                </van-button>
+                            </div> -->
                         </div>
                     </div>
 
@@ -258,7 +263,10 @@ export default {
                 this.$toast('签收完成')
                 this.receiving = false
                 this.$refs.scrollRefresh.onRefresh()
+            } else {
+                this.$toast('签收失败')
             }
+            this.uploader = []
         },
         // 展开
         async onUnfold(waite) {

+ 3 - 3
src/pages/new/storage.vue

@@ -117,6 +117,7 @@ export default {
                 value4: '货架A', //货架信息
                 value: '', //快递公司
             },
+            value14: '',//添加下一个的货架信息
             checkbox: false,//到付是否选择
             ischeckDisabled: false,//到付是否必填
             isdisabled: true,//是否选中多选
@@ -227,6 +228,7 @@ export default {
                 ...originalObj
             }
             const res = await appSaveExpressRecord({ ...params, ...value }, { emulateJSON: true })
+            this.value14 = this.object.value4
             console.log(res[0], 'res===')
             if (res.msg == 'success') {
                 this.$toast('打印成功')
@@ -251,9 +253,7 @@ export default {
             } else if (res.msg == 'already') {
                 this.$toast('该账号已添加过')
             }
-            console.log(res, '123====================')
-            console.log('submit', values);
-            // this.$router.push('/')
+            this.object.value4 = this.value14
         },
         // 到付change
         onCheckboxChange() {