Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo-web

yxh

2023-09-14 23a9cb837058edd4fd7fd07d74a200845297bca1

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

@@ -164,7 +164,7 @@
          >
          </el-alert>
        </el-row>
        <el-row>
        <el-row v-if="businessType == 2">
          <div style="margin-bottom: 15px;">
            <el-button
              type="success"
@@ -210,7 +210,7 @@
                >
                  <el-option
                    v-for="dict in rowfeeItemTypes"
                    :key="dict.index"
                    :key="dict.value"
                    :label="dict.label"
                    :value="dict.value"
                  ></el-option>
@@ -416,11 +416,7 @@
                  type="primary"
                  plain
                  @click="ShowDetailDialog(scope, 'expert')"
                  >{{
                    experthear == "expert"
                      ? scope.row.unitname
                      : scope.row.beneficiaryname
                  }}</el-button
                  >{{ scope.row.beneficiaryname }}</el-button
                >
                <!-- <el-select
                  v-model="scope.row.unitno"
@@ -873,7 +869,7 @@
                ref="beneficiaryname"
                default-first-option
                @change="bbaaccss"
                v-model="funddetailForm.beneficiaryname"
                v-model="Personnelforname"
                placeholder="请选择"
                style="width: 100%"
              >
@@ -890,7 +886,7 @@
          <el-col :span="24" v-if="experthear == 'expert'">
            <el-form-item label="单位名称" prop="unitno" label-width="120px">
              <el-select
                v-model="funddetailForm.unitname"
                v-model="unitforname"
                placeholder="单位名称"
                @change="bbaaccss"
                clearable
@@ -1030,6 +1026,85 @@
      :visible.sync="pdfVisible"
      width="60%"
    >
      <div>
        <el-table :data="tableDatatop" style="width: 100%">
          <el-table-column
            v-if="businessType == 4"
            prop="price"
            align="center"
            label="单价"
          >
          </el-table-column>
          <el-table-column
            prop="quantity"
            align="center"
            label="数量"
            v-if="businessType == 4"
          >
          </el-table-column>
          <el-table-column prop="amount" align="center" :label="amountLabel">
          </el-table-column>
          <el-table-column
            prop="taxedamount"
            align="center"
            label="税后金额"
            v-if="
              (this.ismanager == true) &
                (form.applytype == '1' || form.applytype == '2')
            "
          >
          </el-table-column>
          <el-table-column
            prop="beneficiaryname"
            align="center"
            label="姓名"
            v-if="form.applytype == '1' || form.applytype == '2'"
          >
          </el-table-column>

          <el-table-column
            prop="unitno"
            align="center"
            label="单位名称"
            width="250"
            v-if="form.applytype != '4'"
          >
          </el-table-column>
          <el-table-column
            prop="beneficiaryname"
            align="center"
            label="单位/个人"
            width="250"
            v-if="form.applytype == '4'"
          >
          </el-table-column>
          <el-table-column
            prop="title"
            align="center"
            label="职称"
            width="120"
            v-if="form.applytype == '1' || form.applytype == '2'"
          >
          </el-table-column>
          <el-table-column
            prop="idcardno"
            align="center"
            label="身份证号"
            width="200"
            v-if="form.applytype == '1' || form.applytype == '2'"
          >
          </el-table-column>
          <el-table-column prop="depositbank" align="center" label="开户银行">
          </el-table-column>
          <el-table-column
            prop="bankcardno"
            align="center"
            label="银行帐号"
            width="210"
          >
          </el-table-column>
        </el-table>
      </div>
      <div class="pdfimg">
        <div class="box-pdf">
          <div>
@@ -1119,7 +1194,7 @@
          </div> -->
        </div>

        <div v-if="this.previewpdf" class="pdfimgmin">
        <div v-if="this.previewpdf && pdfimgsrcList.length" class="pdfimgmin">
          <!-- <img :src="pdfimg" /> -->
          <el-image
            style="width: 95%; height: 90%"
@@ -1176,7 +1251,7 @@
      </div>

      <span slot="footer" class="dialog-footer">
        <el-button @click="dialogVisible = false">取 消</el-button>
        <el-button @click="batchdialogVisible = false">取 消</el-button>
        <el-button type="primary" @click="BatchentryFn">确 定</el-button>
      </span>
    </el-dialog>
@@ -1327,7 +1402,8 @@
      cityOptions: [],
      checkAll: false,
      checkedCities: [],

      Personnelforname: "请选择",
      unitforname: "请选择",
      isIndeterminate: true,

      //是否是专家费的OPO审批人员
@@ -1345,6 +1421,7 @@
      totalPreTaxAmount: 0.0,
      totalAfterTaxAmount: 0.0,
      totalAmount: 0.0,
      tableDatatop: [],

      //费用类型数组
      feeItemTypes: [],
@@ -1483,7 +1560,7 @@
      pdfimgsrcList: [],
      pdfVisible: false,
      previewpdf: false,
      hintitle: "选中左侧已上传文件预览查看",
      hintitle: "请上传文件后查看",
      atpresent: "",
      Savereminder: false, //提醒保存弹框
      Reminderquantity: 0, //提醒数量
@@ -1887,6 +1964,7 @@
    },
    /** 提交按钮 */
    submitForm: debounce(function() {
      console.log("debounce");
      if (!this.randomnumber) {
        this.randomnumber = this.generateRandomString(9);
        this.form.randomnumber = this.randomnumber;
@@ -2215,6 +2293,7 @@
              expertNo: this.personlist[j].id,
              exportName: this.personlist[j].username
            });
            console.log(this.expertlist);
          }
        }
      });
