yxh
13 小时以前 38c26c3049d55ffda598ce0263498448b7c60834
增加增值税城建税
已修改16个文件
429 ■■■■■ 文件已修改
src/views/project/distributedetail/index.vue 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/donateconsolationfund/index.vue 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fund/applyDetail/index.vue 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fund/applyDetail0/index.vue 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fund/ethicalExpertFeeApply/index.vue 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fund/expertFeeApply/index.vue 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fund/officeExpenseApply/index.vue 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fund/performancedetails/index.vue 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fundcheck/expertFeeCheck/index.vue 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fundcheck/medicalCostCheck/index.vue 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fundcheck/officeExpenseCheck/index.vue 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/funddetail/index.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/tallage/computingBill/index.vue 207 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/tallage/index.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/travelexpensedeal/index.vue 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/distributedetail/index.vue
@@ -211,8 +211,11 @@
      <el-table-column label="数量" align="center" prop="quantity" />
      <el-table-column label="价格" align="center" prop="price" />
      <el-table-column label="申请金额" align="center" prop="amount" />
      <el-table-column label="扣税金额" align="center" prop="taxamount" />
      <el-table-column label="税后金额" align="center" prop="taxedamount" />
      <el-table-column label="增值税" align="center" prop="vatAmount" />
      <el-table-column label="城建税" align="center" prop="cityTaxAmount" />
      <el-table-column label="劳务税前" align="center" prop="laborPretaxAmount" />
      <el-table-column label="劳务个税" align="center" prop="taxamount" />
      <el-table-column label="劳务税后" align="center" prop="taxedamount" />
      <el-table-column label="预支金额" align="center" prop="prepaidamount" />
      <el-table-column label="备注" align="center" prop="remark" />
      <el-table-column label="记录状态" align="center" prop="recordstatus" />
@@ -348,11 +351,11 @@
        <el-form-item label="申请金额" prop="amount">
          <el-input v-model="form.amount" placeholder="请输入申请金额" />
        </el-form-item>
        <el-form-item label="扣税金额" prop="taxamount">
          <el-input v-model="form.taxamount" placeholder="请输入扣税金额" />
        <el-form-item label="劳务个税" prop="taxamount">
          <el-input v-model="form.taxamount" placeholder="请输入劳务个税" />
        </el-form-item>
        <el-form-item label="税后金额" prop="taxedamount">
          <el-input v-model="form.taxedamount" placeholder="请输入税后金额" />
        <el-form-item label="劳务税后" prop="taxedamount">
          <el-input v-model="form.taxedamount" placeholder="请输入劳务税后" />
        </el-form-item>
        <el-form-item label="预支金额" prop="prepaidamount">
          <el-input v-model="form.prepaidamount" placeholder="请输入预支金额" />
src/views/project/donateconsolationfund/index.vue
@@ -526,25 +526,43 @@
              </template>
            </el-table-column>
            <el-table-column
              prop="vatAmount"
              align="center"
              label="增值税"
              width="120"
            />
            <el-table-column
              prop="cityTaxAmount"
              align="center"
              label="城建税"
              width="120"
            />
            <el-table-column
              prop="laborPretaxAmount"
              align="center"
              label="劳务税前"
              width="130"
            />
            <el-table-column
              prop="taxamount"
              align="center"
              label="扣税"
              label="劳务个税"
              width="150"
            >
              <template slot-scope="scope">
                <el-input v-model="scope.row.taxamount" placeholder="扣税" />
                <el-input v-model="scope.row.taxamount" placeholder="劳务个税" />
              </template>
            </el-table-column>
            <el-table-column
              prop="taxedamount"
              align="center"
              label="税后金额"
              label="劳务税后"
              width="150"
            >
              <template slot-scope="scope">
                <el-input
                  v-model="scope.row.taxedamount"
                  placeholder="税后金额"
                  placeholder="劳务税后"
                />
              </template>
            </el-table-column>
src/views/project/fund/applyDetail/index.vue
@@ -178,18 +178,18 @@
                <el-input v-model="scope.row.amount" placeholder="金额" />
              </template>
            </el-table-column>
            <el-table-column prop="taxamount" align="center" label="扣税金额" width="120" v-if="
            <el-table-column prop="taxamount" align="center" label="劳务个税" width="120" v-if="
              ismanager == true &&
              (businessType == '1' || businessType == '2')
            ">
              <template slot-scope="scope">
                <el-input v-model="scope.row.taxamount" placeholder="扣税金额" />
                <el-input v-model="scope.row.taxamount" placeholder="劳务个税" />
              </template>
            </el-table-column>
            <el-table-column prop="taxedamount" align="center" label="税后金额" width="120"
            <el-table-column prop="taxedamount" align="center" label="劳务税后" width="120"
              v-if="businessType == '1' || businessType == '2'">
              <template slot-scope="scope">
                <el-input v-model="scope.row.taxedamount" placeholder="税后金额" />
                <el-input v-model="scope.row.taxedamount" placeholder="劳务税后" />
              </template>
            </el-table-column>
            <el-table-column prop="beneficiaryname" column-key="sdad" align="center" :label="beneficiarylabel"
