yxh

yxh

2023-08-01 5ba9921fb11703c89de646c1176dbfa0f59bc4cd

yxh

 src/utils/request.js

@@ -98,7 +98,7 @@
    Message({
      message: message,
      type: 'error',
      duration: 30* 1000
      duration: 10* 1000
    })
    return Promise.reject(error)
  }

 src/views/home/index.vue

@@ -1641,13 +1641,13 @@
        donateorgans = res.data;
        console.log("donateorgans:" + JSON.stringify(donateorgans))
      } catch (e) {}
      debugger
      //debugger
      try {
        let res = await getdonateNumberByMonth(params);
        organList = res.data;
        console.log("organList:" + JSON.stringify(organList))
      } catch (e) {}
      debugger
      //debugger
      console.log(donateorgans);
      let arr = [];
      for (let i = 0; i < 12; i++) {

 src/views/project/components/annexupload/index.vue

@@ -311,7 +311,7 @@
        this.$modal.msgSuccess(response.msg);
        this.fileList.push({ name: response.fileName, url: response.fileName });
      } else {
        this.$modal.msgError(response.msg);
        console.log(response.msg);;
      }
      console.log("上传文件后：" + JSON.stringify(this.fileList));
    },

 src/views/project/documentfiles/index.vue

@@ -698,7 +698,7 @@
        this.$modal.msgSuccess(response.msg);
        this.fileList.push({ name: response.fileName, url: response.fileName });
      } else {
        this.$modal.msgError(response.msg);
        console.log(response.msg);;
      }
      //console.log("上传文件后：" + JSON.stringify(this.fileList));
    },

 src/views/project/donateannex/index.vue

@@ -1044,7 +1044,7 @@
          }
        }
      } else {
        this.$modal.msgError(response.msg);
        console.log(response.msg);;
      }
    },


 src/views/project/fund/expertFeeFundApply/index.vue

@@ -96,10 +96,10 @@
                  <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="(scope.row)">上报</el-button>
                      " 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="date(scope.row)">修改</el-button>
                      " size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
                    <el-button size="mini" type="text" icon="el-icon-edit" @click="handleDetail(scope.row)">查看</el-button>
                    <!-- v-hasPermi="['project:expretfund:edit']" -->
                    <el-button v-if="scope.row.recordstatus == -1 ||
@@ -137,6 +137,14 @@
            </el-form-item>
          </el-col>
          <el-col :span="5">
            <el-form-item label="经办人" prop="username">
              <el-select v-model="form.username" placeholder="申请人" clearable filterable allow-create style="width: 100%">
                <el-option v-for="dict in userlist" :key="dict.index" :label="dict.nickname"
                  :value="dict.nickname"></el-option>
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="5">
            <el-form-item label="所属组别" prop="deptmentname">
              <el-input v-model="form.deptmentname" placeholder="请输入所属组别" clearable />
            </el-form-item>
@@ -144,13 +152,6 @@
          <el-col :span="5">
            <el-form-item label="组长" prop="managername">
              <el-input v-model="form.managername" placeholder="请输入组长" clearable />
            </el-form-item>
          </el-col><el-col :span="5">
            <el-form-item label="经办人" prop="username">
              <el-select v-model="form.username" placeholder="申请人" clearable filterable allow-create style="width: 100%">
                <el-option v-for="dict in userlist" :key="dict.index" :label="dict.nickname"
                  :value="dict.nickname"></el-option>
              </el-select>
            </el-form-item>
          </el-col>
        </el-row>
