yxh

yxh

2023-12-26 8674bd83142b905e2377ddeeba6d0163c37bd48f

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

@@ -393,7 +393,7 @@
            <el-form-item label="账户来源" prop="accountfrom" class="left-align">
              <el-radio-group v-model="accountfrom" style="margin-bottom: 0">
                <el-radio label="1">从账户库</el-radio>
                <el-radio label="2">新增账户（新增后需要审核确认才能启用）</el-radio>
                <el-radio label="2">新增账户（新增专家账户后需要审核启用才能使用）</el-radio>
              </el-radio-group>
            </el-form-item>
          </el-col>
@@ -408,11 +408,13 @@
          </el-col>
        </el-row>
        <el-row v-if="selectionType == 'account' && accountfrom == '2'">
          <el-col :span="16"><el-form-item label="新增类型" prop="usertype">
          <el-col :span="24">
            <el-form-item label="新增类型" prop="usertype" class="left-align">
              <el-radio-group v-model="accountselectform.usertype" style="margin-bottom: 0"
                @change="userTypeChange(accountselectform.usertype)">
                <el-radio label="expert">新增专家账号</el-radio>
                <el-radio label="org">新增单位账号</el-radio>
                <el-radio label="expert">专家账号</el-radio>
                <el-radio label="org">单位账号</el-radio>
                <el-radio label="donor">捐献者亲属账号</el-radio>
              </el-radio-group>
            </el-form-item>
          </el-col>
@@ -420,7 +422,7 @@
        <el-row v-if="selectionType == 'account' && accountfrom == '2'">
          <el-col :span="24">
            <el-form-item label="账号名称" prop="username">
              <el-input v-model="accountselectform.username" placeholder="请输入单位名称或专家姓名" />
              <el-input v-model="accountselectform.username" placeholder="请输入单位名称，或专家姓名，或其他账号" />
            </el-form-item>
          </el-col>
        </el-row>
@@ -430,7 +432,7 @@
              <el-input v-model="accountselectform.idcardno" placeholder="请输入身份证号" />
            </el-form-item>
          </el-col>
          <el-col :span="12">
          <el-col :span="12" v-if="accountselectform.usertype == 'expert'">
            <el-form-item label="职称" prop="title">
              <el-select v-model="accountselectform.title" placeholder="请选择人员职称">
                <el-option v-for="dict in dict.type.sys_professionaltitle" :key="dict.value" :label="dict.label"
@@ -439,7 +441,7 @@
            </el-form-item>
          </el-col>
        </el-row>
        <el-row v-if="selectionType == 'account' && accountfrom == '2' && accountselectform.usertype != 'org'">
        <el-row v-if="selectionType == 'account' && accountfrom == '2' && accountselectform.usertype == 'expert'">
          <el-col>
            <el-form-item label="所在单位" prop="unitno">
              <el-select v-model="accountselectform.unitno" placeholder="单位名称" clearable filterable allow-create
