Commit 2907fc3e authored by 王飞龙's avatar 王飞龙

Merge remote-tracking branch 'origin/master'

parents 252d448b 5a0d8ebc
......@@ -19,7 +19,10 @@
</el-select>
</el-form-item>
<el-form-item>
<el-select v-model="queryParams.checkItemsId" :disabled="queryParams.checkType === null || queryParams.checkType === ''" clearable placeholder="检查项目">
<el-select v-model="queryParams.checkItemsId"
:disabled="queryParams.checkType === null || queryParams.checkType === ''" clearable
placeholder="检查项目"
>
<el-option
v-for="item in checkItemOptions"
:key="item.id"
......@@ -64,32 +67,44 @@
icon="el-icon-plus"
size="mini"
@click="selectAll()"
>选择全部</el-button>
>选择全部
</el-button>
<el-button
class="fourWordsBtn"
icon="el-icon-edit"
size="mini"
@click="reverseSelect()"
>反向选择</el-button>
>反向选择
</el-button>
<el-button
class="fourWordsBtn"
icon="el-icon-delete"
size="mini"
@click="handleExport()"
>批量导出</el-button>
>批量导出
</el-button>
<el-button
class="fourWordsBtn"
icon="el-icon-download"
size="mini"
@click="checkItem()"
>检查项目</el-button>
<el-button style="position: relative; float: right;" class="resetBtn" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button style="position: relative; float: right;" class="queryBtn" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
>检查项目
</el-button>
<el-button style="position: relative; float: right;" class="resetBtn" icon="el-icon-refresh" size="mini"
@click="resetQuery"
>重置
</el-button>
<el-button style="position: relative; float: right;" class="queryBtn" icon="el-icon-search" size="mini"
@click="handleQuery"
>查询
</el-button>
</el-row>
<el-table ref="table" v-loading="loading" :data="manageList" :row-key="getRowKeys" @selection-change="handleSelectionChange">
<el-table ref="table" v-loading="loading" :data="manageList" :row-key="getRowKeys"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" :reserve-selection="true"/>
<el-table-column label="序号" type="index" align="center" />
<el-table-column label="序号" type="index" align="center"/>
<el-table-column label="检查类型" align="center" prop="checkType" width="100">
<template slot-scope="scope">
<dict-tag
......@@ -98,8 +113,8 @@
/>
</template>
</el-table-column>
<el-table-column label="检查项目" align="center" :show-overflow-tooltip="true" prop="checkItemsName" />
<el-table-column label="宠物昵称" align="center" :show-overflow-tooltip="true" prop="petNickname" />
<el-table-column label="检查项目" align="center" :show-overflow-tooltip="true" prop="checkItemsName"/>
<el-table-column label="宠物昵称" align="center" :show-overflow-tooltip="true" prop="petNickname"/>
<el-table-column label="宠物保险" align="center" :show-overflow-tooltip="true" prop="insure">
<template slot-scope="scope">
<dict-tag
......@@ -108,10 +123,10 @@
/>
</template>
</el-table-column>
<el-table-column label="宠主姓名" align="center" :show-overflow-tooltip="true" prop="nickname" />
<el-table-column label="联系方式" align="center" :show-overflow-tooltip="true" prop="phonenumber" width="90" />
<el-table-column label="预约兽医" align="center" :show-overflow-tooltip="true" prop="doctorName" />
<el-table-column label="所属科室" align="center" :show-overflow-tooltip="true" prop="doctorDeptName" />
<el-table-column label="宠主姓名" align="center" :show-overflow-tooltip="true" prop="nickname"/>
<el-table-column label="联系方式" align="center" :show-overflow-tooltip="true" prop="phonenumber" width="90"/>
<el-table-column label="预约兽医" align="center" :show-overflow-tooltip="true" prop="doctorName"/>
<el-table-column label="所属科室" align="center" :show-overflow-tooltip="true" prop="doctorDeptName"/>
<el-table-column label="缴费状态" align="center" :show-overflow-tooltip="true" prop="payType">
<template slot-scope="scope">
<dict-tag
......@@ -139,7 +154,9 @@
</el-table-column>
<el-table-column label="检查时段" align="center" :show-overflow-tooltip="true" prop="checkStartTime" width="80">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.checkStartTime, '{h}:{i}') + '-' + parseTime(scope.row.checkEndTime, '{h}:{i}') }}</span>
<span>{{
parseTime(scope.row.checkStartTime, '{h}:{i}') + '-' + parseTime(scope.row.checkEndTime, '{h}:{i}')
}}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
......@@ -149,12 +166,16 @@
size="mini"
icon="el-icon-document"
@click="handleDetails(scope.row)"
>详情</el-button>
>详情
</el-button>
<el-button
class="bookNow"
size="mini"
icon="el-icon-check"
@click="handleSubscribe(scope.row)"
:disabled="scope.row.deviceId !== null"
>立即预约
</el-button>
@click="handleSubscribe(scope.row)"
>立即预约</el-button>
</template>
......@@ -170,12 +191,16 @@
/>
<!-- 添加或修改业务管理-检查管理对话框 -->
<el-dialog title="立即预约" :visible.sync="open" width="800px" append-to-body :close-on-press-escape="false" :close-on-click-modal="false">
<el-dialog title="立即预约" :visible.sync="open" width="800px" append-to-body :close-on-press-escape="false"
:close-on-click-modal="false"
>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="8">
<el-form-item label="设备">
<el-select v-model="form.equipmentIdList" multiple collapse-tags clearable placeholder="请选择设备" @change="changeDeviceName">
<el-select v-model="form.equipmentIdList" multiple collapse-tags clearable placeholder="请选择设备"
@change="changeDeviceName"
>
<el-option
v-for="item in selectableDevice"
:key="item.id"
......@@ -190,10 +215,10 @@
<el-date-picker
v-model="form.checkDate"
type="date"
@change="changeDate"
placeholder="请选择检查日期"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
@change="changeDate"
/>
</el-form-item>
</el-col>
......@@ -208,18 +233,19 @@
:data="deviceList"
style="width: 100%"
>
<el-table-column prop="deviceName" align="left" label="设备名称" />
<el-table-column prop="checkDate" align="left" label="检查日期" />
<el-table-column prop="checkTime" align="left" label="检查时段" />
<el-table-column prop="num" align="left" label="剩余可预约" />
<el-table-column prop="date" align="left" label="设备服务费" />
<el-table-column prop="deviceName" align="left" label="设备名称"/>
<el-table-column prop="checkDate" align="left" label="检查日期"/>
<el-table-column prop="checkTime" align="left" label="检查时段"/>
<el-table-column prop="num" align="left" label="剩余可预约"/>
<el-table-column prop="date" align="left" label="设备服务费"/>
<el-table-column align="left" label="操作">
<template slot-scope="scope">
<el-button
class="fourWordsBtn"
size="mini"
@click="handleSubscribeDevice(scope.row)"
>立即预约</el-button>
>立即预约
</el-button>
</template>
</el-table-column>
</el-table>
......@@ -230,10 +256,10 @@
:limit.sync="deviceQueryParams.pageSize"
@pagination="getDevice"
/>
<!-- <div slot="footer" class="dialog-footer">-->
<!-- <el-button type="primary" @click="submitForm"> </el-button>-->
<!-- <el-button @click="cancel"> </el-button>-->
<!-- </div>-->
<!-- <div slot="footer" class="dialog-footer">-->
<!-- <el-button type="primary" @click="submitForm"> </el-button>-->
<!-- <el-button @click="cancel"> </el-button>-->
<!-- </div>-->
</el-dialog>
</div>
</template>
......@@ -325,8 +351,7 @@ export default {
checkDate: null // 检查日期
},
// 表单校验
rules: {
},
rules: {},
// 设备集合
deviceList: [],
// 检查类型列表
......@@ -373,10 +398,10 @@ export default {
return row.id
},
/**
* 全部选择
* @param selection 已选择内容
* @param all 是否永远进行全选操作
*/
* 全部选择
* @param selection 已选择内容
* @param all 是否永远进行全选操作
*/
async selectAll(selection = [], all = true) {
if (this.manageList.length !== selection.length && !all) {
this.effectTableSelect([])
......@@ -614,7 +639,8 @@ export default {
}).then(() => {
this.getList()
this.$modal.msgSuccess('删除成功')
}).catch(() => {})
}).catch(() => {
})
},
/** 导出按钮操作 */
handleExport() {
......@@ -624,13 +650,29 @@ export default {
if (this.ids.length !== 0) {
const exportTable = {}
exportTable.treatIds = this.ids
this.download('business/check/export', exportTable, `manage_${new Date().getTime()}.xlsx`).then(res => {
this.download('business/check/export', exportTable, `检查管理-${this.exportFormatTime(new Date())}.xlsx`).then(res => {
this.$refs.table.clearSelection()
})
} else {
this.$modal.msgError('请选择至少一条数据导出')
return
}
},
// 导出格式化
exportFormatTime(date) {
// 获取年月日
var year = date.getFullYear()
var month = date.getMonth() + 1 // 月份从0开始,需要加1
var day = date.getDate()
// 将年月日格式化为字符串
if (month < 10) {
month = '0' + month
}
if (day < 10) {
day = '0' + day
}
const formattedDate = year.toString() + month.toString() + day.toString()
return formattedDate
}
}
}
......@@ -643,8 +685,9 @@ export default {
border-radius: 6px 6px 6px 6px;
border: 1px solid rgb(95, 181, 75);
color: #5FB54B;
background: rgba(91,182,71,0.08);
background: rgba(91, 182, 71, 0.08);
font-family: Microsoft YaHei-Regular, Microsoft YaHei;
&:hover {
background: rgba(95, 181, 75, 0.08);
opacity: 1;
......@@ -652,14 +695,16 @@ export default {
color: #5FB54B !important;
}
}
/** 立即预约 */
.bookNow {
width: 80px;
border-radius: 6px 6px 6px 6px;
border: 1px solid rgb(255, 157, 78);
color: #FF9D4E;
background: rgba(255,157,78,0.08);
background: rgba(255, 157, 78, 0.08);
font-family: Microsoft YaHei-Regular, Microsoft YaHei;
&:hover {
background: rgba(95, 181, 75, 0.08);
opacity: 1;
......@@ -667,6 +712,7 @@ export default {
color: #FF9D4E !important;
}
}
.app-container {
background-color: #FFFFFF;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment