修改了财务和审批

yxh

2023-05-23 86a98c135c7ebc417f8af2045aa105a94f2ccbeb

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

@@ -17,14 +17,12 @@
            </el-select>
          </el-form-item>
        </el-col>

        <el-col :span="6">
          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
        </el-col>
      </el-row>
    </el-form>

    <el-row>
      <el-col :span="8">
        <el-card shadow="never">
@@ -59,12 +57,12 @@
              </el-col>
              <el-col :span="9">
                <el-form-item label="捐献编号">
                  <el-input v-model="curCase.donorno" disabled></el-input>
                  <el-input v-model="curCase.donorno" :disabled="true"></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="9">
                <el-form-item label="姓名">
                  <el-input v-model="curCase.name" disabled></el-input>
                  <el-input v-model="curCase.name" :disabled="true"></el-input>
                </el-form-item>
              </el-col>
              <el-col> </el-col>
@@ -81,27 +79,26 @@
                <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" />

                -->
                <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 ||
                    <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 ||
                      " 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)"
                      " size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                      v-hasPermi="['project:ethicalfund: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 ||
                    <el-button v-if="scope.row.recordstatus == -1 ||
                      scope.row.recordstatus == 1
                    " size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
                      " size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
                      v-hasPermi="['project:ethicalfund:delete']">删除</el-button>
                    <el-button size="mini" type="text" icon="el-icon-download" @click="mixExport(scope.row.id)"
                      v-hasPermi="['project:ethicalfund:download']">下载</el-button>
@@ -119,35 +116,72 @@
      style="text-align: center" v-loading="loading">
      <el-form ref="form" :model="form" label-width="120px" :rules="rules">
        <el-row style="text-align: left">
          <el-col :span="7">
            <el-form-item label="申请类型">
              <el-radio v-model="form.applytype" label="2">伦理审查专家费申请</el-radio>
          <el-col :span="5">
            <el-form-item label="申请日期" prop="createTime">
              <el-date-picker clearable style="width: 100%" v-model="form.createTime" type="date"
                value-format="yyyy-MM-dd HH:mm:ss" placeholder="申请日期">
              </el-date-picker>
            </el-form-item>
          </el-col>
          <el-col :span="7">
            <el-form-item label="捐献者" prop="name">
              <el-input disabled v-model="form.name" placeholder="请输入捐献者姓名" clearable />
            </el-form-item>
          </el-col>
          <el-col :span="7">
            <el-form-item label="审核状态" prop="recordstatus">
              <!-- <el-input v-model="form.recordstatus" placeholder="审核意见" /> -->
              <el-select v-model="form.recordstatus" placeholder="请选择审核状态" clearable size="small">
                <el-option v-for="dict in dict.type.sys_recordstatus" :key="dict.value" :label="dict.label"
                  :value="dict.value" />
              </el-select>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row style="text-align: left">
          <el-col :span="7">
            <el-form-item label="申请人" prop="username">
              <el-select v-model="form.username" placeholder="申请人" clearable filterable allow-create style="width: 100%">
          <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>
          </el-col>
          <el-col :span="5">
            <el-form-item label="组长" prop="managername">
              <el-input v-model="form.managername" placeholder="请输入组长" clearable />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row style="text-align: left">
          <el-col :span="5">
            <el-form-item label="申请类型">
              <el-radio v-model="form.applytype" label="2">伦理审查专家费申请</el-radio>
            </el-form-item>
          </el-col><el-col :span="10">
            <el-form-item label="申请说明" prop="remark">
              <el-input v-model="form.remark" placeholder="申请说明" />
            </el-form-item>
          </el-col>
          <el-col :span="5">
            <el-form-item label="捐献者" prop="name">
              <el-input :disabled="true" v-model="form.name" placeholder="请输入捐献者姓名" clearable />
            </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-input v-model="form.pretaxcost" 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="recordstatus">
              <!-- <el-input v-model="form.recordstatus" placeholder="审核意见" /> -->
              <el-select v-model="form.recordstatus" placeholder="请选择审核状态" clearable size="small" :disabled="true">
                <el-option v-for="dict in dict.type.sys_recordstatus" :key="dict.value" :label="dict.label"
                  :value="dict.value" />
              </el-select>
            </el-form-item>
          </el-col>
          <!--
          <el-col :span="7">
            <el-form-item label="联系电话" prop="phone">
              <el-input v-model="form.phone" placeholder="请输入申请者的联系方式" clearable />
@@ -158,20 +192,7 @@
              <org-selecter ref="orgSelecter" :org-type="'3'" v-model="form.unitno" />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row style="text-align: left">
          <el-col :span="14">
            <el-form-item label="申请说明" prop="remark">
              <el-input v-model="form.remark" placeholder="申请说明" />
            </el-form-item>
          </el-col>
          <el-col :span="7">
            <el-form-item label="申请日期" prop="createTime">
              <el-date-picker clearable style="width: 100%" v-model="form.createTime" type="date"
                value-format="yyyy-MM-dd HH:mm:ss" placeholder="申请日期">
              </el-date-picker>
            </el-form-item>
          </el-col>
-->
        </el-row>
        <el-row style="margin-bottom: 10px">
          <el-col :span="4">
@@ -209,7 +230,7 @@
              <template slot-scope="scope">
                <el-button type="primary" plain @click="ShowDetailDialog(scope, 'name')">{{ scope.row.beneficiaryname
                }}</el-button>
              <!-- <el-input
                <!-- <el-input
                  v-model="scope.row.beneficiaryname"
                  placeholder="姓名"
                          /> -->
@@ -226,21 +247,19 @@
            </el-table-column>
            <el-table-column prop="amount" align="center" label="税前金额" width="120" v-if="form.applytype != 3">
              <template slot-scope="scope">
                <el-input v-model="scope.row.amount" placeholder="税前金额" @blur="
                  (val) => {
                    sumTotalFee();
                  }
                " />
                <el-input v-model="scope.row.amount" placeholder="税前金额" @blur="(val) => {
                  sumTotalFee();
                }
                  " />
              </template>
            </el-table-column>

            <el-table-column prop="taxedamount" align="center" label="税后金额" width="120" v-if="form.applytype != '3'">
              <template slot-scope="scope">
                <el-input v-model="scope.row.taxedamount" placeholder="税后金额" @blur="
                  (val) => {
                    sumTotalFee();
                  }
                " />
                <el-input v-model="scope.row.taxedamount" placeholder="税后金额" @blur="(val) => {
                  sumTotalFee();
                }
                  " />
              </template>
            </el-table-column>
            <el-table-column prop="unitno" align="center" label="单位" width="220">
