修改了风格

yxh

23 小时以前 a79d67f8a9a9fa02f9d25f987b9611af965c484f

 src/views/project/donatebaseinfo/index.vue

@@ -3,16 +3,17 @@
    <el-form
      :model="queryParams"
      ref="queryForm"
      class="opo-query-form"
      :inline="true"
      v-show="showSearch"
      label-width="70px"
    >
      <el-row :gutter="8">
        <el-col :span="5">
          <el-form-item label="姓名" prop="name">
          <el-form-item label="捐献者" prop="name">
            <el-input
              v-model="queryParams.name"
              placeholder="请输入姓名"
              placeholder="请输入捐献者姓名"
              clearable
              size="small"
              @keyup.enter.native="handleQuery"
@@ -46,41 +47,7 @@
            </el-select>
          </el-form-item>
        </el-col>
        <el-col :span="9">
          <el-form-item label="日期">
            <el-date-picker
              style="width: 100%"
              v-model="selecttime"
              type="monthrange"
              range-separator="至"
              start-placeholder="开始月份"
              end-placeholder="结束月份"
              value-format="yyyy-MM-dd"
              @change="getTimeList"
            >
            </el-date-picker>
          </el-form-item>
        </el-col>
      </el-row>
      <el-row :gutter="8">
        <el-col :span="5">
          <el-form-item label="捐献进度" prop="workflow">
            <el-select
              v-model="queryParams.workflow"
              placeholder="请选择当前进度"
              clearable
              size="small"
            >
              <el-option
                v-for="dict in dict.type.sys_DonationStatus"
                :key="dict.value"
                :label="dict.label"
                :value="dict.value"
              />
            </el-select>
          </el-form-item>
        </el-col>
        <el-col :span="5">
       <el-col :span="6">
          <el-form-item label="报告人">
            <el-select
              v-model="queryParams.reporterno"
@@ -96,17 +63,59 @@
            </el-select>
          </el-form-item>
        </el-col>
        <el-col :span="9">
          <el-form-item label="籍贯">
            <div>
              <li_area_select
                ref="areaSelect"
                v-model="searchAddress"
              ></li_area_select>
            </div>
      </el-row>
      <el-row :gutter="8">
        <el-col :span="6">
          <el-form-item label="捐献进度" prop="workflow">
            <el-select
              v-model="queryParams.workflow"
              placeholder="请选择当前进度"
              clearable
              size="small"
            >
              <el-option
                v-for="dict in dict.type.sys_donornode"
                :key="dict.value"
                :label="dict.label"
                :value="dict.value"
              />
            </el-select>
          </el-form-item>
        </el-col>
        <el-col :span="4">
         <el-col :span="9">
          <el-form-item label="案例时间">
            <el-date-picker
              style="width: 100%"
              v-model="selecttime"
              type="monthrange"
              range-separator="至"
              start-placeholder="开始月份"
              end-placeholder="结束月份"
              value-format="yyyy-MM-dd"
              @change="getTimeList"
            >
            </el-date-picker>
          </el-form-item>
        </el-col>
        
        <el-col :span="6">
          <el-form-item label="是否终止">
            <el-select
              v-model="queryParams.terminationCase"
              placeholder="请选择状态"
            >
              <el-option
                v-for="item in terminationCaselist"
                :key="item.value"
                :label="item.name"
                :value="item.value"
              >
              </el-option>
            </el-select>
          </el-form-item>
        </el-col>
        <!-- 搜索/重置紧跟查询条件（与"案例评估"页一致） -->
        <el-col :span="6">
          <el-form-item>
            <el-button
              type="primary"
@@ -188,7 +197,7 @@
        label="捐献编号"
        align="center"
        prop="donorno"
        width="200"
        width="100"
      />
      <el-table-column label="姓名" align="center" prop="name" width="100" />
      <el-table-column label="性别" align="center" prop="sex" width="100">
