财务对账修改003

src/views/finance/contrast/index.vue

@@ -220,6 +220,7 @@
       width="70%"
       append-to-body
       :close-on-click-modal="false"
+      :show-close="colseButton"
     >
       <el-form
         ref="ruless"
@@ -356,13 +357,13 @@
       </el-table>
 
       <div slot="footer" class="dialog-footer">
-        <el-button v-if="approve === true" @click="addOrUpdateHand">审批</el-button>
-        <el-button type="info" v-show="notChange" @click="addOrUpdateHandle()">查看审批流</el-button>
         <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
         <approval-comments v-if="addOrUpdateVisib" ref="ApprovalComments" @refreshDataList="returnData"></approval-comments>
+        <el-button v-if="approve === true" @click="goApproval">审批</el-button>
+        <el-button type="info" v-if="notChange" @click="addOrUpdateHandle()">查看审批流</el-button>
         <el-button type="primary" @click="submitForm" :disabled="notChange">保 存</el-button>
-        <el-button @click="cancel">取 消</el-button>
-<!--        <el-button>取1消</el-button>-->
+        <el-button v-if="cancelButton === true" @click="cancel">取 消</el-button>
+        <el-button v-if="cancelButton === false" @click="homePage">取消</el-button>
       </div>
 
       <!-- 添加或修改财务数据主对话框 -->
@@ -639,11 +640,14 @@ import { queryUserVal } from '@/api/warehouseBusiness/agreement'
 import moment from 'moment'
 import print from "print-js"
 import ApprovalComments from '@/views/startApproval'
+import Global from '@/layout/components/global'
 export default {
   name: "Fee",
 
   data() {
     return {
+      colseButton:true,
+      approval:[],
       disappear:false,
       addIndex:[],
       addOrUpdateVisible: false,
@@ -708,6 +712,7 @@ export default {
         fCorpid:''     //结算单位ID
       },
       hide:false,
+      cancelButton:true,
       // 传值对象
       TWareHouseFees:{
         fCorpid:'',
@@ -795,7 +800,64 @@ export default {
     this.getList()
     this.register()
   },
+  activated(){
+    this.Jump()
+  },
   methods: {
+    // 审批跳转
+    Jump(){
+      this.approval = this.$route.query.data
+      console.log(this.approval)
+      if(this.approval){
+        this.closeButton = false
+        this.approval = JSON.parse(this.approval)
+        this.hide = false
+        this.notChange = true
+        this.approve = true
+        this.disappear = true
+        this.cancelButton = false
+        this.reset()
+        this.pass = {
+          fAmtdr: '',    //应收合计
+          fAmtcr: '',    //应付合计
+          fMblno: '',    //提单号
+          fName: '',      //货权方
+          fFeesName: '',   //结算单位
+          fCorpid: ''     //结算单位ID
+        }
+        getFee(this.approval.billId).then(response => {
+          this.Operator = response.data.tFee.createBy
+          this.DzfeeList = response.data.feeDoList
+          this.fWbuOptions = response.data.feesList
+          this.queryParams = response.data.tFee
+          this.fWbuOptions = response.data.feesList
+          this.fMblnoOptions = response.data.corps
+          this.open = true;
+          this.title = "修改财务数据主"
+        })
+      }
+    },
+    homePage() {
+      this.open = false
+      let view = {
+        fullPath: "/finance/contrast",
+        hash: "",
+        matched: Array(2),
+        meta: Object,
+        name: "contrast",
+        params: Object,
+        path: "/finance/contrast",
+        query: Object,
+        title: "收费"
+      }
+      this.$router.push({ path: '/index' })
+      this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => {
+        if (this.isActive(view)) {
+          this.toLastView(visitedViews, view)
+        }
+      })
+      Global.$emit("removeCache", "closeSelectedTag", view);
+    },
     // 撤销审批
     backApproval(){
       let data = {
@@ -818,11 +880,9 @@ export default {
     this.addOrUpdateVisible = false
   },
     // 审批按钮
-    addOrUpdateHand(){
+    goApproval(){
       this.addOrUpdateVisib = true
-      this.addOrUpdateVisible = false
-      let id = '448'
-      let actId = '110'
+      console.log(this.approval)
       this.$nextTick(() => {
         this.$refs.ApprovalComments.init(this.queryParams.fId,this.contrastId)
       })