@@ -252,21 +271,19 @@

            <el-table-column prop="quantity" align="center" label="数量" width="120" v-if="form.applytype == '3'">
              <template slot-scope="scope">
                <el-input v-model="scope.row.quantity" placeholder="数量" @blur="
                  (val) => {
                    sumTotalFee();
                  }
                " />
                <el-input v-model="scope.row.quantity" placeholder="数量" @blur="(val) => {
                  sumTotalFee();
                }
                  " />
              </template>
            </el-table-column>

            <el-table-column prop="price" align="center" label="价格" width="120" v-if="form.applytype == '3'">
              <template slot-scope="scope">
                <el-input v-model="scope.row.price" placeholder="价格" @blur="
                  (val) => {
                    sumTotalFee();
                  }
                " />
                <el-input v-model="scope.row.price" placeholder="价格" @blur="(val) => {
                  sumTotalFee();
                }
                  " />
              </template>
            </el-table-column>

@@ -302,29 +319,16 @@
                <el-button type="text" size="mini" @click="addRow(scope.$index)">新增</el-button>
                <el-button @click.native.prevent="
                  deleteRows(scope.row, scope.$index, fundDetailArr)
                " type="text" size="small">
                  " type="text" size="small">
                  删除
                </el-button>
              </template>
            </el-table-column>
          </el-table>
        </el-row>
        <el-row>
          <el-col :span="7">
            <el-form-item label="申请金额" prop="amountrequested">
              <el-input v-model="form.amountrequested" placeholder="申请金额" />
            </el-form-item>
          </el-col> <el-col :span="7">
            <el-form-item label="税前合计" prop="pretaxcost">
              <el-input v-model="form.pretaxcost" placeholder="税前金额合计" />
            </el-form-item>
          </el-col>
          <el-col :span="7">
            <el-form-item label="税后合计" prop="pretaxcost">
              <el-input v-model="form.taxedcost" placeholder="税后金额合计" />
            </el-form-item>
          </el-col>

        <!--
        <el-row>
          <el-col :span="7">
            <el-form-item label="预支金额" prop="prepaidamount">
              <el-input v-model="form.prepaidamount" placeholder="申请金额" />
@@ -360,16 +364,15 @@
              <el-input v-model="form.financechecher" placeholder="请输入财务审核" />
            </el-form-item>
          </el-col>
            -->
        </el-row>
            -->
        <el-row>
          <el-col :span="24">
            <el-form-item label="申请附件：" align="left" prop="annexbankcard">
              <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileList" multiple :limit="5"
                :headers="headers" :on-success="
                  (response, file, fileList) =>
                    uploadSccess(response, file, fileList)
                " :on-preview="downFile" :disabled='dialogType == "detail"' :on-error="handleUploadError"
                :headers="headers" :on-success="(response, file, fileList) =>
                  uploadSccess(response, file, fileList)
                  " :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>