@@ -199,13 +208,25 @@
          />
        </template>
      </el-table-column>
      <el-table-column label="年龄" align="center" prop="age" width="100" />
      <el-table-column label="年龄" align="center" prop="age" width="100">
        <template slot-scope="scope">
           {{
            `${
              scope.row.age && scope.row.age !== 0 ? `${scope.row.age}${scope.row.ageunit?scope.row.ageunit:''}` : ""
            } ${
              scope.row.age2 && scope.row.age2 !== 0
                ? `${scope.row.age2}${scope.row.ageunit2}`
                : ""
            }`.trim()
          }}
        </template>
      </el-table-column>
      <el-table-column
        label="医疗机构"
        align="center"
        prop="treatmenthospitalname"
        prop="treatmenthospitalname" width="220"
      />
      <el-table-column label="血型" align="center" prop="bloodtype" width="100">
      <el-table-column label="血型" align="center" prop="bloodtype" width="80">
        <template slot-scope="scope">
          <dict-tag
            :options="dict.type.sys_BloodType"
@@ -233,7 +254,7 @@
        prop="reportername"
        width="100"
      />
      <!-- 
      
         <el-table-column
        label="现所在地市"
        align="center"
@@ -250,10 +271,10 @@
         <dict-tag
            :options="dict.type.sys_DonationStatus"
            :value="scope.row.recordstate"
          />          
          />
        </template>
      </el-table-column>
      -->
     
      <el-table-column
        label="捐献进度"
        align="center"
@@ -274,7 +295,7 @@
        label="操作"
        align="center"
        class-name="small-padding fixed-width"
        fixed="right"
        fixed="right" width="200"
      >
        <template slot-scope="scope">
          <el-button
@@ -294,9 +315,9 @@
            v-hasPermi="['project:donatebaseinfo:remove']"
            >删除</el-button
          >
          <!-- 
          <!--
            <el-button v-if="scope.row.recordstate == 0 || scope.row.recordstate == 3" size="mini" type="text"
            icon="el-icon-thumb" @click="handleapproval(scope.row)">提交</el-button>        
            icon="el-icon-thumb" @click="handleapproval(scope.row)">提交</el-button>
           -->
          <el-button
            size="mini"
@@ -305,9 +326,9 @@
            @click="handledownload(scope.row)"
            >下载</el-button
          >
          <!-- 
          <!--
            <el-button size="mini" type="text" icon="el-icon-edit" @click="handletermination(scope.row)"
            v-hasPermi="['project:donatebaseinfo:edit']">{{ scope.row.recordstate == 99 ? "恢复": "终止"  }}</el-button> 
            v-hasPermi="['project:donatebaseinfo:edit']">{{ scope.row.recordstate == 99 ? "恢复": "终止"  }}</el-button>
          -->
        </template>
      </el-table-column>
@@ -439,8 +460,15 @@
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="年龄" prop="age">
                <el-input v-model="form.age" placeholder="请输入年龄" />
              <el-form-item label="学历" prop="education">
                <el-select v-model="form.education" placeholder="请选择学历">
                  <el-option
                    v-for="dict in dict.type.sys_education"
                    :key="dict.value"
                    :label="dict.label"
                    :value="dict.value"
                  ></el-option>
                </el-select>
              </el-form-item>
            </el-col>
          </el-row>
@@ -453,10 +481,19 @@
                  v-model="form.birthday"
                  type="date"
                  style="width: 174px"
                  value-format="yyyy-MM-dd HH:mm:ss"
                  @change="calculateAge"
                  value-format="yyyy-MM-dd"
                  placeholder="选择出生日期"
                >
                </el-date-picker>
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <!-- <el-form-item label="年龄" prop="age">
                <el-input v-model="form.age" placeholder="请输入年龄" />
              </el-form-item> -->
              <el-form-item label="年龄" prop="age">
                <el-input v-model="form.andAge" disabled> </el-input>
              </el-form-item>
            </el-col>
            <el-col :span="6">