@@ -178,25 +179,38 @@
            </el-form-item>
          </el-col>
          <el-col :span="5">
            <el-form-item label="捐献者" prop="name">
              <el-input :disabled="true" v-model="form.name" placeholder="请输入捐献者姓名" />
            <el-form-item label="联系电话" prop="phone">
              <el-input v-model="form.phone" placeholder="请输入联系电话" />
            </el-form-item>
          </el-col>

        </el-row>
        <el-row style="text-align: left">
          <!--
          <el-col :span="5">
            <el-form-item label="合计金额" prop="amountrequested">
              <el-input v-model="form.amountrequested" placeholder="申请金额" :disabled="true" />
            </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.pretaxcost" placeholder="税前金额合计" :disabled="true" />
            </el-form-item>
          </el-col>
          <el-col :span="5">
            <el-form-item label="应缴税" prop="taxcost">
              <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>
          </el-col>-->
          <el-col :span="5">
            <el-form-item label="捐献者" prop="name">
              <el-input :disabled="true" v-model="form.name" placeholder="请输入捐献者姓名" />
            </el-form-item>
          </el-col>
          <el-col :span="5">
@@ -362,7 +376,8 @@
              </template>
            </el-table-column>
          </el-table>
        </el-row> <!--
        </el-row>
        <!--
        <el-row>   
          <el-col :span="7">
            <el-form-item label="预支金额" prop="prepaidamount">
@@ -402,20 +417,20 @@
            </el-form-item>
          </el-col>
        </el-row>
                 
              -->
        <el-row>
          <el-col :span="12">
            <el-form-item label="费用申请附件" align="left" prop="annexbankcard">
              <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileList" multiple
                :limit="20" :headers="headers" :on-success="(response, file, fileList) =>
                  uploadSccess(response, file, fileList)
                  " :on-preview="downFile" :disabled='dialogType == "detail"' :on-error="loadError"
                  " :on-preview="downFile" :disabled='dialogType == "detail"' :on-error="handleUploadError"
                :on-exceed="handleExceed" :on-remove="remove" accept="image/*,.pdf">
                <el-button :disabled='dialogType == "detail"' size="small" type="primary">上传</el-button>
              </el-upload>
            </el-form-item>
          </el-col>
        </el-row> -->
        </el-row>
        <el-row v-if="dialogType == 'detail'">
          <el-table :data="fundflowList" border>
            <el-table-column label="审核人" align="center" width="120" prop="checkusername" />
@@ -539,6 +554,7 @@
  listDonatebaseinfo,
  getDonatebaseinfo
} from "@/api/project/donatebaseinfo";

import {
  onelistFund,
  listFund,
@@ -555,6 +571,7 @@
  batchUploadFund,
  getdetailsByItemId
} from "@/api/project/fund";

import {
  onelistFunds,
  listFunddetails,
@@ -575,13 +592,16 @@
  getTaxationByBeneFiciaryNo,
  getTaxBeforeByAfterMoney
} from "@/api/project/funddetail";

import { listFundflow } from "@/api/project/fundflow";

import {
  listOrganization,
  getOrganization,
  listReportname,
  listUser
} from "@/api/project/organization";

import {
  listExternalperson,
  getExternalperson,
@@ -591,6 +611,7 @@
  updateExternalperson,
  exportExternalperson
} from "@/api/project/externalperson";

