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

WXL

2023-08-28 a58cbd391aa2b58d59c0970f74edf006a03da1d7

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

 src/views/project/donationwitness/index.vue

@@ -161,24 +161,19 @@
            </el-form-item>
          </el-col>
          <el-col :span="6">
            <el-form-item label="证件号码" prop="idcardno">
              <el-input ref="updateBSvalue" class="sfzcode" v-model="curCase.idcardno" placeholder="请输入证件号码" disabled />
            </el-form-item>
          </el-col>
        </el-row>
        <!--
        <el-row>
          <el-col :span="6">
            <el-form-item label="民族" prop="nation">
              <el-select v-model="curCase.nation" disabled placeholder="请选择民族">
                <el-option v-for="dict in dict.type.sys_nation" :key="dict.value" :label="dict.label"
                  :value="dict.value"></el-option>
              </el-select>
            </el-form-item>
          </el-col> </el-row><el-row>
          <el-col :span="6">
            <el-form-item label="证件类型" prop="idcardtype">
              <el-select v-model="curCase.idcardtype" disabled placeholder="请选择证件类型">
                <el-option v-for="dict in dict.type.sys_IDType" :key="dict.value" :label="dict.label"
                  :value="parseInt(dict.value)"></el-option>
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="6">
            <el-form-item label="证件号码" prop="idcardno">
              <el-input ref="updateBSvalue" class="sfzcode" v-model="curCase.idcardno" placeholder="请输入证件号码" disabled />
            </el-form-item>
          </el-col>
          <el-col :span="6">
@@ -197,8 +192,16 @@
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="6">
            <el-form-item label="证件类型" prop="idcardtype">
              <el-select v-model="curCase.idcardtype" disabled placeholder="请选择证件类型">
                <el-option v-for="dict in dict.type.sys_IDType" :key="dict.value" :label="dict.label"
                  :value="parseInt(dict.value)"></el-option>
              </el-select>
            </el-form-item>
          </el-col>
        </el-row>

      -->
        <el-row>
          <el-col :span="24">
            <el-form-item align="left" label="捐献决定">
@@ -988,13 +991,24 @@
    },
    /** 新增按钮操作 */
    handleAdd(row) {
      this.reset();

      const id = row.id;
      this.curCase = {
        id: row.id,
        recordstate: null,
        donorno: row.donorno,
        name: row.name,
        treatmenthospitalname: row.treatmenthospitalname,
        sex: row.sex,
        idcardtype: row.idcardtype,
        idcardno: row.idcardno,
        education: row.education,
        nationality: row.nationality,
        occupation: row.occupation,
        birthday: row.birthday,
      };
      this.reset();
      const id = row.id;

      getDonatebaseinfo(id).then((res) => {
        console.log("捐献基础表数据", res);
        this.curCase.nation = res.data.nation;
@@ -1002,6 +1016,7 @@
        this.curCase.occupation = res.data.occupation;
      });
      // this.open = true;
      console.log("row", row);
      this.form.infoid = row.id;
      this.form.donorno = row.donorno;
      this.form.name = row.name;
@@ -1161,6 +1176,7 @@
      console.log(
        "调用器官列表接口，参数：" + JSON.stringify(oraganqueryParam)
      );

      listDonateorgan(oraganqueryParam).then((response) => {
        this.loading = false;
        if (response.code == 200) {

 src/views/project/ethicalReview/index.vue

@@ -61,36 +61,34 @@
    </el-form>

    <el-table :default-sort="{ prop: 'createTime' }" v-loading="loading" :data="listnews" border>
      <el-table-column label="报告时间" align="center" prop="reporttime" width="140">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.reporttime, "{y}-{m}-{d}") }}</span>
        </template>
      </el-table-column>

      <el-table-column label="姓名" align="center" prop="name" width="120" />

      <el-table-column label="捐献者" align="center" prop="name" width="120" />
      <el-table-column label="年龄" align="center" prop="age" width="100" />
      <el-table-column label="性别" align="center" prop="sex" width="100">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.sys_user_sex" :value="parseInt(scope.row.sex)" />
        </template>
      </el-table-column>
      <el-table-column label="年龄" align="center" prop="age" width="100" />
      <el-table-column label="医疗机构" align="center" prop="treatmenthospitalname" />
      <el-table-column label="审查结论" align="center" prop="flowconclusion" width="100">
      <el-table-column label="伦理审查结论" align="center" prop="flowconclusion" width="100">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.sys_EthicalReview" :value="scope.row.flowconclusion" />
        </template>
      </el-table-column>
      <el-table-column label="审查意见" align="center" prop="flowcontent" />
      <el-table-column label="审查时间" align="center" prop="createTime" width="160" />
      <!-- <el-table-column label="身份证号" prop="idcardno" width="200" /> -->
      <el-table-column label="报告人" align="center" prop="reportername" width="100" />

      <el-table-column label="报告时间" align="center" prop="reporttime" width="140">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.reporttime, "{y}-{m}-{d}") }}</span>
        </template>
      </el-table-column>
      <!--
      <el-table-column label="捐献进度" align="center" prop="recordstate">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.sys_DonationStatus" :value="scope.row.recordstate" />
        </template>
      </el-table-column>
      </el-table-column> -->

      <el-table-column label="操作" align="center" width="150px" class-name="small-padding fixed-width" fixed="right">
        <template slot-scope="scope">
