Merge remote-tracking branch 'origin/master'

linwenling

2023-08-08 b29f1588f2bb8b46df38a52cbae07ea8590f099a

 ruoyi-ui/src/views/pet/index.vue

@@ -1,10 +1,10 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
      <el-form-item label="类型" prop="type">
      <el-form-item label="性别" prop="sex">
        <el-select
          v-model="queryParams.type"
          placeholder="所有类型"
          v-model="queryParams.sex"
          placeholder="请选择性别"
          clearable
          style="width: 240px"
        >
@@ -33,24 +33,8 @@
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
        <el-form-item label="持有人" prop="holder">
          <el-input
            v-model="queryParams.holder"
            placeholder="请输入持有人"
            clearable
            style="width: 240px"
            @keyup.enter.native="handleQuery"
          />
        </el-form-item>
        <!-- <el-form-item label="具体位置" prop="address">
          <el-input
            v-model="queryParams.address"
            placeholder="请输入具体位置"
            clearable
            style="width: 240px"
            @keyup.enter.native="handleQuery"
          />
        </el-form-item> -->


      </el-form-item>
      <!-- <el-form-item label="发生时间">
        <el-date-picker
@@ -103,60 +87,57 @@
          @click="handleExport"
          v-hasPermi="['family:note:export']"
        >导出</el-button>
   </el-col>
      </el-col>

      <el-col :span="1.5">
        <el-button
          type="warning"
          plain
          icon="el-icon-download"
          size="mini"
          @click="handleExportTemplate"
          v-hasPermi="['family:note:export']"
        >导入模板下载</el-button>
      </el-col>
      <el-col :span="1.2">
        <el-upload
          action=""
          class="upload-demo"
          :show-file-list="false"
          :http-request="handleEnport"
        >
          <el-button size="mini"   type="primary"
          plain
          icon="el-icon-plus" >导入</el-button>
      <el-col :span="1.5">
        <el-button
          type="warning"
          plain
          icon="el-icon-download"
          size="mini"
          @click="handleExport"
          v-hasPermi="['family:note:export']"
        >导入模板下载</el-button>
      </el-col>
      <el-col :span="1.2">
        <el-upload
          action=""
          class="upload-demo"
          :show-file-list="false"
          :http-request="handleEnport"
        >
          <el-button size="mini"   type="primary"
                     plain
                     icon="el-icon-plus" >导入</el-button>

        </el-upload>
      </el-col>
        </el-upload>
      </el-col>

      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>

    <el-table v-loading="loading" :data="petList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
      <el-table-column type="selection" :reserve-selection="true" width="55"  align="center" />
    <el-table v-loading="loading" :data="petList,PetNoteList" @selection-change="handleSelectionChange"  :row-class-name="tableRowClassName">
      <el-table-column type="selection" width="55"  align="center" />

      <el-table-column  label="序号" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>

      <el-table-column label="类型" prop="type" sortable :show-overflow-tooltip="true" width="150" />
      <el-table-column label="名字" prop="name" sortable :show-overflow-tooltip="true" width="150" />
      <el-table-column label="性别" prop="sex" sortable width="120" >
          <template slot-scope="scope">
          {{ getSrc1(scope.row.sex) }}
           </template>
          </el-table-column>
      <el-table-column label="颜色" prop="color" sortable width="100" />

      <!-- <el-table-column label="主人姓名" prop="holder" sortable width="100" /> -->
      <el-table-column label="居住地址" prop="address" sortable width="100" />
      <el-table-column label="证件号码" prop="idNum" sortable width="100" />
      <!-- <el-table-column label="家庭号" prop="familyId" sortable width="100" /> -->
      <el-table-column label="出生日期" align="center" sortable prop="birth" width="180">

        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.birth) }}</span>
          {{ getSrc1(scope.row.sex) }}
        </template>
      </el-table-column>
      <el-table-column label="颜色" prop="color" sortable width="100" />

      <el-table-column label="证件号码" prop="idNum" sortable width="100" />

      <el-table-column label="出生日期" align="center" sortable prop="birth" width="180">
        <template slot-scope="scope">{{scope.row.birth? scope.row.birth: '————'}}</template>

      </el-table-column>
      <el-table-column label="宠物id" prop="id" sortable width="100" />
      <el-table-column label="主人姓名" prop="masterName" sortable width="100" />
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope" v-if="scope.row.roleId !== 1">
          <el-button
