11
WXL
2023-09-22 2871dd51e0adc895781cf4ddb6979c93abe55b75
11
已修改7个文件
352 ■■■■ 文件已修改
src/views/project/fund/applyDetail/index.vue 79 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue 53 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fundcheck/expertFeeCheck/index.vue 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fundcheck/medicalCostCheck/index.vue 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fundcheck/officeExpenseCheck/index.vue 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/travelexpenseapply/travelexpensedetail/index.vue 51 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/travelexpensecheck/index.vue 66 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fund/applyDetail/index.vue
@@ -128,7 +128,24 @@
              <el-input v-model="form.taxedcost" placeholder="税后金额合计" :disabled="true" />
            </el-form-item>
          </el-col>-->
          <el-col :span="10">
          <el-col :span="5">
            <el-form-item label="预审状态" prop="infoid">
              <el-select
                v-model="form.checkstatus"
                filterable
                placeholder="请选择预审状态"
              >
                <el-option
                  v-for="item in baselisttages"
                  :key="item.id"
                  :label="item.name"
                  :value="item.id"
                >
                </el-option>
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="申请说明" prop="remark">
              <el-input v-model="form.remark" placeholder="申请说明" />
            </el-form-item>
@@ -773,24 +790,21 @@
          v-if="
            operationType == 'add' ||
              operationType == 'update' ||
              ismanager == true
              ismanager == true ||
              beforehandType == '1'
          "
          >提交保存</el-button
        >
        <el-button
          type="primary"
          type="success"
          @click="handleup"
          v-if="
            operationType == 'add' ||
              operationType == 'update' ||
              ismanager == true
          "
          v-if="operationType == 'add' || operationType == 'update'"
          >上报</el-button
        >
        <el-button
          type="primary"
          @click="checksubmit"
          v-if="operationType == 'check'"
          v-if="operationType == 'check' && beforehandType != '1'"
          >提交审核</el-button
        >
        <el-button @click="cancel">关 闭</el-button>
@@ -1104,28 +1118,27 @@
            "
          >
          </el-table-column>
          <el-table-column
          <!-- <el-table-column
            prop="beneficiaryname"
            align="center"
            label="姓名"
            v-if="form.applytype == '1' || form.applytype == '2'"
          >
          </el-table-column>
          </el-table-column> -->
          <el-table-column
            prop="unitno"
          <!-- <el-table-column
            prop="beneficiaryname"
            align="center"
            label="单位名称"
            width="250"
            v-if="form.applytype != '4'"
          >
          </el-table-column>
          </el-table-column> -->
          <el-table-column
            prop="beneficiaryname"
            align="center"
            label="单位/个人"
            width="250"
            v-if="form.applytype == '4'"
          >
          </el-table-column>
          <el-table-column
@@ -1463,6 +1476,20 @@
      ismanager: false,
      //专家费选择:1是专家库,2是新增
      expertfrom: "1",
      baselisttages: [
        {
          id: 1,
          name: "待预审"
        },
        {
          id: 2,
          name: "预审通过等待材料"
        },
        {
          id: 3,
          name: "已收到报销材料"
        }
      ],
      //捐献案例列表
      donateList: [],
