收款单审核更新

src/views/ecw/financial/receiptDetail.vue

@@ -259,7 +259,7 @@
         </el-table-column>
         <el-table-column :label="$t('操作')" align="center" width="200">
           <template slot-scope="scope">
-            <el-button v-if="scope.row.status == 0" v-hasPermi="['ecw:payment:detail:delete']" type="text" @click="deleteClick(scope.row)">{{ $t('删除') }}</el-button>
+            <el-button v-if="scope.row.status == 0 || scope.row.status == 1" v-hasPermi="['ecw:payment:detail:delete']" type="text" @click="deleteClick(scope.row)">{{ $t('删除') }}</el-button>
             <el-button v-if="scope.row.status == 0" type="text" @click="detailClick(scope.row)" v-hasPermi="['ecw:payment:detail:detail']">{{ $t('详情') }}</el-button>
             <el-button v-if="scope.row.status == 0" type="text" @click="$router.push(`bankDetail?id=`+id+`&bankId=`+scope.row.id)" v-hasPermi="['ecw:payment:detail:writeOff']">{{ $t('核销') }}</el-button>
             <el-button v-if="scope.row.status == 1" type="text" @click="showCancel(scope.$index)" v-hasPermi="['ecw:payment:detail:cancelWriteOff']">{{ $t('反核销') }}</el-button>
@@ -857,15 +857,17 @@ export default {
       var receiptItemId = this.detailed[this.selectIndex].id
       if(this.cancelType==1){
         cancelFinanceReceiptItemWriteOff({receiptItemId:receiptItemId,remark:this.cancelReason}).then(res=>{
-          this.$message.success(this.$t("提交成功"));
           this.cancelShow = false
           this.getList()
+          this.$message.success(this.$t("提交成功"));
+
         });
       }else{
         cancelFinanceReceiptItemWriteOffNo({receiptItemId:receiptItemId,remark:this.cancelReason}).then(res=>{
-          this.$message.success(this.$t("提交成功"));
           this.cancelShow = false
           this.getList()
+          this.$message.success(this.$t("提交成功"));
+
         });
       }
 
@@ -978,6 +980,7 @@ export default {
         .confirm(this.$t('您确认要反核销吗')+'?')
         .then(()=>{
           financeReceiptItemWriteOffNo({receiptId:this.id,receiptNo:this.form.receiptNo,receiptItemId:id,remark:this.reason}).then(res=>{
+              this.getList();
               this.$message.success(this.$t("提交成功"));
               this.dialogVisible = false
             });
@@ -1015,7 +1018,7 @@ export default {
       this.$modal
         .confirm(this.$t('您确认要全部核销吗'+'?'))
         .then(() => {
-          return financeReceiptWriteOff({receiptId:this.id,receiptNo:form.receiptNo});
+          return financeReceiptWriteOff({receiptId:this.id,receiptNo:this.form.receiptNo});
         })
         .then(() => {
           this.$modal.msgSuccess(this.$t('核销成功'));

src/views/ecw/financial/voucher.vue

@@ -175,7 +175,7 @@
           <el-button
             size="mini"
             type="text"
-            v-if="scope.row.state == 9 || scope.row.state == 7 || scope.row.state == 11"
+            v-if="scope.row.state == 9 || scope.row.state == 7 || scope.row.state == 11|| scope.row.state == 10"
             v-hasPermi="['ecw:voucher:cancelWriteOff']"
             @click="$router.push(`/bpm/process-instance/detail?id=`+scope.row.bmpId)"
             >{{ $t('审核详情') }}</el-button
@@ -418,21 +418,24 @@ export default {
       var receiptId = this.list[this.selectIndex].id
       if(this.cancelIndex==1){
             cancelFinanceReceiptApproval({receiptId:receiptId,remark:this.cancelReason}).then(res=>{
-              this.$message.success(this.$t("提交成功"));
               this.cancelShow = false
               this.getList();
+              this.$message.success(this.$t("提交成功"));
+
             });
       }else if(this.cancelIndex ==2){
           cancelFinanceReceiptApprovalNo({receiptId:receiptId,remark:this.cancelReason}).then(res=>{
-            this.$message.success(this.$t("提交成功"));
             this.cancelShow = false
             this.getList();
+            this.$message.success(this.$t("提交成功"));
+
           });
       }else{
           cancelFinanceReceiptWriteOffNo({receiptId:receiptId,remark:this.cancelReason}).then(res=>{
-            this.$message.success(this.$t("提交成功"));
             this.cancelShow = false
             this.getList();
+            this.$message.success(this.$t("提交成功"));
+
           });
       }
 
@@ -448,6 +451,7 @@ export default {
           .confirm(this.$t('您确认要反审核吗')+'?')
           .then(()=>{
             financeApproveNo({receiptId:receiptIdData.id,receiptNo:receiptIdData.receiptNo,remark:this.reason}).then(res=>{
+              this.getList();
               this.$message.success(this.$t("提交成功"));
               this.dialogVisible = false
               // this.$store.dispatch('tagsView/delCurrentView')
@@ -459,6 +463,7 @@ export default {
           .confirm(this.$t('您确认要反核销吗')+'?')
           .then(()=>{
             financeReceiptWriteOffNo({receiptId:receiptIdData.id,receiptNo:receiptIdData.receiptNo,remark:this.reason}).then(res=>{
+              this.getList();
               this.$message.success(this.$t("提交成功"));
               this.dialogVisible = false
               // this.$store.dispatch('tagsView/delCurrentView')