فهرست منبع

fix:经销商提货列表

zh 2 سال پیش
والد
کامیت
e0a256b0fc
2فایلهای تغییر یافته به همراه20 افزوده شده و 16 حذف شده
  1. 5 4
      src/layout/components/Navbar.vue
  2. 15 12
      src/views/supply/pickup/components/pickup_form.vue

+ 5 - 4
src/layout/components/Navbar.vue

@@ -84,7 +84,6 @@
       :modal="false"
       width="70%"
       :visible.sync="hasNotice"
-      center
       @close="handleNotice(false)"
     >
       <div class="mymain-container">
@@ -163,10 +162,9 @@
         </div>
       </div>
     </el-dialog>
-    <el-dialog title="物流通知" :visible.sync="isLogistics" width="50%" :modal="false" @close="isLogistics = false">
+    <el-dialog title="物流通知" :visible.sync="isLogistics" width="60%" :modal="false" @close="isLogistics = false">
       <div class="table">
         <el-table
-          v-if="invoiceOrderList.length"
           ref="table"
           v-loading="listLoading"
           :data="invoiceOrderList"
@@ -201,7 +199,6 @@
             </template>
           </el-table-column>
         </el-table>
-        <div v-else class="tip">暂无物流通知</div>
       </div>
 
       <!-- 分页 -->
@@ -859,4 +856,8 @@ export default {
     }
   }
 }
+.tip{
+  margin: 50px auto;
+  text-align: center;
+}
 </style>

+ 15 - 12
src/views/supply/pickup/components/pickup_form.vue

@@ -753,11 +753,13 @@ export default {
         if (!k.warehouseFlag) {
           this.$set(k, 'warehouseFlag', null)
           if (this.mainForm.pickupWay == 2 && this.logisticsNumber === '001') {
-            if (k.refLinkman || k.refPhone || k.refInstallAddress) {
-              this.$set(k, 'warehouseFlag', 1)
-            } else {
-              this.$set(k, 'warehouseFlag', 0)
-            }
+                      // 注释默认不选择仓库
+
+            // if (k.refLinkman || k.refPhone || k.refInstallAddress) {
+            //   this.$set(k, 'warehouseFlag', 1)
+            // } else {
+            //   this.$set(k, 'warehouseFlag', 0)
+            // }
           }
         }
       })
@@ -772,13 +774,14 @@ export default {
         this.deliverList = res.data
         this.deliverList.forEach(k => {
           this.$set(k, 'warehouseFlag', null)
-          if (this.mainForm.pickupWay == 2 && this.logisticsNumber === '001') {
-            if (k.refLinkman || k.refPhone || k.refInstallAddress) {
-              this.$set(k, 'warehouseFlag', 1)
-            } else {
-              this.$set(k, 'warehouseFlag', 0)
-            }
-          }
+          // 注释默认不选择仓库
+          // if (this.mainForm.pickupWay == 2 && this.logisticsNumber === '001') {
+          //   if (k.refLinkman || k.refPhone || k.refInstallAddress) {
+          //     this.$set(k, 'warehouseFlag', 1)
+          //   } else {
+          //     this.$set(k, 'warehouseFlag', 0)
+          //   }
+          // }
         })
         this.listLoading = false
       })