@@ -1597,7 +1624,7 @@
        money: "0",
        startTime: ""
      },
      beforehandType: null,
      //服务费用参数
      expenseQueryParams: {
        pageNum: 1,
@@ -1723,6 +1750,7 @@
      this.curId = this.$route.query.id;
      this.businessType = this.$route.query.businessType;
      this.operationType = this.$route.query.operationType;
      this.beforehandType = this.$route.query.beforehandType;
      //获取费用项目类型
      this.getFeeTypes();
@@ -1960,10 +1988,10 @@
          JSON.stringify(this.rbDetails) ==
            sessionStorage.getItem("apifunddetail")) ||
        !sessionStorage.getItem("apifunddetail")
      ){
      }else{
        this.$message.error('请保存后再进行上报');
        return
      ) {
      } else {
        this.$message.error("请保存后再进行上报");
        return;
      }
      this.$confirm("是否确认将登记记录上报?", "提示", {
        confirmButtonText: "确定",
@@ -1974,13 +2002,17 @@
          //查找是否存在登记完成记录
          //判断是否存在上报记录
          this.form.recordstatus = 0;
          if (!this.form.id) {
            this.form.id = this.$route.query.id
          }
          updateFund(this.form).then(response => {
            if (response.code == 200) {
              this.$message({
                type: "success",
                message: "申请成功"
              });
              this.cancel()
              this.cancel();
            } else {
              this.$message({
                type: "error",
@@ -2254,8 +2286,6 @@
          //关闭窗口
          this.loading = false;
          // this.getfundList();
          // this.$store.dispatch("tagsView/delView", this.$route);
          // this.$router.go(-1);
        }
      });
    }, 500),
@@ -2282,8 +2312,7 @@
      // this.reset();
      console.log(-this.Routinglevel);
      this.$store.dispatch("tagsView/delView", this.$route);
        this.$router.go(-this.Routinglevel);
      this.$router.go(-this.Routinglevel);
    },
    //获取当前用户信息
src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue
@@ -147,6 +147,19 @@
            </template>
          </el-table-column>
          <el-table-column
            label="预审状态"
            width="140"
            align="center"
            prop="checkFlag"
          >
            <template slot-scope="scope">
              <dict-tag
                :options="dict.type.sys_stage_type"
                :value="scope.row.checkstatus"
              />
            </template>
          </el-table-column>
          <el-table-column
            label="捐献者"
            align="center"
            prop="donorname"
@@ -170,6 +183,14 @@
                v-if="scope.row.checkFlag == 0"
                @click="handleDetail(scope.row)"
                >详情</el-button
              >
              <el-button
                v-if="scope.row.checkFlag == 1"
                size="mini"
                type="text"
                icon="el-icon-edit"
                @click="beforehandCheck(scope.row)"
                >预审核</el-button
              >
              <el-button
                v-if="scope.row.checkFlag == 1"
@@ -730,7 +751,8 @@
    "sys_ConsolationType",
    "sys_fund_type",
    "sys_finsubject",
    "sys_financeitemtype"
    "sys_financeitemtype",
    "sys_stage_type"
  ],
  data() {
    return {
@@ -826,6 +848,21 @@
          label: "全部"
        }
      ],
      // 审批单流程
      checkFlagOptionsbar: [
        {
          value: 1,
          label: "待预审"
        },
        {
          value: 2,
          label: "预算通过,等待纸质报销材料"
        },
        {
          value: 3,
          label: "收到纸质报销材料"
        }
      ],
      // 查询参数
      queryParams: {
        pageNum: 1,
@@ -916,7 +953,7 @@
  mounted() {
    if (grtItem("ethicalExpertFeeCheck")) {
      this.queryParams = grtItem("ethicalExpertFeeCheck");
    };
    }
    this.selectReporters();
    this.getlistOrganization();
    //this.getlistUser();
@@ -1029,7 +1066,6 @@
    isopenvalue(index) {
      this.isopen = index;
    },
    tojust(e) {
      let username = "111";
      getFund(e).then(res => {
@@ -1235,6 +1271,17 @@
        });
      }
    },
    beforehandCheck(row) {
      this.$router.push({
        path: "/finance/applyDetail/",
        query: {
          id: row.id,
          beforehandType: "1",
          businessType: "2",
          operationType: "check",
        }
      });
    },
    /** 修改按钮操作 */
    handleCheck(row) {
      this.$router.push({
src/views/project/fundcheck/expertFeeCheck/index.vue
@@ -88,6 +88,19 @@
              <dict-tag :options="dict.type.sys_recordstatus" :value="scope.row.recordstatus" />
            </template>
          </el-table-column>
          <el-table-column
        label="预审状态"
        width="140"
        align="center"
        prop="checkstatus"
      >
        <template slot-scope="scope">
          <dict-tag
            :options="dict.type.sys_stage_type"
            :value="scope.row.checkstatus"
          />
        </template>
      </el-table-column>
          <el-table-column label="捐献者" align="center" prop="donorname" width="120px" />
          <el-table-column label="备注" align="center" prop="remark" />
          <!--<el-table-column label="捐献编号" align="center" prop="donorno" />
@@ -96,6 +109,14 @@
            <template slot-scope="scope">
              <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.checkFlag == 0"
                @click="handleDetail(scope.row)">详情</el-button>
                <el-button
                v-if="scope.row.checkFlag == 1"
                size="mini"
                type="text"
                icon="el-icon-edit"
                @click="beforehandCheck(scope.row)"
                >预审核</el-button
              >
              <el-button v-if="scope.row.checkFlag == 1" size="mini" type="text" icon="el-icon-edit"
                @click="handleCheck(scope.row)">审核</el-button>
              <!-- v-hasPermi="['project:donateconsolationfund:edit']" -->
@@ -444,6 +465,7 @@
    "sys_fund_type",
    "sys_finsubject",
    "sys_financeitemtype",
    "sys_stage_type"
  ],
  data() {
    return {
@@ -942,6 +964,17 @@
        });
      }
    },
    beforehandCheck(row){
      this.$router.push({
        path: "/finance/applyDetail/",
        query: {
          id: row.id,
          businessType: "2",
          beforehandType:'1',
          operationType: "check",
        }
      });
    },
    /** 修改按钮操作 */
    handleCheck(row) {      
      this.$router.push({
src/views/project/fundcheck/medicalCostCheck/index.vue
@@ -187,6 +187,19 @@
              />
            </template>
          </el-table-column>
          <el-table-column
        label="预审状态"
        width="140"
        align="center"
        prop="checkstatus"
      >
        <template slot-scope="scope">
          <dict-tag
            :options="dict.type.sys_stage_type"
            :value="scope.row.checkstatus"
          />
        </template>
      </el-table-column>
          <el-table-column label="备注" align="center" prop="remark" />
          <el-table-column
            label="操作"
@@ -196,6 +209,14 @@
            width="260px"
          >
            <template slot-scope="scope">
              <el-button
                v-if="scope.row.checkFlag == 1"
                size="mini"
                type="text"
                icon="el-icon-edit"
                @click="beforehandCheck(scope.row)"
                >预审核</el-button
              >
              <el-button
                v-if="scope.row.checkFlag == 1"
                size="mini"
@@ -911,7 +932,8 @@
    "sys_fund_type",
    "sys_finsubject",
    "sys_financeitemtype",
    "sys_consolationfundlevel"
    "sys_consolationfundlevel",
    "sys_stage_type"
  ],
  data() {
    return {
@@ -1360,6 +1382,17 @@
        });
      }
    },
    beforehandCheck(row){
      this.$router.push({
        path: "/finance/applyDetail/",
        query: {
          id: row.id,
          businessType: "3",
          beforehandType:'1',
          operationType: "check",
        }
      });
    },
    /** 修改按钮操作 */
    handleCheck(row) {
      this.$router.push({
src/views/project/fundcheck/officeExpenseCheck/index.vue
@@ -167,6 +167,19 @@
              />
            </template>
          </el-table-column>
          <el-table-column
        label="预审状态"
        width="140"
        align="center"
        prop="checkstatus"
      >
        <template slot-scope="scope">
          <dict-tag
            :options="dict.type.sys_stage_type"
            :value="scope.row.checkstatus"
          />
        </template>
      </el-table-column>
          <el-table-column label="备注" align="center" prop="remark" />
          <el-table-column
            label="操作"
@@ -183,6 +196,14 @@
                v-if="scope.row.checkFlag == 0"
                @click="handleDetail(scope.row)"
                >详情</el-button
              >
              <el-button
                v-if="scope.row.checkFlag == 1"
                size="mini"
                type="text"
                icon="el-icon-edit"
                @click="beforehandCheck(scope.row)"
                >预审核</el-button
              >
              <el-button
                v-if="scope.row.checkFlag == 1"
@@ -892,7 +913,8 @@
    "sys_fund_type",
    "sys_finsubject",
    "sys_financeitemtype",
    "sys_consolationfundlevel"
    "sys_consolationfundlevel",
    "sys_stage_type"
  ],
  data() {
    return {
@@ -1342,6 +1364,17 @@
        });
      }
    },
    beforehandCheck(row){
      this.$router.push({
        path: "/finance/applyDetail/",
        query: {
          id: row.id,
          businessType: "2",
          beforehandType:'1',
          operationType: "check",
        }
      });
    },
    /** 审核按钮操作 */
    handleCheck(row) {
      this.$router.push({
src/views/project/travelexpenseapply/travelexpensedetail/index.vue
@@ -84,7 +84,7 @@
              />
            </el-form-item>
          </el-col>
          <el-col :span="10">
          <el-col :span="7">
            <el-form-item label="大写金额" prop="bigstrmoney">
              <el-input
                :disabled="true"
@@ -92,7 +92,7 @@
                placeholder="报销大写金额"
              />
            </el-form-item> </el-col
          ><el-col :span="5">
          ><el-col :span="4">
            <el-form-item label="审核状态" prop="flowlevel">
              <el-select
                v-model="form.recordstatus"
@@ -107,6 +107,23 @@
                  :label="dict.label"
                  :value="dict.value"
                />
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="5">
            <el-form-item label="预审状态" prop="infoid">
              <el-select
                v-model="form.checkstatus"
                filterable
                placeholder="请选择预审状态"
              >
                <el-option
                  v-for="item in baselisttages"
                  :key="item.id"
                  :label="item.name"
                  :value="item.id"
                >
                </el-option>
              </el-select>
            </el-form-item>
          </el-col>
@@ -920,13 +937,13 @@
        <el-button
          type="primary"
          @click="submitForm"
          v-if="operationType == 'edit'"
          v-if="operationType == 'edit'||beforehandType=='1'"
          >保 存</el-button
        >
        <el-button
          type="primary"
          @click="checksubmit"
          v-if="operationType == 'check'"
          v-if="operationType == 'check'&& beforehandType!='1'"
          >提 交</el-button
        >
        <!--<el-button @click="cancel">退 出</el-button>-->
@@ -946,8 +963,7 @@
          <el-table-column prop="orderno" label="序号"> </el-table-column>
          <el-table-column prop="personname" label="费用人员">
          </el-table-column>
          <el-table-column prop="starttime" label="开始日期">
          </el-table-column>
          <el-table-column prop="starttime" label="开始日期"> </el-table-column>
          <el-table-column prop="endtime" label="结束日期"> </el-table-column>
          <el-table-column prop="departure" label="出发地"> </el-table-column>
          <el-table-column prop="destination" label="到达地"> </el-table-column>
@@ -1254,6 +1270,20 @@
      rbDetails: [],
      rbPayees: [],
      arrr2: [],
      baselisttages: [
        {
          id: 1,
          name: "待预审"
        },
        {
          id: 2,
          name: "预审通过等待材料"
        },
        {
          id: 3,
          name: "已收到报销材料"
        },
      ],
      baselist: [],
      donatorList: [],
      standardlevel: 0,
@@ -1271,7 +1301,7 @@
      persontype: null,
      //到达地
      arriveAddr: null,
      beforehandType:null,
      headers: {
        Authorization: "Bearer " + getToken()
      },
@@ -1333,6 +1363,7 @@
    let curId = this.$route.query.id;
    let pos = this.$route.query.pos;
    this.defaultperson = this.$route.query.routerparam;
    this.beforehandType = this.$route.query.beforehandType;
    if (pos == 1) {
      this.handleAdd(curId);
    } else if (pos == 2) {
@@ -1349,7 +1380,7 @@
    });
  },
  destroyed() {
    window.removeEventListener('beforeunload', e => this.beforeunloadFn(e))
    window.removeEventListener("beforeunload", e => this.beforeunloadFn(e));
  }, //生命周期 - 销毁完成
  methods: {
@@ -2212,7 +2243,7 @@
          const rbDetails = [...this.rbDetails];
          const rbPayees = [...this.rbPayees];
          if (this.form.id != null) {
            console.log(this.form);
            console.log(this.form);
            updateReimbursement(this.form);
            //   .then(res => {
            //保存明细
@@ -2544,7 +2575,7 @@
      })
        .then(() => {
          console.log(row);
          let arrow=[];
          let arrow = [];
          arrow.push(row.id);
          if (row.id !== null) {
            delReimbursementpayee(arrow).then(res => {
src/views/project/travelexpensecheck/index.vue
@@ -128,19 +128,7 @@
          <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
        </template>
      </el-table-column>
      <el-table-column
        label="审批状态"
        width="120"
        align="center"
        prop="checkFlag"
      >
        <template slot-scope="scope">
          <dict-tag
            :options="dict.type.sys_recordstatus"
            :value="scope.row.recordstatus"
          />
        </template>
      </el-table-column>
      <el-table-column
        label="经办人"
        width="120"
@@ -166,14 +154,41 @@
        prop="amountrequested"
      >
      </el-table-column>
      <el-table-column label="出差事由" align="center" prop="reason">
      </el-table-column>
      <el-table-column
        label="捐献者"
        width="120"
        align="center"
        prop="donorname"
      >
      </el-table-column>
      <el-table-column
        label="审批状态"
        width="140"
        align="center"
        prop="checkFlag"
      >
        <template slot-scope="scope">
          <dict-tag
            :options="dict.type.sys_recordstatus"
            :value="scope.row.recordstatus"
          />
        </template>
      </el-table-column>
      <el-table-column
        label="预审状态"
        width="140"
        align="center"
        prop="checkstatus"
      >
        <template slot-scope="scope">
          <dict-tag
            :options="dict.type.sys_stage_type"
            :value="scope.row.checkstatus"
          />
        </template>
      </el-table-column>
      <el-table-column label="出差事由" align="center" prop="reason">
      </el-table-column>
      <!-- 
      <el-table-column label="出差人" width="180" align="center" prop="travelers">
@@ -200,10 +215,18 @@
      >
        <template slot-scope="scope">
          <el-button
                v-if="scope.row.checkFlag == 1"
                size="mini"
                type="text"
                icon="el-icon-edit"
                @click="beforehandCheck(scope.row)"
                >预审核</el-button
              >
          <el-button
            size="mini"
            type="text"
            icon="el-icon-edit"
            v-if="scope.row.checkFlag == 1 || scope.row.checkFlag == 0"
            v-if="scope.row.checkFlag == 1"
            @click="handleUpdate(scope.row)"
            >审批</el-button
          >
@@ -1094,7 +1117,7 @@
          />
          <el-table-column
            label="审核日期"
            align="center"
            align="center"
            width="160"
            prop="createTime"
          />
@@ -1212,7 +1235,8 @@
    "sys_0_1",
    "sys_fund_type",
    "sys_financeitemtype",
    "sys_travelexpensebelong"
    "sys_travelexpensebelong",
"sys_stage_type",
  ],
  data() {
    return {
@@ -1532,6 +1556,12 @@
      this.open = true;
      this.title = "添加报销申请";
    },
    beforehandCheck(row){
      this.$router.push({
        path: "/finance/travelexpenseapply/travelexpensedetail/",
        query: { id: row.id, pos: 4,beforehandType:'1' }
      });
    },
    /** 修改按钮操作 */
    handleUpdate(row) {
      this.$router.push({