@@ -875,7 +877,7 @@
        reason: [{ required: true, message: "请输入出差事由", trigger: "blur" }],
        deptmentname: [{ required: true, message: "请输入所属业务组", trigger: "blur" }]
      },
      

      dialogrules: {
        usertype: [{ required: true, message: "请输入账户类型", trigger: "blur" }],
        username: [{ required: true, message: "请输入账户名称", trigger: "blur" }],
@@ -1664,23 +1666,31 @@
    // },
    checksubmit() {
      console.log(this.checkObj.flowlevelone);
      if (this.userprofile.nickName == "陈慕华") {
        //检查是否收到纸质材料
        if (this.form.checkstatus != 3 && this.checkObj.flowlevelone == 1) {
          this.$modal.msgError("请确认报销的纸质材料已经收到！");
          return;
        }
      //检查是否收到纸质材料
      if (this.checkObj.flowlevelone == 2 && !this.checkObj.flowconclusion && this.checkObj.flowconclusion.trim() != "") {
        this.$modal.msgError("请输入审核不通过的说明信息，方便经办人修改申请单！");
        return;
      }
      else {

        //检查个税计算
        // if ( (this.form.applytype == "1" || this.form.applytype == "2") && this.form.fundtaxtime == null ) {
        //   this.$modal.msgError(
        //     "提交专家费用申请单、伦理专家申请费用申请单审核，需要先完成个税计算！"
        //   );
        //   return;
        // }
        if (this.form.applytype == "1" && this.form.fundtaxtime == null) {
          this.$modal.msgError("提交专家费用申请单审核，需要先完成个税计算！");
          return;
        if (this.userprofile.nickName == "陈慕华") {
          //检查是否收到纸质材料
          if (this.form.checkstatus != 3 && this.checkObj.flowlevelone == 1) {
            this.$modal.msgError("请确认报销的纸质材料已经收到！");
            return;
          }

          //检查个税计算
          // if ( (this.form.applytype == "1" || this.form.applytype == "2") && this.form.fundtaxtime == null ) {
          //   this.$modal.msgError(
          //     "提交专家费用申请单、伦理专家申请费用申请单审核，需要先完成个税计算！"
          //   );
          //   return;
          // }
          if (this.form.applytype == "1" && this.form.fundtaxtime == null) {
            this.$modal.msgError("提交专家费用申请单审核，需要先完成个税计算！");
            return;
          }
        }
      }

@@ -2833,7 +2843,7 @@
              this.accountform.del_flag = "0";
              this.accountform.personnelunitno = null;

              if (this.accountselectform.usertype != "org") {
              if (this.accountselectform.usertype == "expert") {
                this.accountform.unitno = this.accountselectform.unitno;
                this.unitList.map(res => {
                  if (res.organizationid == this.accountform.unitno) {
@@ -2841,29 +2851,33 @@
                  }
                });
              }

              addExternalperson(this.accountform).then(response => {
                if (response.code == 200) {
                  this.$modal.msgSuccess("新账户信息已添加成功,需要在账号状态启用后才能被使用！");
                  if (this.accountselectform.usertype == "expert") {
                    this.$modal.msgSuccess("新账户信息已添加成功,需要在账号状态启用后才能被使用！");
                    return;
                  } else {
                    this.$modal.msgSuccess("新账户信息已添加成功！");
                  }

                  /**
                  this.accountselectform.accountno = this.accountselectform.userno;
                  this.accountselectform.accountname = this.accountselectform.username;
  

                  //重新获取账户列表
                  listExternalperson().then(res => {
                    this.accountlist = res.rows;
  

                    //赋值信息
                    this.accountlist.map(res => {
                      if (res.username == this.accountselectform.accountname) {
                        this.rbDetails[tempIndex].beneficiaryno = res.userno;
                        this.rbDetails[tempIndex].beneficiaryname = res.username;
                        this.rbDetails[tempIndex].depositbank = res.depositbank;
                        this.rbDetails[tempIndex].branchbankname =
                          res.branchbankname;
                        this.rbDetails[tempIndex].branchbankname = res.branchbankname;
                        this.rbDetails[tempIndex].bankcardno = res.bankcardno;
                        this.rbDetails[tempIndex].phone = res.telephone;
  

                        if (res.usertype == "org") {
                          this.rbDetails[tempIndex].idcardno = "";
                          this.rbDetails[tempIndex].title = "";
@@ -2878,12 +2892,10 @@
                      }
                    });
                  });
                  */

                }
              });
            });


          }
        } else if (this.selectionType == "workunit") {
          if (this.rbDetails[tempIndex].unitname != this.accountselectform.expertunitname) {
@@ -2900,6 +2912,7 @@
        this.showselectiondialog = false;
      });
    },

    tableParValueChange(row, tto) {
      const regex = /^[1-9]\d{5}(19|20)\d{2}(0[1-9]|1[012])(0[1-9]|[12]\d|3[01])\d{3}([0-9]|X)$/;
      if (tto) {