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

WXL

6 天以前 0b5a704e49545b4059b9eebe247adea8ec14911f

 src/views/project/travelexpenseapply/travelexpensedetail/index.vue

@@ -61,6 +61,7 @@
              <el-select
                v-model="form.infoid"
                @change="selectbaseinfo"
                clearable
                filterable
                placeholder="请选择捐献者"
              >
@@ -195,7 +196,7 @@
          </el-col>
        </el-row>
                -->
        <!-- 
        <!--
        <el-row type="flex" :gutter="10" align="right" class="mb8">
          <el-col :span="6">
            <el-button
@@ -541,7 +542,7 @@
              width="120"
            >
              <template slot-scope="scope">
                <el-input 
                <el-input
                  v-model="scope.row.foodexpenses"
                  placeholder="伙食费报销"
                  @blur="
@@ -912,7 +913,8 @@
          <el-col :span="12">
            <el-form-item label="算税状态" prop="infoid">
              <el-radio-group v-model="form.istax" align="left">
                <el-radio :label="2">待算税</el-radio>
                <el-radio :label="-1">审核中</el-radio>
                <el-radio :label="0">允许算税</el-radio>
                <el-radio :label="1">已算税</el-radio>
              </el-radio-group>
            </el-form-item>
@@ -2493,11 +2495,20 @@
      this.$modal.loading("正在提交审核，请稍候！");

      checkfund(checkfundobj).then(res => {
        this.$modal.closeLoading();
        this.$modal.msgSuccess("提交审核成功!");
        // 关闭窗口
        this.$store.dispatch("tagsView/delView", this.$route);
        this.$router.go(-1);
        if (res.code == 200) {
          this.$modal.closeLoading();
          this.$modal.msgSuccess("提交审核成功!");
          // 关闭窗口
          this.$store.dispatch("tagsView/delView", this.$route);
          this.$router.go(-1);
        } else {
          this.$modal.closeLoading();
          if (res.msg) {
            this.$modal.msgError("操作失误");
          } else {
            this.$modal.msgError(res.msg);
          }
        }
      });
    },

@@ -2526,7 +2537,7 @@
          //保存前校验数据
          for (let k = 0; k < rbDetails.length; k++) {
            let tempDetail = rbDetails[k];
            console.log(tempDetail,'tem');
            console.log(tempDetail, "tem");
            if (!tempDetail.persontype) {
              this.$modal.msgWarning(
                "明细表中，第" +
@@ -2536,34 +2547,32 @@
              return;
            }

            
              if (!tempDetail.personname) {
                this.$modal.msgWarning(
                  "明细表中，第" +
                    (k + 1).toString() +
                    "行的费用人员未选择,请选择费用人员后再提交保存！"
                );
                return;
              }
            if (!tempDetail.personname) {
              this.$modal.msgWarning(
                "明细表中，第" +
                  (k + 1).toString() +
                  "行的费用人员未选择,请选择费用人员后再提交保存！"
              );
              return;
            }

              if (!tempDetail.starttime) {
                this.$modal.msgWarning(
                  "明细表中，第" +
                    (k + 1).toString() +
                    "行的开始日期未选择,请选择开始日期后再提交保存！"
                );
                return;
              }
            if (!tempDetail.starttime) {
              this.$modal.msgWarning(
                "明细表中，第" +
                  (k + 1).toString() +
                  "行的开始日期未选择,请选择开始日期后再提交保存！"
              );
              return;
            }

              if (!tempDetail.endtime) {
                this.$modal.msgWarning(
                  "明细表中，第" +
                    (k + 1).toString() +
                    "行的结束日期姓名为选择,请选择结束日期后再提交保存！"
                );
                return;
              }
            
            if (!tempDetail.endtime) {
              this.$modal.msgWarning(
                "明细表中，第" +
                  (k + 1).toString() +
                  "行的结束日期姓名为选择,请选择结束日期后再提交保存！"
              );
              return;
            }
          }

          if (this.form.id != null) {