首页收费付费作业费提交

src/api/agreement/agreement.js

@@ -83,11 +83,29 @@ export function updateAgreements(fId, fStatus) {
     method: 'put',
     data: {
       fId:fId,
-      fBillstatus:fStatus
+      fStatus:fStatus
     }
   })
 }
 
+// 撤销作业费
+export function backCharge(data) {
+  return request({
+    url: '/warehouseBusiness/agreementTask/revoke',
+    method: 'post',
+    data: data
+  })
+}
+
+// 撤销审批
+export function revocation(data) {
+  return request({
+    url: '/warehouse/paths/revoke',
+    method: 'post',
+    data: data
+  })
+}
+
 // 删除仓储费
 export function delAgreement(fId) {
   return request({

src/layout/components/TagsView/index.vue

@@ -150,6 +150,7 @@ export default {
     closeSelectedTag(view) {
       this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => {
         if (this.isActive(view)) {
+          console.log(view)
           this.toLastView(visitedViews, view)
         }
       })

src/views/agreement/agreementTask/index.vue

@@ -152,16 +152,26 @@
         </template>
       </el-table-column>
       <!--      <el-table-column label="状态" align="center" prop="fId" />-->
-      <el-table-column label="状态" align="center" prop="fBillstatus">
+      <el-table-column label="是否启用" align="center" prop="fStatus">
         <template slot-scope="scope">
           <el-switch
-            v-model="scope.row.fBillstatus"
+            v-model="scope.row.fStatus"
             active-value="0"
             inactive-value="1"
             @change="handleStatusChange(scope.row)"
           ></el-switch>
         </template>
       </el-table-column>
+      <el-table-column label="状态" align="center" prop="fBillstatus">
+        <template slot-scope="scope">
+          <span v-if="scope.row.fBillstatus == '1'">保存</span>
+          <span v-else-if="scope.row.fBillstatus == '2'">暂存</span>
+          <span v-else-if="scope.row.fBillstatus == '3'">审批驳回</span>
+          <span v-else-if="scope.row.fBillstatus == '4'">提交审核</span>
+          <span v-else-if="scope.row.fBillstatus == '5'">审核中</span>
+          <span v-else-if="scope.row.fBillstatus == '6'">审核完成</span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -169,6 +179,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
+            v-if="scope.row.fBillstatus <= 3"
             v-hasPermi="['warehouseBusiness:agreement:edit']"
           >修改
           </el-button>
@@ -177,9 +188,28 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
+            v-if="scope.row.fBillstatus <= 3"
             v-hasPermi="['warehouseBusiness:agreement:remove']"
           >删除
           </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="speed(scope.row,0)"
+            v-if="scope.row.fBillstatus == 6"
+            v-hasPermi="['warehouseBusiness:agreement:remove']"
+          >查看
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="speed(scope.row,1)"
+            v-if="scope.row.fBillstatus == 4 || scope.row.fBillstatus == 5"
+            v-hasPermi="['warehouseBusiness:agreement:remove']"
+          >审批进度
+          </el-button>
         </template>
       </el-table-column>
       <!--      <el-table-column label="业务编号" align="center" prop="fBillno" />-->
@@ -201,7 +231,7 @@
     />
 
     <!-- 添加或修改作业费对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="65%" append-to-body :before-close="handleClose" :close-on-click-modal="false">
+    <el-dialog :title="title" :visible.sync="open" :show-close="Xbutton" width="65%" append-to-body :before-close="handleClose" :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px"
                style="display: flex;flex-wrap: wrap;"
       >
@@ -211,6 +241,7 @@
             filterable
             remote
             clearable
+            :disabled="prohibit"
             style="width: 200px"
             @keyup.enter.native="handleQuery"
             :remote-method="corpsRemoteMethod"
@@ -232,6 +263,7 @@
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.fBegindate"
                           type="date"
+                          :disabled="prohibit"
                           value-format="yyyy-MM-dd"
                           placeholder="选择有效期起"
           >
@@ -241,17 +273,18 @@
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.fEnddate"
                           type="date"
+                          :disabled="prohibit"
                           value-format="yyyy-MM-dd"
                           placeholder="选择有效期至"
           >
           </el-date-picker>
         </el-form-item>
         <el-form-item label="协议编号" prop="fContractno">
-          <el-input v-model="form.fContractno" placeholder="请输入协议编号" style="width: 200px"/>
+          <el-input v-model="form.fContractno" placeholder="请输入协议编号" :disabled="prohibit" style="width: 200px"/>
         </el-form-item>
 
         <el-form-item label="商品类别" prop="tPackages">
-          <el-select v-model="form.tPackages" placeholder="请选择商品类别">
+          <el-select v-model="form.tPackages" placeholder="请选择商品类别" :disabled="prohibit">
             <el-option
               v-for="dict in fTypeidOptions"
               :key="dict.dictValue"
@@ -262,10 +295,12 @@
           </el-select>
         </el-form-item>
       </el-form>
-      <el-button @click="confirmCharge"  type="primary">请 核</el-button>
+      <el-button @click="confirmCharge" v-if="form.fBillstatus < 4" type="primary">请 核</el-button>
+      <el-button @click="revokeCharge" v-if="form.fBillstatus == 6" type="danger">撤销请核</el-button>
+      <el-button @click="revocationApproval" v-if="form.fBillstatus == 4" type="danger">撤销审批</el-button>
       <div class="dialogTableTitle flex a-center jlr">
-        <h2>标题</h2>
-        <el-button @click="getList_s()">新增</el-button>
+        <h2>作业费明细</h2>
+        <el-button @click="getList_s" :disabled="prohibit">新增</el-button>
       </div>
       <el-table v-loading="loading_s" :data="agreementitemsList" @selection-change="handleSelectionChange">
         <!--        <el-table-column type="selection" width="55" align="center"/>-->
@@ -326,6 +361,7 @@
             slot-scope="scope"
             v-model="scope.row.fPrice"
             placeholder="请输入单价"
+            :disabled="prohibit"
             clearable
             size="small"
           />
@@ -358,6 +394,7 @@
               size="mini"
               type="text"
               icon="el-icon-delete"
+              :disabled="prohibit"
               @click.native.prevent="deleteRow(scope.$index, agreementitemsList)"
             >删除
             </el-button>
@@ -365,8 +402,12 @@
         </el-table-column>
       </el-table>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button v-if="approvalProhibit" @click="immediateApproval">审批</el-button>
+        <el-button v-if="form.fBillstatus > 2" @click="viewAudit">查看审批</el-button>
+        <el-button type="primary" @click="submitForm" :disabled="determine">确 定</el-button>
         <el-button @click="cancel">取 消</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>
       </div>
     </el-dialog>
   </div>
@@ -384,27 +425,36 @@ import {
   listAgreementitems,
   queryUserVal,
   updateAgreements,
-  collecTask
+  collecTask,
+  backCharge,
+  revocation
 } from '@/api/agreement/agreement'
 import { listCorps } from '@/api/basicdata/corps'
 import { listGoods } from '@/api/basicdata/goods'
-import { delWarehousebills } from '@/api/warehouseBusiness/warehouseInStock'
-import { listGoodsTransfer } from '@/api/warehouseBusiness/goodsTransfer'
 import { listFees } from '@/api/basicdata/fees'
-import { updateAgreement_s } from '@/api/warehouseBusiness/agreement'
-import {collectFee} from "@/api/finance/charge";
-// import { listUser, queryUserVal } from '@/api/system/user'
+import AddOrUpdate from '@/views/viewApproval'
+import ApprovalComments from '@/views/startApproval'
+import Global from "@/layout/components/global.js";
 
 export default {
   name: 'Agreement',
-  components: {},
+  components: {
+    AddOrUpdate,
+    ApprovalComments
+  },
   data() {
     return {
       dataList: '',
       // 遮罩层
       loading: true,
+      determine:false,
+      approvalProhibit:false,
       loading_s: false,
       browseStatus: false,
+      Xbutton:true,
+      prohibit:false,
+      addOrUpdateVisible:false,
+      addOrUpdateVisib:false,
       // 计价单位
       jFeetunitOptions: [
         { dictLabel: "件数", dictValue: "1" },
@@ -497,7 +547,95 @@ export default {
     //   this.jFeetunitOptions = response.data;
     // });
   },
+  activated(){
+    this.adoPt()
+  },
   methods: {
+    immediateApproval(){
+      this.addOrUpdateVisib = true
+      console.log(this.approval)
+      this.$nextTick(() => {
+        this.$refs.ApprovalComments.init(this.approval.billId,320)
+      })
+    },
+    adoPt(){
+      this.approval = this.$route.query.data
+      if (this.approval){
+        this.determine = true
+        this.prohibit = true
+        this.browseStatus = true
+        this.Xbutton = false
+        this.approval = JSON.parse(this.approval)
+        this.approvalProhibit = true
+        this.reset()
+        this.pass = {
+          fAmtdr: '',    //应收合计
+          fAmtcr: '',    //应付合计
+          fMblno: '',    //提单号
+          fName: '',      //货权方
+          fFeesName: '',   //结算单位
+          fCorpid: ''     //结算单位ID
+        }
+        getAgreement(this.approval.billId).then(response => {
+
+          console.log(this.deptName)
+          console.log(response)
+          this.deptName = response.data.dept.deptName
+          this.form = response.data.tWarehouseAgreement
+          this.fMblnoOptions = response.data.corps
+          this.agreementitemsList = response.data.tWarehouseAgreementitems
+          for (let item in this.agreementitemsList) {
+            this.$set(this.agreementitemsList[item], 'fFeeunitid', this.agreementitemsList[item].fFeeunitid + '')
+          }
+          this.fWbuOptions = response.data.feesList
+          console.log(JSON.stringify(this.agreementitemsList))
+
+          this.open = true
+          this.title = '修改作业费'
+        })
+      }
+    },
+    viewAudit(){
+      this.addOrUpdateVisible = true
+      this.addOrUpdateVisib = false
+
+      console.log(this.form)
+      let id = '448'
+      let actId = '110'
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.init(this.form.fId,320)
+      })
+    },
+    returnData(){
+      this.open = false
+      this.addOrUpdateVisib = false
+      this.homePage()
+    },
+    getDataList(){
+      this.open = false
+      this.addOrUpdateVisible = false
+      this.homePage()
+    },
+    homePage(){
+      let view = {
+        fullPath: "/agreement/agreementTask",
+        hash: "",
+        matched: Array(2),
+        meta: Object,
+        name: "AgreementTask",
+        params: Object,
+        path: "/agreement/agreementTask",
+        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);
+    },
     test_s(){
       console.log(this.agreementitemsList)
     },
@@ -532,32 +670,113 @@ export default {
         //格式化时间戳
         // this.$set(this.agreementitemsList, "createTime", moment(Date.parse(new Date())).format("YYYY-MM-DD HH:mm:ss"));
       });
-
-
       listAgreementitems(this.queryParams).then(response => {
         console.log(response)
       })
     },
+    speed(row,res){
+      if(res == 1){
+        this.determine = true
+        this.prohibit = true
+        this.browseStatus = true
+        this.approvalProhibit = false
+        this.reset()
+        const fId = row.fId || this.ids
+        getAgreement(fId).then(response => {
+          console.log(this.deptName)
+          console.log(response)
+          this.deptName = response.data.dept.deptName
+          this.form = response.data.tWarehouseAgreement
+          this.fMblnoOptions = response.data.corps
+          this.agreementitemsList = response.data.tWarehouseAgreementitems
+          for (let item in this.agreementitemsList) {
+            this.$set(this.agreementitemsList[item], 'fFeeunitid', this.agreementitemsList[item].fFeeunitid + '')
+          }
+          this.fWbuOptions = response.data.feesList
+          console.log(JSON.stringify(this.agreementitemsList))
+
+          this.open = true
+          this.title = '查看作业费'
+        })
+      }else {
+        this.prohibit = true
+        this.determine = true
+        this.browseStatus = true
+        this.approvalProhibit = false
+        this.reset()
+        const fId = row.fId || this.ids
+        getAgreement(fId).then(response => {
+          console.log(this.deptName)
+          console.log(response)
+          this.deptName = response.data.dept.deptName
+          this.form = response.data.tWarehouseAgreement
+          this.fMblnoOptions = response.data.corps
+          this.agreementitemsList = response.data.tWarehouseAgreementitems
+          for (let item in this.agreementitemsList) {
+            this.$set(this.agreementitemsList[item], 'fFeeunitid', this.agreementitemsList[item].fFeeunitid + '')
+          }
+          this.fWbuOptions = response.data.feesList
+          console.log(JSON.stringify(this.agreementitemsList))
+
+          this.open = true
+          this.title = '查看作业费'
+        })
+      }
+    },
+    revocationApproval(){
+      let  data = {
+        id:this.form.fId,
+        actId: 320,
+        billId:this.form.fId
+      }
+      console.log(this.form)
+      revocation(data).then(data =>{
+        console.log(data)
+        if (data.code === 200){
+          this.$message.success('撤销成功');
+          this.open = false
+          this.getList()
+        }
+      })
+    },
     // 请核
     confirmCharge() {
-      console.log(this.form)
-      this.$refs['form'].validate(valid => {
-        if (valid) {
-          if (this.form.fId != null) {
-            updateAgreement(this.form).then(response => {
-              let formData = new window.FormData();
-              // 附件数据
-              formData.append("agreement",JSON.stringify(this.form))
-              formData.append("agreementitems", JSON.stringify(this.agreementitemsList));
-              collecTask(formData).then(response => {
-                this.msgSuccess('请核成功')
-                this.open = false
-                this.getList()
-                this.agreementitemsList = []
+      console.log(this.agreementitemsList)
+      if(this.agreementitemsList.length !== 0){
+        this.$refs['form'].validate(valid => {
+          if (valid) {
+            if (this.form.fId != null) {
+              updateAgreement(this.form).then(response => {
+                let formData = new window.FormData();
+                // 附件数据
+                this.form.fBillstatus = 4
+                formData.append("agreement",JSON.stringify(this.form))
+                formData.append("agreementitems", JSON.stringify(this.agreementitemsList));
+                collecTask(formData).then(response => {
+                  this.msgSuccess('请核成功')
+                  this.open = false
+                  this.getList()
+                  this.agreementitemsList = []
+                })
               })
-            })
+            }
           }
-        }
+        })
+      }else {
+        this.$message.error('作业费明细为空无法操作');
+      }
+    },
+    // 撤销作业费
+    revokeCharge(){
+      this.form.fBillstatus = '1'
+      let formDate = new window.FormData()
+      formDate.append('agreement', JSON.stringify(this.form))
+      formDate.append('agreementitems', JSON.stringify(this.agreementitemsList))
+      backCharge(formDate).then(response => {
+        console.log(response)
+        this.open = false
+        this.msgSuccess('操作成功')
+        this.getList()
       })
     },
     /* 远程模糊查询商品 */
@@ -686,18 +905,23 @@ export default {
     },
     // 作业费状态修改
     handleStatusChange(row) {
-      let text = row.fBillstatus === "0" ? "启用" : "停用";
-      this.$confirm('确认要"' + text + '""' + row.fCorpid + '"用户吗?', "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(function() {
-        return updateAgreements(row.fId, row.fBillstatus);
-      }).then(() => {
-        this.msgSuccess(text + "成功");
-      }).catch(function() {
-        row.fBillstatus = row.fBillstatus === "0" ? "1" : "0";
-      });
+      if (row.fBillstatus == '6'){
+        let text = row.fStatus === "0" ? "启用" : "停用";
+        this.$confirm('确认要"' + text + '""' + row.fCorpid + '"用户吗?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return updateAgreements(row.fId, row.fStatus);
+        }).then(() => {
+          this.msgSuccess(text + "成功");
+        }).catch(function() {
+          row.fStatus = row.fStatus === "0" ? "1" : "0";
+        });
+      }else {
+        row.fStatus = 0
+        this.$message.error('审核完成时才能启用');
+      }
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -750,7 +974,6 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      console.log(this.form)
       this.$refs['form'].validate(valid => {
         if (valid) {
           if (this.form.fId != null) {
@@ -761,9 +984,7 @@ export default {
               formData.append("agreementitems", JSON.stringify(this.agreementitemsList));
               addAgreement(formData).then(response => {
                 this.msgSuccess('修改成功')
-                this.open = false
                 this.getList()
-                this.agreementitemsList = []
               })
             })
           } else {
@@ -773,9 +994,7 @@ export default {
             formData.append("agreementitems", JSON.stringify(this.agreementitemsList));
             addAgreement(formData).then(response => {
               this.msgSuccess('新增成功')
-              this.open = false
               this.getList()
-              this.agreementitemsList = []
             })
           }
         }

src/views/finance/charge/index.vue

@@ -637,31 +637,31 @@ export default {
       // 表单校验
       ruless: {
         fCtrlcorpid: [
-          { required: true, message: '货权方不能为空', trigger: 'blur' }
+          { required: true, message: ' ', trigger: 'blur' }
         ],
         fCorpid: [
-          { required: true, message: '结算单位不能为空', trigger: 'blur' }
+          { required: true, message: ' ', trigger: 'blur' }
         ],
         fAccbilldate: [
-          { required: true, message: '对账日期不能为空', trigger: 'blur' }
+          { required: true, message: ' ', trigger: 'blur' }
         ]
       },
       // 表单校验
       rules: {
         fBilltype: [
-          { required: true, message: '单据类型', trigger: 'change' }
+          { required: true, message: ' ', trigger: 'change' }
         ],
         fBillstatus: [
-          { required: true, message: '状态不能为空', trigger: 'blur' }
+          { required: true, message: ' ', trigger: 'blur' }
         ],
         fDeptid: [
-          { required: true, message: '制单部门不能为空', trigger: 'blur' }
+          { required: true, message: ' ', trigger: 'blur' }
         ],
         fToCorpid: [
-          { required: true, message: '结算单位不能为空', trigger: 'blur' }
+          { required: true, message: ' ', trigger: 'blur' }
         ],
         timeExamine: [
-          { required: true, message: '审核日期不能为空', trigger: 'blur' }
+          { required: true, message: ' ', trigger: 'blur' }
         ]
       }
     }
@@ -673,7 +673,6 @@ export default {
   created() {
     this.getList()
     this.register()
-
   },
   activated(){
     this.adoPt()
@@ -696,6 +695,33 @@ export default {
     },
     returnData(){
       this.addOrUpdateVisib = false
+      this.open = false
+      this.homepaGe()
+    },
+    getDataList(){
+      this.open = false
+      this.addOrUpdateVisible = false
+      this.homepaGe()
+    },
+    homepaGe(){
+      let view = {
+        fullPath: "/finance/charge",
+        hash: "",
+        matched: Array(2),
+        meta: Object,
+        name: "Charge",
+        params: Object,
+        path: "/finance/charge",
+        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);
     },
     adoPt(){
       this.approval = this.$route.query.data
@@ -761,9 +787,6 @@ export default {
         this.$refs.ApprovalComments.init(this.approval.billId,this.approval.actId)
       })
     },
-    getDataList(){
-      this.addOrUpdateVisible = false
-    },
     // 查看审批流
     addOrUpdateHandle(){
       this.addOrUpdateVisible = true
@@ -1214,20 +1237,19 @@ export default {
             formData.append('tFeeDo', JSON.stringify(this.increase_s))
             addCharge(formData).then(response => {
               this.msgSuccess('新增成功')
-              this.increase_s = []
+              // this.increase_s = []
               // this.open = false
               this.getList()
             })
           } else {
             console.log(this.queryParams)
-            // this.chargeList.fBillstatus = '1'
             this.queryParams.fBillstatus = '1'
             let formData = new window.FormData()
             formData.append('tFee', JSON.stringify(this.queryParams))
             formData.append('tFeeDo', JSON.stringify(this.increase_s))
             addCharge(formData).then(response => {
               this.msgSuccess('修改成功')
-              this.increase_s = []
+              // this.increase_s = []
               // this.open = false
               this.getList()
             })

src/views/finance/payment/index.vue

@@ -264,9 +264,9 @@
         </el-form-item>
       </el-form>
       <div style="width: 100%;">
-        <el-button type="warning" size="small" @click="charGe" :disabled="notChange" v-if="queryParams.fBillstatus < '4'">收费</el-button>
-        <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="warning" size="small" @click="charGe" :disabled="notChange" v-if="queryParams.fBillstatus < '4'">付费</el-button>
+        <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" :disabled="notChange">打印</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>
@@ -637,31 +637,31 @@ export default {
       // 表单校验
       ruless: {
         fCtrlcorpid: [
-          { required: true, message: '货权方不能为空', trigger: 'blur' }
+          { required: true, message: ' ', trigger: 'blur' }
         ],
         fCorpid: [
-          { required: true, message: '结算单位不能为空', trigger: 'blur' }
+          { required: true, message: ' ', trigger: 'blur' }
         ],
         fAccbilldate: [
-          { required: true, message: '对账日期不能为空', trigger: 'blur' }
+          { required: true, message: ' ', trigger: 'blur' }
         ]
       },
       // 表单校验
       rules: {
         fBilltype: [
-          { required: true, message: '单据类型', trigger: 'change' }
+          { required: true, message: ' ', trigger: 'change' }
         ],
         fBillstatus: [
-          { required: true, message: '状态不能为空', trigger: 'blur' }
+          { required: true, message: ' ', trigger: 'blur' }
         ],
         fDeptid: [
-          { required: true, message: '制单部门不能为空', trigger: 'blur' }
+          { required: true, message: ' ', trigger: 'blur' }
         ],
         fToCorpid: [
-          { required: true, message: '结算单位不能为空', trigger: 'blur' }
+          { required: true, message: ' ', trigger: 'blur' }
         ],
         timeExamine: [
-          { required: true, message: '审核日期不能为空', trigger: 'blur' }
+          { required: true, message: ' ', trigger: 'blur' }
         ]
       }
     }
@@ -695,8 +695,36 @@ export default {
       })
     },
     returnData(){
+      this.open = false
       this.addOrUpdateVisib = false
+      this.homepaGe()
+    },
+    getDataList(){
+      this.open = false
+      this.addOrUpdateVisible = false
+      this.homepaGe()
+    },
+    homepaGe(){
+      let view = {
+        fullPath: "/finance/payment",
+        hash: "",
+        matched: Array(2),
+        meta: Object,
+        name: "Payment",
+        params: Object,
+        path: "/finance/payment",
+        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);
     },
+
     adoPt(){
       this.approval = this.$route.query.data
       if (this.approval){
@@ -724,22 +752,22 @@ export default {
           this.fWbuOptions = response.data.feesList
           this.fMblnoOptions = response.data.corps
           this.open = true
-          this.title = '修改收费列表'
+          this.title = '修改付费列表'
         })
       }
     },
     homePage(){
       this.open = false
       let view = {
-        fullPath: "/finance/charge",
+        fullPath: "/finance/payment",
         hash: "",
         matched: Array(2),
         meta: Object,
-        name: "Charge",
+        name: "Payment",
         params: Object,
-        path: "/finance/charge",
+        path: "/finance/payment",
         query: Object,
-        title: "收费"
+        title: "付费",
       }
       this.$router.push({ path: '/index'})
       this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => {
@@ -761,9 +789,6 @@ export default {
         this.$refs.ApprovalComments.init(this.approval.billId,this.approval.actId)
       })
     },
-    getDataList(){
-      this.addOrUpdateVisible = false
-    },
     // 查看审批流
     addOrUpdateHandle(){
       this.addOrUpdateVisible = true
@@ -776,7 +801,7 @@ export default {
       })
     },
 
-    // 撤销收费
+    // 撤销付费
     revokeCharge(){
       this.queryParams.fBillstatus = '1'
       let formDate = new window.FormData()
@@ -802,7 +827,7 @@ export default {
         this.fWbuOptions = response.data.feesList
         this.fMblnoOptions = response.data.corps
         this.open = true
-        this.title = '收费列表'
+        this.title = '付费列表'
         console.log(this.Lander)
         console.log(this.Operator)
         this.tablefilter = true
@@ -1196,7 +1221,7 @@ export default {
         this.fWbuOptions = response.data.feesList
         this.fMblnoOptions = response.data.corps
         this.open = true
-        this.title = '修改收费列表'
+        this.title = '修改付费列表'
       })
     },
     /** 提交按钮 */
@@ -1214,7 +1239,7 @@ export default {
             formData.append('tFeeDo', JSON.stringify(this.increase_s))
             addCharge(formData).then(response => {
               this.msgSuccess('新增成功')
-              this.increase_s = []
+              // this.increase_s = []
               // this.open = false
               this.getList()
             })
@@ -1227,7 +1252,7 @@ export default {
             formData.append('tFeeDo', JSON.stringify(this.increase_s))
             addCharge(formData).then(response => {
               this.msgSuccess('修改成功')
-              this.increase_s = []
+              // this.increase_s = []
               // this.open = false
               this.getList()
             })

src/views/startApproval.vue

@@ -90,32 +90,32 @@ import Global from '@/layout/components/global'
                 }
               })
               this.visible = true
-              this.homePage()
+              // this.homePage()
             } else {
               this.$message.error(data.msg)
             }
           })
       },
-      homePage(){
-        let view = {
-          fullPath: "/finance/charge",
-          hash: "",
-          matched: Array(2),
-          meta: Object,
-          name: "Charge",
-          params: Object,
-          path: "/finance/charge",
-          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);
-      },
+      // homePage(){
+      //   let view = {
+      //     fullPath: "/finance/charge",
+      //     hash: "",
+      //     matched: Array(2),
+      //     meta: Object,
+      //     name: "Charge",
+      //     params: Object,
+      //     path: "/finance/charge",
+      //     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);
+      // },
       approvalRejected () {
         this.dataForm.auditUserId = ''
         this.$confirm(`是否驳回审批?`, '提示', {
@@ -130,12 +130,13 @@ import Global from '@/layout/components/global'
                 message: '驳回审批',
                 type: 'success',
                 duration: 600,
-                onClose: () => {
-                  this.closeDia()
-                }
+                // onClose: () => {
+                //   this.closeDia()
+                // }
               })
               this.visible = true
-              this.homePage()
+              this.closeDia()
+              // this.homePage()
             } else {
               this.$message.error(data.msg)
             }
@@ -148,7 +149,7 @@ import Global from '@/layout/components/global'
       },
       closeDia () {
         this.visible = false
-        this.$emit('returnApproval', this.dataForm.id, false)
+        this.$emit('refreshDataList', this.dataForm.id, false)
         Object.assign(this.$data, this.$options.data.call(this))
       }
     }