yxh
yxh
2023-08-10 6c6de9a0f4f6bfe8e80292b0bf0bc31d8b63a979
yxh
已修改1个文件
已重命名12个文件
已复制1个文件
156 ■■■■ 文件已修改
src/router/index.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fund/applyDetail/index.vue 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fund/ethicalExpertFeeApply/index.vue 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fund/expertFeeApply/index.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fund/medicalCostApply/index.vue 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fund/officeExpenseApply/index.vue 103 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fundcheck/expertFeeCheck/index.vue 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fundcheck/medicalCostCheck/index.vue 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fundcheck/officeExpenseCheck/index.vue 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/travelexpenseapply/edit.vue 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/travelexpenseapply/index.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/travelexpenseapply/travelexpensedetail/index.vue 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/travelexpensecheck/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/router/index.js
@@ -164,7 +164,7 @@
    children: [
      {
        path: 'edit',
        component: (resolve) => require(['@/views/project/travelexpenseslist/eidt'], resolve),
        component: (resolve) => require(['@/views/project/travelexpenseapply/edit'], resolve),
        name: 'edit',
        meta: { title: '修改', icon: 'edit' }
      }
src/views/project/fund/applyDetail/index.vue
src/views/project/fund/ethicalExpertFeeApply/index.vue
ÎļþÃû´Ó src/views/project/fund/fundApply/index.vue ÐÞ¸Ä
@@ -69,18 +69,22 @@
            </el-row>
            <el-row>
              <el-table v-loading="loading" border :data="donateconsolationfundList">
                <el-table-column label="申请日期" align="center" prop="createTime" width="180px" />
                <el-table-column label="申请日期" align="center" prop="createTime" width="150px">
                  <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" width="120px" />
                <el-table-column label="审核状态" width="150" align="center" prop="recordstatus">
                <el-table-column label="申请金额" align="center" prop="pretaxcost" width="200px" />
                <el-table-column label="所属组别" align="center" prop="deptmentname" width="200px" />
                <el-table-column label="组长" align="center" prop="managername" width="150px" />
                <el-table-column label="审核状态" align="center" prop="recordstatus">
                  <template slot-scope="scope">
                    <dict-tag :options="dict.type.sys_recordstatus" :value="scope.row.recordstatus" />
                  </template>
                </el-table-column>
                <el-table-column label="税前金额合计" align="center" prop="pretaxcost" 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="deptmentname" width="150px" />
                <el-table-column label="组长" align="center" prop="managername" width="220px" />
                <!--
                <el-table-column label="联系电话" align="center" prop="phone" width="150px" />
                <el-table-column label="工作单位" align="center" prop="unitname" width="220px" />
src/views/project/fund/expertFeeApply/index.vue
ÎļþÃû´Ó src/views/project/fund/expertFeeFundApply/index.vue ÐÞ¸Ä
@@ -79,13 +79,14 @@
                  </template>
                </el-table-column>
                <el-table-column label="申请人" align="center" prop="username" width="120px" />
                <el-table-column label="审核状态" width="150" align="center" prop="recordstatus">
                <el-table-column label="申请金额" align="center" prop="pretaxcost" width="200px" />
                <el-table-column label="组长" align="center" prop="managername" width="120px" />
                <el-table-column label="所属组别" align="center" prop="deptmentname" width="200px" />
                <el-table-column label="审核状态" align="center" prop="recordstatus">
                  <template slot-scope="scope">
                    <dict-tag :options="dict.type.sys_recordstatus" :value="scope.row.recordstatus" />
                  </template>
                </el-table-column>
                <el-table-column label="所属组别" align="center" prop="deptmentname" width="220px" />
                <el-table-column label="组长" align="center" prop="managername" width="150px" />
                <!-- 
                <el-table-column label="申请金额" align="center" prop="amountrequested" width="120px" />    
                <el-table-column label="联系电话" align="center" prop="phone" width="150px" />
src/views/project/fund/medicalCostApply/index.vue
ÎļþÃû´Ó src/views/project/fund/medicalCostFundApply/index.vue ÐÞ¸Ä
@@ -77,15 +77,15 @@
                    }}</span>
                  </template>
                </el-table-column>
                <el-table-column label="申请人" align="center" prop="username" width="150px" />
                <el-table-column label="审核状态" width="150" align="center" prop="recordstatus">
                <el-table-column label="申请人" align="center" prop="username" width="120px" />
                <el-table-column label="申请金额" align="center" prop="pretaxcost" width="200px" />
                <el-table-column label="所属组别" align="center" prop="deptmentname" width="220px" />
                <el-table-column label="组长" align="center" prop="managername" width="200px" />
                <el-table-column label="审核状态" align="center" prop="recordstatus">
                  <template slot-scope="scope">
                    <dict-tag :options="dict.type.sys_recordstatus" :value="scope.row.recordstatus" />
                  </template>
                </el-table-column>
                <el-table-column label="申请金额" align="center" prop="amountrequested" width="150px" />
                <el-table-column label="所属组别" align="center" prop="deptmentname" width="150px" />
                <el-table-column label="组长" align="center" prop="managername" width="220px" />
                <!--
                  <el-table-column label="联系电话" align="center" prop="phone" width="150px" />
                <el-table-column label="工作单位" align="center" prop="unitname" width="150px" />
