Commit ab6c0a64 authored by 盖献康's avatar 盖献康

Merge remote-tracking branch 'origin/master'

parents 6e527cd4 8ee23d50
......@@ -121,8 +121,8 @@ aside {
//main-container全局样式
.app-container {
padding: 20px 20px 50px 20px;
min-height: calc(100vh - 50px - 24px - 24px - 5px);
padding: 20px 20px 0 20px;
min-height: calc(100vh - 11rem);
}
.components-container {
......
......@@ -139,7 +139,7 @@ export default {
],
// 文章封面判空校验
articleCover: [
{ required: true, message: '请输入文章封面', trigger: 'change' }
{ required: true, message: '请上传文章封面', trigger: 'change' }
],
// 文章状态判空校验
articleStatus: [
......
......@@ -151,7 +151,7 @@ export default {
],
// 文章封面判空校验
articleCover: [
{ required: true, message: '请输入文章封面', trigger: 'change' }
{ required: true, message: '请上传文章封面', trigger: 'change' }
],
// 文章状态判空校验
articleStatus: [
......
......@@ -64,7 +64,7 @@
size="mini"
@click="selectAll"
>
<svg-icon icon-class="shuaixuan_icon_quanbu" />
<svg-icon style="margin-right: 1px" icon-class="shuaixuan_icon_quanbu" />
选择全部
</el-button>
<!--反向选择-->
......@@ -74,7 +74,7 @@
size="mini"
@click="reverseSelect"
>
<svg-icon icon-class="shuaixuan_icon_fanxiang" />
<svg-icon style="margin-right: 1px" icon-class="shuaixuan_icon_fanxiang" />
反向选择
</el-button>
<!--批量导出-->
......@@ -86,7 +86,7 @@
@click="handleExport"
>
<!-- 导入svg文件-->
<svg-icon style="margin-right: 5px" icon-class="shaixuan_icon_daochu" />
<svg-icon style="margin-right: 1px" icon-class="shaixuan_icon_daochu" />
批量导出
</el-button>
</el-form-item>
......@@ -107,7 +107,11 @@
@selection-change="handleSelectionChange"
>
<el-table-column align="center" reserve-selection type="selection" width="55" />
<el-table-column label="序号" width="80" show-overflow-tooltip type="index" />
<el-table-column align="left" label="序号" min-width="60" show-overflow-tooltip prop="index">
<template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column label="文章标题" prop="articleTitle" show-overflow-tooltip min-width="200">
<template slot-scope="scope">
<!--<span style="white-space: pre-wrap">{{ scope.row.articleTitle || '-' }}</span>-->
......
......@@ -79,7 +79,11 @@
:header-cell-style="{background:'#f4f4f4'}"
@selection-change="handleSelectionChange"
>
<el-table-column label="序号" min-width="10px" show-overflow-tooltip type="index" />
<el-table-column align="left" label="序号" min-width="60" show-overflow-tooltip prop="index">
<template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column label="标题" prop="title" show-overflow-tooltip />
<el-table-column label="轮播图" prop="img" show-overflow-tooltip width="100px">
<template slot-scope="scope">
......
......@@ -257,7 +257,11 @@
:data="hospitalList"
@sort-change="handleSortChange"
>
<el-table-column label="序号" align="left" type="index" width="55" />
<el-table-column align="left" label="序号" width="60" show-overflow-tooltip prop="index">
<template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column sortable label="医院名称" align="left" prop="hospitalName" show-overflow-tooltip />
<el-table-column sortable label="医院ID" align="left" prop="ownId" show-overflow-tooltip>
<template slot-scope="scope">
......
......@@ -242,7 +242,11 @@
style="width: 100%"
@sort-change="ownerSortChange"
>
<el-table-column label="序号" min-width="20px" show-overflow-tooltip type="index" />
<el-table-column align="left" label="序号" width="60" show-overflow-tooltip prop="index">
<template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column sortable label="宠主姓名" show-overflow-tooltip prop="name">
<template slot-scope="scope">
{{ scope.row.name || '-' }}
......@@ -531,7 +535,11 @@
</div>
<el-divider class="dividerLine" />
<el-table ref="balanceList" :data="balanceList" style="width: 100%" @sort-change="balanceSortChange">
<el-table-column label="序号" min-width="20px" show-overflow-tooltip type="index" />
<el-table-column align="left" label="序号" width="60" show-overflow-tooltip prop="index">
<template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column sortable label="宠主姓名" show-overflow-tooltip prop="name">
<template slot-scope="scope">
{{ scope.row.name || '-' }}
......
......@@ -225,7 +225,11 @@
style="width: 100%"
@sort-change="handleSortChangeForPlatform"
>
<el-table-column label="序号" min-width="20px" show-overflow-tooltip type="index" />
<el-table-column align="left" label="序号" width="60" show-overflow-tooltip prop="index">
<template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column sortable label="检查项目" show-overflow-tooltip prop="checkItemsName" />
<el-table-column sortable label="设备名称" show-overflow-tooltip prop="deviceName" />
<el-table-column sortable label="支付金额" show-overflow-tooltip prop="payAmount">
......@@ -693,7 +697,11 @@
</div>
<el-divider class="dividerLine" />
<el-table :data="recordTableData" style="width: 100%">
<el-table-column label="序号" min-width="20px" show-overflow-tooltip type="index" />
<el-table-column align="left" label="序号" width="60" show-overflow-tooltip prop="index">
<template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column label="病历号" min-width="120px" show-overflow-tooltip prop="medicalRecordNo" />
<el-table-column label="主治兽医" show-overflow-tooltip prop="doctorName" />
<el-table-column label="所属科室" show-overflow-tooltip prop="hospitalDepartmentName" />
......
......@@ -11,7 +11,7 @@
/>
</el-form-item>
<el-form-item v-if="userType==='00'">
<el-select v-model="queryParams.isPrivate" placeholder="平台自有设备" clearable>
<el-select v-model="queryParams.isPrivate" placeholder="平台自有设备" clearable disabled>
<el-option
v-for="item in option"
:key="item.value"
......@@ -132,7 +132,11 @@
<el-table ref="table" v-loading="loading" :data="deviceList" :header-cell-style="{ background:'#F4F4F4'}" :row-key="getRowKeys" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="47" align="center" :reserve-selection="true" />
<el-table-column type="index" label="序号" min-width="50" />
<el-table-column align="left" label="序号" min-width="60" show-overflow-tooltip prop="index" >
<template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column label="设备名称" align="left" prop="deviceName" show-overflow-tooltip />
<el-table-column label="设备ID" align="left" prop="deviceCode" show-overflow-tooltip />
<el-table-column label="负责人" align="left" prop="head" show-overflow-tooltip>
......@@ -556,13 +560,13 @@ export default {
}
// this.queryParams.isPrivate = this.isPrivate
listDevice(this.queryParams).then(response => {
console.log('列表参数', response)
this.deviceList = response.rows
console.log('this.deviceList', this.deviceList)
// this.deviceList.forEach(item => {
// this.$set(item, 'checkTypeArr', item.checkType.split(','))
// })
this.idsForever = response.idList
this.total = response.total
this.loading = false
this.manualCheck()
// console.log("---------------------",this.userType)
})
},
......
......@@ -90,7 +90,11 @@
<el-table ref="table" v-loading="loading" :data="userList" :row-key="getRowKeys" :header-cell-style="{background:'#F4F4F4'}" @selection-change="handleSelectionChange">
<el-table-column type="selection" min-width="50" align="center" :reserve-selection="true" />
<el-table-column type="index" label="序号" width="80" />
<el-table-column align="left" label="序号" min-width="60" show-overflow-tooltip prop="index" >
<template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column label="设备名称" align="left" prop="deviceName" min-width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.deviceName || '-' }}</span>
......
......@@ -52,7 +52,7 @@ color: #333333;"
</div>
</div>
<!-- 1-- 宠物基本信息的页面--内部信息 -->
<div class="base-msg">
<div class="base-msg mb22">
<div>
<!--基础信息右边的信息-->
<div class="base-inner">
......@@ -258,7 +258,7 @@ color: #333333;"
</div>
</div>
<!-- 1-- 宠物基本信息的页面--内部信息 -->
<div class="base-msg">
<div class="base-msg mb22">
<div>
<!--基础信息右边的信息-->
<div class="base-inner">
......@@ -354,7 +354,7 @@ color: #333333;"
</div>
</div>
<!-- 1-- 宠物基本信息的页面--内部信息 -->
<div class="base-msg">
<div class="base-msg mb22">
<div>
<!--基础信息右边的信息-->
<div class="base-inner">
......@@ -396,7 +396,7 @@ color: #333333;"
<!--5--进度信息-->
<schedule-info :schedule-key="scheduleKey" />
<!--6--就诊信息-->
<div style="display: flex;margin-bottom: 20px;">
<div style="display: flex;margin-bottom: 30px;">
<div class="tip-green" />
<div
style="padding-left: 13px;font-size: 16px;font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;font-weight: bold;color: #333333;"
......@@ -405,7 +405,7 @@ color: #333333;"
</div>
<!-- 内部信息 -->
<!-- 宠主基本信息-->
<el-row style="margin-left: 10px">
<el-row style="margin-left: -40px">
<el-col :span="8" class="form__left">
<el-form-item label="病历号">
<el-input
......@@ -434,6 +434,8 @@ color: #333333;"
<el-input v-model="detailInfo.visitLocation" placeholder="-" disabled />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="主诉" prop="mainSuit" style="margin-left: -40px">
<el-input
......@@ -447,6 +449,8 @@ color: #333333;"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="医嘱" style="margin-left: -40px" prop="doctorAdvice">
<el-input
......@@ -460,6 +464,8 @@ color: #333333;"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="诊断结果" style="margin-left: -40px" prop="diagnosisResult">
<el-input
......@@ -1155,7 +1161,7 @@ color: #333333;"
</el-table-column>
<el-table-column align="left" label="入住日期" prop="admissionDate">
<template slot-scope="scope">
{{ scope.row.admissionDate || '-' }}
{{ scope.row.admissionDate ? parseTime(scope.row.admissionDate, '{y}/{m}/{d}') : '-' }}
</template>
</el-table-column>
<el-table-column align="left" label="天数" prop="actualDays">
......@@ -1232,7 +1238,7 @@ color: #333333;"
</el-table-column>
<el-table-column align="left" label="入住日期" prop="admissionDate">
<template slot-scope="scope">
{{ scope.row.admissionDate || '-' }}
{{ scope.row.admissionDate ? parseTime(scope.row.admissionDate, '{y}/{m}/{d}') : '-' }}
</template>
</el-table-column>
<el-table-column align="left" label="天数" prop="actualDays">
......@@ -1242,8 +1248,10 @@ color: #333333;"
</el-table-column>
<el-table-column align="left" label="状态" prop="status">
<template slot-scope="scope">
<span v-if="!scope.row.status">{{ '-' }}</span>
<dict-tag :options="dict.type.hospital_status_in" :value="scope.row.status" />
<span v-if="inHospitalBo.status === '3' && scope.row.status === '2'" class="inHos">住院中</span>
<span v-else-if="inHospitalBo.status === '3' && scope.row.status === '3'" class="outHos">已转出</span>
<span v-else-if="inHospitalBo.status === '4'" class="outHos">已出院</span>
<span v-else>-</span>
</template>
</el-table-column>
</el-table>
......@@ -1310,7 +1318,7 @@ color: #333333;"
</div>
</div>
<!--8--检查信息-->
<div class="title-content" style="margin-bottom: 20px">
<div class="title-content" style="margin-bottom: 30px">
<div class="title-left">
<div class="tip-green" />
<div
......@@ -1336,9 +1344,10 @@ color: #333333;"
:disabled="!isEdit || detailInfo.followTime"
maxlength="200"
show-word-limit
class="follow-textarea"
:placeholder="isEdit? '请输入回访情况' : '-'"
type="textarea"
style="width: 97.4%!important"
style="width: 100%!important"
/>
</el-form-item>
</el-col>
......@@ -1681,6 +1690,7 @@ export default {
}],
// 宠物住院情况
petInHospitalList: [],
inHospitalBo: {},
petInHospitalStatus: false,
petInHospitalUpdateShow: false,
recordDetail: {},
......@@ -2042,6 +2052,7 @@ export default {
console.log(this.stockDispenseOutboundList, 'kkkkkkkkkkkkkkkkkkkkkkk')
// 住院情况
this.petInHospitalList = []
this.inHospitalBo = response.data.inHospitalBo
if (response.data.inHospitalBo.status === '0' || response.data.inHospitalBo.status === '1' || response.data.inHospitalBo.status === '2') {
this.petInHospitalList.push(response.data.inHospitalBo)
this.petInHospitalStatus = false
......@@ -2519,7 +2530,7 @@ export default {
//2--宠物保险--模块内信息整体样式
.table-content {
margin: 35px 1% 20px;
margin: 30px 1% 40px;
}
//3--主人信息--模块内信息整体样式
......@@ -2638,11 +2649,11 @@ export default {
margin-right: 5px;
}
::v-deep .waitInHos {
::v-deep .waitHos {
color: #D94343;
}
::v-deep .waitInHos::before {
::v-deep .waitHos::before {
content: "·";
font-size: 14px;
margin-right: 5px;
......@@ -2746,7 +2757,7 @@ export default {
//1--基本信息--模块内信息整体样式
.base-msg {
color: #666666;
margin-top: 20px;
margin-top: 30px;
margin-bottom: 20px;
}
......@@ -2762,4 +2773,12 @@ export default {
padding-left: 10px;
}
.mb22 {
margin-bottom: 22px;
}
::v-deep .el-textarea.is-disabled .el-textarea__inner::placeholder {
color: #333;
}
</style>
......@@ -217,7 +217,7 @@
class="el-button--primary--solid"
type="primary"
@click="handleUpdate(scope.row)"
><svg-icon icon-class="liebiao_icon_bianji" style="font-size: 11px;vertical-align: top;" />编辑
><svg-icon icon-class="liebiao_icon_bianji" style="font-size: 0.7rem;margin-top:1px;margin-right:-3px;vertical-align: top;" />编辑
</el-button>
</template>
</el-table-column>
......
......@@ -34,7 +34,7 @@
<el-col :span="8">
<el-form-item label="能否沐浴" prop="petSex">
<el-input
v-bind="showLabelBath(inHospitalInfo.bathe)"
v-model="bathe"
class="input-detail"
placeholder="-"
disabled
......@@ -184,6 +184,7 @@ export default {
},
data() {
return {
bathe: '',
chooseWardIs: false,
// 病房选择传参
chooseWard: {
......@@ -312,23 +313,6 @@ export default {
this.$emit('admissionModleClose', false)
},
getWardList() {
// if (this.diseaseLevel === '1') {
// this.queryParams.wardType = '2'
// listWardUse(this.queryParams).then(res => {
// this.wardList = res.rows
// console.log('1111111111getWardListOne)')
// this.total = res.total
// console.log('病房信息', res)
// })
// } else {
// this.queryParams.wardType = '1'
// listWardUse(this.queryParams).then(res => {
// this.wardList = res.rows
// console.log('111111111111getWardListTwo')
// this.total = res.total
// console.log('病房信息', res)
// })
// }
listWardUse(this.queryParams).then(res => {
this.wardList = res.rows
console.log('111111111111getWardListTwo')
......@@ -336,26 +320,6 @@ export default {
console.log('病房信息', res)
})
}
// 获取病房列表
// getWardListOne() {
// this.queryParams.wardType = '2'
// listWardUse(this.queryParams).then(res => {
// this.wardList = res.rows
// console.log('1111111111getWardListOne)')
// this.total = res.total
// console.log('病房信息', res)
// })
// },
// // 获取病房列表
// getWardListTwo() {
// this.queryParams.wardType = '1'
// listWardUse(this.queryParams).then(res => {
// this.wardList = res.rows
// console.log('111111111111getWardListTwo')
// this.total = res.total
// console.log('病房信息', res)
// })
// }
}
}
</script>
......
......@@ -67,7 +67,7 @@
size="mini"
@click="selectAll()"
>
<svg-icon style="margin-right: 5px" icon-class="shuaixuan_icon_quanbu" />
<svg-icon style="margin-right: 1px" icon-class="shuaixuan_icon_quanbu" />
选择全部
</el-button>
<el-button
......@@ -75,14 +75,14 @@
class="fourWordswhiteBtn"
size="mini"
@click="reverseSelect(hospitalList)"
><svg-icon icon-class="shuaixuan_icon_fanxiang" />反向选择
><svg-icon style="margin-right: 1px" icon-class="shuaixuan_icon_fanxiang" />反向选择
</el-button>
<el-button
v-hasPermi="['business:hospital:export']"
class="fourWordswhiteBtn"
size="mini"
@click="handleExport()"
> <svg-icon icon-class="shaixuan_icon_daochu" />
> <svg-icon style="margin-right: 1px" icon-class="shaixuan_icon_daochu" />
批量导出
</el-button>
<el-button
......@@ -111,14 +111,18 @@
:header-cell-style="{ background:'#F4F4F4'}"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" min-width="47" align="center" :reserve-selection="true" />
<el-table-column label="序号" type="index" align="left" width="68"/>
<el-table-column type="selection" min-width="47" align="center" :reserve-selection="true" />
<el-table-column label="序号" align="left" min-width="60" :show-overflow-tooltip="true" prop="index">
<template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column label="病情等级" align="left" prop="diseaseLevel" min-width="100">
<template slot-scope="scope">
<span v-if="scope.row.diseaseLevel==='1'">
<!-- <img src="/src/assets/images/zhuyuan_bingwei@2x.png">-->
<svg-icon icon-class="zhuyuan_bingwei" />
<!-- <el-image src="/tmt-pic/business/fbe41c8939154a01a713d49efeb7b72c-20230902-195608.png"></el-image>-->
<!-- <el-image src="/tmt-pic/business/fbe41c8939154a01a713d49efeb7b72c-20230902-195608.png"></el-image>-->
</span>
<dict-tag v-else-if="scope.row.diseaseLevel" :options="dict.type.disease_level" :value="scope.row.diseaseLevel" />
<span v-else>-</span>
......@@ -198,7 +202,7 @@
<span>{{ parseTime(scope.row.dischargeDate, '{y}/{m}/{d}') || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="操作" class-name="small-padding fixed-width" align="center" min-width="180px">
<el-table-column label="操作" class-name="small-padding fixed-width" fixed="right" align="center" min-width="180px">
<template slot-scope="scope">
<el-button
v-hasPermi="['business:hospital:query']"
......@@ -238,8 +242,8 @@
@click="handleDischargeMe(scope.row)"
>办理出院</el-button>
<el-button
style="visibility: hidden"
v-else-if="scope.row.status==='4'"
style="visibility: hidden"
icon="el-icon-paperclip"
plain
size="mini"
......@@ -406,6 +410,9 @@ export default {
console.log('this.diseaseLevel', this.diseaseLevel)
this.$refs.admissions.getWardList()
}
if (this.inHospitalInfo.bathe !== '' && this.inHospitalInfo.bathe !== null) {
this.$refs.admissions.bathe = this.$refs.admissions.showLabelBath(this.inHospitalInfo.bathe)
}
console.log('ruyuan详情', res.data)
})
},
......
......@@ -57,8 +57,8 @@
:header-cell-class-name="cellClass"
@selection-change="handleSelectionChange"
>
<el-table-column :selectable="selectable" align="center" min-width="30" reserve-selection type="selection" />
<el-table-column label="序号" min-width="80" show-overflow-tooltip type="index" />
<el-table-column :selectable="selectable" align="center" min-width="30" reserve-selection type="selection"/>
<el-table-column label="序号" min-width="80" show-overflow-tooltip type="index"/>
<el-table-column label="宠主姓名" min-width="80" prop="ownerName" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.ownerName || '-' }}</span>
......@@ -102,12 +102,12 @@
</el-table-column>
<el-table-column label="宠物性别" min-width="60" prop="petSex" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.pet_sex" :value="scope.row.petSex" />
<dict-tag :options="dict.type.pet_sex" :value="scope.row.petSex"/>
</template>
</el-table-column>
<el-table-column label="生存状态" min-width="60" prop="petBo.existState" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.exist_state" :value="scope.row.petBo.existState" />
<dict-tag :options="dict.type.exist_state" :value="scope.row.petBo.existState"/>
</template>
</el-table-column>
</el-table>
......@@ -316,8 +316,12 @@ export default {
<style lang="scss" scoped>
.pet-choose-modle {
::v-deep .el-dialog__body {
padding-left: 23px;
}
.basicInformation {
.title {
margin-left: 10px;
//border-bottom: 1px solid #EFEFEF;
color: #333333;
font-size: 14px;
......@@ -339,13 +343,18 @@ export default {
}
}
}
::v-deep th{
::v-deep th {
.cell {
.el-checkbox{
.el-checkbox {
display: none;
}
}
}
}
::v-deep .el-form-item--small.el-form-item {
margin-top: 30px !important;
margin-bottom: 30px !important;
}
</style>
......@@ -156,8 +156,8 @@ export default {
//进度条整体框架边距
.progress-base {
padding-top: 50px;
padding-bottom: 50px;
padding-top: 30px;
padding-bottom: 40px;
//进度条排列方向及顺序布局
.display-base {
display: flex;
......
......@@ -456,8 +456,8 @@
</el-row>
<!-- 新学的第二种方法-->
<el-form-item
style="margin-left: -40px"
label="主诉"
style="margin-left: -2.5rem"
prop="mainSuit"
:rules="[
{ required: true, message: '请输入主诉', trigger: 'change' },
......@@ -471,16 +471,16 @@
>
<el-input
v-model.trim="visitForm.mainSuit"
style="width: 97.3%"
maxlength="400"
placeholder="请输入患者主诉"
type="textarea"
show-word-limit
style="width: 97.645% !important;"
/>
</el-form-item>
<el-form-item
style="margin-left: -40px"
label="医嘱"
style="margin-left: -2.5rem"
prop="doctorAdvice"
:rules="[
{ required: true, message: '请输入医嘱', trigger: 'change' },
......@@ -498,12 +498,11 @@
placeholder="请输入医嘱"
show-word-limit
type="textarea"
style="width: 97.645% !important;"
/>
</el-form-item>
<el-form-item
style="margin-left: -40px"
label="诊断结果"
style="margin-left: -2.5rem"
prop="diagnosisResult"
:rules="[
{ required: true, message: '请输入诊断结果', trigger: 'change' },
......@@ -518,12 +517,15 @@
<el-input
v-model.trim="visitForm.diagnosisResult"
class="reg-diagnosisResult"
style="width: calc(100% - 2.5rem) !important"
maxlength="30"
placeholder="请输入诊断结果"
style="width: 97.645% !important;"
/>
</el-form-item>
<el-form-item style="margin-left: -40px" label="处方单">
<el-form-item
label="处方单"
style="margin-left: -2.5rem"
>
<el-button
class="fourWordsBtn"
icon="el-icon-date"
......@@ -553,6 +555,7 @@
:loading="submiting"
:button-class="'queryBtn'"
:button-icon="'el-icon-check'"
style="margin-top: -10px"
:click-action="submitForm"
button-text="提 交"
:is-show-confirm="$route.params.type === 'enter'"
......@@ -560,6 +563,7 @@
<back-btn
button-text="返 回"
button-class="resetBtn"
style="margin-top: -10px"
:click-action="goBack"
:is-show-confirm="$route.params.type === 'enter'"
/>
......@@ -911,7 +915,7 @@ export default {
}
.reg-card {
padding: 20px;
padding: 30px 20px 50px 20px;
}
.reg-pet {
......@@ -966,12 +970,8 @@ export default {
//display: grid !important;
//grid-template-columns: repeat(2, auto);
color: #666666;
margin-top: 20px;
margin-bottom: 20px;
}
.el-col-8 {
padding-left: 41px;
margin-top: 30px;
margin-bottom: 22px;
}
.form__left {
......@@ -988,8 +988,8 @@ export default {
color: #666666;
//display: grid !important;
//grid-template-columns: repeat(2, auto);
margin-top: 20px;
margin-bottom: 20px;
margin-top: 30px;
margin-bottom: 22px;
//margin-right: 5%;
padding-left: 10px;
}
......@@ -1137,7 +1137,7 @@ export default {
//文本框样式
::v-deep .el-textarea {
width: 90% !important;
width: calc(100% - 2.5rem) !important;
}
.bottom-input-style {
......@@ -1147,4 +1147,10 @@ export default {
}
}
::v-deep .schedule-info {
.progress-base {
padding-top: 30px !important;
padding-bottom: 40px !important;
}
}
</style>
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