Merge branch 'yxh' of http://116.62.18.175:6699/r/~yxh/opo-web

yxh

3 小时以前 c75027743ea7c3ecc2d0885f01d11d2ad78679a3

 src/views/project/tallage/index.vue

@@ -1,6 +1,7 @@
<template>
  <div class="app-container">
    <el-form
      class="opo-query-form"
      :model="queryParams"
      ref="queryForm"
      :inline="true"
@@ -82,37 +83,41 @@
        label="申请日期"
        align="center"
        prop="createTime"
        width="180"
        width="140"
      >
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
        </template>
      </el-table-column>
      <el-table-column label="经办人" align="center" prop="username" />
      <!-- <el-table-column label="经办人" align="center" prop="username" /> -->
      <el-table-column
        label="申请单号"
        width="180"
        width="160"
        align="center"
        prop="applyno"
      />

      <el-table-column label="税前金额" align="center" prop="pretaxamount">
      <el-table-column label="税前金额" align="center" prop="pretaxamount" width="100" > 
      </el-table-column>
      <el-table-column label="扣税金额" align="center" prop="taxMoney" />
      <el-table-column label="税后金额" align="center" prop="taxedamount" />
      <el-table-column label="是否算税" width="180" align="center" prop="istax">
      <el-table-column label="扣税金额" align="center" prop="taxMoney" width="100" />
      <el-table-column label="税后金额" align="center" prop="taxedamount" width="100" />
      <el-table-column label="是否算税" align="center" prop="istax" width="90" >
        <template slot-scope="scope">
          <dict-tag
            :options="dict.type.sys_calculate"
            :options="dict.type.sys_0_1"
            :value="scope.row.istax"
          />
        </template>
      </el-table-column>
      <el-table-column label="总金额" align="center" prop="taxamount" />
      <!-- <el-table-column label="总金额" align="center" prop="taxamount" /> -->

      <el-table-column label="算税时间" align="center" prop="taxedtime" />
      <el-table-column label="付款状态" align="center" prop="isdistribute" />
      <el-table-column label="付款日期" align="center" prop="riqi" />
      <el-table-column label="付款状态" align="center" prop="isdistribute" width="100" >
        <template slot-scope="scope">
          <span>{{ scope.row.isdistribute == "0" ? "未付款" : "已付款" }}</span>
        </template>
      </el-table-column>
      <el-table-column label="付款日期" align="center" prop="riqi" width="120" />
      <el-table-column label="操作" width="280" align="center">
        <template slot-scope="scope">
          <el-button
@@ -216,7 +221,7 @@

export default {
  name: "Donorcharge",
  dicts: ["sys_gathering", "sys_calculate"],
  dicts: ["Collection_status", "sys_0_1"],
  components: {
    OrgSelecter
  },
@@ -385,7 +390,7 @@
    /** 修改按钮操作 */
    handleUpdate(row) {
      this.$router.push({
        path: "/cost/computingBill",
        path: "/finance/computingBill",
        query: { id: row.id, operation: "update", data: row }
      });
    },
@@ -393,7 +398,7 @@
    /** 详情查看按钮操作 */
    handleDetail(row) {
      this.$router.push({
        path: "/cost/computingBill",
        path: "/finance/computingBill",
        query: { id: row.id, operation: "detail", data: row }
      });
    },