@@ -471,16 +508,45 @@
                </el-select>
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="学历" prop="education">
                <el-select v-model="form.education" placeholder="请选择学历">
                  <el-option
                    v-for="dict in dict.type.sys_education"
                    :key="dict.value"
                    :label="dict.label"
                    :value="dict.value"
                  ></el-option>
                </el-select>
          </el-row>
                    <el-row>
            <el-col :span="12">
              <el-form-item
                label="所在医疗机构"
                prop="currentMedicalInstitution"
              >
                <el-input
                  v-model="form.currentMedicalInstitution"
                  placeholder="请输入"
                />
              </el-form-item>
            </el-col>
            <el-col :span="12">
              <el-form-item
                label-width="150px"
                label="所在医疗机构科室"
                prop="currentDept"
              >
                <el-input v-model="form.currentDept" placeholder="请输入" />
              </el-form-item>
            </el-col>
          </el-row>
          <el-row>
            <el-col :span="12">
              <el-form-item label="首次医疗机构" prop="firstMedicalInstitution">
                <el-input
                  v-model="form.firstMedicalInstitution"
                  placeholder="请输入"
                />
              </el-form-item>
            </el-col>
            <el-col :span="12">
              <el-form-item
                label-width="150px"
                label="首次医疗机构科室"
                prop="firstDept"
              >
                <el-input v-model="form.firstDept" placeholder="请输入" />
              </el-form-item>
            </el-col>
          </el-row>
@@ -652,6 +718,21 @@
                margin-top: 20px;
              "
        >
         <el-row>
            <el-col :span="24">
              <el-form-item align="left" label="本人意愿 ">
                <el-checkbox-group v-model="form.selfwill">
                  <el-checkbox
                    v-for="dict in dict.type.sys_SelfWill"
                    :key="dict.value"
                    :label="dict.value"
                  >
                    {{ dict.label }}
                  </el-checkbox>
                </el-checkbox-group>
              </el-form-item>
            </el-col>
          </el-row>
          <el-row>
            <div display="flex">
              <el-row>
@@ -684,21 +765,7 @@
              </el-row>
            </div>
          </el-row>
          <el-row>
            <el-col :span="24">
              <el-form-item align="left" label="本人意愿 ">
                <el-checkbox-group v-model="form.selfwill">
                  <el-checkbox
                    v-for="dict in dict.type.sys_SelfWill"
                    :key="dict.value"
                    :label="dict.value"
                  >
                    {{ dict.label }}
                  </el-checkbox>
                </el-checkbox-group>
              </el-form-item>
            </el-col>
          </el-row>

          <el-row>
            <el-col :span="12">
              <el-form-item label="主要亲属" prop="majorrelatives">
@@ -787,7 +854,7 @@
                  size="small"
                  style="width: 190px"
                  v-model="form.contacttime"
                  type="datetime"
                  type="datetime" format="yyyy-MM-dd HH:mm"
                  value-format="yyyy-MM-dd HH:mm:ss"
                  placeholder="选择报告时间"
                >
@@ -844,7 +911,7 @@
                  size="small"
                  style="width: 190px"
                  v-model="form.reporttime"
                  type="datetime"
                  type="datetime" format="yyyy-MM-dd HH:mm"
                  value-format="yyyy-MM-dd HH:mm:ss"
                  placeholder="选择报告时间"
                >
@@ -889,7 +956,7 @@
  exportDonatebaseinfo,
  downloadbaseinfo,
  getDonationNumber,
  getdonatorno,
  getdonatorno
} from "@/api/project/donatebaseinfo";
import Li_area_select from "@/components/Address";
import OrgSelecter from "@/views/project/components/orgselect";
@@ -965,6 +1032,10 @@
        shi: "",
        qu: ""
      },
      terminationCaselist: [
        { name: "终止状态", value: 1 },
        { name: "正常状态", value: 0 }
      ],
      // 遮罩层
      loading: true,
      // 导出遮罩层
@@ -1019,7 +1090,11 @@
        sex: null,
        idcardtype: null,
        idcardno: null,
        age: null,
        age: null, // 年龄（年）
        andAge: "",
        ageunit: "年", // 单位，通常固定为“年”
        age2: null, // 年龄（月或天）
        ageunit2: "月", // 单位，根据计算决定是“月”还是“天”
        ageunit: null,
        birthday: null,
        phone: null,