@@ -175,8 +156,8 @@
          >删除</el-button>
          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['familymodel:property:info']">
            <el-button size="mini" type="text" icon="el-icon-d-arrow-right"  @click="handleCheck(scope.row)">查看详情</el-button>

          </el-dropdown>

        </template>
      </el-table-column>
    </el-table>
@@ -192,39 +173,86 @@

    <!-- 添加或修改资产信息配置对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
      <h2 style="width: 100px;height: 16px;font-size: 15px;font-family: Microsoft YaHei-Regular, Microsoft YaHei;font-weight: 400;color: #000000;line-height: 15px;">魅宠信息</h2>

      <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">

        <el-form-item label="类别" prop="type">
          <el-select v-model="formDat.type" placeholder="请选择类别" clearable :style="{width: '100%'}"  >
        <el-form-item label="证件号码" prop="idNum">
          <el-input v-model="formDat.idNum" placeholder="请输入证件号码" clearable :style="{width: '100%'}" ></el-input>
        </el-form-item>
        <el-form-item label="防伪证" prop="securityCode">
          <el-input v-model="formDat.securityCode" placeholder="请输入防伪证" clearable :style="{width: '100%'}" ></el-input>
        </el-form-item>
        <el-form-item label="品种" prop="type">
          <el-input v-model="formDat.type" placeholder="请输入品种" clearable :style="{width: '100%'}" ></el-input>
        </el-form-item>
        <el-form-item label="名字" prop="name">
          <el-input v-model="formDat.name" placeholder="请输入名字" clearable :style="{width: '100%'}" ></el-input>
        </el-form-item>
        <el-form-item label="出生日期" prop="birth">
          <el-input
            v-model='formDat.birth'
            type='date'
            placeholder='选择日期'
          ></el-input>
        </el-form-item>
        <el-form-item label="性别" prop="sex">
          <el-select v-model="formDat.sex" placeholder="请选择性别" clearable :style="{width: '100%'}"  >
            <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
            ></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="标题" prop="title">
          <el-input v-model="formDat.title" placeholder="请输入标题" clearable :style="{width: '100%'}" ></el-input>
        <el-form-item label="颜色" prop="color">
          <el-input v-model="formDat.color" placeholder="请输入颜色" clearable :style="{width: '100%'}" ></el-input>
        </el-form-item>
        <el-form-item label="存储地址" prop="location">
          <el-input v-model="formDat.location" placeholder="请输入存储地址" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="持有人" prop="holder">
          <el-input v-model="formDat.holder" placeholder="请输入持有人" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="具体位置" prop="address">
          <el-input v-model="formDat.address" placeholder="请输入具体位置" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <!-- <el-form-item label="家庭号" prop="familyId">
          <el-input v-model="formDat.familyId" placeholder="请输入家庭号" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item> -->

        <el-form-item label="备注" prop="remark">
          <el-input v-model="formDat.remark" placeholder="请输入备注" clearable :style="{width: '100%'}" ></el-input>
        <el-form-item label="性质" prop="properties">
          <el-input v-model="formDat.properties" placeholder="请输入性质" clearable :style="{width: '100%'}" ></el-input>
        </el-form-item>

        <h4 class="form-header">相关图片 </h4>
        <el-form-item label="饮食习惯(喜)" prop="eatHabit">
          <el-input v-model="formDat.eatHabit" placeholder="请输入饮食习惯(喜)" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="饮食习惯(恶)" prop="diseatHabit">
          <el-input v-model="formDat.diseatHabit" placeholder="请输入饮食习惯(恶)" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="生活习惯(喜)" prop="lifeHabit">
          <el-input v-model="formDat.lifeHabit" placeholder="请输入生活习惯(喜)" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="生活习惯(恶)" prop="disLifeHabit">
          <el-input v-model="formDat.disLifeHabit" placeholder="请输入生活习惯(恶)" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>

        <el-form-item label="魅宠居住地址" prop="address">
          <el-input v-model="formDat.address" placeholder="请输入居住地址" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>

        <el-form-item label="听懂方言" prop="dialect">
          <el-input v-model="formDat.dialect" placeholder="请输入听懂方言" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <h2 style="width: 100px;height: 16px;font-size: 15px;font-family: Microsoft YaHei-Regular, Microsoft YaHei;font-weight: 400;color: #000000;line-height: 15px;">魅宠主人信息</h2>
        <el-form-item label="主人名字" prop="masterName">
          <el-input v-model="formDat.masterName" placeholder="请输入主人名字" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="身份证号码" prop="masterIdNum">
          <el-input v-model="formDat.masterIdNum" placeholder="请输入身份证号码" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="手机号码" prop="phone">
          <el-input v-model="formDat.phone" placeholder="请输入主人手机号码" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <el-form-item label="主人地址" prop="masterAddress">
          <el-input v-model="formDat.masterAddress" placeholder="请输入主人地址" clearable :style="{width: '100%'}" >
          </el-input>
        </el-form-item>
        <h4 class="form-header">魅宠头像 </h4>
        <el-upload
          action="#"
          list-type="picture-card"
