财务模块修改

src/api/finance/payment.js

@@ -95,8 +95,9 @@ export function backCharge(queryParameter) {
 // 撤销审批
 export function revocation(data) {
   return request({
-    url: '/warehouse/payment/revoke',
+    url: '/warehouse/paths/revoke',
     method: 'post',
     data: data
   })
 }
+

src/views/finance/charge/index.vue

@@ -274,7 +274,8 @@
         <el-button type="primary" size="small" @click="confirmCharge" :disabled="notChange" v-if="queryParams.fBillstatus < '4'">确认收费</el-button>
         <el-button type="success" size="small" @click="revokeCharge" v-if="queryParams.fBillstatus === '6'">撤销收费</el-button>
 <!--        <el-button type="info" size="small" @click="printing">打印</el-button>-->
-        <!--        <el-button type="danger" size="small" :disabled="notChange" v-show="Lander == Operator">撤销审批</el-button>-->
+        <!--        <el-button type="danger" size="small" :disabled="notChange" v-show="Lander == Operator">
+        </el-button>-->
         <el-button type="danger" size="small" :disabled="tablefilter" @click="approvalRevocation" v-show="queryParams.fBillstatus === '4'">撤销审批</el-button>
       </div>
       <el-table v-loading="loading" :data="increase_s" @selection-change="handleSelectionChange_s">
@@ -323,7 +324,7 @@
         <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="immediateApproval">审批</el-button>
-        <el-button type="primary" v-if="notChange" @click="addOrUpdateHandle">查看审批流</el-button>
+        <el-button type="primary" v-if="queryParams.fBillstatus >= '3'" @click="addOrUpdateHandle">查看审批流</el-button>
         <el-button type="primary" @click="submitForm" :disabled="notChange">保 存</el-button>
         <el-button v-if="cancelButton === true" @click="cancel">取 消</el-button>
         <el-button v-if="cancelButton === false" @click="homePage">取 消</el-button>
@@ -919,7 +920,7 @@ export default {
       this.$refs['ruless'].validate(valid => {
         if (valid) {
           if(this.increase_s.length){
-            this.queryParams.fBillstatus = '4'
+            // this.queryParams.fBillstatus = '4'
             let formDate = new window.FormData()
             formDate.append('tFee', JSON.stringify(this.queryParams))
             formDate.append('tFeeDo', JSON.stringify(this.increase_s))

src/views/finance/contrast/index.vue

@@ -371,11 +371,11 @@
       <div slot="footer" class="dialog-footer">
         <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="primary" v-if="notChange" @click="addOrUpdateHandle()">查看审批流</el-button>
-        <el-button type="primary" @click="submitForm" :disabled="notChange">保 存</el-button>
-        <el-button v-if="cancelButton === true" @click="cancel">取 消</el-button>
-        <el-button v-if="cancelButton === false" @click="homePage">取消</el-button>
+          <el-button v-if="approve === true" @click="goApproval">审批</el-button>
+          <el-button type="primary" v-if="queryParams.fBillstatus >= '3'"@click="addOrUpdateHandle()">查看审批流</el-button>
+          <el-button type="primary" @click="submitForm" :disabled="notChange">保 存</el-button>
+          <el-button v-if="cancelButton === true" @click="cancel">取 消</el-button>
+          <el-button v-if="cancelButton === false" @click="homePage">取消</el-button>
       </div>
 
       <!-- 添加或修改财务数据主对话框 -->
@@ -985,7 +985,7 @@ export default {
       this.$refs['ruless'].validate(valid => {
         if(valid){
           if(this.DzfeeList.length){
-            this.queryParams.fBillstatus = '4'
+            // this.queryParams.fBillstatus = '4'
             let formDate = new window.FormData()
             formDate.append('tFee',JSON.stringify(this.queryParams))
             formDate.append("tFeeDo", JSON.stringify(this.DzfeeList))

src/views/finance/payment/index.vue

@@ -323,7 +323,7 @@
         <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="immediateApproval">审批</el-button>
-        <el-button type="primary" v-if="notChange" @click="addOrUpdateHandle">查看审批流</el-button>
+        <el-button type="primary" v-if="queryParams.fBillstatus >= '3'" @click="addOrUpdateHandle">查看审批流</el-button>
         <el-button type="primary" @click="submitForm" :disabled="notChange">保 存</el-button>
         <el-button v-if="cancelButton === true" @click="cancel">取 消</el-button>
         <el-button v-if="cancelButton === false" @click="homePage">取 消</el-button>
@@ -549,7 +549,7 @@ export default {
       Operator:'',
       approve:false,
       addOrUpdateVisible: false,
-      contrastId:220,
+      contrastId:230,
       tablefilter:false,
       hide:false,
       openPrint:false,
@@ -740,6 +740,7 @@ export default {
         this.Xbutton = false
         this.approval = JSON.parse(this.approval)
         this.hide = false
+        this.tablefilter = true
         this.notChange = true
         this.approve = true
         this.cancelButton = false
@@ -918,13 +919,13 @@ export default {
       this.$refs['ruless'].validate(valid => {
         if (valid) {
           if(this.increase_s.length){
-            this.queryParams.fBillstatus = '4'
+            // this.queryParams.fBillstatus = '4'
             let formDate = new window.FormData()
             formDate.append('tFee', JSON.stringify(this.queryParams))
             formDate.append('tFeeDo', JSON.stringify(this.increase_s))
             collectFee(formDate).then(response => {
-              this.open = false
               this.msgSuccess('操作成功')
+              this.open = false
               this.getList()
             })
           }else {