@@ -2296,6 +2375,7 @@
            subjecttype: dataList[m].subjecttype,
            subjecttypename: dataList[m].subjecttypename
          });
          console.log("费用类型", this.rowfeeItemTypes);
        }
      });
    },
@@ -2304,6 +2384,7 @@
      let list = this.feeItemTypes.filter(r => r.itemType == row.applytype);
      row.itemlist = list[0].itemDetails;
      this.$set(this.rbDetails, rowindex, row);
      console.log(this.rbDetails);
      //this.loading = true;
      // getItemNames(row.applytype).then((res) => {
      //   this.loading = false;
@@ -2838,11 +2919,12 @@
          branchbankname: item.branchbankname,
          annexbankcard: null,
          annexregistform: null,
          applytype: "伦理审核专家费",
          itemid: "器官捐献伦理审核专家费",
          itemname: null,
          applytype: "7",
          applytypename: "伦理审核专家费",
          itemid: "27",
          itemname: "器官捐献伦理审核专家费",
          itemtype: null,
          amount: null,
          amount: 200,
          prepaidamount: null,
          taxamount: null,
          invoicecount: null,
@@ -2857,7 +2939,7 @@
          updateTime: null,
          uploadflag: null,
          uploadtime: null,
          itemlist: [],
          itemlist: [{ id: "27", itemName: "器官捐献伦理审核专家费" }],
          servicesscope: null,
          rowfeeblocks: [],
          annexfiles: null
@@ -2958,6 +3040,9 @@
                    console.log(res);

                    this.$set(this.rbDetails, res.data);
                    for (let i = 0; i < this.rbDetails.length; i++) {
                      this.rbDetails[i].orderno = i + 1;
                    }
                    this.sumTotalFee();
                    // this.rbDetails = res.data
                  });
@@ -3104,6 +3189,8 @@
        this.pdfimgsrcList.push(
          this.Networkheader + "/prod-api" + response.fileName
        );
        this.pdftitle = "共" + this.pdfimgsrcList.length + "项";

        this.pdfimg = this.Networkheader + "/prod-api" + response.fileName;

        this.rbDetails[this.atpresent].annexfilesList = this.fileListto;
@@ -3114,6 +3201,11 @@

    // 点击票据
    Filepopup(index, rows, row) {
      console.log(row);
      this.tableDatatop = [];
      this.pdfimgsrcList = [];
      this.tableDatatop.push(row);

      this.atpresent = index;
      this.pdfVisible = true;
      if (this.rbDetails[index].annexfilesList) {
@@ -3121,12 +3213,12 @@
        this.fileListto = this.rbDetails[index].annexfilesList;
        this.pdfimg = this.Networkheader + "/prod-api" + this.fileListto[0].url;
        // this.pdfimg = this.fileListto[0].url;
        this.pdfimgsrcList = [];
        this.fileListto.forEach(item => {
          this.pdfimgsrcList.push(this.Networkheader + "/prod-api" + item.url);
        });
        console.log(this.pdfimgsrcList);
        console.log(this.pdfimg);
        this.pdftitle = "共" + this.pdfimgsrcList.length + "项";
      } else {
        this.fileListto = [];
        this.pdfimg = "";
@@ -3137,7 +3229,8 @@
    // 点击已上传文件
    downFile(item) {
      console.log(item);
      this.pdftitle = item.name;
      this.pdftitle =
        "共" + this.pdfimgsrcList.length + "项，当前选中" + item.name;
      let name = item.name.split(".");
      if (name[1] == "pdf") {
        this.$modal.msgWarning("当前文件暂不支持预览");
@@ -3220,7 +3313,18 @@

    //专家/医疗机构/费用报销机构选择
    ConfirmDetailDialog() {
      console.log(this.funddetailForm.tempExpertName);
      console.log(this.unitforname);
      console.log(this.Personnelforname);
      if (this.businessType == 4) {
        if (this.experthear == "expert") {
          this.funddetailForm.beneficiaryname = this.unitforname;
        } else {
          console.log(11);
          this.funddetailForm.beneficiaryname = this.Personnelforname;
          console.log(this.funddetailForm.beneficiaryname);
        }
      }

      console.log(this.funddetailForm);
      let tempIndex = this.funddetailForm.index;
      let tempExpertName = this.funddetailForm.beneficiaryname;
@@ -3328,7 +3432,6 @@
            let unitIndex = this.feeUnitList.findIndex(
              item => singleDetail.unitno == item.reportNo
            );

            if (unitIndex > -1) {
              singleDetail.unitname = this.feeUnitList[unitIndex].reportName;
              singleDetail.depositbank = this.feeUnitList[
@@ -3348,8 +3451,9 @@
      //   singleDetail.unitname = "";
      // }
      if (this.businessType == 4) {
        singleDetail.unitname = this.funddetailForm.unitname;
        singleDetail.beneficiaryname = this.funddetailForm.beneficiaryname;
      }
      console.log(singleDetail);
      console.log(this.funddetailForm);
      this.rbDetails[tempIndex] = singleDetail;
      this.showSelectionDialog = false;
@@ -3399,7 +3503,6 @@

    .top-text {
      text-align: center;

      font-size: 23px;
      font-weight: 600;
      margin: 20px 0;