Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb_region

qx

4 天以前 857950aac3233497766024759fdf4eff55d58424

Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb_region

 src/views/doctor/check/index.vue

@@ -1909,23 +1909,40 @@
    }, */
    bzxz() {
      this.taocan = true;
      this.titles = "";
      var deptAdviceList1 = [];
      let data = { proId: this.proId, tjNum: this.tableAll.tjNumber };
      getAdviceByTjNumAndPro(data).then((res) => {
        if (res.data) {
          this.deptAdviceList3 = res.data;    
          if (this.proParentList.xiaoJieIds) {
            this.proParentList.xiaoJieIds.forEach((item) => {
              this.deptAdviceList3.forEach((items) => {
      var deptAdviceList1 = []
      // let data = { proId: this.proId, tjNum: this.tableAll.tjNumber };
      // getAdviceByTjNumAndPro(data).then((res) => {
        // if (res.data) {
        //   this.deptAdviceList3 = res.data;
          if (this.proParentList.xiaoJieIds.length != 0) {
            if (this.vaids.length != 0) {
              const result = this.vaids.reduce((acc, item) => {
                const matches = this.deptAdviceList.filter(items => {
                  return item == items.id;  // 或 === 根据需求
                });
                return acc.concat(matches);
              }, []);
              deptAdviceList1 = result;

              return this.deptAdviceList1 = [
                ...new Set(deptAdviceList1),
              ];
            } else {
              this.proParentList.xiaoJieIds.forEach(item => {
                this.deptAdviceList.forEach((items) => {
                if (item == items.id) {
                  deptAdviceList1.push(items);
                    deptAdviceList1.push(items)
                }
              });
            });
            this.deptAdviceList1 = [...new Set(deptAdviceList1)];
              })
              return this.deptAdviceList1 = [
                ...new Set(deptAdviceList1),
              ];
            }


          } else if(this.proParentList.xiaoJieIds == null){
            this.deptAdviceList1 = [];
            this.deptAdviceList1 = []
          }

          // this.deptAdviceList1 = [
@@ -1935,8 +1952,8 @@
          //   this.idss.push(items.id);
          //   this.remakes += items.advice + ",";
          // });
        }
      });
      //   }
      // });
    },

    result() {
@@ -2010,6 +2027,7 @@
      if (this.proParentList.xiaoJie.length != 0) {
        this.remakes = "";
        this.titles = "";
        this.vaids = []
        this.deptAdviceList1.forEach((item1) => {
          if (this.proParentList.remark != null) {
            this.titles += item1.title + ",";
@@ -2194,7 +2212,14 @@

    eventchange(data) {
      this.dataText = data;
      data.forEach((item) => (this.proParentList.remark += item.advice));
      data.forEach((item) => {
        if (item.advice) {
          this.proParentList.remark += item.advice
        } else if (item.jynr) {
          this.proParentList.remark += item.jynr
        }
      })
      //  data.forEach((item) => (this.proParentList.remark += item.jynr));
    },

    proposalChange() {

 src/views/reservation/reservations/index.vue

@@ -2172,6 +2172,7 @@
        sex: null,
        phoe: "",
        nation: null,
        companyId:null,
        email: "",
        marriage: null,
        address: "",
@@ -2605,6 +2606,7 @@
    handleUpdate(row) {
      this.title = "修改体检预约";
      this.formIn = row;
      
      this.form.tjType = this.formIn.tjType;
      if (this.formIn.timeRegion === 0) {
        this.formIn.timeRegion = "8:00-9:00";
@@ -3143,7 +3145,8 @@
          isExpire: this.formIn.isExpire,
          address: this.formIn.address,
          company: this.formIn.company,
          department: this.formIn.department,
          companyId: this.formIn.companyId,
          marriage: this.formIn.marriage,
          discount: this.discount,
          email: this.formIn.email,
          idCard: this.formIn.idCard,
@@ -3170,6 +3173,7 @@
          address: this.formIn.address,
          company: this.formIn.company,
          department: this.formIn.department,
          companyId: this.formIn.companyId,
          discount: this.discount,
          email: this.formIn.email,
          idCard: this.formIn.idCard,
@@ -3233,6 +3237,7 @@
            address: this.formIn.address,
            company: this.formIn.company,
            department: this.formIn.department,
            companyId: this.formIn.companyId,
            discount: this.discount,
            email: this.formIn.email,
            idCard: this.formIn.idCard,
@@ -3259,6 +3264,7 @@
            address: this.formIn.address,
            company: this.formIn.company,
            department: this.formIn.department,
            companyId: this.formIn.companyId,
            discount: this.discount,
            email: this.formIn.email,
            idCard: this.formIn.idCard,

 src/views/system/biol/index.vue

@@ -530,9 +530,9 @@
    </el-dialog>
    <!--:before-close="handleClose"  -->
    <el-dialog title="提示" :visible.sync="dialogVisiblese" width="30%">
        <el-form :model="forms" ref="form" :inline="true" label-width="76px" style="margin-top: 10px">
        <el-form-item label="" prop="radios">
          <el-select  filterable v-model="forms.radios" placeholder="请选择打印健康检查表类型" clearable
        <el-form :model="forms" ref="form"  style="margin-top: 10px; width: 100%">
        <el-form-item label="" prop="radios" style="width: 100%">
          <el-select  filterable v-model="forms.radios" placeholder="请选择打印健康检查表类型" clearable style="width: 100%"  
            >
            <el-option v-for="dict in radiosList" :key="dict.dictValue" :label="dict.dictLabel"
              :value="dict.dictValue" />