import { getUserProfile } from "@/api/system/user";
import Li_area_select from "@/components/Address";
import OrgSelecter from "@/views/project/components/orgselect";
@@ -603,7 +624,9 @@
    Li_area_select,
    OrgSelecter,
  },

  name: "fundApply",

  dicts: [
    //"sys_consolationfundlevel",
    //"sys_OrganizationType",
@@ -619,11 +642,12 @@
    "sys_recordstatus",
    "sys_professionaltitle"
  ],

  data() {
    //这里存放数据
    return {
      // 遮罩层
      loading: true,
      loading: false,
      // 导出遮罩层
      exportLoading: false,
      total: 0,
@@ -729,9 +753,6 @@

      //是否是专家费的OPO审批人员
      ismanager: false,



      unitList: [],
      dialogType: "edit",
      fundflowList: [],
@@ -795,38 +816,33 @@
  computed: {},
  //监控data中的数据变化
  watch: {},
  // mounted(){
  //  this.getUsermsg()
  // },
  //生命周期 - 创建完成（可以访问当前this实例）    
  created() {
    this.getList();
    this.getBaseInfoList();
    this.getCurFundType();
    this.getUserList();
    this.getUnitList();

  },

  //生命周期 - 挂载完成（可以访问DOM元素）
  mounted() {
    this.selectReporters();
    this.getUsermsg();
    this.getExternalpersonList();
  },

  beforeCreate() { }, //生命周期 - 创建之前
  beforeMount() { }, //生命周期 - 挂载之前
  beforeUpdate() { }, //生命周期 - 更新之前
  updated() { }, //生命周期 - 更新之后
  beforeDestroy() { }, //生命周期 - 销毁之前
  destroyed() { }, //生命周期 - 销毁完成
  activated() { }, //如果页面有keep-alive缓存功能，这个函数会触发

  //方法集合
  methods: {
    //生命周期 - 创建完成（可以访问当前this实例）
    created() {      
      console.log("getUnitList", 1);
      this.getUnitList();
      console.log("getBaseInfoList", 2);
      this.getBaseInfoList();
      console.log("getlistUser", 3);
      this.getlistUser();
      console.log("getCurFundType", 4);
      this.getCurFundType();
      console.log("getList", 5);
      this.getList();
      console.log("last", 6);
    },
    //生命周期 - 挂载完成（可以访问DOM元素）
    mounted() {
      this.selectReporters();
      this.getUsermsg();
      this.getlistExternalperson();
    },
    beforeCreate() { }, //生命周期 - 创建之前
    beforeMount() { }, //生命周期 - 挂载之前
    beforeUpdate() { }, //生命周期 - 更新之前
    updated() { }, //生命周期 - 更新之后
    beforeDestroy() { }, //生命周期 - 销毁之前
    destroyed() { }, //生命周期 - 销毁完成
    activated() { }, //如果页面有keep-alive缓存功能，这个函数会触发

    /** 搜索按钮操作 */
    handleQuery() {
@@ -841,16 +857,6 @@
      this.handleQuery();
    },

    /** 下载文件按钮操作 */
    downFile(item) {
      const url = process.env.VUE_APP_BASE_API + item.url
      var a = document.createElement('a');
      var event = new MouseEvent('click');
      a.download = item.name;
      a.href = url;
      a.dispatchEvent(event);
    },

    /** 新增按钮操作 */
    handleAdd() {
      if (this.curCase.id) {
@@ -860,13 +866,14 @@
        this.form.donorno = this.curCase.donorno;
        this.form.name = this.curCase.name;
        this.form.infoid = this.curCase.id;
        console.log("defaultperson", this.defaultperson);
        this.form.username = this.defaultperson.nickName;
        this.form.userno = this.defaultperson.userName;
        // this.form.phone = this.defaultperson.phone;

        this.form.phone = this.defaultperson.phonenumber;
        this.form.deptmentname = this.defaultperson.dept.deptName;
        this.form.deptmentno = this.defaultperson.dept.deptId;
        this.form.managername = this.defaultperson.dept.leader;

        // this.form.createTime = nowdate;
        //this.open = true;
        //this.initFundApplyForm();
@@ -1005,7 +1012,7 @@
    },

    /** 上报按钮操作 */
    handleup(row) {
    handleUp(row) {
      this.$confirm("是否确认将登记记录上报？", "提示", {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
@@ -1166,23 +1173,42 @@
          if (this.form.id != null) {
            //捐献者
            this.form.donorname = this.curCase.name;
          }
          else {

            updateFund(this.form).then((response) => {
              if (response.code === 200) {
                this.loading = false;
                for (let m = 0; m < this.fundDetails.length; m++) {
                  if (this.fundDetails[m].id > 0) {
                    updateFunddetail(this.fundDetails[m]).then((response2) => { this.$modal.msgError("专家劳务费保存失败1：" + response.msg); });
                  } else {
                    addFunddetail(this.fundDetails[m]).then((response2) => { this.$modal.msgError("专家劳务费保存失败2：" + response.msg); });
                  }
                }
                this.$modal.msgSuccess("专家劳务费保存成功！");
              } else {
                this.$modal.msgError("专家劳务费保存失败：" + response.msg);
              }

            });

          } else {
            this.form.recordstatus = -1;

            batchUploadFund(this.form).then((response) => {
              if (response.code === 200) {
                this.selectDonotor(this.curCase);
              } else {
                this.$modal.msgError("专家劳务费保存失败：" + response.msg);
              }
            });
          }

          batchUploadFund(this.form).then((response) => {
            if (response.code === 200) {
              this.$modal.msgSuccess("专家劳务费保存成功！");
              this.selectDonotor(this.curCase);
            } else {
              this.$modal.msgError("专家劳务费保存失败：" + response.msg);
            }
          });

          //关闭窗口
          this.loading = false;
          this.dialogOpen = false;
          // this.getfundList();
          this.getList();
          this.selectDonotor(this.curCase);

        }
      });
    },
@@ -1451,6 +1477,7 @@

    /** 查询捐献人道慰问金列表 */
    getList() {
      console.log("getList", "getList");
      this.loading = true;
      this.queryParams.params = {};
      if (null != this.daterangeReporttime && "" != this.daterangeReporttime) {
@@ -1461,12 +1488,11 @@
      // this.queryParams.residencetown = this.$refs.areaSelect.getQu();
      listDonatebaseinfo(this.queryParams).then((response) => {
        this.donatebaseinfoList = response.rows;
        console.log("this.queryParams", this.queryParams)
        console.log("this.donatebaseinfoList", this.donatebaseinfoList)
        this.total = response.total;
        this.loading = false;
      });
    },

    getUnitList() {
      listOrganization(3).then((response) => {
        for (let i = 0; i < response.rows.length; i++) {
@@ -1478,6 +1504,7 @@
        }
      });
    },

    getBaseInfoList() {
      this.loading = true;
      listDonatebaseinfo(this.queryParams).then((response) => {
@@ -1492,6 +1519,7 @@
      this.curCase = row;
      this.getfundList();
    },

    getfundList() {
      this.loading = true;
      this.reset();
@@ -1667,7 +1695,7 @@
    },

    //获取专家列表
    getlistExternalperson() {
    getExternalpersonList() {
      listExternalperson().then((res) => {
        this.personlist = res.rows;
      });
@@ -1711,11 +1739,33 @@
      });
    },

    getlistUser() {
    getUserList() {
      listUser().then((res) => {
        console.log("listUser", res);
        this.userlist = res.data;
      });
    },

    //筛查出对应的费用项目
    searchItemType(val, scope) {
      let result = [];
      if (val != "") {
        let tempItemArr = scope.row.itemArr;
        for (let i = 0; i < tempItemArr.length; i++) {
          let pym = tempItemArr[i].itempinyin;
          if (pym != null && pym != undefined && pym != "") {
            if (pym.indexOf(val) != -1) {
              result.push(tempItemArr[i]);
            }
          }
        }
        scope.row.itemArr = result;
      } else {
        getItemNames(scope.row.applytype).then((res) => {
          scope.row.itemArr = res.data;
          //this.$set(this.fundDetails, rowindex, row);
        });
      }
    },

    deleteRows(row, index, rows) {
@@ -1878,36 +1928,29 @@
      });
    },

    //筛查出对应的费用项目
    searchItemType(val, scope) {
      let result = [];
      if (val != "") {
        let tempItemArr = scope.row.itemArr;
        for (let i = 0; i < tempItemArr.length; i++) {
          let pym = tempItemArr[i].itempinyin;
          if (pym != null && pym != undefined && pym != "") {
            if (pym.indexOf(val) != -1) {
              result.push(tempItemArr[i]);
            }
          }
        }
        scope.row.itemArr = result;
      } else {
        getItemNames(scope.row.applytype).then((res) => {
          scope.row.itemArr = res.data;
          //this.$set(this.fundDetails, rowindex, row);
        });
      }
    },


    //文件上传
    handleUploadError() { },

    /** 下载文件按钮操作 */
    downFile(item) {
      const url = process.env.VUE_APP_BASE_API + item.url
      var a = document.createElement('a');
      var event = new MouseEvent('click');
      a.download = item.name;
      a.href = url;
      a.dispatchEvent(event);
    },

    remove(file) {
      this.fileList.splice(this.fileList.indexOf(file), 1)
    },

    handleExceed() {
      this.$message.error(`上传文件数量不能超过 ${5} 个!`);
    },

    //文件上传成功回调
    uploadSccess(response, file, fileList) {
      //获取附件信息位置
@@ -1916,14 +1959,14 @@
        this.$modal.msgSuccess(response.msg);
        this.fileList.push({ name: response.fileName, url: response.fileName });
      } else {
        this.$modal.msgError(response.msg);
        console.log(response.msg);;
      }
    },

  },


};

</script>
<style scoped>
/* @import url(); 引入公共css类 */

 src/views/project/fund/fundApply/index.vue

@@ -1470,7 +1470,7 @@
        this.$modal.msgSuccess(response.msg);
        this.fileList.push({ name: response.fileName, url: response.fileName });
      } else {
        this.$modal.msgError(response.msg);
        console.log(response.msg);;
      }
    },


 src/views/project/fund/medicalCostFundApply/index.vue

