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

WXL

2023-08-28 a58cbd391aa2b58d59c0970f74edf006a03da1d7

 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,14 +991,24 @@
    },
    /** 新增按钮操作 */
    handleAdd(row) {
      debugger;
      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;
@@ -1003,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;
@@ -1019,7 +1033,6 @@
      let searchParam = {
        infoid: row.id,
      };
      debugger;
      this.GetDonortedList();
      const infoid = this.form.infoid;
      getByInfoId(infoid).then((response) => {
@@ -1160,12 +1173,11 @@
        //donorno: this.form.donorno,
        infoid: this.curCase.id,
      };
      debugger;
      console.log(
        "调用器官列表接口，参数：" + JSON.stringify(oraganqueryParam)
      );

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