@@ -113,7 +111,7 @@
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="姓名">
            <el-form-item label="捐献者姓名">
              <el-input v-model="curCase.name" placeholder="请输入姓名" disabled />
            </el-form-item>
          </el-col>
@@ -216,7 +214,7 @@
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button type="primary" :loading="loading" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
      </div>
    </el-dialog>
@@ -685,14 +683,15 @@
    },
    /** 伦理审查弹窗 */
    showDonationEvaluationDialog(dontateInfo) {
      console.log("伦理审查11", dontateInfo);
      //查找是否存在伦理审查记录
      //this.curCase = dontateInfo;
      this.curCase = {
        id: dontateInfo.id,
        recordstate: null,
        donorno: dontateInfo.donorno,
        name: dontateInfo.name,
        recordstate: null,
      };

      this.reset();
      this.form.donorno = dontateInfo.donorno;
      this.form.infoid = dontateInfo.id;
@@ -733,51 +732,56 @@
    },
    /** 保存捐献评估 */
    submitForm() {
      this.$refs["form"].validate((valid) => {
        if (valid) {
          //判断审查意见录入
          if (this.form.flowconclusion == 2 || this.form.flowconclusion == 3) {
            var exp = this.form.flowcontent;
            if (typeof exp == "undefined" || exp == null || exp == "") {
              this.$modal.msgError("请输入审查意见!");
              return;
      this.loading = true;
      this.$nextTick(() => {
        this.$refs["form"].validate((valid) => {
          if (valid) {
            //判断审查意见录入
            if (this.form.flowconclusion == 2 || this.form.flowconclusion == 3) {
              var exp = this.form.flowcontent;
              if (typeof exp == "undefined" || exp == null || exp == "") {
                this.$modal.msgError("请输入审查意见!");
                return;
              }
            }

            //判断是否是新纪录
            if (this.form.id != null) {
              // updateEthicalreviewopinions没有权限
              updateDonateflowchart(this.form).then((response) => {
                this.$modal.msgSuccess("修改成功");
                //更新捐献状态
                if (this.form.flowconclusion == 1) {
                  this.curCase.recordstate = 8;
                } else {
                  this.curCase.recordstate = 9;
                }
                updateDonatebaseinfo(this.curCase).then((response) => {
                  this.open = false;
                  this.getList();
                });
              });
            } else {
              addDonateflowchart(this.form).then((response) => {
                //更新捐献状态
                if (this.form.flowconclusion == 1) {
                  this.curCase.recordstate = 8;
                } else {
                  this.curCase.recordstate = 9;
                }
                updateDonatebaseinfo(this.curCase).then((response) => {
                  this.$modal.msgSuccess("新增成功");
                  this.getList();
                });
              });
            }
          }

          //判断是否是新纪录
          if (this.form.id != null) {
            // updateEthicalreviewopinions没有权限
            updateDonateflowchart(this.form).then((response) => {
              this.$modal.msgSuccess("修改成功");
              //更新捐献状态
              if (this.form.flowconclusion == 1) {
                this.curCase.recordstate = 8;
              } else {
                this.curCase.recordstate = 9;
              }
              updateDonatebaseinfo(this.curCase).then((response) => {
                this.open = false;
                this.getList();
              });
            });
          } else {
            addDonateflowchart(this.form).then((response) => {
              //更新捐献状态
              if (this.form.flowconclusion == 1) {
                this.curCase.recordstate = 8;
              } else {
                this.curCase.recordstate = 9;
              }
              updateDonatebaseinfo(this.curCase).then((response) => {
                this.$modal.msgSuccess("新增成功");
                this.open = false;
                this.getList();
              });
            });
          }
        }
      });
        });
        
      this.loading = false;
      })
    },

    /** 获取捐献评估 */
    getDonationEvaluation(dontateInfo) {
      //this.loading = true;
@@ -800,6 +804,7 @@
        }
      });
    },

    /** 判断新增或是编辑 */
    checkEditOrAdd(dontateInfo) {
      if (dontateInfo.recordstate == 4) {
@@ -813,6 +818,7 @@
    handlePreview(file) {
      console.log(file);
    },

    //显示专家意见弹窗
    showExpertAdviceDialog() {
      this.resetExperAdviceForm();
@@ -820,6 +826,7 @@
      this.expertAdviceForm.donorno = this.curCase.donorno;
      this.isShowExpertAdviceDialog = true;
    },

    //保存专家意见
    saveExpertAdvice() {
      this.$refs["expertAdviceForm"].validate((valid) => {
@@ -869,6 +876,7 @@
        })
        .catch(() => { });
    },

    /** 修改按钮操作 */
    handleUpdateExpert(row) {
      this.reset();

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

@@ -7,53 +7,28 @@
        <el-row>
          <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 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="5">
            <el-form-item label="经办人" prop="username">
              <el-select
                v-model="form.username"
                placeholder="申请人"
                clearable
                filterable
                allow-create
                style="width: 100%"
                @change="getUserAccount"
              >
                <el-option
                  v-for="dict in userlist"
                  :key="dict.index"
                  :label="dict.nickname"
                  :value="dict.nickname"
                ></el-option>
              <el-select v-model="form.username" placeholder="申请人" clearable filterable allow-create style="width: 100%"
                @change="getUserAccount">
                <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-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-input v-model="form.managername" placeholder="请输入组长" clearable />
            </el-form-item>
          </el-col>
        </el-row>
@@ -75,13 +50,9 @@
          <el-col :span="5">
            <el-form-item label="银行名称" prop="bankname">
              <el-input v-model="form.bankname" placeholder="请输入银行名称" />
            </el-form-item> </el-col
          ><el-col :span="5">
            </el-form-item> </el-col><el-col :span="5">
            <el-form-item label="银行账号" prop="bankcardno">
              <el-input
                v-model="form.bankcardno"
                placeholder="请输入银行账号"
              />
              <el-input v-model="form.bankcardno" placeholder="请输入银行账号" />
            </el-form-item>
          </el-col>
          <el-col :span="5">
@@ -100,11 +71,7 @@
          -->
          <el-col :span="5">
            <el-form-item label="申请金额" prop="pretaxcost">
              <el-input
                v-model="form.pretaxcost"
                placeholder="税前金额合计"
                :disabled="true"
              />
              <el-input v-model="form.pretaxcost" placeholder="税前金额合计" :disabled="true" />
            </el-form-item>
          </el-col>
          <!--
@@ -125,11 +92,7 @@
          </el-col>
          <el-col :span="5">
            <el-form-item label="捐献者" prop="name">
              <el-input
                :disabled="true"
                v-model="form.donorname"
                placeholder="请输入捐献者姓名"
              />
              <el-input :disabled="true" v-model="form.donorname" placeholder="请输入捐献者姓名" />
            </el-form-item>
          </el-col>
          <!-- 
@@ -145,28 +108,14 @@
        <el-row style="margin-top: 5px; margin-bottom: 5px" />
        <el-row style="margin-bottom: 10px" v-if="businessType == '1'">
          <el-col :span="4">
            <el-button
              @click.native.prevent="importFeeItems"
              type="primary"
              size="small"
            >
            <el-button @click.native.prevent="importFeeItems" type="primary" size="small">
              导入服务项目
            </el-button>
          </el-col>
        </el-row>
        <el-row>
          <el-table
            :data="rbDetails"
            v-loading="loading"
            border
            highlight-current-row
          >
            <el-table-column
              prop="orderno"
              align="center"
              label="序号"
              width="65"
            >
          <el-table :data="rbDetails" v-loading="loading" border highlight-current-row>
            <el-table-column prop="orderno" align="center" label="序号" width="65">
              <template slot-scope="scope">
                <el-input v-model="scope.row.orderno" placeholder="序号" />
              </template>
@@ -175,125 +124,53 @@
            <el-table-column prop="itemcode" align="center" label="项目编号" show-overflow-tooltip=""
              v-if="form.applytype == '1'">
            </el-table-column>-->
            <el-table-column
              prop="applytype"
              align="center"
              label="服务类型"
              width="200"
            >
            <el-table-column prop="applytype" align="center" label="服务类型" width="200">
              <template slot-scope="scope">
                <el-select
                  v-model="scope.row.applytype"
                  placeholder="服务类型"
                  @change="verifyFeeItemType(scope.row)"
                >
                  <el-option
                    v-for="dict in rowfeeItemTypes"
                    :key="dict.index"
                    :label="dict.label"
                    :value="dict.value"
                  ></el-option>
                <el-select v-model="scope.row.applytype" placeholder="服务类型" @change="verifyFeeItemType(scope.row)">
                  <el-option v-for="dict in rowfeeItemTypes" :key="dict.index" :label="dict.label"
                    :value="dict.value"></el-option>
                </el-select>
              </template>
            </el-table-column>
            <el-table-column
              prop="itemid"
              align="center"
              label="服务项目"
              width="260"
            >
            <el-table-column prop="itemid" align="center" label="服务项目" width="260">
              <template slot-scope="scope">
                <el-select
                  v-model="scope.row.itemid"
                  placeholder="服务项目"
                  filterable
                  @change="verifyFeeItem(scope.row)"
                  :filter-method="val => searchItemType(val, scope)"
                >
                  <el-option
                    v-for="dict in scope.row.itemlist"
                    :key="dict.index"
                    :label="dict.itemName"
                    :value="dict.id"
                  ></el-option>
                <el-select v-model="scope.row.itemid" placeholder="服务项目" filterable @change="verifyFeeItem(scope.row)"
                  :filter-method="val => searchItemType(val, scope)">
                  <el-option v-for="dict in scope.row.itemlist" :key="dict.index" :label="dict.itemName"
                    :value="dict.id"></el-option>
                </el-select>
              </template>
            </el-table-column>
            <el-table-column
              prop="servicesscope"
              align="center"
              label="服务说明"
              v-if="form.applytype == '1'"
              width="180"
            >
            <el-table-column prop="servicesscope" align="center" label="服务说明" v-if="form.applytype == '1'" width="180">
              <template slot-scope="scope">
                <el-select
                  v-model="scope.row.servicesscope"
                  placeholder="服务说明"
                  clearable
                  allow-create
                  filterable
                  @change="verifyFeeRemark(scope.row)"
                >
                  <el-option
                    v-for="dict in scope.row.rowfeeblocks"
                    :key="dict.servicesscope"
                    :label="dict.remark"
                    :value="dict.servicesscope"
                  ></el-option>
                <el-select v-model="scope.row.servicesscope" placeholder="服务说明" clearable allow-create filterable
                  @change="verifyFeeRemark(scope.row)">
                  <el-option v-for="dict in scope.row.rowfeeblocks" :key="dict.servicesscope" :label="dict.remark"
                    :value="dict.servicesscope"></el-option>
                </el-select>
              </template>
            </el-table-column>
            <el-table-column
              prop="price"
              align="center"
              label="单价"
              width="120"
              v-if="businessType == 4"
            >
            <el-table-column prop="price" align="center" label="单价" width="120" v-if="businessType == 4">
              <template slot-scope="scope">
                <el-input
                  v-model="scope.row.price"
                  placeholder="单价"
                  @blur="
                    val => {
                      sumTotalFee(scope.row);
                    }
                  "
                />
                <el-input v-model="scope.row.price" placeholder="单价" @blur="val => {
                  sumTotalFee(scope.row);
                }
                  " />
              </template>
            </el-table-column>
            <el-table-column
              prop="quantity"
              align="center"
              label="数量"
              width="120"
              v-if="businessType == 4"
            >
            <el-table-column prop="quantity" align="center" label="数量" width="120" v-if="businessType == 4">
              <template slot-scope="scope">
                <el-input
                  v-model="scope.row.quantity"
                  placeholder="数量"
                  @blur="
                    val => {
                      sumTotalFee(scope.row);
                    }
                  "
                />
                <el-input v-model="scope.row.quantity" placeholder="数量" @blur="val => {
                  sumTotalFee(scope.row);
                }
                  " />
              </template>
            </el-table-column>
            <el-table-column
              v-if="
                businessType == 2 ||
                  businessType == 3 ||
                  businessType == 4 ||
                  ismanager == true
              "
              prop="amount"
              align="center"
              :label="amountLabel"
              width="120"
            >
            <el-table-column v-if="businessType == 2 ||
              businessType == 3 ||
              businessType == 4 ||
              ismanager == true
              " prop="amount" align="center" :label="amountLabel" width="120">
              <template slot-scope="scope">
                <!--
                  <el-select v-model="scope.row.amount" placeholder="税前金额" clearable filterable allow-create
@@ -305,37 +182,18 @@
                <el-input v-model="scope.row.amount" placeholder="金额" />
              </template>
            </el-table-column>
            <el-table-column
              prop="taxedamount"
              align="center"
              label="税后金额"
              width="120"
              v-if="
                (this.ismanager == true) &
                  (form.applytype == '1' || form.applytype == '2')
              "
            >
            <el-table-column prop="taxedamount" align="center" label="税后金额" width="120" v-if="(this.ismanager == true) &
              (form.applytype == '1' || form.applytype == '2')
              ">
              <template slot-scope="scope">
                <el-input
                  v-model="scope.row.taxedamount"
                  placeholder="税后金额"
                />
                <el-input v-model="scope.row.taxedamount" placeholder="税后金额" />
              </template>
            </el-table-column>
            <el-table-column
              prop="beneficiaryname"
              align="center"
              label="姓名"
              width="120"
              v-if="form.applytype == '1' || form.applytype == '2'"
            >
            <el-table-column prop="beneficiaryname" align="center" label="姓名" width="120"
              v-if="form.applytype == '1' || form.applytype == '2'">
              <template slot-scope="scope">
                <el-button
                  type="primary"
                  plain
                  @click="ShowDetailDialog(scope, 'expert')"
                  >{{ scope.row.beneficiaryname }}</el-button
                >
                <el-button type="primary" plain @click="ShowDetailDialog(scope, 'expert')">{{ scope.row.beneficiaryname
                }}</el-button>
                <!-- <el-select
                  filterable
                  allow-create
@@ -355,19 +213,10 @@
                                      </el-select> -->
              </template>
            </el-table-column>
            <el-table-column
              prop="unitno"
              align="center"
              label="单位名称"
              width="250"
            >
            <el-table-column prop="unitno" align="center" label="单位名称" width="250">
              <template slot-scope="scope">
                <el-button
                  type="primary"
                  plain
                  @click="ShowDetailDialog(scope, 'unit')"
                  >{{ scope.row.unitname }}</el-button
                >
                <el-button type="primary" plain @click="ShowDetailDialog(scope, 'unit')">{{ scope.row.unitname
                }}</el-button>
                <!-- <el-select
                  v-model="scope.row.unitno"
                  placeholder="单位"
@@ -384,54 +233,26 @@
                                      </el-select> -->
              </template>
            </el-table-column>
            <el-table-column
              prop="title"
              align="center"
              label="职称"
              width="120"
              v-if="form.applytype == '1' || form.applytype == '2'"
            >
            <el-table-column prop="title" align="center" label="职称" width="120"
              v-if="form.applytype == '1' || form.applytype == '2'">
              <template slot-scope="scope">
                <el-input v-model="scope.row.title" placeholder="职称" />
              </template>
            </el-table-column>
            <el-table-column
              prop="idcardno"
              align="center"
              label="身份证号"
              width="200"
              v-if="form.applytype == '1' || form.applytype == '2'"
            >
            <el-table-column prop="idcardno" align="center" label="身份证号" width="200"
              v-if="form.applytype == '1' || form.applytype == '2'">
              <template slot-scope="scope">
                <el-input v-model="scope.row.idcardno" placeholder="身份证号" />
              </template>
            </el-table-column>
            <el-table-column
              prop="depositbank"
              align="center"
              label="开户银行"
              width="200"
              v-if="form.applytype != '4'"
            >
            <el-table-column prop="depositbank" align="center" label="开户银行" width="200" v-if="form.applytype != '4'">
              <template slot-scope="scope">
                <el-input
                  v-model="scope.row.depositbank"
                  placeholder="开户银行"
                />
                <el-input v-model="scope.row.depositbank" placeholder="开户银行" />
              </template>
            </el-table-column>
            <el-table-column
              prop="bankcardno"
              align="center"
              label="银行帐号"
              width="210"
              v-if="form.applytype != '4'"
            >
            <el-table-column prop="bankcardno" align="center" label="银行帐号" width="210" v-if="form.applytype != '4'">
              <template slot-scope="scope">
                <el-input
                  v-model="scope.row.bankcardno"
                  placeholder="银行帐号"
                />
                <el-input v-model="scope.row.bankcardno" placeholder="银行帐号" />
              </template>
            </el-table-column>
            <el-table-column prop="remark" align="center" label="备注">
@@ -439,39 +260,18 @@
                <el-input v-model="scope.row.remark" placeholder="备注" />
              </template>
            </el-table-column>
            <el-table-column
              fixed="right"
              align="center"
              label="操作"
              width="180"
            >
            <el-table-column fixed="right" align="center" label="操作" width="180">
              <template slot-scope="scope">
                <el-button
                  type="text"
                  size="mini"
                  @click="addRow(scope.$index)"
                  v-if="operationType == 'add' || operationType == 'update'"
                  >新增</el-button
                >
                <el-button
                  @click.native.prevent="
                    deleteRows(scope.row, scope.$index, rbDetails)
                  "
                  type="text"
                  size="small"
                  v-if="operationType == 'add' || operationType == 'update'"
                >
                <el-button type="text" size="mini" @click="addRow(scope.$index)"
                  v-if="operationType == 'add' || operationType == 'update'">新增</el-button>
                <el-button @click.native.prevent="
                  deleteRows(scope.row, scope.$index, rbDetails)
                  " type="text" size="small" v-if="operationType == 'add' || operationType == 'update'">
                  删除
                </el-button>
                <el-button
                  @click.native.prevent="
                    Filepopup(scope.$index, rbDetails, scope.row)
                  "
                  type="text"
                  size="small"
                  v-if="businessType == 3 || businessType == 4"
                  >票据</el-button
                >
                <el-button @click.native.prevent="
                  Filepopup(scope.$index, rbDetails, scope.row)
                  " type="text" size="small" v-if="businessType == 3 || businessType == 4">票据</el-button>
              </template>
            </el-table-column>
          </el-table>
@@ -519,77 +319,31 @@
              -->
        <el-row>
          <el-col :span="12">
            <el-form-item
              label="费用申请附件"
              align="left"
              prop="annexbankcard"
              v-if="businessType == 0"
            >
              <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="operationType == 'detail'"
                :on-error="handleUploadError"
                :on-exceed="handleExceed"
                :on-remove="remove"
                accept="image/*,.pdf"
              >
                <el-button
                  :disabled="operationType == 'detail'"
                  size="small"
                  type="primary"
                  >上传票据</el-button
                >
            <el-form-item label="费用申请附件" align="left" prop="annexbankcard" v-if="businessType == 0">
              <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="operationType == 'detail'" :on-error="handleUploadError"
                :on-exceed="handleExceed" :on-remove="remove" accept="image/*,.pdf">
                <el-button :disabled="operationType == 'detail'" size="small" type="primary">上传票据</el-button>
              </el-upload>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row v-if="operationType == 'detail' || operationType == 'check'">
          <el-table :data="fundflowList" border>
            <el-table-column
              label="审核日期"
              align="center"
              width="160"
              prop="createTime"
            />
            <el-table-column
              label="审核人"
              align="center"
              width="120"
              prop="checkusername"
            />
            <el-table-column
              label="审核结果"
              align="center"
              width="200"
              prop="flowconclusion"
            >
            <el-table-column label="审核日期" align="center" width="160" prop="createTime" />
            <el-table-column label="审核人" align="center" width="120" prop="checkusername" />
            <el-table-column label="审核结果" align="center" width="200" prop="flowconclusion">
              <template slot-scope="scope">
                <span v-if="scope.row.flowconclusion == 1">通过</span>
                <span v-if="scope.row.flowconclusion == 2">不通过</span>
              </template>
            </el-table-column>
            <el-table-column
              label="审核备注"
              align="center"
              prop="flowcontent"
            />
            <el-table-column label="审核备注" align="center" prop="flowcontent" />
          </el-table>
        </el-row>
        <el-row
          style="margin-top: 25px; margin-bottom: 5px"
          v-if="operationType == 'check'"
        >
        <el-row style="margin-top: 25px; margin-bottom: 5px" v-if="operationType == 'check'">
          <el-col :span="7">
            <el-form-item label="审核结果" align="left">
              <el-radio-group v-model="checkObj.flowlevelone" align="left">
@@ -608,30 +362,15 @@
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button
          type="primary"
          @click="submitForm"
          v-if="operationType == 'add' || operationType == 'update'"
          >提交保存</el-button
        >
        <el-button
          type="primary"
          @click="checksubmit"
          v-if="operationType == 'check'"
          >提交审核</el-button
        >
        <el-button type="primary" @click="submitForm"
          v-if="operationType == 'add' || operationType == 'update'">提交保存</el-button>
        <el-button type="primary" @click="checksubmit" v-if="operationType == 'check'">提交审核</el-button>
        <el-button @click="cancel">关 闭</el-button>
      </div>
    </div>

    <el-dialog
      :visible.sync="showSelectionDialog"
      :close-on-click-modal="false"
      :title="'单位/专家信息选择'"
      width="500px"
      style="text-align: center"
      v-loading="loading"
    >
    <el-dialog :visible.sync="showSelectionDialog" :close-on-click-modal="false" :title="'单位/专家信息选择'" width="500px"
      style="text-align: center" v-loading="loading">
      <el-form ref="funddetailForm" :model="funddetailForm">
        <el-row>
          <el-col :span="24" v-if="selectionType == 'expert'">
@@ -642,77 +381,29 @@
              </el-radio-group>
            </el-form-item>
          </el-col>
          <el-col
            :span="24"
            v-if="selectionType == 'expert' && expertfrom == '1'"
          >
            <el-form-item
              label="专家姓名"
              prop="beneficiaryname"
              label-width="80px"
            >
              <el-select
                filterable
                allow-create
                ref="beneficiaryname"
                default-first-option
                v-model="funddetailForm.beneficiaryname"
                placeholder="请选择"
                style="width: 100%"
              >
                <el-option
                  v-for="item in expertlist"
                  :key="item.expertNo"
                  :label="item.exportName"
                  :value="item.exportName"
                >
          <el-col :span="24" v-if="selectionType == 'expert' && expertfrom == '1'">
            <el-form-item label="专家姓名" prop="beneficiaryname" label-width="80px">
              <el-select filterable allow-create ref="beneficiaryname" default-first-option
                v-model="funddetailForm.beneficiaryname" placeholder="请选择" style="width: 100%">
                <el-option v-for="item in expertlist" :key="item.expertNo" :label="item.exportName"
                  :value="item.exportName">
                </el-option>
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="24" v-if="selectionType == 'unit'">
            <el-form-item
              label="单位名称"
              prop="unitno"
              label-width="120px"
              v-if="businessType == 1 || businessType == 2"
            >
              <el-select
                v-model="funddetailForm.unitno"
                placeholder="单位名称"
                clearable
                filterable
                allow-create
                style="width: 100%"
              >
                <el-option
                  v-for="(spec, index) in unitList"
                  :key="index"
                  :label="spec.organizationname"
                  :value="spec.organizationid"
                ></el-option>
            <el-form-item label="单位名称" prop="unitno" label-width="120px" v-if="businessType == 1 || businessType == 2">
              <el-select v-model="funddetailForm.unitno" placeholder="单位名称" clearable filterable allow-create
                style="width: 100%">
                <el-option v-for="(spec, index) in unitList" :key="index" :label="spec.organizationname"
                  :value="spec.organizationid"></el-option>
              </el-select>
            </el-form-item>
            <el-form-item
              label="发票单位名称"
              prop="unitno"
              label-width="120px"
              v-if="businessType == 3 || businessType == 4"
            >
              <el-select
                v-model="funddetailForm.unitno"
                placeholder="单位名称"
                clearable
                filterable
                allow-create
                style="width: 100%"
              >
                <el-option
                  v-for="(item, index) in feeUnitList"
                  :key="index"
                  :label="item.reportName"
                  :value="item.reportNo"
                ></el-option>
            <el-form-item label="发票单位名称" prop="unitno" label-width="120px" v-if="businessType == 3 || businessType == 4">
              <el-select v-model="funddetailForm.unitno" placeholder="单位名称" clearable filterable allow-create
                style="width: 100%">
                <el-option v-for="(item, index) in feeUnitList" :key="index" :label="item.reportName"
                  :value="item.reportNo"></el-option>
              </el-select>
            </el-form-item>
          </el-col>
@@ -720,43 +411,22 @@
        <el-row>
          <el-col :span="12" v-if="expertfrom == '2'">
            <el-form-item label="专家姓名" prop="expertname" label-width="80px">
              <el-input
                v-model="funddetailForm.expertname"
                placeholder="必填项"
              />
              <el-input v-model="funddetailForm.expertname" placeholder="必填项" />
            </el-form-item>
          </el-col>
          <el-col :span="12" v-if="expertfrom == '2'">
            <el-form-item
              label="职    称"
              prop="experttitle"
              label-width="80px"
            >
              <el-select
                v-model="funddetailForm.experttitle"
                placeholder="必填项"
              >
                <el-option
                  v-for="dict in dict.type.sys_professionaltitle"
                  :key="dict.value"
                  :label="dict.label"
                  :value="dict.label"
                ></el-option>
            <el-form-item label="职    称" prop="experttitle" label-width="80px">
              <el-select v-model="funddetailForm.experttitle" placeholder="必填项">
                <el-option v-for="dict in dict.type.sys_professionaltitle" :key="dict.value" :label="dict.label"
                  :value="dict.label"></el-option>
              </el-select>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="24" v-if="expertfrom == '2'">
            <el-form-item
              label="身份证号"
              prop="expertidcardno"
              label-width="80px"
            >
              <el-input
                v-model="funddetailForm.expertidcardno"
                placeholder="必填项"
              />
            <el-form-item label="身份证号" prop="expertidcardno" label-width="80px">
              <el-input v-model="funddetailForm.expertidcardno" placeholder="必填项" />
            </el-form-item>
          </el-col>
        </el-row>
@@ -774,91 +444,41 @@
      -->
        <el-row>
          <el-col :span="24" v-if="expertfrom == '2'">
            <el-form-item
              label="单位名称"
              prop="expertunitno"
              label-width="80px"
            >
              <el-select
                v-model="funddetailForm.expertunitno"
                placeholder="单位名称"
                clearable
                filterable
                allow-create
                style="width: 100%"
              >
                <el-option
                  v-for="(spec, index) in unitList"
                  :key="index"
                  :label="spec.organizationname"
                  :value="spec.organizationid"
                ></el-option>
              </el-select> </el-form-item
          ></el-col>
            <el-form-item label="单位名称" prop="expertunitno" label-width="80px">
              <el-select v-model="funddetailForm.expertunitno" placeholder="单位名称" clearable filterable allow-create
                style="width: 100%">
                <el-option v-for="(spec, index) in unitList" :key="index" :label="spec.organizationname"
                  :value="spec.organizationid"></el-option>
              </el-select> </el-form-item></el-col>
        </el-row>
        <el-row>
          <el-col :span="24" v-if="expertfrom == '2'">
            <el-form-item
              label="开户银行"
              prop="expertdepositbank"
              label-width="80px"
            >
              <el-input
                v-model="funddetailForm.expertdepositbank"
                placeholder="必填项"
              />
            <el-form-item label="开户银行" prop="expertdepositbank" label-width="80px">
              <el-input v-model="funddetailForm.expertdepositbank" placeholder="必填项" />
            </el-form-item>
          </el-col>
          <el-col :span="24" v-if="expertfrom == '2'">
            <el-form-item
              label="银行卡号"
              prop="expertbankcardno"
              label-width="80px"
            >
              <el-input
                v-model="funddetailForm.expertbankcardno"
                placeholder="必填项"
              />
            <el-form-item label="银行卡号" prop="expertbankcardno" label-width="80px">
              <el-input v-model="funddetailForm.expertbankcardno" placeholder="必填项" />
            </el-form-item>
          </el-col>
        </el-row>
      </el-form>
      <span slot="footer" class="dialog-footer">
        <el-button @click="showSelectionDialog = false">取 消</el-button>
        <el-button type="primary" @click="ConfirmDetailDialog()"
          >确 定</el-button
        >
        <el-button type="primary" @click="ConfirmDetailDialog()">确 定</el-button>
      </span>
    </el-dialog>
    <el-dialog :title="pdftitle" :visible.sync="pdfVisible" width="50%">
      <div class="pdfimg">
        <div class="box-pdf">
          <div>
            <el-upload
              size="mini"
              class="upload-demo"
              :action="uploadFileUrl"
              :file-list="fileListto"
              multiple
              :limit="20"
              :headers="headers"
              :on-success="
                (response, file, fileList) =>
                  uploadSccess(response, file, fileList)
              "
              :on-preview="downFile"
              :disabled="operationType == 'detail'"
              :on-error="handleUploadError"
              :on-exceed="handleExceed"
              :on-remove="remove"
              accept="image/*,.pdf"
            >
              <el-button
                :disabled="operationType == 'detail'"
                size="small"
                type="primary"
                >上传票据</el-button
              >
            <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileListto" multiple
              :limit="20" :headers="headers" :on-success="(response, file, fileList) =>
                uploadSccess(response, file, fileList)
                " :on-preview="downFile" :disabled="operationType == 'detail'" :on-error="handleUploadError"
              :on-exceed="handleExceed" :on-remove="remove" accept="image/*,.pdf">
              <el-button :disabled="operationType == 'detail'" size="small" type="primary">上传票据</el-button>
            </el-upload>
          </div>
          <!-- <div
@@ -873,11 +493,7 @@

        <div v-if="this.previewpdf" class="pdfimgmin">
          <!-- <img :src="pdfimg" /> -->
          <el-image
            style="width: 100px; height: 100px"
            :src="pdfimg"
            :preview-src-list="pdfimgsrcList"
          >
          <el-image style="width: 100px; height: 100px" :src="pdfimg" :preview-src-list="pdfimgsrcList">
          </el-image>
        </div>
        <div v-else class="pdfimgmins">{{ hintitle }}</div>
@@ -1444,7 +1060,7 @@
    handleDelete() {
      this.$modal
        .confirm("是否确认删除该记录？")
        .then(function() {
        .then(function () {
          return delFund(this.curId);
        })
        .then(() => {
@@ -1459,7 +1075,7 @@
          this.getfundList();
          this.$modal.msgSuccess("删除成功");
        })
        .catch(() => {});
        .catch(() => { });
    },

    /** 上报按钮操作 */
@@ -1512,8 +1128,8 @@
            if (tempDetail.itemid == null) {
              this.$modal.msgWarning(
                "服务项目表中，第" +
                  (k + 1).toString() +
                  "行的服务项目未选择，请先选择服务项目后再提交保存！"
                (k + 1).toString() +
                "行的服务项目未选择，请先选择服务项目后再提交保存！"
              );
              return;
            }
@@ -1522,8 +1138,8 @@
              if (tempDetail.servicesscope == null) {
                this.$modal.msgWarning(
                  "服务项目表中，第" +
                    (k + 1).toString() +
                    "行的费用说明未选择,请选择费用说明后再提交保存！"
                  (k + 1).toString() +
                  "行的费用说明未选择,请选择费用说明后再提交保存！"
                );
                return;
              }
@@ -1534,8 +1150,8 @@
              ) {
                this.$modal.msgWarning(
                  "服务项目表中，第" +
                    (k + 1).toString() +
                    "行的服务人员姓名为选择,请选择人员后再提交保存！"
                  (k + 1).toString() +
                  "行的服务人员姓名为选择,请选择人员后再提交保存！"
                );
                return;
              }
@@ -1562,7 +1178,7 @@
          //   this.form.annexfiles = list.map(item => item.url).join(",");
          // }

          //处理明细
          //处理明细          
          for (let i = 0; i < this.rbDetails.length; i++) {
            let tempDetail = this.rbDetails[i];
            //获取服务项目明细
@@ -1580,15 +1196,9 @@
              item => tempDetail.applytype == item.value
            );
            if (applytypeIndex > -1) {
              tempDetail.applytypename = this.rowfeeItemTypes[
                applytypeIndex
              ].label;
              tempDetail.subjecttype = this.rowfeeItemTypes[
                applytypeIndex
              ].subjecttype;
              tempDetail.subjecttypename = this.rowfeeItemTypes[
                applytypeIndex
              ].subjecttypename;
              tempDetail.applytypename = this.rowfeeItemTypes[applytypeIndex].label;
              tempDetail.subjecttype = this.rowfeeItemTypes[applytypeIndex].subjecttype;
              tempDetail.subjecttypename = this.rowfeeItemTypes[applytypeIndex].subjecttypename;
            }
            this.rbDetails[i] = tempDetail;
            /*
@@ -1613,7 +1223,7 @@
              });
            }
           
            // 计算税前金额
            // 计算税前、税费、税后金额
            if (tempDetail.amount == undefined || tempDetail.amount == null || tempDetail.amount == 0 || tempDetail.amount == '') {
              //获取参数
              this.taxParam.money = tempDetail.taxedamount.toString();
@@ -1629,7 +1239,32 @@
              });
            }
            */

          }
          //计算当前行报销内容费用合计，税前金额（amount）、扣税金额（taxamount）、税后金额（taxedamount） 
          if (this.businessType == '2') {
            for (let j = 0; j < this.rbDetails.length; j++) {
              let tempDetail = this.rbDetails[j];
              if (isNaN(parseFloat(tempDetail.amount)) || parseFloat(tempDetail.amount) == 0) {
                this.$modal.msgWarning("服务项目表中，第" + (j + 1).toString() + "行的金额未输入，请先输入金额后再提交保存！");
                return;
              }
            }
          } else if (this.businessType == '3' || this.businessType == '4') {
            for (let j = 0; j < this.rbDetails.length; j++) {
              let tempDetail = this.rbDetails[j];
              if (isNaN(parseFloat(tempDetail.amount)) || parseFloat(tempDetail.amount) == 0) {
                this.$modal.msgWarning("服务项目表中，第" + (j + 1).toString() + "行的金额未输入，请先输入金额后再提交保存！");
                return;
              }
              if (isNaN(parseFloat(tempDetail.taxamount)) || parseFloat(tempDetail.taxamount) == 0) {
                tempDetail.taxedamount = tempDetail.amount
              } else {
                tempDetail.taxedamount = tempDetail.amount + tempDetail.taxamount
              }
            }
          }

          //费用合计
          // this.form.pretaxcost = parseFloat(this.totalPreTaxAmount).toFixed(2);
          // this.form.taxedcost = parseFloat(this.totalAfterTaxAmount).toFixed(2);
@@ -1681,9 +1316,9 @@
          });

          //关闭窗口
          // this.loading = false;
          // this.getfundList();
          this.$store.dispatch("tagsView/delView", this.$route);
          this.loading = false;
          // this.getfundList();          
          this.$store.dispatch('tagsView/delView', this.$route)
          this.$router.go(-1);
        }
      });