@@ -1499,7 +1499,7 @@
        this.$modal.msgSuccess(response.msg);
        this.fileList.push({ name: response.fileName, url: response.fileName });
      } else {
        this.$modal.msgError(response.msg);
        console.log(response.msg);;
      }
    },
    // 下载文件
@@ -1537,11 +1537,13 @@
    this.getlistUser();
    // this.getUnitList();
  },

  //生命周期 - 挂载完成（可以访问DOM元素）
  mounted() {
    this.getBankAccount();
    this.getUsermsg();
  },
  
  beforeCreate() { }, //生命周期 - 创建之前
  beforeMount() { }, //生命周期 - 挂载之前
  beforeUpdate() { }, //生命周期 - 更新之前

 src/views/project/medicalcostfundapplycheck/index.vue

@@ -1621,7 +1621,7 @@
        this.$modal.msgSuccess(response.msg);
        this.fileList.push({ name: response.fileName, url: response.fileName });
      } else {
        this.$modal.msgError(response.msg);
        console.log(response.msg);;
      }
    },
    // 下载文件

 src/views/project/travelexpenseslist/Modifydetails/index.vue

@@ -787,7 +787,8 @@
        console.log(this.fileListto);
        this.rbDetails[this.atpresent].annexfilesList = this.fileListto;
      } else {
        this.$modal.msgError(response.msg);
        console.log(response.msg);;
        console.log(response.msg);
      }
    },
    // 点击票据

 src/views/project/travelexpenseslist/eidt.vue

