yz3456
2024-06-23 db3d71b62fcd859bf5e2c75b107c1d28bd977632
修改了333之前的报错
9个文件已修改
131 ■■■■■ 已修改文件
ruoyi-ui/src/api/pet/index.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/bignote/familyeventInfo.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/doctor/doctorInfo.vue 48 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/doctor/index.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/economy/index.vue 35 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/marry/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/meeting/approveInfo.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/meeting/meetingInfo.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/views/pet/petnote.vue 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/api/pet/index.js
@@ -115,7 +115,7 @@
  })
}
//导入
export function enload(pid) {
export function enload(data,pid) {
  return request({
    url: '/zfPetNote/importData/' + pid,
    method: 'post',
ruoyi-ui/src/views/bignote/familyeventInfo.vue
@@ -341,6 +341,7 @@
      });
    }
    console.log(this.fileList,'fileListfilelllllllllllll')
    console.log(this.fileListOther,'fileListOtherfileListOtherfileListOther')
  },
  mounted() {},
  methods: {
ruoyi-ui/src/views/doctor/doctorInfo.vue
@@ -13,11 +13,43 @@
    </div>
    <div>
      <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-position="left" label-width="100px">
      <!--      <el-form-item label="id" prop="id">-->
      <!--        <el-input v-model="formData.id" placeholder="请输入id" :maxlength="11" show-word-limit :disabled="true"-->
      <!--                  clearable prefix-icon='el-icon-mobile' :style="{width: '100%'}"></el-input>-->
      <!--      </el-form-item>-->
      <el-container>
      <el-form-item label="类别" prop="type" label-width="55px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
        <el-select v-model="formData.type" placeholder="请选择类别" clearable :style="{width: '100%'}"   :disabled="dsb">
          <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
          ></el-option>
        </el-select>
        <el-input v-model="newOption" v-if="showInput" placeholder="若未在上述选项中找到对应类别,请在此输入新的类别" @change="addNewOption"></el-input>
      </el-form-item>
      <el-form-item label="症状" prop="symptom" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
        <el-input v-if="!dsb" v-model="formData.symptom" placeholder="请输入症状" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
        <el-input v-if="dsb" v-model="formData.symptom" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
      </el-form-item>
      <el-form-item label="持续时间" prop="duration" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
        <el-input v-model="formData.duration" placeholder="请输入持续时间" type="number" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="功效" prop="effect" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
        <el-input v-model="formData.effect" placeholder="请输入功效" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="适用人" prop="suitable" label-width="65px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
        <el-input v-model="formData.suitable" placeholder="请输入适用人" clearable :style="{width: '100%'}" :disabled="dsb">
        </el-input>
      </el-form-item>
      <el-form-item label="中医处方" prop="cmedical" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
        <el-input v-model="formData.cmedical" placeholder="请输入中医处方"  clearable :style="{width: '100%'}" :disabled="dsb" >
        </el-input>
      </el-form-item>
      <el-form-item label="西医处方" prop="wmedical" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
          <el-input v-if="!dsb" v-model="formData.wmedical" placeholder="请输入西医处方" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
          <el-input v-if="dsb" v-model="formData.wmedical" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
      </el-form-item>
      <el-form-item label="备注" prop="remark" label-width="45px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
        <el-input v-if="!dsb" v-model="formData.remark" placeholder="请输入备注" clearable :style="{width: '100%'}" :disabled="dsb" type="textarea"></el-input>
        <el-input v-if="dsb" v-model="formData.remark" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb" type="textarea"></el-input>
      </el-form-item>
      <!-- <el-container>
      <div>
        <el-container>
          <el-row>
@@ -81,7 +113,8 @@
          </el-row>
        </el-container>
      </div>
      </el-container>
      </el-container> -->
      <h4 class="form-header">相关图片 </h4>
      <el-upload
        action="#"
@@ -772,4 +805,7 @@
.form{
  background:center/11% no-repeat url('../../assets/icons/form.png') ;
}
/* /deep/ .el-input__inner{
          height: 72px;
        } */
</style>
ruoyi-ui/src/views/doctor/index.vue
@@ -593,7 +593,8 @@
      //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
      listDoctor(this.queryParams).then(response => {
          //  alert(123)
          //   console.log(response.data)
          console.log(this.queryParams,'queryParamsqueryParamsqueryParams')
            console.log(response.data,'response.dataresponse.dataresponse.data')
          if(response.msg=="您没加入到对应的家庭,请联系管理员")
          {
              _this.$modal.msgSuccess("您没加入到对应的家庭,请联系管理员");
ruoyi-ui/src/views/economy/index.vue
@@ -812,28 +812,27 @@
    },
    /** 导出按钮操作 */
    handleExport() {
      this.download('/zfEconomy/export', {
      this.download('/zfEconomy/model', {
        ...this.queryParams
      }, `zfEconomy_${new Date().getTime()}.xlsx`)
    }
    },
    /** 导入操作*/
    handleEnport(params){
      var file = params.file;
      var formData = new FormData();
      formData.append('excelImport', file);
      let _this = this
      enload(formData).then(response => {
        _this.getList();
        Message({ message: "导入成功", type: 'warning' })
      }).catch(err)
      {
        Message({ message: "导入失败", type: 'error' })
      }
    },
  },
  /** 导入操作*/
  handleEnport(params){
    var file = params.file;
    var formData = new FormData();
    formData.append('excelImport', file);
    let _this = this
    alert(file)
    enload(formData).then(response => {
      _this.getList();
      Message({ message: "导入成功", type: 'warning' })
    }).catch(err)
    {
      Message({ message: "导入失败", type: 'error' })
    }
  }
};
</script>
ruoyi-ui/src/views/marry/index.vue
@@ -778,7 +778,7 @@
    getList() {
      this.loading = false;
      this.loading = true;
      //个人信息
      listMarry(this.queryParams).then(response => {
ruoyi-ui/src/views/meeting/approveInfo.vue
@@ -50,14 +50,6 @@
                </el-input>
              </el-form-item>
            </el-cow>
            <!-- <el-cow>
              <el-form-item label="会议室代码" prop="meetingID" label-width="90px"
                style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                <el-input v-model="formData.meetingID" placeholder="请输入会议室代码" clearable :style="{width: '100%'}">
                </el-input>
              </el-form-item>
            </el-cow> -->
            <el-cow>
              <el-form-item label="可容纳人数" prop="conPeople" label-width="90px"
                style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
@@ -95,7 +87,7 @@
              </el-form-item>
            </el-cow>
            <el-cow>
              <el-form-item label="是否拜访水牌" prop="isPlacebrand" label-width="120px"
              <el-form-item label="是否摆放水牌" prop="isPlacebrand" label-width="120px"
                style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                <el-select v-model="formData.isPlacebrand" placeholder="请选择 " clearable :style="{width: '100%'}"
                  :disabled="dsb">
@@ -290,13 +282,13 @@
            if (this.formData.id != undefined) {
              updateStatu(this.formDat).then(response => {
                this.$modal.msgSuccess("修改成功");
                this.getList();
                // this.btn = false
              });
            } else {
              this.$modal.msgSuccess("修改失败");
              this.getList();
            }
            this.getList();
            this.getList();
      },
      refuse(row){
        this.formDat.id = this.formData.id
ruoyi-ui/src/views/meeting/meetingInfo.vue
@@ -95,7 +95,7 @@
              </el-form-item>
            </el-cow>
            <el-cow>
              <el-form-item label="是否拜访水牌" prop="isPlacebrand" label-width="120px"
              <el-form-item label="是否摆放水牌" prop="isPlacebrand" label-width="120px"
                style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
                <el-select v-model="formData.isPlacebrand" placeholder="请选择 " clearable :style="{width: '100%'}"
                  :disabled="dsb">
@@ -248,7 +248,7 @@
          }],
          isPlacebrand: [{
            required: true,
            message: '请选择是否拜访水牌',
            message: '请选择是否摆放水牌',
            trigger: 'blur'
          }],
          connPerson: [{
ruoyi-ui/src/views/pet/petnote.vue
@@ -749,6 +749,7 @@
        ...this.queryParams
      };
      if (Object.keys(queryParams).length === 1 && 'pid' in queryParams) {
        this.download('/family/zfPetNote/export', queryParams, `zfPetNote_${new Date().getTime()}.xlsx`);
      } else {
@@ -772,11 +773,12 @@
      var file = params.file;
      var formData = new FormData();
      formData.append('excelImport', file);
      formData.append('pid', pid); // 添加导入到哪个 ID 的信息
      console.log(this.pid);
      // formData.append('pid', pid); // 添加导入到哪个 ID 的信息
      // console.log(formData,'formDataformDataformData')
      // alert(this.pid);
      let _this = this;
      enload(formData)
      enload(formData,this.pid)
        .then(response => {
          _this.getList();
          Message({ message: "导入成功", type: 'warning' });
@@ -784,15 +786,17 @@
        .catch(error => {
          Message({ message: "导入失败", type: 'error' });
        });
    }
    },
    //  弹窗
    handleShow(scope){
      this.openDataScope = true
      this.getList()
    },
  },
  //  弹窗
  handleShow(scope){
    this.openDataScope = true
    this.getList()
  }
};
</script>