From c40fc03236e94c0b7710d5e931a915f78ecdea13 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期二, 25 七月 2023 00:09:18 +0800
Subject: [PATCH] 所有模块的按时间搜索
---
ruoyi-ui/src/views/pet/index.vue | 456 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 280 insertions(+), 176 deletions(-)
diff --git a/ruoyi-ui/src/views/pet/index.vue b/ruoyi-ui/src/views/pet/index.vue
index 6719690..551e98b 100644
--- a/ruoyi-ui/src/views/pet/index.vue
+++ b/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-date-picker
+ v-model='formDat.birth'
+ type='date'
+ placeholder='閫夋嫨鏃ユ湡'
+ ></el-date-picker>
+ </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="fileList"
>
- <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="handleRemove(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: '璇疯緭鍏amilyId',
- // 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,27 +575,30 @@
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.fileListOther.length; i++)
@@ -484,10 +606,6 @@
if(this.fileListOther[i].url==file.url)
this.$delete(this.fileListOther,i);
}
- },
- getRowId(row)
- {
- return row.id
},
// 鍙栨秷鎸夐挳
cancel() {
@@ -545,13 +663,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,7 +702,7 @@
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();
@@ -617,8 +736,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 +745,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' })
+ }
}
}
--
Gitblit v1.9.1