浏览代码

fix: 返利互转申请

zh 2 年之前
父节点
当前提交
96a23f7109

+ 28 - 24
src/views/finance/change_list.vue

@@ -1,33 +1,31 @@
 <template>
 <template>
-  <div style="width: 100%; height: 100%">
-    <template-page
-      v-if="showPage == 1"
-      ref="pageRef"
-      :operation="operation()"
-      :optionsEvensGroup="optionsEvensGroup"
-      :getList="getList"
-      :exportList="exportList"
-      :tableAttributes="tableAttributes"
-      :tableEvents="tableEvents"
-      :columnParsing="columnParsing"
-    >
-    </template-page>
-    <div class="app-container" v-else-if="showPage == 2">
-      <ChangeListDetail :detailList="detailList" />
-    </div>
-    <div class="app-container" v-else-if="showPage == 3">
-      <ChangeListExamine @refresh="refreshFn" :detailList="detailList" />
-    </div>
-    <div class="app-container" v-else-if="showPage == 4">
-      <ChangeListReview @refresh="refreshFn" :detailList="detailList" />
-    </div>
-  </div>
+  <template-page
+    ref="pageRef"
+    :operation="operation()"
+    :optionsEvensGroup="optionsEvensGroup"
+    :getList="getList"
+    :exportList="exportList"
+    :tableAttributes="tableAttributes"
+    :tableEvents="tableEvents"
+    :columnParsing="columnParsing"
+  >
+    <Popu v-if="showPage !== 1">
+      <ChangeListDetail v-if="showPage == 2" @refresh="refreshFn" :detailList="detailList" />
+
+      <ChangeListExamine v-if="showPage == 3" @refresh="refreshFn" :detailList="detailList" />
+
+      <ChangeListReview v-if="showPage == 4" @refresh="refreshFn" :detailList="detailList" />
+    </Popu>
+  </template-page>
 </template>
 </template>
 
 
 <script>
 <script>
 import TemplatePage from '@/components/template/template-page-1.vue'
 import TemplatePage from '@/components/template/template-page-1.vue'
 import { getChangeList, getChangeListDetail, getTransferSubmit, getTransferCancel } from '@/api/finance/change_list'
 import { getChangeList, getChangeListDetail, getTransferSubmit, getTransferCancel } from '@/api/finance/change_list'
 import { financeTransferList, financeTransferListExport } from '@/api/finance/change_list_v2'
 import { financeTransferList, financeTransferListExport } from '@/api/finance/change_list_v2'
+import Popu from '@/components/template/popu.vue'
+import import_mixin from '@/components/template/import_mixin.js'
+import add_callback_mixin from '@/components/template/add_callback_mixin.js'
 import ChangeListDetail from './components/change_list-detail'
 import ChangeListDetail from './components/change_list-detail'
 import ChangeListExamine from './components/change_list-examine'
 import ChangeListExamine from './components/change_list-examine'
 import ChangeListReview from './components/change_list-review'
 import ChangeListReview from './components/change_list-review'
@@ -36,8 +34,10 @@ export default {
     ChangeListDetail,
     ChangeListDetail,
     ChangeListExamine,
     ChangeListExamine,
     ChangeListReview,
     ChangeListReview,
-    TemplatePage
+    TemplatePage,
+    Popu
   },
   },
+  mixins: [import_mixin, add_callback_mixin],
   data() {
   data() {
     return {
     return {
       isCustomer: null,
       isCustomer: null,
@@ -151,6 +151,10 @@ export default {
     //刷新
     //刷新
     refreshFn() {
     refreshFn() {
       this.$refs.pageRef.refreshList()
       this.$refs.pageRef.refreshList()
+      this.addOff(() => {
+        console.log(this.showPage)
+        this.showPage = 1
+      })()
     },
     },
     //提审
     //提审
     async submitFn(id) {
     async submitFn(id) {

+ 1 - 1
src/views/finance/components/change_list-detail.vue

@@ -182,7 +182,7 @@ export default {
   },
   },
   methods: {
   methods: {
     goBack() {
     goBack() {
-      this.$parent.showPage = 1
+     this.$emit('refresh')
     }
     }
   }
   }
 }
 }

+ 0 - 2
src/views/finance/components/change_list-examine.vue

@@ -190,8 +190,6 @@ export default {
     },
     },
     goBack() {
     goBack() {
       this.$emit('refresh')
       this.$emit('refresh')
-
-      this.$parent.showPage = 1
     }
     }
   }
   }
 }
 }

+ 4 - 3
src/views/finance/components/change_list-review.vue

@@ -187,7 +187,8 @@ export default {
       initiatorWalletRebateId = this.dataList[0].initiatorWalletRebateId
       initiatorWalletRebateId = this.dataList[0].initiatorWalletRebateId
       receiverWalletRebateId = this.dataList[1].receiverWalletRebateId
       receiverWalletRebateId = this.dataList[1].receiverWalletRebateId
       initiatorRemark = this.dataList[0].remark
       initiatorRemark = this.dataList[0].remark
-      receiverRemark = this.dataList[1].remark
+      receiverRemark = this.dataList[1].remark,
+   
       amount = this.dataList[1].amount
       amount = this.dataList[1].amount
       await getTransferEdit({
       await getTransferEdit({
         id: this.detailList.id,
         id: this.detailList.id,
@@ -196,14 +197,14 @@ export default {
         receiverRemark,
         receiverRemark,
         initiatorRemark,
         initiatorRemark,
         amount: amount * 1,
         amount: amount * 1,
-        initiatorAmount
+        initiatorAmount,
+        remark:this.detailList.remark
       })
       })
       this.$message.success('修改成功')
       this.$message.success('修改成功')
       this.goBack()
       this.goBack()
     },
     },
     goBack() {
     goBack() {
       this.$emit('refresh')
       this.$emit('refresh')
-      this.$parent.showPage = 1
     }
     }
   }
   }
 }
 }