@@ -770,7 +770,7 @@
    /** æ–°å¢žæŒ‰é’®æ“ä½œ */
    handleAdd() {
      this.$router.push({
        path: "/finance/fundcontext/",
        path: "/finance/applyDetail/",
        query: {
          id: 0,
          businessType: "3",
@@ -811,7 +811,7 @@
    /** ä¿®æ”¹æŒ‰é’®æ“ä½œ */
    handleUpdate(row) {
      this.$router.push({
        path: "/finance/fundcontext/",
        path: "/finance/applyDetail/",
        query: {
          id: row.id,
          businessType: "3",
@@ -854,7 +854,7 @@
    /** æŸ¥çœ‹æŒ‰é’®æ“ä½œ */
    handleDetail(row) {
      this.$router.push({
        path: "/finance/fundcontext/",
        path: "/finance/applyDetail/",
        query: {
          id: row.id,
          businessType: "3",
@@ -1099,6 +1099,7 @@
      this.curCase = row;
      this.getfundList();
    },
    getfundList() {
      this.loading = true;
      this.reset();
@@ -1106,6 +1107,7 @@
      listFund(this.fundQueryParam).then(response => {
        this.loading = false;
        this.donateconsolationfundList = response.rows;
        console.log("donateconsolationfundList",this.donateconsolationfundList);
      });
    },
src/views/project/fund/officeExpenseApply/index.vue
ÎļþÃû´Ó src/views/project/fund/overheadcosts/index.vue ÐÞ¸Ä
@@ -23,55 +23,59 @@
        </el-col>
      </el-row>
    </el-form>
    <el-row>
    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
          v-hasPermi="['project:medicalfund:add']">创建申请单</el-button>
        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
        <!-- v-hasPermi="['project:medicalfund:add']" -->
      </el-col>
      <el-col :span="1.5">
        <el-button type="warning" plain icon="el-icon-download" size="mini" :loading="exportLoading"
          @click="handleExport">导出</el-button>
      </el-col>
      <!-- v-hasPermi="['project:medicalfund:export']" -->
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>
    <el-row>
      <el-table v-loading="loading" border :data="donateconsolationfundList">
        <el-table-column label="申请日期" align="center" prop="createTime" width="150px">
          <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" width="150px" />
        <el-table-column label="审核状态" width="150" align="center" prop="recordstatus">
          <template slot-scope="scope">
            <dict-tag :options="dict.type.sys_recordstatus" :value="scope.row.recordstatus" />
          </template>
        </el-table-column>
        <el-table-column label="申请金额" align="center" prop="amountrequested" width="150px" />
        <el-table-column label="所属组别" align="center" prop="deptmentname" width="150px" />
        <el-table-column label="组长" align="center" prop="managername" width="220px" />
        <!--
    <el-table v-loading="loading" border :data="donateconsolationfundList">
      <el-table-column label="申请日期" align="center" prop="createTime" width="180px">
        <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" width="150px" />
      <el-table-column label="申请金额" align="center" prop="pretaxcost" width="150px" />
      <el-table-column label="所属组别" align="center" prop="deptmentname" width="200px" />
      <el-table-column label="组长" align="center" prop="managername" width="150px" />
      <el-table-column label="审核状态" width="150" align="center" prop="recordstatus">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.sys_recordstatus" :value="scope.row.recordstatus" />
        </template>
      </el-table-column>
      <!--
                  <el-table-column label="联系电话" align="center" prop="phone" width="150px" />
                <el-table-column label="工作单位" align="center" prop="unitname" width="150px" />
                -->
        <el-table-column label="备注" align="center" prop="remark" />
        <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width" width="280px">
          <template slot-scope="scope">
            <el-button v-if="scope.row.recordstatus == -1 ||
              scope.row.recordstatus == 1
              " size="mini" type="text" icon="el-icon-edit" @click="handleup(scope.row)">上报</el-button>
            <el-button v-if="scope.row.recordstatus == -1 ||
              scope.row.recordstatus == 1
              " size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
              v-hasPermi="['project:medicalfund:edit']">修改</el-button>
            <el-button size="mini" type="text" icon="el-icon-edit" @click="handleDetail(scope.row)">查看</el-button>
            <el-button v-if="scope.row.recordstatus == -1 ||
              scope.row.recordstatus == 1
              " size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
              v-hasPermi="['project:medicalfund:delete']">删除</el-button>
            <el-button size="mini" type="text" icon="el-icon-download" @click="mixExport(scope.row.id)"
              v-hasPermi="['project:medicalfund:download']">下载</el-button>
          </template>
        </el-table-column>
      </el-table>
    </el-row>
      <el-table-column label="备注" align="center" prop="remark" />
      <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width" width="280px">
        <template slot-scope="scope">
          <el-button v-if="scope.row.recordstatus == -1 ||
            scope.row.recordstatus == 1
            " size="mini" type="text" icon="el-icon-edit" @click="handleup(scope.row)">上报</el-button>
          <el-button v-if="scope.row.recordstatus == -1 ||
            scope.row.recordstatus == 1
            " size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
            v-hasPermi="['project:medicalfund:edit']">修改</el-button>
          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleDetail(scope.row)">查看</el-button>
          <el-button v-if="scope.row.recordstatus == -1 ||
            scope.row.recordstatus == 1
            " size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
            v-hasPermi="['project:medicalfund:delete']">删除</el-button>
          <el-button size="mini" type="text" icon="el-icon-download" @click="mixExport(scope.row.id)"
            v-hasPermi="['project:medicalfund:download']">下载</el-button>
        </template>
      </el-table-column>
    </el-table>
    <!-- æ·»åŠ æˆ–ä¿®æ”¹è´¹ç”¨ç”³è¯·å• -->
    <el-dialog :visible.sync="dialogOpen" :close-on-click-modal="false" width="1400px" :title="title"
      style="text-align: center" v-loading="loading">
@@ -184,7 +188,8 @@
              </template>
            </el-table-column>
            <el-table-column prop="beneficiaryno" align="center" label="姓名" width="120" v-if="form.applytype=='1' || form.applytype=='2'">
            <el-table-column prop="beneficiaryno" align="center" label="姓名" width="120"
              v-if="form.applytype == '1' || form.applytype == '2'">
              <template slot-scope="scope">
                <el-button type="primary" plain @click="ShowDetailDialog(scope, 'name')">{{ scope.row.beneficiaryname
                }}</el-button>
@@ -791,7 +796,7 @@
    /** æ–°å¢žæŒ‰é’®æ“ä½œ */
    handleAdd() {
      this.$router.push({
        path: "/finance/fundcontext/",
        path: "/finance/applyDetail/",
        query: { id: 0, businessType: "4", operationType: "add" }
      });
@@ -816,7 +821,7 @@
    /** ä¿®æ”¹æŒ‰é’®æ“ä½œ */
    handleUpdate(row) {
      this.$router.push({
        path: "/finance/fundcontext/",
        path: "/finance/applyDetail/",
        query: { id: row.id, businessType: "4", operationType: "update" }
      });
@@ -847,8 +852,8 @@
    /** æŸ¥çœ‹æŒ‰é’®æ“ä½œ */
    handleDetail(row) {
      this.$router.push({
        path: "/finance/fundcontext/",
        query: { id: row.id, businessType: "4", operationType: "detail"}
        path: "/finance/applyDetail/",
        query: { id: row.id, businessType: "4", operationType: "detail" }
      });
      this.isopen = 0;
@@ -1038,7 +1043,7 @@
        this.total = response.total;
        this.loading = false;
      });
    },
    },
    // å–消按钮
    cancel() {
src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue
src/views/project/fundcheck/expertFeeCheck/index.vue
src/views/project/fundcheck/medicalCostCheck/index.vue
src/views/project/fundcheck/officeExpenseCheck/index.vue
copy from src/views/project/medicalcostfundapplycheck/index.vue copy to src/views/project/fundcheck/officeExpenseCheck/index.vue
src/views/project/travelexpenseapply/edit.vue
src/views/project/travelexpenseapply/index.vue
ÎļþÃû´Ó src/views/project/travelexpenseslist/index.vue ÐÞ¸Ä
@@ -1847,7 +1847,7 @@
    handleAdd() {
      console.log("defaultperson",this.defaultperson);
      this.$router.push({
        path: "/finance/travelexpenseslist/Modifydetails/",
        path: "/finance/travelexpenseapply/travelexpensedetail/",
        query: { id: 0, pos: 1,routerparam:this.defaultperson}
      });
@@ -1870,7 +1870,7 @@
    /** ä¿®æ”¹æŒ‰é’®æ“ä½œ */
    handleUpdate(row) {
      this.$router.push({
        path: "/finance/travelexpenseslist/Modifydetails/",
        path: "/finance/travelexpenseapply/travelexpensedetail/",
        query: { id: row.id, pos: 2 }
      });
      this.dialogType = "edit";
@@ -1927,7 +1927,7 @@
    /** æŸ¥çœ‹æŒ‰é’®æ“ä½œ */
    handleDetail(row) {
      this.$router.push({
        path: "/finance/travelexpenseslist/Modifydetails/",
        path: "/finance/travelexpenseapply/travelexpensedetail/",
        query: { id: row.id, pos: 3 }
      });
      
src/views/project/travelexpenseapply/travelexpensedetail/index.vue
src/views/project/travelexpensecheck/index.vue
ÎļþÃû´Ó src/views/project/travelexpenseslistrecord/index.vue ÐÞ¸Ä
@@ -948,7 +948,7 @@
    /** ä¿®æ”¹æŒ‰é’®æ“ä½œ */
    handleUpdate(row) {
      this.$router.push({
        path: "/finance/travelexpenseslist/Modifydetails/",
        path: "/finance/travelexpenseapply/travelexpensedetail/",
        query: { id: row.id, pos: 4 }
      });
      this.dialogType = "edit";