@@ -552,6 +555,9 @@
        createTime: [
          { required: true, message: "请输入申请日期", trigger: "blur" },
        ],
        deptmentname: [
          { required: true, message: "请输入所属组别", trigger: "blur" },
        ],
        amountrequested: [
          { required: true, message: "请输入申请金额", trigger: "blur" },
        ],
@@ -665,8 +671,6 @@
      this.detailInfoDialogShow = false;
    },
    handleup(row) {
      console.log("rowrowrowrow", row);

      this.$confirm("是否确认将登记记录上报？", "提示", {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
@@ -701,7 +705,6 @@
    },
    getUsermsg() {
      getUserProfile().then((response) => {
        console.log("登录用户信息", response.data);
        this.defaultperson = response.data;
        this.standardlevel = response.data.standardlevel;
      });
@@ -755,6 +758,10 @@
        this.form.infoid = this.curCase.id;
        this.form.username = this.defaultperson.nickName;
        this.form.userno = this.defaultperson.userName;

        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();
@@ -804,7 +811,6 @@
      }

      getdetailsByItemId(row.itemid).then((res) => {
        console.log("费用数据", res.data);
        let fundmsg = res.data;
        let fundblock = [];
        fundmsg.forEach((item) => {
@@ -815,7 +821,7 @@
            servicesscope: item.id,
          });
        });
        console.log("组装后的数据", fundblock);

        row.fundblock = fundblock;
        row.servicesscope = null;
        row.servicesscopename = "";
@@ -830,10 +836,10 @@
    // 表单重置
    reset() {
      this.form = {
        id: null,
        recordstatus: "-1",
        username: null,
        userno: null,
        id: null,
        infoid: null,
        donorno: null,
        delFlag: null,
@@ -1066,7 +1072,6 @@
      });
    },
    selectremark(row) {
      console.log("row", row.amount, this.fundblock);
      this.fundblock.forEach((item, i) => {
        if (item.expensedescribe === row.servicesscopename) {
          row.servivesscope = item.servivesscope;
@@ -1083,7 +1088,6 @@
      });
    },
    selectamount(row) {
      console.log("row", row.amount);
      this.fundblock.forEach((item, i) => {
        if (item.expense === row.amount) {
          row.remark = item.expensedescribe;
@@ -1169,7 +1173,6 @@
              servicesscope: this.fundDetailArr[m].servicesscope,
            });
          }
          // console.log("fundDetailArr:" + JSON.stringify(this.fundDetailArr));
        });
      });
    },
@@ -1215,14 +1218,12 @@
                    this.$set(this.fundDetailArr, res.data);
                    this.sumTotalFee();
                    // this.fundDetailArr = res.data
                    // console.log('删除后',this.fundDetailArr)
                  });
                });
              }
              // getownFundDetail(this.form.id).then(res=>{
              // this.$set(this.fundDetailArr,res.data)
              // this.fundDetailArr = res.data
              // console.log('删除后',this.fundDetailArr)
              // })
            });
          } else {
@@ -1279,7 +1280,6 @@
      this.form.pretaxcost = preTaxSum.toFixed(2);
      this.form.taxedcost = taxedSum.toFixed(2);
      this.$forceUpdate();
      console.log(this.form);
    },

    //获取费用类型
@@ -1294,7 +1294,6 @@
            label: dataList[m].itemTypeName,
          });
        }
        console.log(this.fundtypeArr);
      });
    },

@@ -1367,19 +1366,16 @@
        listReportname(arr[i]).then((res) => {
          this.arrr2 = res.data;
          this.arrr3 = this.arrr3.concat(this.arrr2);
          console.log("adadadadasdsad", this.arrr3, this.userlist);
        });
      }
    },
    getlistExternalperson() {
      listExternalperson().then((res) => {
        console.log("人员表：", res.rows);
        this.personlist = res.rows;
      });
    },

    selectpersonmsg(row, rowindex) {
      console.log("row", row);
      this.personlist.map((res) => {
        if (row.beneficiaryno === res.userno) {
          row.beneficiaryname = res.username;
@@ -1402,7 +1398,6 @@
        for (let i = 0; i < tempItemArr.length; i++) {
          let pym = tempItemArr[i].itempinyin;
          if (pym != null && pym != undefined && pym != "") {
            console.log(pym);
            if (pym.indexOf(val) != -1) {
              result.push(tempItemArr[i]);
            }
@@ -1419,7 +1414,6 @@

    getUnitList() {
      listOrganization(3).then((response) => {
        console.log("机构列表：" + JSON.stringify(response));
        for (let i = 0; i < response.rows.length; i++) {
          this.unitList.push({
            organizationid: response.rows[i].organizationid,
@@ -1481,7 +1475,16 @@
      } else {
        this.$modal.msgError(response.msg);
      }
      //console.log("上传文件后：" + JSON.stringify(this.fileList));
    },

    // 下载文件
    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);
    },
  },
  //生命周期 - 创建完成（可以访问当前this实例）