Ver Fonte

bug 修复

lilei há 2 anos atrás
pai
commit
1422404abb

+ 19 - 18
src/views/salesReturnManagement/custConfirm/list.vue

@@ -172,18 +172,18 @@
             </div>
           </template>
         </s-table>
+        <div class="footer-btn">
+          <a-button
+            size="large"
+            style="padding: 0 60px;"
+            :disabled="spinning"
+            type="primary"
+            class="button-primary"
+            @click="handleSubmit()"
+            id="salesReturn-handleSubmit">审核通过</a-button>
+        </div>
       </a-card>
     </a-spin>
-    <div class="affix-cont">
-      <a-button
-        size="large"
-        style="padding: 0 60px;"
-        :disabled="spinning"
-        type="primary"
-        class="button-primary"
-        @click="handleSubmit()"
-        id="salesReturn-handleSubmit">审核通过</a-button>
-    </div>
     <!-- 设置退货单价 -->
     <setPriceModal
       ref="setPriceModal"
@@ -406,24 +406,24 @@ export default {
         _this.setTableH()
       })
       this.orderSn = this.$route.params.sn
-      this.rowSelectionInfo = null
-      this.$refs.table.clearTable()
       this.returnReasonList = this.$store.state.app.returnReason
       this.getOrderDetail()
     },
     setTableH () {
-      this.tableHeight = window.innerHeight - 340
+      this.tableHeight = window.innerHeight - 390
     }
   },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
-      this.$refs.table.refresh(true)
+      this.$refs.table.refresh()
       this.pageInit()
     }
   },
   activated () {
-    this.$refs.table.refresh(true)
-    this.pageInit()
+    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+      this.$refs.table.refresh()
+      this.pageInit()
+    }
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {})
@@ -435,12 +435,13 @@ export default {
   .custConfirm-wrap{
     position: relative;
     height: 100%;
-    padding-bottom: 51px;
     box-sizing: border-box;
     >.ant-spin-nested-loading{
-      overflow-y: scroll;
       height: 100%;
     }
+    .footer-btn{
+      text-align: center;
+    }
     .custConfirm-cont{
       margin-top: 10px;
       .sTable{

+ 1 - 0
src/views/salesReturnManagement/custConfirm/setPriceModal.vue

@@ -228,6 +228,7 @@ export default {
         productName: '',
         productCode: ''
       }
+      this.buyerName = ''
       if (this.$refs.table) {
         this.$refs.table.refresh(true)
       }

+ 15 - 16
src/views/salesReturnManagement/receiveCheck/checking.vue

@@ -68,19 +68,18 @@
               style="width: 100%;" />
           </template>
         </s-table>
+        <div class="footer-btn">
+          <a-button
+            size="large"
+            style="padding: 0 60px;"
+            :disabled="spinning"
+            type="primary"
+            class="button-primary"
+            @click="handleSubmit()"
+            id="salesReturn-handleSubmit">提交</a-button>
+        </div>
       </a-card>
     </a-spin>
-    <div class="affix-cont">
-      <a-button
-        size="large"
-        style="padding: 0 60px;"
-        :disabled="spinning"
-        type="primary"
-        class="button-primary"
-        @click="handleSubmit()"
-        id="salesReturn-handleSubmit">提交</a-button>
-    </div>
-
     <!-- 选中批量操作 -->
     <chooseTypeModal :openModal="openTypeModal" :type="actionType" @close="openTypeModal=false" @confirm="plconfirm"></chooseTypeModal>
   </div>
@@ -301,12 +300,10 @@ export default {
         _this.setTableH()
       })
       this.orderSn = this.$route.params.sn
-      this.rowSelectionInfo = null
-      this.$refs.table.clearTable()
       this.getOrderDetail()
     },
     setTableH () {
-      this.tableHeight = window.innerHeight - 340
+      this.tableHeight = window.innerHeight - 390
     }
   },
   mounted () {
@@ -316,7 +313,7 @@ export default {
     }
   },
   activated () {
-    this.$refs.table.refresh(true)
+    this.$refs.table.refresh()
     this.pageInit()
   },
   beforeRouteEnter (to, from, next) {
@@ -332,9 +329,11 @@ export default {
     padding-bottom: 51px;
     box-sizing: border-box;
     >.ant-spin-nested-loading{
-      overflow-y: scroll;
       height: 100%;
     }
+    .footer-btn{
+      text-align: center;
+    }
     .salesReturnCheck-cont{
       margin-top: 10px;
       .sTable{

+ 15 - 16
src/views/salesReturnManagement/receiveCheck/receiving.vue

@@ -81,19 +81,18 @@
             </div>
           </template>
         </s-table>
+        <div class="footer-btn">
+          <a-button
+            size="large"
+            style="padding: 0 60px;"
+            :disabled="spinning"
+            type="primary"
+            class="button-primary"
+            @click="handleSubmit()"
+            id="salesReturn-handleSubmit">提交</a-button>
+        </div>
       </a-card>
     </a-spin>
-    <div class="affix-cont">
-      <a-button
-        size="large"
-        style="padding: 0 60px;"
-        :disabled="spinning"
-        type="primary"
-        class="button-primary"
-        @click="handleSubmit()"
-        id="salesReturn-handleSubmit">提交</a-button>
-    </div>
-
     <!-- 添加产品 -->
     <chooseProductsModal ref="chooseProduct" :openModal="openModal" :buyerSn="$route.params.buyerSn" @close="openModal=false" @addProduct="addProduct"></chooseProductsModal>
   </div>
@@ -334,13 +333,11 @@ export default {
         _this.setTableH()
       })
       this.orderSn = this.$route.params.sn
-      this.rowSelectionInfo = null
-      this.$refs.table.clearTable()
       this.returnReasonList = this.$store.state.app.returnReason
       this.getOrderDetail()
     },
     setTableH () {
-      this.tableHeight = window.innerHeight - 340
+      this.tableHeight = window.innerHeight - 390
     }
   },
   mounted () {
@@ -350,7 +347,7 @@ export default {
     }
   },
   activated () {
-    this.$refs.table.refresh(true)
+    this.$refs.table.refresh()
     this.pageInit()
   },
   beforeRouteEnter (to, from, next) {
@@ -366,9 +363,11 @@ export default {
     padding-bottom: 51px;
     box-sizing: border-box;
     >.ant-spin-nested-loading{
-      overflow-y: scroll;
       height: 100%;
     }
+    .footer-btn{
+      text-align: center;
+    }
     .salesReturnReceive-cont{
       margin-top: 10px;
       .sTable{