@@ -262,25 +290,46 @@

          </div>
        </el-upload>
        <h4 class="form-header">其他附件 </h4>
        <h4 class="form-header">魅宠全身照 </h4>
        <el-upload
          action=""
          :file-list="fileListOther"
          class="upload-demo"
          action="#"
          list-type="picture-card"
          multiple

          :on-remove="handleRemove"
          :http-request="requestUpload"
          :show-file-list="true"
          :file-list="fileListOther"
        >
          <el-button type="primary">Click to upload</el-button>
          <template #tip>
            <div class="el-upload__tip">
            </div>
          </template>
        </el-upload>
          <i slot="default" class="el-icon-plus"></i>
          <div slot="file" slot-scope="{file}">
            <img
              class="el-upload-list__item-thumbnail"
              :src="file.url"
              alt=""
              style="width: 126px; height: 126px"
              fit="cover"
              :preview-src-list="[file.url]"
            >
            <span class="el-upload-list__item-actions">
        <span
          class="el-upload-list__item-preview"
          @click="handlePictureCardPreview(file)"
        >
          <i class="el-icon-zoom-in"></i>
        </span>

        <span
          v-if="!disabled"
          class="el-upload-list__item-delete"
          @click="handleRemoveFile(file)"
        >
          <i class="el-icon-delete"></i>
        </span>
      </span>


          </div>
        </el-upload>
      </el-form>

      <h4 class="form-header"> </h4>

      <div slot="footer" class="dialog-footer">
@@ -356,8 +405,41 @@
        address: undefined,
        remark: undefined,
        url: undefined,
        type: undefined,
        idNum: undefined,
        name: undefined,
        birth: undefined,
        sex: undefined,
        color: undefined,
        properties: undefined,
        securityCode: undefined,
        dialect: undefined,
        address:undefined,
        eatHabit:undefined,
        diseatHabit: undefined,
        LifeHabit: undefined,
        disLifeHabit: undefined,
        url: undefined,

      },
      petList: {
        type: undefined,
        idNum: undefined,
        name: undefined,
        birth: undefined,
        sex: undefined,
        color: undefined,
        properties: undefined,
        securityCode: undefined,
        dialect: undefined,
        address:undefined,
        eatHabit:undefined,
        diseatHabit: undefined,
        LifeHabit: undefined,
        disLifeHabit: undefined,
        url: undefined,
      },

      // 菜单列表
      menuOptions: [],
      // 部门列表
