8022f7036945b75f82f2dfc43055623f81ed98f6..3e136d18ac8f7a0c6aede92cfdd30206b20417d3
8 天以前 yxh
Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo-web
3e136d 对比 | 目录
8 天以前 yxh
修了差旅报销
6d5e5a 对比 | 目录
2025-06-05 WXL
Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo-web
0b5a70 对比 | 目录
2025-06-05 WXL
11
0875e8 对比 | 目录
已修改15个文件
120 ■■■■■ 文件已修改
package.json 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/store/getters.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/store/modules/user.js 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/externalperson/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fund/applyDetail/index.vue 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fund/applyDetail0/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fund/expertFeeApply/index.vue 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fund/performancedetails/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fundcheck/expertFeeCheck/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fundcheck/medicalCostCheck/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fundcheck/officeExpenseCheck/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fundcheck/performanceCheck/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/organallocation/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/travelexpenseapply/travelexpensedetail/index.vue 67 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
package.json
@@ -73,7 +73,7 @@
  "devDependencies": {
    "@vue/cli-plugin-babel": "4.4.6",
    "@vue/cli-plugin-eslint": "4.4.6",
    "@vue/cli-service": "4.4.6",
    "@vue/cli-service": "^5.0.8",
    "babel-eslint": "10.1.0",
    "chalk": "4.1.0",
    "connect": "3.6.6",
src/store/getters.js
@@ -11,6 +11,7 @@
  organization: state => state.user.organization,
  introduction: state => state.user.introduction,
  roles: state => state.user.roles,
  rolesor: state => state.user.rolesor,
  permissions: state => state.user.permissions,
  permission_routes: state => state.permission.routes,
  topbarRouters:state => state.permission.topbarRouters,
src/store/modules/user.js
@@ -13,6 +13,7 @@
    code: '',
    msg: '',
    roles: [],
    rolesor: [],
    permissions: [],
    organization:[],
    addressArray:[],
@@ -36,6 +37,9 @@
    },
    SET_ROLES: (state, roles) => {
      state.roles = roles
    },
    SET_ROLESor: (state, rolesor) => {
      state.rolesor = rolesor
    },
     SET_addressArray: (state, addressArray) => {
      state.addressArray = addressArray
@@ -89,6 +93,7 @@
            commit('SET_ROLES', ['ROLE_DEFAULT'])
          }
          commit('SET_NAME', user.userName)
          commit('SET_ROLESor', user.roles)
          commit('SET_AVATAR', avatar)
          resolve(res)
        }).catch(error => {
src/views/project/externalperson/index.vue
@@ -452,7 +452,7 @@
      getUserProfile().then(res => {
        if (
          res.data.userName == "admin" ||
          res.data.userName == "001" ||
          res.data.userName == "053" ||
          res.data.userName == "047"
        ) {
          this.ismanager = true;
src/views/project/fund/applyDetail/index.vue
@@ -1287,6 +1287,8 @@
</template>
<script>
import store from "@/store";
// 'sdaad2123UD2',1  'wsadadwsad',4 'sdadaddad',3 'ssaaddxs',2
//这里可以导入其他文件(比如:组件,工具js,第三方插件js,json文件,图片文件等等)
//例如:import 《组件名称》 from '《组件路径》';
@@ -2316,10 +2318,11 @@
      getUserProfile().then(res => {
        this.userprofile = res.data;
        this.standardlevel = res.data.standardlevel;
        if (
          this.userprofile.userName == "admin" ||
          this.userprofile.userName == "001" ||
          this.userprofile.userName == "047"
          this.userprofile.userName == "053" ||
          this.userprofile.userName == "047"|| store.getters.rolesor[0].roleSort=='13'
        ) {
          this.ismanager = true;
        } else {
src/views/project/fund/applyDetail0/index.vue
@@ -2126,7 +2126,7 @@
        this.standardlevel = res.data.standardlevel;
        if (
          this.userprofile.userName == "admin" ||
          this.userprofile.userName == "001" ||
          this.userprofile.userName == "053" ||
          this.userprofile.userName == "047"
        ) {
          this.ismanager = true;
src/views/project/fund/expertFeeApply/index.vue
@@ -202,10 +202,10 @@
                    />
                  </template>
                </el-table-column>
                <!--
                <el-table-column label="申请金额" align="center" prop="amountrequested" width="120px" />
                <!--
                <el-table-column label="申请金额" align="center" prop="amountrequested" width="120px" />
                <el-table-column label="联系电话" align="center" prop="phone" width="150px" />
                <el-table-column label="工作单位" align="center" prop="unitname" width="220px" />
                <el-table-column label="工作单位" align="center" prop="unitname" width="220px" />
                -->
                <el-table-column
                  label="操作"
@@ -786,14 +786,14 @@
          </el-table>
        </el-row>
        <!--
        <el-row>
        <el-row>
          <el-col :span="7">
            <el-form-item label="预支金额" prop="prepaidamount">
              <el-input v-model="form.prepaidamount" placeholder="申请金额" />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="7">
            <el-form-item label="OPO中心签字" prop="opochecker">
              <el-input v-model="form.opochecker" placeholder="opo中心签字" />
@@ -1026,7 +1026,7 @@
                  :value="dict.value"></el-option>
              </el-select>
            </el-form-item>
          </el-col>
          </el-col>
        </el-row>
      -->
        <el-row>
@@ -1745,7 +1745,7 @@
            }
            this.fundDetails[i] = tempDetail;
            /*
            //计算个税
            //计算个税
            //if (isNaN(parseFloat(tempDetail.taxedamount)))
            //获取参数
            this.taxParam.beneficiaryNo = tempDetail.beneficiaryno;
@@ -2028,7 +2028,7 @@
        this.standardlevel = response.data.standardlevel;
        if (
          this.defaultperson.createBy == "admin" ||
          this.defaultperson.createBy == "001" ||
          this.defaultperson.createBy == "053" ||
          this.defaultperson.createBy == "002"
        ) {
          this.ismanager = true;
src/views/project/fund/performancedetails/index.vue
@@ -1821,7 +1821,7 @@
        this.standardlevel = res.data.standardlevel;
        if (
          this.userprofile.userName == "admin" ||
          this.userprofile.userName == "001" ||
          this.userprofile.userName == "053" ||
          this.userprofile.userName == "047"
        ) {
          this.ismanager = true;
src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue
@@ -1874,7 +1874,7 @@
        // this.defaultperson = response.data;
        // this.standardlevel = response.data.standardlevel;
        if (
          response.data.userName === "001" ||
          response.data.userName === "053" ||
          response.data.userName === "002" ||
          response.data.userName === "admin"
        ) {
src/views/project/fundcheck/expertFeeCheck/index.vue
@@ -694,7 +694,7 @@
    getUsermsg() {
      getUserProfile().then(response => {
        if (
          response.data.userName === "001" ||
          response.data.userName === "053" ||
          response.data.userName === "002" ||
          response.data.userName === "012" ||
          response.data.userName === "admin"
src/views/project/fundcheck/medicalCostCheck/index.vue
@@ -1552,7 +1552,7 @@
        // this.defaultperson = response.data;
        // this.standardlevel = response.data.standardlevel;
        if (
          response.data.userName === "001" ||
          response.data.userName === "053" ||
          response.data.userName === "002" ||
          response.data.userName === "admin"
        ) {
src/views/project/fundcheck/officeExpenseCheck/index.vue
@@ -1997,7 +1997,7 @@
        // this.defaultperson = response.data;
        // this.standardlevel = response.data.standardlevel;
        if (
          response.data.userName === "001" ||
          response.data.userName === "053" ||
          response.data.userName === "002" ||
          response.data.userName === "admin"
        ) {
src/views/project/fundcheck/performanceCheck/index.vue
@@ -501,7 +501,7 @@
        // this.defaultperson = response.data;
        // this.standardlevel = response.data.standardlevel;
        if (
          response.data.userName === "001" ||
          response.data.userName === "053" ||
          response.data.userName === "002" ||
          response.data.userName === "admin"
        ) {
src/views/project/organallocation/index.vue
@@ -700,7 +700,7 @@
      this.queryParams.reportervalue = this.reportervalue;
      console.log(JSON.stringify(this.queryParams));
      // this.queryParams.city='001'
      // this.queryParams.city='053'
      //console.log(JSON.stringify(this.queryParams));
      if (this.starttime != "") {
        this.queryParams.starttime = this.starttime;
src/views/project/travelexpenseapply/travelexpensedetail/index.vue
@@ -51,16 +51,25 @@
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="15">
          <el-col :span="10">
            <el-form-item label="出差事由" prop="reason">
              <el-input v-model="form.reason" placeholder="出差事由" />
            </el-form-item>
          </el-col>
          <el-col :span="5">
            <el-form-item label="捐献者" prop="infoid">
            <el-form-item label="报销类别" prop="costtype">
              <el-select v-model="form.costtype" value-key="value" placeholder="请选择报销人员类别" @change="getTravelers">
                <el-option v-for="dict in dict.type.sys_travelexpensebelong" :key="dict.value" :label="dict.label"
                  :value="dict.value"></el-option>
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="5">
            <el-form-item label="捐献者" prop="infoid" v-show="form.costtype==4">
              <el-select
                v-model="form.infoid"
                @change="selectbaseinfo"
                clearable
                filterable
                placeholder="请选择捐献者"
              >
@@ -77,23 +86,6 @@
        </el-row>
        <el-row style="margin-top: 10px">
          <el-col :span="5">
            <el-form-item label="报销金额" prop="amountrequested">
              <el-input
                :disabled="true"
                v-model="form.amountrequested"
                placeholder="报销合计金额"
              />
            </el-form-item>
          </el-col>
          <el-col :span="7">
            <el-form-item label="大写金额" prop="bigstrmoney">
              <el-input
                :disabled="true"
                v-model="form.bigstrmoney"
                placeholder="报销大写金额"
              />
            </el-form-item> </el-col
          ><el-col :span="4">
            <el-form-item label="审核状态" prop="flowlevel">
              <el-select
                v-model="form.recordstatus"
@@ -111,6 +103,24 @@
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="5">
            <el-form-item label="报销金额" prop="amountrequested">
              <el-input
                :disabled="true"
                v-model="form.amountrequested"
                placeholder="报销合计金额"
              />
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="大写金额" prop="bigstrmoney">
              <el-input
                :disabled="true"
                v-model="form.bigstrmoney"
                placeholder="报销大写金额"
              />
            </el-form-item>
            </el-col>
        </el-row>
        <!--
        <el-row>
@@ -118,15 +128,7 @@
            <el-form-item label="出差事由" prop="reason">
              <el-input v-model="form.reason" placeholder="出差事由" />
            </el-form-item>
          </el-col>
          <el-col :span="5">
            <el-form-item label="报销分类" prop="costtype">
              <el-select v-model="form.costtype" value-key="value" placeholder="请选择出差人分类" @change="getTravelers">
                <el-option v-for="dict in dict.type.sys_travelexpensebelong" :key="dict.value" :label="dict.label"
                  :value="dict.value"></el-option>
              </el-select>
            </el-form-item>
          </el-col>
          </el-col>
          <el-col :span="5">
            <el-form-item label="出差人" prop="travelers">
              <el-select v-model="form.travelers" clearable filterable allow-create ref="getReportname"
@@ -1382,6 +1384,9 @@
        ],
        deptmentname: [
          { required: true, message: "请输入所属业务组", trigger: "blur" }
        ],
        costtype: [
          { required: true, message: "请输入报销类别", trigger: "blur" }
        ]
      },
      //费用申请单form
@@ -2572,10 +2577,9 @@
              );
              return;
            }
          }
          }
          if (this.form.id != null) {
            console.log(this.form);
          if (this.form.id != null) {
            updateReimbursement(this.form);
            //   .then(res => {
            //保存明细
@@ -2745,7 +2749,6 @@
          const rbDetails = [...this.rbDetails];
          const rbPayees = [...this.rbPayees];
          if (this.form.id != null) {
            console.log(this.form);
            updateReimbursement(this.form);
            //   .then(res => {
            //保存明细