@@ -1905,7 +1540,7 @@
      });
    },

    //校验收费项目是否重复
    //校验收费项目
    verifyFeeItem(row) {
      row.itemlist.map(res => {
        if (row.itemid === res.id) {
@@ -1913,14 +1548,18 @@
          row.itemcode = res.itemCode;
        }
      });
      var repeatNum = 0;
      this.rbDetails.map(res => {
        if (res.applytype === row.applytype && res.itemid == row.itemid) {
          repeatNum++;

      //判断收费项目是否重复
      if (this.businessType == "1") {
        var repeatNum = 0;
        this.rbDetails.map(res => {
          if (res.applytype === row.applytype && res.itemid == row.itemid) {
            repeatNum++;
          }
        });
        if (repeatNum > 1) {
          this.$modal.msgWarning("您已经提交过该服务项目了");
        }
      });
      if (repeatNum > 1) {
        this.$modal.msgWarning("您已经提交过该服务项目了");
      }

      //获取费用项目的详细信息
@@ -2162,7 +1801,7 @@
    },

    //计算个税
    calculateTax() {},
    calculateTax() { },

    //计算总金额
    sumTotalFee(row) {
@@ -2257,7 +1896,7 @@
    },

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

    /** 下载文件按钮操作 */
    downFile(item) {
@@ -2507,13 +2146,13 @@
    // this.getFeeUnitList();
  },

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