@@ -384,46 +466,83 @@
      rules: {
        type: [{
          required: true,
          message: '请选择类别',
          message: '请输入品种',
          trigger: 'blue'
        }],
        idNum: [{
          required: true,
          message: '请输入证件号码',
          trigger: 'blue'
        }],
        securityCode: [{
          required: true,
          message: '请输入防伪码',
          trigger: 'blue'
        }],
        name: [{
          required: true,
          message: '请输入名字',
          trigger: 'blue'
        }],
        birth: [{
          required: true,
          message: '请输入出生日期',
          trigger: 'change'
        }],
        title: [{
        color: [{
          required: true,
          message: '请输入标题',
          trigger: 'blur'
          message: '请输入颜色',
          trigger: 'blue'
        }],
        location: [{
        properties: [{
          required: true,
          message: '请输入存储地址',
          trigger: 'blur'
          message: '请输入性质',
          trigger: 'blue'
        }],
        holder: [{
        sex: [{
          required: true,
          message: '请输入持有人',
          trigger: 'blur'
        }],
        address: [{
          required: true,
          message: '请输入具体位置',
          trigger: 'blur'
        }],
        // familyId: [{
        //   required: true,
        //   message: '请输入familyId',
        //   trigger: 'blur'
        // }],
        createTime: [{
          required: true,
          message: '请选择日期选择',
          message: '请选择性别',
          trigger: 'change'
        }],

        LifeHabit: [{
          required: true,
          message: '请输入生活习惯(喜)',
          trigger: 'blur'
        }],

        disLifeHabit: [{
          required: true,
          message: '请输入生活习惯(恶)',
          trigger: 'blur'
        }],

        eatHabit: [{
          required: true,
          message: '请输入饮食习惯(喜)',
          trigger: 'blur'
        }],

        diseatHabit: [{
          required: true,
          message: '请输入饮食习惯(喜)',
          trigger: 'blur'
        }],


      },
      typeOptions: [],
      typeOptions: [ {
        value: '0',
        label: '雌性',
      },
        {
          value: '1',
          label: '雄性',
        }],
    };
  },
  created() {
    this.getList();
  //  this.getCateInfor()

  },
  methods: {
@@ -434,13 +553,13 @@
    },

//宠物性别的选择
  getSrc1(sex) {
    if (sex === 0) {
      return '雌性'
    }else {
      return '雄性'
    }
  },
    getSrc1(sex) {
      if (sex === 0) {
        return '雌性'
      }else {
        return '雄性'
      }
    },

    //隔行变色
    tableRowClassName({ row, rowIndex }) {
@@ -456,38 +575,43 @@
      this.loading = true;
      this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
      this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]

      // console.log(this.queryParams)
      //  listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
      listPet(this.queryParams).then(response => {
          //  alert(123)
          //   console.log(response.data)
          this.petList = response.data.data;

          this.total = response.data.total;
          this.loading = false;
        }
      );
    },
    /** 查询类别信息 */
    getCateInfor()
    {
      let _this = this
      getCategory().then(response=>{
      listPetnote(this.queryParams).then(response => {
          //  alert(123)
          //   console.log(response.data)
          console.log(response.data)
          this.PetNoteList = response.data.data;

        response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
          _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
        })
      })
          this.total = response.data.total;
          this.loading = false;
        }
      );
    },

    handleRemove(file) {
      for(let i = 0; i < this.fileList.length; i++)
      {
        if(this.fileList[i].url==file.url)
          this.$delete(this.fileList,i);
      }
    },
    handleRemoveFile(file) {
      for(let i = 0; i < this.fileListOther.length; i++)
      {
        if(this.fileListOther[i].url==file.url)
          this.$delete(this.fileListOther,i);
      }
    },
    getRowId(row)
    {
      return row.id
    },
    // 取消按钮
    cancel() {
@@ -545,13 +669,14 @@
    handleAdd() {
      this.reset();
      this.open = true;
      this.title = "添加资产详细信息";
      this.title = "添加魅宠详细信息";
    },
    /** 查看详细信息 */
    handleCheck(row){
      const id = row.id;
      this.$router.push("/familymodel/pet/petInfo/" + id);
    },

    /** 修改按钮操作 */
    handleUpdate(row) {
      const id = row.id;
@@ -583,13 +708,19 @@
      this.$refs["elForm"].validate(valid => {
        if (valid) {

          addProperty(this.formDat).then(response => {
          addPet(this.formDat).then(response => {
            this.$modal.msgSuccess("新增成功");
            this.open = false;
            this.getList();
          });
        }
      });
      // 清空formDat对象的数据
      Object.keys(this.formDat).forEach(key => {
        this.formDat[key] = '';
      });
      this.handleRemove(this.fileList[0]);
      this.handleRemoveFile(this.fileListOther[0]);
    },
    requestUpload(params)
    {
@@ -617,8 +748,8 @@
    /** 删除按钮操作 */
    handleDelete(row) {
      const Ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除资产编号为"' + Ids + '"的数据项？').then(function() {
        return delProperty(Ids);
      this.$modal.confirm('是否确认删除所选数据项？').then(function() {
        return delPet(Ids);
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");
@@ -626,40 +757,25 @@
    },
    /** 导出按钮操作 */
    handleExport() {
      const Ids = this.ids;
      
      if(Ids.length==0)
      {
      this.download('/family/property/export', {
      this.download('family/pet/export', {
        ...this.queryParams
      }, `pet_${new Date().getTime()}.xlsx`)
      }else{
        this.download('/family/property/export1/'+Ids, {
          
        }, `pet_${new Date().getTime()}.xlsx`)
      }
    },
   handleExportTemplate()
   {
      this.download('/family/property/model', {
        ...this.queryParams
      }, `pet_${new Date().getTime()}.xlsx`)
   },
    /** 导入操作*/
    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' })
      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' })
    }
      }).catch(err)
      {
        Message({ message: "导入失败", type: 'error' })
      }

    }
  }