@@ -1098,9 +1173,24 @@
      users: [],

      // 表单校验
      rules: {
     rules: {
        name: [
          { required: true, message: "请输入捐献者姓名", trigger: "blur" }
        ],
        nationality: [
          { required: true, message: "请输入国籍", trigger: "blur" }
        ],
        currentMedicalInstitution: [
          { required: true, message: "请输入所在医疗机构", trigger: "blur" }
        ],
        currentDept: [
          { required: true, message: "所在医疗机构科室", trigger: "blur" }
        ],
        firstMedicalInstitution: [
          { required: true, message: "请输入首次医疗机构", trigger: "blur" }
        ],
        firstDept: [
          { required: true, message: "请输入首次医疗机构科室", trigger: "blur" }
        ],
        birthday: [
          { required: true, message: "请选择出生日期", trigger: "blur" }
@@ -1111,12 +1201,35 @@
        residenceaddress: [
          { required: true, message: "请输入住址", trigger: "blur" }
        ],
        contacttime: [
          {
            required: true,
            message: "请输入红十字会联系时间",
            trigger: "blur"
          }
        registerAddresss: [
          { required: true, message: "请输入现居住地址", trigger: "blur" }
        ],
        diseasetype: [
          { required: true, message: "请选择疾病类型", trigger: "blur" }
        ],
        infectious: [
          { required: true, message: "请选择传染病类型", trigger: "blur" }
        ],
        patientstate: [
          { required: true, message: "请选择病人状况", trigger: "blur" }
        ],
        kinship: [
          { required: true, message: "请选择亲属情况", trigger: "blur" }
        ],
        majorrelatives: [
          { required: true, message: "请输入主要亲属", trigger: "blur" }
        ],
        selfwill: [
          { required: true, message: "请选择本人意愿", trigger: "blur" }
        ],
        registerAddresss: [
          { required: true, message: "请输入现所在地", trigger: "blur" }
        ],
        familyrelations: [
          { required: true, message: "请选择亲属与捐献者关系", trigger: "blur" }
        ],
        infosources: [
          { required: true, message: "请选择信息来源", trigger: "blur" }
        ],
        idcardno: [
          { required: true, message: "请正确输入证件号码", trigger: "blur" }
@@ -1126,7 +1239,6 @@
        treatmenthospitalno: [
          { required: true, message: "请选择医疗机构", trigger: "blur" }
        ],
        // treatmenthospitalno: [{ required: true, message: "请选择医疗机构", trigger: "change" }],
        bloodtype: [
          { required: true, message: "请选择ABO血型", trigger: "blur" }
        ],
@@ -1138,7 +1250,6 @@
        inpatientno: [
          { required: true, message: "输入住院号", trigger: "blur" }
        ],

        diagnosisname: [
          { required: true, message: "疾病诊断不能为空", trigger: "blur" }
        ],
@@ -1148,17 +1259,6 @@
        infophone: [
          { required: true, message: "请输入信息员联系电话", trigger: "blur" }
        ],
        redorganno: [
          { required: true, message: "请选择红十字会机构", trigger: "blur" }
        ],
        contactperson: [
          {
            required: true,
            message: "红十字会联系人不能为空",
            trigger: "blur"
          }
        ],
        // contactnumber: [{required: true,message: "请输入红十字会联系电话",trigger: "change"}],
        acquisitiontissueno: [
          { required: true, message: "器官获取组织不能为空", trigger: "blur" }
        ],
@@ -1227,6 +1327,8 @@
    if (this.$route.params.reporterno != "") {
      this.reporterno = this.$route.params.reporterno;
    }
    this.queryParams.terminationcase = this.$route.params.terminationcase;

    if (
      this.$route.params.tempRecordState != "" &&
      this.$route.params.tempRecordState != undefined
@@ -1253,7 +1355,7 @@
    }

    this.getTimeList();
    

    this.getList();
  },

@@ -1263,7 +1365,83 @@
        this.currentuser = response.data;
      });
    },
    calculateAge(birthday) {
      if (!birthday) {
        // 清空年龄字段
        this.form.age = null;
        this.form.age2 = null;
        // this.form.age3 = null;
        return;
      }

      const birthDate = new Date(birthday);
      const today = new Date();

      // 计算总月份差异
      let yearDiff = today.getFullYear() - birthDate.getFullYear();
      let monthDiff = today.getMonth() - birthDate.getMonth();
      let dayDiff = today.getDate() - birthDate.getDate();

      // 如果当前日期的天数小于出生日期的天数，则借月
      if (dayDiff < 0) {
        monthDiff--;
        // 获取上个月的最后一天
        const lastDayOfMonth = new Date(
          today.getFullYear(),
          today.getMonth(),
          0
        ).getDate();
        dayDiff += lastDayOfMonth;
      }

      // 如果月份差为负，则借年
      if (monthDiff < 0) {
        yearDiff--;
        monthDiff += 12;
      }

      // 赋值年部分
      this.form.age = yearDiff;
      this.form.ageunit = "岁";

      // 赋值月部分（或者您也可以选择显示剩余的天数）
      this.form.age2 = monthDiff;
      this.form.ageunit2 = "月";

      // 如果您还想显示天数
      // this.form.age3 = dayDiff;
      // this.form.ageunit3 = '天';

      // 如果年龄小于1岁，可能您希望用月或天来表示主年龄
      // 这里是一个简单的逻辑，您可以根据需求调整
      if (yearDiff === 0) {
        if (monthDiff === 0) {
          // 小于1个月，用天表示
          this.form.age = dayDiff;
          this.form.ageunit = "天";
          this.form.age2 = null; // 清空第二字段
          // this.form.age3 = null;
        } else {
          // 小于1年，用月表示
          this.form.age = monthDiff;
          this.form.ageunit = "月";
          this.form.age2 = dayDiff; // 第二字段显示天
          this.form.ageunit2 = "天";
        }
      }

      this.form.andAge = `${
        this.form.age && this.form.age !== 0
          ? `${this.form.age}${this.form.ageunit}`
          : ""
      } ${
        this.form.age2 && this.form.age2 !== 0
          ? `${this.form.age2}${this.form.ageunit2}`
          : ""
      }`.trim();
      this.$forceUpdate(); // 强制更新
      console.log(this.form.andAge);
    },
    LoadReportList() {
      listDonatebaseinfo().then(res => {
        let list = res.rows;
@@ -1426,7 +1604,8 @@
          // 赋值给表格
          this.form.sex = sex;
          this.form.birthday = birthday;
          this.form.age = age;
          this.calculateAge(birthday);
          // this.form.age = age;
        } else {
        }
      } catch {}
@@ -1475,19 +1654,16 @@
        this.queryParams.reportno = this.reportervalue;
      }

      if (this.starttime != "") {
        this.queryParams.starttime = this.starttime;
      } else {
        this.queryParams.starttime = "";
      }
      if (this.endtime != "") {
        this.queryParams.endtime = this.endtime;
      } else {
        this.queryParams.endtime = "";
      }
      this.queryParams.residenceprovince = this.$refs.areaSelect.getSheng();
      this.queryParams.residencecity = this.$refs.areaSelect.getShi();
      this.queryParams.residencetown = this.$refs.areaSelect.getQu();
      // 未选择时间范围时必须传 null：传空串会让后端拼出 `donatetime >= ''`，
      // MySQL 严格模式会报 Incorrect DATETIME value: ''，导致列表查不出来。
      // request.js 只会拼接非 null/undefined 的参数，所以 null 等于"不带该条件"。
      this.queryParams.starttime = this.starttime || null;
      this.queryParams.endtime = this.endtime || null;
      // 查询条件里的"籍贯"已移除，不再从 areaSelect 组件取值；
      // 置空以清掉可能残留的旧条件（参数为 null 时不会被拼进请求）
      this.queryParams.residenceprovince = null;
      this.queryParams.residencecity = null;
      this.queryParams.residencetown = null;
      console.log(this.queryParams);

      listDonatebaseinfo(this.queryParams).then(response => {
@@ -1707,7 +1883,6 @@
      const id = row.id || this.ids;
      getDonatebaseinfo(id).then(response => {
        this.form = response.data;

        this.form.diseasetype = this.form.diseasetype.split(",");
        this.form.infectious = this.form.infectious.split(",");
        this.form.selfwill = this.form.selfwill.split(",");
@@ -1899,9 +2074,16 @@
</script>

<style scoped>
/* 查询区行距、页面内边距、工具栏间距已提升为全局规则（.opo-query-form / .app-container），此处不再单独覆盖 */
::v-deep .el-dialog__header {
  padding-top: 40px !important;
  margin: auto !important;
  padding-bottom: 0px !important;
}
::v-deep .el-input.is-disabled .el-input__inner {
  background-color: #fff;
  border-color: #dfe4ed;
  color: #000;
  cursor: not-allowed;
}
</style>