lilei il y a 2 ans
Parent
commit
f9eae4d246

+ 3 - 0
src/views/common/auditDetail.vue

@@ -77,6 +77,9 @@ export default {
   methods: {
     clearTable () {
       this.$refs.table.clearTable()
+    },
+    refresh () {
+      this.$refs.table.refresh(true)
     }
   }
 }

+ 10 - 13
src/views/salesReturnManagement/salesReturn/detail.vue

@@ -55,8 +55,8 @@
         </a-collapse>
       </a-card>
       <a-card size="small" :bordered="false" class="pages-wrap">
-        <a-tabs>
-          <a-tab-pane key="1" tab="产品明细" force-render>
+        <a-tabs v-model="curTab">
+          <a-tab-pane :key="1" tab="产品明细" force-render>
             <a-alert style="margin-bottom: 10px;" type="info">
               <div slot="message" class="total-bar">
                 <div>
@@ -85,14 +85,13 @@
               :rowKey="record => record.id"
               :columns="columns"
               :data="loadData"
-              :defaultLoadData="false"
               bordered></s-table>
           </a-tab-pane>
-          <a-tab-pane key="2" tab="审核进度" >
+          <a-tab-pane :key="2" tab="审核进度" >
             <auditDetail v-if="$hasPermissions('B_salesReturnAudit')" ref="auditDetail" businessType="SALES_RETURN" :itemSn="$route.params.sn"></auditDetail>
             <span v-else>您没有权限查看审核进度</span>
           </a-tab-pane>
-          <a-tab-pane key="3" tab="操作记录">
+          <a-tab-pane :key="3" tab="操作记录">
             <s-table
               class="sTable"
               ref="operateTable"
@@ -147,6 +146,7 @@ export default {
       detailData: null, //  详情数据
       visibleAudit: false,
       spinningAudit: false,
+      curTab: 1,
       queryStrList: [
         { code: 0, text: '不显示退货单价/金额' },
         { code: 1, text: '显示——按照申请退货数量计算' },
@@ -212,13 +212,10 @@ export default {
     //  返回
     handleBack () {
       this.$router.push({ name: 'salesReturnList', query: { closeLastOldTab: true } })
-    },
-    // 明细筛选
-    changeQueryStr (v) {
-
     },
     //  详情
     getDetail () {
+      this.curTab = 1
       salesReturnDetail({ sn: this.$route.params.sn }).then(res => {
         if (res.status == 200) {
           this.detailData = res.data
@@ -249,15 +246,15 @@ export default {
   },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
-      this.$refs.table.refresh(true)
       this.getDetail()
     }
   },
   activated () {
-    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
-    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
+    this.getDetail()
+    if (!this.$store.state.app.isNewTab) {
       this.$refs.table.refresh(true)
-      this.getDetail()
+      this.$refs.auditDetail.refresh()
+      this.$refs.operateTable.refresh(true)
     }
   },
   beforeRouteEnter (to, from, next) {