@@ -542,7 +542,7 @@
          </el-table-column>
          <el-table-column prop="amount" align="center" :label="amountlabel">
          </el-table-column>
          <el-table-column prop="taxedamount" align="center" label="税后金额" v-if="
          <el-table-column prop="taxedamount" align="center" label="劳务税后" v-if="
            (this.ismanager == true) &
            (form.applytype == '1' || form.applytype == '2')
          ">
@@ -1654,7 +1654,7 @@
            }
            this.rbDetails[i] = tempDetail;
          }
          //计算当前行报销内容费用合计,税前金额(amount)、扣税金额(taxamount)、税后金额(taxedamount)
          //计算当前行报销内容费用合计,税前金额(amount)、劳务个税(taxamount)、劳务税后(taxedamount)
          if (this.businessType == "2") {
            for (let j = 0; j < this.rbDetails.length; j++) {
              let tempDetail = this.rbDetails[j];
@@ -2257,7 +2257,7 @@
      });
    },
    //计算个税:type(A:已知税前金额,计算税后金额;B:已知税后金额,计算税前金额)
    //计算个税:type(A:已知税前金额,计算劳务税后;B:已知劳务税后,计算税前金额)
    calculateTax(row, type) {
      for (let i = 0; i < this.rbDetails.length; i++) {
        if (!this.rbDetails[i].amount) {
@@ -2433,7 +2433,7 @@
              }
              this.rbDetails[i] = tempDetail;
            }
            //计算当前行报销内容费用合计,税前金额(amount)、扣税金额(taxamount)、税后金额(taxedamount)
            //计算当前行报销内容费用合计,税前金额(amount)、劳务个税(taxamount)、劳务税后(taxedamount)
            if (this.businessType == "2") {
              for (let j = 0; j < this.rbDetails.length; j++) {
                let tempDetail = this.rbDetails[j];
src/views/project/fund/applyDetail0/index.vue
@@ -119,13 +119,13 @@
          <!--
          <el-col :span="5">
            <el-form-item label="应缴税" prop="taxcost" v-if="businessType == '1' || businessType == '2'">
              <el-input v-model="form.taxcost" placeholder="应缴税金额合计" :disabled="true" />
            <el-form-item label="劳务个税" prop="taxcost" v-if="businessType == '1' || businessType == '2'">
              <el-input v-model="form.taxcost" placeholder="劳务个税合计" :disabled="true" />
            </el-form-item>
          </el-col>
          <el-col :span="5">
            <el-form-item label="税后金额" prop="pretaxcost">
              <el-input v-model="form.taxedcost" placeholder="税后金额合计" :disabled="true" />
            <el-form-item label="劳务税后" prop="pretaxcost">
              <el-input v-model="form.taxedcost" placeholder="劳务税后合计" :disabled="true" />
            </el-form-item>
          </el-col>-->
          <el-col :span="10">
@@ -328,7 +328,7 @@
            <el-table-column
              prop="taxedamount"
              align="center"
              label="税后金额"
              label="劳务税后"
              width="120"
              v-if="
                (this.ismanager == true) &
@@ -338,7 +338,7 @@
              <template slot-scope="scope">
                <el-input
                  v-model="scope.row.taxedamount"
                  placeholder="税后金额"
                  placeholder="劳务税后"
                  @blur="
                    val => {
                      calculateTax(scope.row, 'B');
@@ -1951,7 +1951,7 @@
            //获取参数
            this.taxParam.beneficiaryNo = tempDetail.beneficiaryno;
            this.taxParam.startTime = this.form.createTime.substring(0, 10);
            // 计算税后金额
            // 计算劳务税后
            if (tempDetail.taxedamount == undefined || tempDetail.taxedamount == null || tempDetail.taxedamount == 0 || tempDetail.taxedamount == '') {
              //获取参数
              this.taxParam.money = tempDetail.amount.toString();
@@ -1967,7 +1967,7 @@
              });
            }
            // 计算税前、税费、税后金额
            // 计算税前、税费、劳务税后
            if (tempDetail.amount == undefined || tempDetail.amount == null || tempDetail.amount == 0 || tempDetail.amount == '') {
              //获取参数
              this.taxParam.money = tempDetail.taxedamount.toString();
@@ -1984,7 +1984,7 @@
            }
            */
          }
          //计算当前行报销内容费用合计,税前金额(amount)、扣税金额(taxamount)、税后金额(taxedamount)
          //计算当前行报销内容费用合计,税前金额(amount)、劳务个税(taxamount)、劳务税后(taxedamount)
          if (this.businessType == "2") {
            for (let j = 0; j < this.rbDetails.length; j++) {
              let tempDetail = this.rbDetails[j];
@@ -2317,7 +2317,7 @@
            row.taxamount = 0.0;
            row.taxedamount = 0.0;
            //计算税后金额
            //计算劳务税后
            // this.calculateTax(row, "A");
          }
@@ -2427,7 +2427,7 @@
      });
    },
    //计算个税:type(A:已知税前金额,计算税后金额;B:已知税后金额,计算税前金额)
    //计算个税:type(A:已知税前金额,计算劳务税后;B:已知劳务税后,计算税前金额)
    calculateTax(row, type) {
      //if (isNaN(parseFloat(tempDetail.taxedamount)))
      //获取参数
@@ -2435,7 +2435,7 @@
      this.taxParam.startTime = this.form.createTime.substring(0, 10);
      if (type == "A") {
        // 计算个税、税后金额
        // 计算个税、劳务税后
        this.taxParam.money = row.amount.toString();
        getTaxByBeneFiciaryNo(this.taxParam).then(res => {
          if (res.code == 200) {
@@ -2636,7 +2636,7 @@
            //获取参数
            this.taxParam.beneficiaryNo = tempDetail.beneficiaryno;
            this.taxParam.startTime = this.form.createTime.substring(0, 10);
            // 计算税后金额
            // 计算劳务税后
            if (tempDetail.taxedamount == undefined || tempDetail.taxedamount == null || tempDetail.taxedamount == 0 || tempDetail.taxedamount == '') {
              //获取参数
              this.taxParam.money = tempDetail.amount.toString();
@@ -2652,7 +2652,7 @@
              });
            }
            // 计算税前、税费、税后金额
            // 计算税前、税费、劳务税后
            if (tempDetail.amount == undefined || tempDetail.amount == null || tempDetail.amount == 0 || tempDetail.amount == '') {
              //获取参数
              this.taxParam.money = tempDetail.taxedamount.toString();
@@ -2669,7 +2669,7 @@
            }
            */
          }
          //计算当前行报销内容费用合计,税前金额(amount)、扣税金额(taxamount)、税后金额(taxedamount)
          //计算当前行报销内容费用合计,税前金额(amount)、劳务个税(taxamount)、劳务税后(taxedamount)
          if (this.businessType == "2") {
            for (let j = 0; j < this.rbDetails.length; j++) {
              let tempDetail = this.rbDetails[j];
src/views/project/fund/ethicalExpertFeeApply/index.vue
@@ -432,10 +432,10 @@
            </el-form-item>
          </el-col>
          <el-col :span="5">
            <el-form-item label="税后金额" prop="pretaxcost">
            <el-form-item label="劳务税后" prop="pretaxcost">
              <el-input
                v-model="form.taxedcost"
                placeholder="税后金额合计"
                placeholder="劳务税后合计"
                :disabled="true"
              />
            </el-form-item>
@@ -609,14 +609,14 @@
            <el-table-column
              prop="taxedamount"
              align="center"
              label="税后金额"
              label="劳务税后"
              width="120"
              v-if="form.applytype != '3'"
            >
              <template slot-scope="scope">
                <el-input
                  v-model="scope.row.taxedamount"
                  placeholder="税后金额"
                  placeholder="劳务税后"
                  @blur="
                    val => {
                      sumTotalFee();
src/views/project/fund/expertFeeApply/index.vue
@@ -469,17 +469,17 @@
            </el-form-item>
          </el-col>
          <el-col :span="5">
            <el-form-item label="应缴税" prop="taxcost">
            <el-form-item label="劳务个税" prop="taxcost">
              <el-input
                v-model="form.taxcost"
                placeholder="应缴税金额合计"
                placeholder="劳务个税合计"
                :disabled="true"
              />
            </el-form-item> </el-col
          ><!--
          <el-col :span="5">
            <el-form-item label="税后金额" prop="pretaxcost">
              <el-input v-model="form.taxedcost" placeholder="税后金额合计" :disabled="true" />
            <el-form-item label="劳务税后" prop="pretaxcost">
              <el-input v-model="form.taxedcost" placeholder="劳务税后合计" :disabled="true" />
            </el-form-item>
          </el-col>-->
          <el-col :span="5">
@@ -643,7 +643,7 @@
            <el-table-column
              prop="taxedamount"
              align="center"
              label="税后金额"
              label="劳务税后"
              width="120"
              v-if="this.ismanager == true"
            >
@@ -651,7 +651,7 @@
              <template slot-scope="scope">
                <el-input
                  v-model="scope.row.taxedamount"
                  placeholder="税后金额"
                  placeholder="劳务税后"
                />
              </template>
            </el-table-column>
@@ -1786,7 +1786,7 @@
            //获取参数
            this.taxParam.beneficiaryNo = tempDetail.beneficiaryno;
            this.taxParam.startTime = this.form.createTime.substring(0, 10);
            // 计算税后金额
            // 计算劳务税后
            if (tempDetail.taxedamount == undefined || tempDetail.taxedamount == null || tempDetail.taxedamount == 0 || tempDetail.taxedamount == '') {
              //获取参数
              this.taxParam.money = tempDetail.amount.toString();
src/views/project/fund/officeExpenseApply/index.vue
@@ -311,8 +311,8 @@
            </el-form-item>
          </el-col>
          <el-col :span="5">
            <el-form-item label="税后金额" prop="pretaxcost">
              <el-input v-model="form.taxedcost" placeholder="税后金额合计" :disabled="true" />
            <el-form-item label="劳务税后" prop="pretaxcost">
              <el-input v-model="form.taxedcost" placeholder="劳务税后合计" :disabled="true" />
            </el-form-item>
          </el-col>
          <el-col :span="5">
@@ -476,14 +476,14 @@
            <el-table-column
              prop="taxamount"
              align="center"
              label="扣税"
              label="劳务个税"
              width="120"
              v-if="form.applytype != '3'"
            >
              <template slot-scope="scope">
                <el-input
                  v-model="scope.row.taxamount"
                  placeholder="扣税"
                  placeholder="劳务个税"
                  @blur="
                    val => {
                      sumTotalFee(scope.row);
@@ -495,14 +495,14 @@
            <el-table-column
              prop="taxedamount"
              align="center"
              label="税后金额"
              label="劳务税后"
              width="120"
              v-if="form.applytype != '3'"
            >
              <template slot-scope="scope">
                <el-input
                  v-model="scope.row.taxedamount"
                  placeholder="税后金额"
                  placeholder="劳务税后"
                />
              </template>
            </el-table-column>
src/views/project/fund/performancedetails/index.vue
@@ -250,27 +250,27 @@
            <el-table-column
              prop="taxamount"
              align="center"
              label="扣税金额"
              label="劳务个税"
              width="120"
            >
              <template slot-scope="scope">
                <el-input
                  @blur="chargeSum"
                  v-model="scope.row.taxamount"
                  placeholder="扣税金额"
                  placeholder="劳务个税"
                />
              </template>
            </el-table-column>
            <el-table-column
              prop="taxedamount"
              align="center"
              label="税后金额"
              label="劳务税后"
              width="120"
            >
              <template slot-scope="scope">
                <el-input
                  v-model="scope.row.taxedamount"
                  placeholder="税后金额"
                  placeholder="劳务税后"
                  @blur="queenchargeSum"
                />
              </template>
@@ -1795,7 +1795,7 @@
            }
            this.rbDetails[i] = tempDetail;
          }
          //计算当前行报销内容费用合计,税前金额(amount)、扣税金额(taxamount)、税后金额(taxedamount)
          //计算当前行报销内容费用合计,税前金额(amount)、劳务个税(taxamount)、劳务税后(taxedamount)
          if (this.businessType == "2") {
            for (let j = 0; j < this.rbDetails.length; j++) {
              let tempDetail = this.rbDetails[j];
src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue
@@ -251,16 +251,19 @@
            <!-- <el-table-column
              prop="taxamount"
              align="center"
              label="扣税"
              label="劳务个税"
              width="150"
            >
              <template slot-scope="scope">
                <el-input v-model="scope.row.taxamount" placeholder="扣税" />
                <el-input v-model="scope.row.taxamount" placeholder="劳务个税" />
              </template>
            </el-table-column> -->
            <el-table-column prop="taxedamount" align="center" label="税后金额" width="150">
            <el-table-column prop="vatAmount" align="center" label="增值税" width="120" />
            <el-table-column prop="cityTaxAmount" align="center" label="城建税" width="120" />
            <el-table-column prop="laborPretaxAmount" align="center" label="劳务税前" width="130" />
            <el-table-column prop="taxedamount" align="center" label="劳务税后" width="150">
              <template slot-scope="scope">
                <el-input v-model="scope.row.taxedamount" placeholder="税后金额" @blur="
                <el-input v-model="scope.row.taxedamount" placeholder="劳务税后" @blur="
                  val => {
                    sumTotalFee();
                  }
@@ -323,8 +326,8 @@
            </el-form-item>
          </el-col>
          <el-col :span="7">
            <el-form-item label="税后金额合计" prop="amountrequested">
              <el-input v-model="form.taxedcost" placeholder="税后金额合计" />
            <el-form-item label="劳务税后合计" prop="amountrequested">
              <el-input v-model="form.taxedcost" placeholder="劳务税后合计" />
            </el-form-item>
          </el-col>
          <el-col :span="7">
src/views/project/fundcheck/expertFeeCheck/index.vue
@@ -107,7 +107,7 @@
          <el-table-column label="经办人" align="center" prop="username" width="90px" />
          <!-- <el-table-column label="工作单位" align="center"  prop="unitname" width="230px" /> -->
          <!-- <el-table-column label="联系电话" align="center"  prop="phone"  width="160"  /> -->
          <!-- <el-table-column label="税后金额" align="center" prop="taxedcost" width="120px" />
          <!-- <el-table-column label="劳务税后" align="center" prop="taxedcost" width="120px" />
          <el-table-column label="申请金额" align="center" prop="amountrequested" width="120px" />
          <el-table-column label="预支费用" align="center" prop="prepaidamount" width="120px" /> -->
          <el-table-column label="材料预审状态" align="center" prop="checkstatus" width="140px">
@@ -223,7 +223,7 @@
        </el-row>
        <el-row>
          <!-- <el-col :span="5">
            <el-form-item label="扣税金额" prop="amountrequested">
            <el-form-item label="劳务个税" prop="amountrequested">
              <el-input v-model="form.amountrequested" placeholder="申请金额" :disabled="true" />
            </el-form-item>
          </el-col> -->
@@ -233,8 +233,8 @@
            </el-form-item>
          </el-col>
          <el-col :span="5">
            <el-form-item label="税后合计" prop="taxedcost">
              <el-input v-model="form.taxedcost" placeholder="税后金额合计" />
            <el-form-item label="劳务税后合计" prop="taxedcost">
              <el-input v-model="form.taxedcost" placeholder="劳务税后合计" />
            </el-form-item> </el-col><!--
          <el-col :span="5">
            <el-form-item label="申请状态" prop="recordstatus">
@@ -309,9 +309,12 @@
                " placeholder="税前金额" />
              </template>
            </el-table-column>
            <el-table-column v-if="show === 1" prop="taxedamount" align="center" label="税后金额" width="100">
            <el-table-column v-if="show === 1" prop="vatAmount" align="center" label="增值税" width="100" />
            <el-table-column v-if="show === 1" prop="cityTaxAmount" align="center" label="城建税" width="100" />
            <el-table-column v-if="show === 1" prop="laborPretaxAmount" align="center" label="劳务税前" width="110" />
            <el-table-column v-if="show === 1" prop="taxedamount" align="center" label="劳务税后" width="100">
              <template slot-scope="scope">
                <el-input v-model="scope.row.taxedamount" placeholder="税后金额" />
                <el-input v-model="scope.row.taxedamount" placeholder="劳务税后" />
              </template>
            </el-table-column>
            <!--
src/views/project/fundcheck/medicalCostCheck/index.vue
@@ -219,8 +219,8 @@
            </el-form-item>
          </el-col>
          <el-col :span="5">
            <el-form-item label="税后金额" prop="amountrequested">
              <el-input v-model="form.taxedcost" placeholder="税后金额合计" :disabled="true" />
            <el-form-item label="劳务税后" prop="amountrequested">
              <el-input v-model="form.taxedcost" placeholder="劳务税后合计" :disabled="true" />
            </el-form-item>
          </el-col>
          <el-col :span="5">
@@ -286,14 +286,17 @@
                </el-select>
              </template>
            </el-table-column>
            <el-table-column prop="taxamount" align="center" label="扣税" width="120" v-if="form.applytype != '3'">
            <el-table-column prop="vatAmount" align="center" label="增值税" width="120" v-if="form.applytype != '3'" />
            <el-table-column prop="cityTaxAmount" align="center" label="城建税" width="120" v-if="form.applytype != '3'" />
            <el-table-column prop="laborPretaxAmount" align="center" label="劳务税前" width="120" v-if="form.applytype != '3'" />
            <el-table-column prop="taxamount" align="center" label="劳务个税" width="120" v-if="form.applytype != '3'">
              <template slot-scope="scope">
                <el-input v-model="scope.row.taxamount" placeholder="扣税" />
                <el-input v-model="scope.row.taxamount" placeholder="劳务个税" />
              </template>
            </el-table-column>
            <el-table-column prop="taxedamount" align="center" label="税后金额" width="120" v-if="form.applytype != '3'">
            <el-table-column prop="taxedamount" align="center" label="劳务税后" width="120" v-if="form.applytype != '3'">
              <template slot-scope="scope">
                <el-input v-model="scope.row.taxedamount" placeholder="税后金额" />
                <el-input v-model="scope.row.taxedamount" placeholder="劳务税后" />
              </template>
            </el-table-column>
src/views/project/fundcheck/officeExpenseCheck/index.vue
@@ -222,8 +222,8 @@
            </el-form-item>
          </el-col>
          <el-col :span="5">
            <el-form-item label="税后金额" prop="amountrequested">
              <el-input v-model="form.taxedcost" placeholder="税后金额合计" :disabled="true" />
            <el-form-item label="劳务税后" prop="amountrequested">
              <el-input v-model="form.taxedcost" placeholder="劳务税后合计" :disabled="true" />
            </el-form-item>
          </el-col>
          <el-col :span="5">
@@ -289,14 +289,17 @@
                </el-select>
              </template>
            </el-table-column>
            <el-table-column prop="taxamount" align="center" label="扣税" width="120" v-if="form.applytype != '3'">
            <el-table-column prop="vatAmount" align="center" label="增值税" width="120" v-if="form.applytype != '3'" />
            <el-table-column prop="cityTaxAmount" align="center" label="城建税" width="120" v-if="form.applytype != '3'" />
            <el-table-column prop="laborPretaxAmount" align="center" label="劳务税前" width="120" v-if="form.applytype != '3'" />
            <el-table-column prop="taxamount" align="center" label="劳务个税" width="120" v-if="form.applytype != '3'">
              <template slot-scope="scope">
                <el-input v-model="scope.row.taxamount" placeholder="扣税" />
                <el-input v-model="scope.row.taxamount" placeholder="劳务个税" />
              </template>
            </el-table-column>
            <el-table-column prop="taxedamount" align="center" label="税后金额" width="120" v-if="form.applytype != '3'">
            <el-table-column prop="taxedamount" align="center" label="劳务税后" width="120" v-if="form.applytype != '3'">
              <template slot-scope="scope">
                <el-input v-model="scope.row.taxedamount" placeholder="税后金额" />
                <el-input v-model="scope.row.taxedamount" placeholder="劳务税后" />
              </template>
            </el-table-column>
src/views/project/funddetail/index.vue
@@ -71,8 +71,11 @@
      <el-table-column label="项目类别" align="center" prop="itemtype" />
      <el-table-column label="费用项目名称" align="left" prop="itemname" />
      <el-table-column label="费用金额" align="center" prop="amount" />
      <el-table-column label="扣税金额" align="center" prop="taxamount" />
      <el-table-column label="税后金额" align="center" prop="taxedamount" />
      <el-table-column label="增值税" align="center" prop="vatAmount" />
      <el-table-column label="城建税" align="center" prop="cityTaxAmount" />
      <el-table-column label="劳务税前" align="center" prop="laborPretaxAmount" />
      <el-table-column label="劳务个税" align="center" prop="taxamount" />
      <el-table-column label="劳务税后" align="center" prop="taxedamount" />
      <!--
      <el-table-column label="专家单位" align="center" prop="uintname" />
      <el-table-column label="证件号码" align="center" prop="idcardno" />
src/views/project/tallage/computingBill/index.vue
@@ -61,21 +61,50 @@
            </el-form-item>
          </el-col>
          <el-col :span="6"
            ><el-form-item label="扣税金额" prop="donateno">
            ><el-form-item label="增值税" prop="donateno">
              <el-input
                v-model="form.vatAmount"
                :disabled="true"
                placeholder="请输入增值税"
              />
            </el-form-item>
          </el-col>
          <el-col :span="6"
            ><el-form-item label="城建税" prop="donateno">
              <el-input
                v-model="form.cityTaxAmount"
                :disabled="true"
                placeholder="请输入城建税"
              />
            </el-form-item>
          </el-col>
          <el-col :span="6"
            ><el-form-item label="劳务税前" prop="donateno">
              <el-input
                v-model="form.laborPretaxAmount"
                :disabled="true"
                placeholder="请输入劳务税前"
              />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="6"
            ><el-form-item label="劳务个税" prop="donateno">
              <el-input
                v-model="form.taxMoney"
                :disabled="true"
                placeholder="请输入扣税金额"
                placeholder="请输入劳务个税"
              />
            </el-form-item>
          </el-col>
          <el-col :span="6">
            <el-form-item label="税后金额" prop="donationcategory">
            <el-form-item label="劳务税后" prop="donationcategory">
              <el-input
                v-model="form.taxedamount"
                :disabled="true"
                placeholder="请输入收款行号"
                placeholder="请输入劳务税后"
              />
            </el-form-item>
          </el-col>
@@ -195,23 +224,50 @@
                />
              </template>
            </el-table-column>
            <el-table-column label="扣税金额" align="center" prop="taXmoney">
            <el-table-column prop="vatCost" align="center" label="增值税">
              <template slot-scope="scope">
                <el-input
                  v-model="scope.row.taXmoney"
                  v-model="scope.row.vatCost"
                  :disabled="true"
                  placeholder="扣税金额"
                  placeholder="增值税"
                />
              </template>
            </el-table-column>
            <el-table-column prop="cityTaxCost" align="center" label="城建税">
              <template slot-scope="scope">
                <el-input
                  v-model="scope.row.cityTaxCost"
                  :disabled="true"
                  placeholder="城建税"
                />
              </template>
            </el-table-column>
            <el-table-column prop="laborPretaxCost" align="center" label="劳务税前">
              <template slot-scope="scope">
                <el-input
                  v-model="scope.row.laborPretaxCost"
                  :disabled="true"
                  placeholder="劳务税前"
                />
              </template>
            </el-table-column>
            <el-table-column label="劳务个税" align="center" prop="taxcost">
              <template slot-scope="scope">
                <el-input
                  v-model="scope.row.taxcost"
                  :disabled="true"
                  placeholder="劳务个税"
                />
              </template>
            </el-table-column>
            <el-table-column prop="taxedcost" align="center" label="税后金额">
            <el-table-column prop="taxedcost" align="center" label="劳务税后">
              <template slot-scope="scope">
                <el-input
                  @blur="chargeSum"
                  :disabled="true"
                  v-model="scope.row.taxedcost"
                  placeholder="税后金额"
                  placeholder="劳务税后"
                />
              </template>
            </el-table-column>
@@ -397,14 +453,32 @@
                >
                </el-table-column>
                <el-table-column
                  prop="taXmoney"
                  label="扣税金额"
                  prop="vatCost"
                  label="增值税"
                  show-overflow-tooltip
                >
                </el-table-column>
                <el-table-column
                  prop="cityTaxCost"
                  label="城建税"
                  show-overflow-tooltip
                >
                </el-table-column>
                <el-table-column
                  prop="laborPretaxCost"
                  label="劳务税前"
                  show-overflow-tooltip
                >
                </el-table-column>
                <el-table-column
                  prop="taxcost"
                  label="劳务个税"
                  show-overflow-tooltip
                >
                </el-table-column>
                <el-table-column
                  prop="taxedcost"
                  label="税后金额"
                  label="劳务税后"
                  show-overflow-tooltip
                >
                </el-table-column>
@@ -812,8 +886,6 @@
        });
      }
      this.donorchargeorgans.forEach(item => {
        item.taXmoney = item.pretaxcost - item.taxedcost;
        item.taXmoney = item.taXmoney.toFixed(2);
        this.accumulation();
      });
      if (this.form.id) {
@@ -828,47 +900,81 @@
      this.dialogVisiblepatient = false;
    },
    // 计算个税
    // 计算个税(先保存当前单据,保存成功后再算税;算税成功后从后端重新加载,不再用页面旧金额回写)
    calculateFn() {
      if (this.form.id >= this.MaxFundTaxId) {
        this.$modal.loading("正在提交,请稍候!");
        this.$modal
          .confirm("即将进行算税是否已保存全部数据?")
          .then(res => {
          .confirm("算税前会先保存当前单据,是否继续?")
          .then(() => {
            this.form.serviceFunds = this.donorchargeorgans;
            this.$refs["form"].validate(valid => {
              if (!valid) {
                this.$modal.msgError("单据校验未通过,请检查后重试");
                return;
              }
              this.$modal.loading("正在提交,请稍候!");
              updateFundtax(this.form).then(res0 => {
                if (res0.code != 200) {
                  this.$modal.closeLoading();
                  this.$modal.msgError(res0.msg);
                  return;
                }
            listbxiaostatistics({
              fundTaxId: Number(this.form.id),
              addOrupdate: 1
            }).then(res1 => {
              if (res1.code == 200) {
                this.$modal.msgSuccess("计算成功");
                    // 后端已回写 service_fund / service_fundtax,这里只做重新加载
                    this.refreshFundtax().then(() => {
                this.$modal.closeLoading();
                this.form.istax = 1;
                this.form.taxedtime = this.$moment().format(
                  "YYYY-MM-DD HH:mm:ss"
                );
                this.submitForm();
                      this.$modal.msgSuccess("计算成功");
                    });
              } else {
                this.$modal.closeLoading();
                this.$modal.msgError(res1.msg);
              }
            });
              });
            });
          })
          .catch(() => {});
      } else {
        this.$modal.msgError("当前单据不为最新申请单");
      }
    },
    // 金额合计
    // 从后端重新加载汇总单(含明细单据行)并重算合计
    refreshFundtax() {
      return getFundtax(this.form.id).then(response => {
        this.form = response.data;
        if (this.form.serviceFunds && this.form.serviceFunds[0]) {
          this.donorchargeorgans = this.form.serviceFunds;
          this.donorchargeorgans.forEach((item, index) => {
            item.index = index + 1;
          });
        }
        this.accumulation();
        return response;
      });
    },
    // 金额合计(6 个金额全部取自单据上的后端金额,不再用“税前-税后”倒算)
    accumulation() {
      this.form.pretaxamount = this.donorchargeorgans
        .reduce((acc, obj) => acc + Number(obj.pretaxcost), 0)
        .reduce((acc, obj) => acc + Number(obj.pretaxcost || 0), 0)
        .toFixed(2);
      this.form.vatAmount = this.donorchargeorgans
        .reduce((acc, obj) => acc + Number(obj.vatCost || 0), 0)
        .toFixed(2);
      this.form.cityTaxAmount = this.donorchargeorgans
        .reduce((acc, obj) => acc + Number(obj.cityTaxCost || 0), 0)
        .toFixed(2);
      this.form.laborPretaxAmount = this.donorchargeorgans
        .reduce((acc, obj) => acc + Number(obj.laborPretaxCost || 0), 0)
        .toFixed(2);
      this.form.taxMoney = this.donorchargeorgans
        .reduce((acc, obj) => acc + Number(obj.taXmoney), 0)
        .reduce((acc, obj) => acc + Number(obj.taxcost || 0), 0)
        .toFixed(2);
      this.form.taxedamount = this.donorchargeorgans
        .reduce((acc, obj) => acc + Number(obj.taxedcost), 0)
        .reduce((acc, obj) => acc + Number(obj.taxedcost || 0), 0)
        .toFixed(2);
    },
    // 多选框选中数据
@@ -1011,14 +1117,12 @@
      this.title = "专家费汇总单编辑";
      getFundtax(this.curId).then(response => {
        this.form = response.data;
        if (this.form.serviceFunds[0]) {
        if (this.form.serviceFunds && this.form.serviceFunds[0]) {
          this.donorchargeorgans = this.form.serviceFunds;
          this.donorchargeorgans.forEach((item, index) => {
            item.taXmoney = item.pretaxcost - item.taxedcost;
            item.taXmoney = item.taXmoney.toFixed(2);
            item.index = index + 1;
            this.accumulation();
          });
          this.accumulation();
        }
      });
    },
@@ -1028,14 +1132,12 @@
      this.title = "查看专家费汇总单";
      getFundtax(this.curId).then(response => {
        this.form = response.data;
        if (this.form.serviceFunds[0]) {
        if (this.form.serviceFunds && this.form.serviceFunds[0]) {
          this.donorchargeorgans = this.form.serviceFunds;
          this.donorchargeorgans.forEach((item, index) => {
            item.taXmoney = item.pretaxcost - item.taxedcost;
            item.taXmoney = item.taXmoney.toFixed(2);
            item.index = index + 1;
            this.accumulation();
          });
          this.accumulation();
        }
      });
    },
@@ -1053,21 +1155,10 @@
          if (this.form.id != null) {
            updateFundtax(this.form).then(res1 => {
              if (res1.code == 200) {
                console.log(3);
                this.$modal.msgSuccess("保存成功!");
                getFundtax(this.form.id).then(response => {
                  this.form = response.data;
                  if (this.form.serviceFunds[0]) {
                    this.donorchargeorgans = this.form.serviceFunds;
                    this.donorchargeorgans.forEach((item, index) => {
                      item.taXmoney = item.pretaxcost - item.taxedcost;
                      item.taXmoney = item.taXmoney.toFixed(2);
                      item.index = index + 1;
                      this.accumulation();
                    });
                  }
                });
                this.refreshFundtax().then(() => {
                this.$modal.closeLoading();
                });
              } else {
                this.$modal.closeLoading();
                this.$modal.msgError(res1.msg);
@@ -1077,20 +1168,10 @@
            addFundtax(this.form).then(response => {
              if (response.code == 200) {
                this.$modal.msgSuccess("新增成功!");
                getFundtax(response.data.fundTaxId).then(res => {
                  this.form = res.data;
                  if (this.form.serviceFunds[0]) {
                    this.donorchargeorgans = this.form.serviceFunds;
                    this.donorchargeorgans.forEach((item, index) => {
                      item.taXmoney = item.pretaxcost - item.taxedcost;
                      item.taXmoney = item.taXmoney.toFixed(2);
                      item.index = index + 1;
                      this.accumulation();
                    });
                  }
                });
                this.form.id = response.data.fundTaxId;
                this.refreshFundtax().then(() => {
                this.$modal.closeLoading();
                });
              } else {
                this.$modal.msgError(response.msg);
                this.$modal.closeLoading();
src/views/project/tallage/index.vue
@@ -97,10 +97,13 @@
        prop="applyno"
      />
      <el-table-column label="税前金额" align="center" prop="pretaxamount" width="100" >
      <el-table-column label="税前金额" align="center" prop="pretaxamount" width="110" >
      </el-table-column>
      <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="vatAmount" width="100" />
      <el-table-column label="城建税" align="center" prop="cityTaxAmount" width="100" />
      <el-table-column label="劳务税前" align="center" prop="laborPretaxAmount" width="110" />
      <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
src/views/project/travelexpensedeal/index.vue
@@ -163,10 +163,13 @@
      <el-table-column label="项目名称" align="center" prop="itemname" />
      <el-table-column label="项目类别" align="center" prop="itemtype" />
      <el-table-column label="申请金额" align="center" prop="amount" />
      <el-table-column label="增值税" align="center" prop="vatAmount" />
      <el-table-column label="城建税" align="center" prop="cityTaxAmount" />
      <el-table-column label="劳务税前" align="center" prop="laborPretaxAmount" />
      <el-table-column label="预支金额" align="center" prop="prepaidamount" />
      <el-table-column label="扣税金额" align="center" prop="taxamount" />
      <el-table-column label="劳务个税" align="center" prop="taxamount" />
      <el-table-column label="发票张数" align="center" prop="invoicecount" />
      <el-table-column label="税后金额" align="center" prop="taxedamount" />
      <el-table-column label="劳务税后" align="center" prop="taxedamount" />
      <el-table-column label="附件张数" align="center" prop="attachcount" />
      <el-table-column label="备注" align="center" prop="remark" />
      <el-table-column label="记录状态" align="center" prop="recordstatus" />
@@ -318,14 +321,14 @@
        <el-form-item label="预支金额" prop="prepaidamount">
          <el-input v-model="form.prepaidamount" placeholder="请输入预支金额" />
        </el-form-item>
        <el-form-item label="扣税金额" prop="taxamount">
          <el-input v-model="form.taxamount" placeholder="请输入扣税金额" />
        <el-form-item label="劳务个税" prop="taxamount">
          <el-input v-model="form.taxamount" placeholder="请输入劳务个税" />
        </el-form-item>
        <el-form-item label="发票张数" prop="invoicecount">
          <el-input v-model="form.invoicecount" placeholder="请输入发票张数" />
        </el-form-item>
        <el-form-item label="税后金额" prop="taxedamount">
          <el-input v-model="form.taxedamount" placeholder="请输入税后金额" />
        <el-form-item label="劳务税后" prop="taxedamount">
          <el-input v-model="form.taxedamount" placeholder="请输入劳务税后" />
        </el-form-item>
        <el-form-item label="附件张数" prop="attachcount">
          <el-input v-model="form.attachcount" placeholder="请输入附件张数" />