Skip to content

P
pet-business-web
Commit 0ef84557 authored by 王飞龙's avatar 王飞龙
Browse files
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/router/index.js
parent 9e049834
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 500 additions and 67 deletions
src/assets/styles/element-ui.scss
View file @ 0ef84557
......@@ -431,3 +431,10 @@ input::-webkit-input-placeholder {
color: #5FB54B;
cursor: pointer;
}
.el-input-number .el-input input {
text-align: center;
}
.el-cascader{
color: #5FB54B;
}
src/router/index.js
View file @ 0ef84557
......@@ -133,6 +133,13 @@ export const constantRoutes = [
name: 'EquipmentAdd',
meta: { title: '设备新增' }
},
{
path: 'equipment-check',
props: true,
component: () => import('@/views/equipment-management/equipment-management/equipment-check'),
name: 'EquipmentCheck',
meta: { title: '检查项目' }
},
{
path: 'use-management',
......
src/views/equipment-management/equipment-management/equipment-add.vue
View file @ 0ef84557
......@@ -327,67 +327,67 @@ export default {
county: '',
area: ''
},
// // 表单校验
// rules: {
// deviceName: [
// { required: true, message: '请输入设备名称', trigger: 'blur' },
// { min: 2, max: 20, message: '输入内容长度应为2~20个字符', trigger: 'blur' }
// ],
//
// head: [
// { min: 2, max: 20, message: '输入内容长度应为2~20个字符', trigger: 'blur' }
// ],
// phone: [
// {
// pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
// message: '请输入正确的手机号码',
// trigger: 'blur'
// }
// ],
// deviceType: [
// { required: true, message: '请选择设备类型', trigger: 'change' }
// ],
// addressCode: [
// { required: true, message: '请选择服务地点', trigger: 'change,blur' }
// ],
// useNum: [
// { required: true, message: '请选择服务单位时段服务数', trigger: 'change,blur' }
// ],
// address: [
// { required: true, message: '请输入服务地址', trigger: 'blur' }
// ],
// ams: [
// { required: true, validator: this.validateMorningStart, trigger: 'blur' }
// ],
// ame: [
// { required: true, validator: this.validateMorningEnd, trigger: 'blur' }
// ],
// pms: [
// { required: true, validator: this.validateAfternoonStart, trigger: 'blur' }
// ],
// pme: [
// { required: true, validator: this.validateAfternoonEnd, trigger: 'blur' }
// ],
// sort: [
// { required: true, message: '请输入权重', trigger: 'change' },
// { pattern: /^([1-9]\d{0,3})$/, message: '权重范围为1-9999', trigger: 'blur' }
// ],
// status: [
// { required: true, message: '请选择设备状态', trigger: 'change' }
// ],
// reservationMethod: [
// { required: true, message: '请选择预约方式', trigger: 'change' }
// ],
// remark: [
// { min: 2, max: 200, message: '输入内容长度应为2~20个字符', trigger: 'blur' }
// ],
// serviceArea: [
// { required: true, message: '请选择支持服务地区', trigger: 'blur' }
// ],
// checkType: [
// { required: true, message: '请选择支持检查类型', trigger: 'blur' }
// ]
// },
// 表单校验
rules: {
deviceName: [
{ required: true, message: '请输入设备名称', trigger: 'blur' },
{ min: 2, max: 20, message: '输入内容长度应为2~20个字符', trigger: 'blur' }
],
head: [
{ min: 2, max: 20, message: '输入内容长度应为2~20个字符', trigger: 'blur' }
],
phone: [
{
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
message: '请输入正确的手机号码',
trigger: 'blur'
}
],
deviceType: [
{ required: true, message: '请选择设备类型', trigger: 'change' }
],
addressCode: [
{ required: true, message: '请选择服务地点', trigger: 'change,blur' }
],
useNum: [
{ required: true, message: '请输入服务单位时段服务数', trigger: 'change,blur' }
],
address: [
{ required: true, message: '请输入服务地址', trigger: 'blur' }
],
ams: [
{ required: true, validator: this.validateMorningStart, trigger: 'blur' }
],
ame: [
{ required: true, validator: this.validateMorningEnd, trigger: 'blur' }
],
pms: [
{ required: true, validator: this.validateAfternoonStart, trigger: 'blur' }
],
pme: [
{ required: true, validator: this.validateAfternoonEnd, trigger: 'blur' }
],
sort: [
{ required: true, message: '请输入权重', trigger: 'change' },
{ pattern: /^([1-9]\d{0,3})$/, message: '权重范围为1-9999', trigger: 'blur' }
],
status: [
{ required: true, message: '请选择设备状态', trigger: 'change' }
],
reservationMethod: [
{ required: true, message: '请选择预约方式', trigger: 'change' }
],
remark: [
{ min: 2, max: 200, message: '输入内容长度应为2~20个字符', trigger: 'blur' }
],
serviceArea: [
{ required: true, message: '请选择支持服务地区', trigger: 'blur' }
],
checkType: [
{ required: true, message: '请选择支持检查类型', trigger: 'blur' }
]
},
// 是否医院自有设备
optionss: [
{
......
src/views/equipment-management/equipment-management/equipment-detail.vue
View file @ 0ef84557
......@@ -407,7 +407,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="单位时段服务数">
<el-form-item label="单位时段服务数" prop="useNum">
<el-input-number
v-model.trim="form.useNum"
placeholder="请输入单位时段服务数"
......@@ -703,6 +703,9 @@ export default {
addressCode: [
{ required: true, message: '请选择服务地点', trigger: 'blur' }
],
useNum: [
{ required: true, message: '请输入服务单位时段服务数', trigger: 'change,blur' }
],
address: [
{ required: true, message: '请输入详细地址', trigger: 'blur' }
],
......
src/views/equipment-management/equipment-management/equipment-management.vue
View file @ 0ef84557
......@@ -102,6 +102,12 @@
@click="handleExport"
>批量导出
</el-button>
<el-button
class="fourWordsBtn"
icon="el-icon-download"
size="mini"
@click="checkItem()"
>检查项目</el-button>
</el-col>
<el-col :span="12" style="padding-bottom: 20px;text-align: end;">
<el-button class="queryBtn" icon="el-icon-search" @click="handleQuery">查询</el-button>
......@@ -119,7 +125,7 @@
<span>{{ scope.row.head || "-" }}</span>
</template>
</el-table-column>
<el-table-column label="手机号" align="center" prop="phone">
<el-table-column label="手机号" align="center" prop="phone" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.phone || "-" }}</span>
</template>
......@@ -138,19 +144,21 @@
<el-table-column label="服务地点" align="center" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.addressText + scope.row.address }}</span>
<span>{{ scope.row.addressText + scope.row.address || "-" }}</span>
</template>
</el-table-column>
<el-table-column label="预约方式" align="center" prop="reservationMethod" show-overflow-tooltip />
<el-table-column v-if="userType=== '3'" label="服务价格" align="center" prop="orderPrice">
<el-table-column v-if="userType=== '3'" label="服务价格" align="center" prop="orderPrice" >
<template slot-scope="scope">
<span>{{ scope.row.orderPrice +"元" || "-" }}</span>
<span>{{(scope.row.orderPrice == "" ||scope.row.orderPrice==null)? "-" :scope.row.orderPrice +"元"}}</span>
<!-- <span>{{ scope.row.orderPrice +"元" || "-" }}</span>-->
</template>
</el-table-column>
<el-table-column label="设备服务费" align="center" prop="servicePrice">
<template slot-scope="scope">
<span>{{ scope.row.servicePrice +"元"|| "-" }}</span>
<span>{{(scope.row.servicePrice == "" ||scope.row.servicePrice==null)? "-" :scope.row.servicePrice +"元"}}</span>
<!-- <span>{{ scope.row.servicePrice +"元"|| "-" }}</span>-->
</template>
</el-table-column>
<el-table-column label="创建日期" align="center" prop="createTime" show-overflow-tooltip>
......@@ -486,6 +494,12 @@ export default {
this.loading = false
})
},
// 点击检查项目
checkItem() {
this.$router.push({
name: 'CheckItem'
})
},
// 取消按钮
cancel() {
this.open = false
......
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