Skip to content

P
pica-admin-consultation
提交 8e7e4da2 编写于 作者: changdi.hao's avatar changdi.hao
浏览文件
操作

Merge branch 'dev-0522' into 'release' 

# Conflicts:
#   src/views/IM/diagnosis-admin/diagnosis-editor.vue
上级 5bec1295 9a90f591
展开全部 显示空白字符变更
内嵌 并排
正在显示 包含 1063 行增加 和 85 行删除
src/components/list/table-component.vue
浏览文件 @ 8e7e4da2
......@@ -12,6 +12,7 @@
<el-table-column prop="orderNo" label="订单ID" min-width="170" align="center"></el-table-column>
<el-table-column prop="diagnoseTypeStr" label="预约类型" min-width="150" align="center"></el-table-column>
<el-table-column prop="statusStr" label="状态" min-width="150" align="center"></el-table-column>
<el-table-column prop="crrsName" label="招募人" min-width="170" align="center"></el-table-column>
<el-table-column prop="operateUserName" label="运营人员" min-width="150" align="center"></el-table-column>
<el-table-column prop="patientName" label="患者姓名" min-width="150" align="center"></el-table-column>
<el-table-column prop="idCard" label="证件号" min-width="170" align="center"></el-table-column>
......@@ -53,6 +54,7 @@
</el-table-column>
<el-table-column prop="payTypeStr" label="支付方式" min-width="150" align="center"></el-table-column>
<el-table-column prop="sexStr" label="性别" min-width="150" align="center"></el-table-column>
<el-table-column prop="maritalStatusStr" label="婚否" min-width="150" align="center"></el-table-column>
<el-table-column prop="age" label="年龄" min-width="150" align="center"></el-table-column>
<el-table-column prop="idCardTypeStr" label="证件类型" min-width="170" align="center"></el-table-column>
<el-table-column prop="userTitle" label="助诊医生职称" min-width="170" align="center"></el-table-column>
......@@ -68,7 +70,6 @@
<span>{{scope.row.serviceFee | priceFilter}}</span>
</template>
</el-table-column>
<el-table-column prop="crrsName" label="招募人" min-width="170" align="center"></el-table-column>
<el-table-column prop="remark" label="备注" min-width="200" align="center" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" fixed="right" align="center" min-width="200">
<template slot-scope="scope">
......
src/router/router.js
浏览文件 @ 8e7e4da2
......@@ -5,6 +5,7 @@ const diagnosisList = r => require.ensure([], () => r(require('../views/IM/diagn
const diagnosisIm = r => require.ensure([], () => r(require('../views/IM/diagnosis-admin/diagnosis-im.vue')), 'diagnosisIm')
const diagnosisLive = r => require.ensure([], () => r(require('../views/IM/diagnosis-admin/diagnosis-live.vue')), 'diagnosisLive')
const serviceList = r => require.ensure([], () => r(require('../views/IM/diagnosis-admin/service-list.vue')), 'serviceList')
const assistList = r => require.ensure([], () => r(require('../views/IM/diagnosis-admin/assist-list.vue')), 'assistList')
const diagnosisEditor = r => require.ensure([], () => r(require('../views/IM/diagnosis-admin/diagnosis-editor.vue')), 'diagnosisEditor')
const diagnosisListLod = r => require.ensure([], () => r(require('../views/IM/diagnosis-admin/diagnosis-list-old.vue')), 'diagnosisListLod')
......@@ -27,6 +28,9 @@ export default [{
}, {
path: '/service-List',
component: serviceList
}, {
path: '/assist-list',
component: assistList
}, {
path: '/diagnosis-editor',
component: diagnosisEditor
......
src/utils/filter.js
浏览文件 @ 8e7e4da2
......@@ -22,6 +22,17 @@ const vueFilter = {
else {
return value;
}
},
priceNum (value) {
if(value != "" && value != null && value != "null"){
return (value/100).toFixed(2);
}
else if(value == 0){
return (value/100).toFixed(2);
}
else {
return value;
}
},
diagnosisTypeFilter: (value) => {
if(value == 1) {
......
src/views/IM/diagnosis-admin/assist-list.vue 0 → 100644
浏览文件 @ 8e7e4da2
此差异已折叠。
src/views/IM/diagnosis-admin/diagnosis-editor.vue
浏览文件 @ 8e7e4da2
......@@ -75,7 +75,7 @@
</el-form-item>
<el-form-item label="预约时间" prop="appointBeginTime" >
<el-date-picker
disabled
:disabled="formData.status == 4 || editorType== 2"
type="datetime"
placeholder="开始时间"
v-model="formData.appointBeginTime"
......@@ -88,7 +88,7 @@
</el-date-picker>
<span>-</span>
<el-date-picker
disabled
:disabled="formData.status == 4 || editorType== 2"
type="datetime"
placeholder="结束时间"
v-model="formData.appointEndTime"
......@@ -131,6 +131,12 @@
<el-option v-for="item of sexList" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="婚否" prop="maritalStatus" >
<el-radio-group v-model="formData.maritalStatus" :disabled="formData.status==4 || editorType== 2">
<el-radio :label="1">未婚</el-radio>
<el-radio :label="2">已婚</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="患者电话" prop="patientMobilePhone" >
<el-input v-model="formData.patientMobilePhone" placeholder="请输入手机号" class="set-width" :disabled="noable || editorType== 2" maxlength="11"></el-input>
</el-form-item>
......@@ -173,10 +179,10 @@
<h1>接诊信息</h1>
<el-form-item label="接诊医生" prop="doctorName">
<el-input v-model="formData.doctorName" placeholder="请选择接诊医生" class="set-width" disabled></el-input>
<!-- <el-select v-model="formData.doctorName" placeholder="请选择接诊医生" disabled class="set-width">
<el-option v-for="item of sexList" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select> -->
<!-- <el-input v-model="formData.doctorName" placeholder="请选择接诊医生" class="set-width" disabled></el-input>-->
<el-select @change="doctorChanged($event)" v-model="formData.doctorName" placeholder="请选择接诊医生" class="set-width" :disabled="editorType== 2 || this.formData.status == 4">
<el-option v-for="item of doctorList" :key="item.doctorId" :label="item.doctorName" :value="item.doctorId"></el-option>
</el-select>
</el-form-item>
<el-form-item label="接诊医生职称" >
<el-input v-model="formData.doctorTitle" placeholder="请选择职称" class="set-width" disabled></el-input>
......@@ -361,6 +367,7 @@ export default {
relationList: RELATION_LIST,
doctorSourceList: D_S_LIST,
followList: FOLLW_LIST,
doctorList: [],
rules: {
appointBeginTime: [
{ required: true, message: '请输入预约时间', trigger: 'change' }
......@@ -383,6 +390,9 @@ export default {
sex: [
{ required: true, message: '请选择性别', trigger: 'change' }
],
maritalStatus: [
{ required: true, message: '请选择婚否', trigger: 'change' }
],
patientMobilePhone: [
{ required: true, message: '请输入患者电话', trigger: ['blur','change'] }
],
......@@ -458,6 +468,21 @@ export default {
} else {
this.$message.info('请稍后重试')
}
this.getDoctorList()
}).catch(() => {
this.$message.info('请稍后重试')
});
},
getDoctorList() {
this.loading = true
let url = `/diagnose/doctorService/doctorList?diagnoseType=${this.formData.diagnoseType}`
this.GET(url).then(res => {
this.loading = false
if (res.code == '000000') {
this.doctorList = res.data
} else {
this.$message.info('请稍后重试')
}
}).catch(() => {
this.$message.info('请稍后重试')
......@@ -507,6 +532,18 @@ export default {
return (value * 100)
}
},
doctorChanged(value) {
let selected = this.doctorList.find(item => item.doctorId === value);
if (selected) {
this.formData.doctorId = value
this.formData.doctorName = selected.doctorName
this.formData.doctorTitle = selected.doctorTitle
this.formData.doctorHospital = selected.doctorHospital
this.formData.doctorDepartment = selected.doctorDepartment
this.formData.doctorMobile = selected.doctorMobile
this.formData.serviceFee = this.priceFilter(selected.serviceFee)
}
},
save() {
this.$refs.form.validate((valid) => {
let url = `/diagnose/admin/diagnose/update`
......
src/views/IM/diagnosis-admin/diagnosis-list.vue
浏览文件 @ 8e7e4da2
......@@ -498,6 +498,23 @@ export default {
},
// 预约时间
timeHandle(row) {
let bTime = new Date(row.userAppointBeginTime)
let eTime = new Date(row.userAppointEndTime)
if (this.activeName == 'three' && (new Date() - bTime) && (eTime - new Date())) {
this.$confirm(' 当前问诊正在进行中，一旦将立即关闭进行中的问诊且无法恢复，确定继续更改时间?', '提醒', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.timeHandleFn(row)
}).catch(() => {
})
} else {
this.timeHandleFn(row)
}
},
timeHandleFn(row) {
this.beginFlag = false
this.endFlag = false
this.timeVisible = true
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或