@@ -418,7 +418,7 @@
                this.$modal.msgSuccess(response.msg);
                this.fileList.push({ name: response.fileName, url: response.fileName });
            } else {
                this.$modal.msgError(response.msg);
                console.log(response.msg);;
            }
            //console.log("上传文件后：" + JSON.stringify(this.fileList));
        },

 src/views/project/travelexpenseslist/index.vue

@@ -1439,7 +1439,7 @@
        this.$modal.msgSuccess(response.msg);
        this.fileList.push({ name: response.fileName, url: response.fileName });
      } else {
        this.$modal.msgError(response.msg);
        console.log(response.msg);;
      }
    },


 src/views/project/travelexpenseslistrecord/index.vue

@@ -947,6 +947,10 @@
    },
    /** 修改按钮操作 */
    handleUpdate(row) {
      this.$router.push({
        path: "/finance/travelexpenseslist/Modifydetails/",
        query: { id: row.id, pos: 4 }
      });
      this.dialogType = "edit";
      const id = row.id || this.ids;
      this.checkObj.fundid = id;
@@ -1313,7 +1317,7 @@
        this.$modal.msgSuccess(response.msg);
        this.fileList.push({ name: response.fileName, url: response.fileName });
      } else {
        this.$modal.msgError(response.msg);
        console.log(response.msg);;
      }
    },