Skip to content

P
pica-admin-consultation
提交 756b4716 编写于 作者: bo.dang's avatar bo.dang
浏览文件
操作

Merge branch 'dev-20210621' into 'release' 

Dev 20210621,code review:bo.dang

See merge request !18
上级 60c0d963 235e60e3
隐藏空白字符变更
内嵌 并排
正在显示 包含 215 行增加 和 87 行删除
src/components/list/table-component.vue
浏览文件 @ 756b4716
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<!-- 1 初始状态 2待咨询 3 咨询中 4已结束 --> <!-- 1 初始状态 2待咨询 3 咨询中 4已结束 -->
<div v-if="scope.row.operateUserID"> <div v-if="scope.row.operateUserID">
<el-button v-if="scope.row.status != 4" type="primary" size="small" @click="timeHandle(scope.row)" style="margin-top: 10px;">修改时间</el-button> <el-button v-if="scope.row.status != 4 && scope.row.status != 5" type="primary" size="small" @click="timeHandle(scope.row)" style="margin-top: 10px;">修改时间</el-button>
<el-button v-if="scope.row.status == 3" type="primary" size="small" @click="endDiagnosis(scope.row)" style="margin-top: 10px;">结束</el-button> <el-button v-if="scope.row.status == 3" type="primary" size="small" @click="endDiagnosis(scope.row)" style="margin-top: 10px;">结束</el-button>
</div> </div>
<div v-if="scope.row.operateUserID"> <div v-if="scope.row.operateUserID">
...@@ -85,10 +85,11 @@ ...@@ -85,10 +85,11 @@
<el-button type="primary" size="small" @click="sendMessage(scope.row)" style="margin-top: 10px;" v-if="!((scope.row.status==2 || scope.row.status==4) && scope.row.createType == 2)">发送消息</el-button> <el-button type="primary" size="small" @click="sendMessage(scope.row)" style="margin-top: 10px;" v-if="!((scope.row.status==2 || scope.row.status==4) && scope.row.createType == 2)">发送消息</el-button>
</div> </div>
<div v-if="!scope.row.operateUserID"> <div v-if="!scope.row.operateUserID">
<el-button type="primary" size="small" @click="selectBtn(scope.row)">匹配</el-button> <el-button v-if="scope.row.status != 5" type="primary" size="small" @click="selectBtn(scope.row)">匹配</el-button>
</div> </div>
<el-button v-if="scope.row.status == 2 || scope.row.status == 3" type="primary" size="small" style="margin-top: 10px;" @click="cancelBtn(scope.row)">取消预约</el-button>
<div> <div>
<el-button type="primary" size="small" style="margin-top: 10px;" @click="goEditor(scope.row,1)">编辑</el-button> <el-button v-if="scope.row.status != 5" type="primary" size="small" style="margin-top: 10px;" @click="goEditor(scope.row,1)">编辑</el-button>
<el-button type="primary" size="small" style="margin-top: 10px;" @click="goEditor(scope.row,2)">预约详情</el-button> <el-button type="primary" size="small" style="margin-top: 10px;" @click="goEditor(scope.row,2)">预约详情</el-button>
</div> </div>
</template> </template>
...@@ -163,6 +164,9 @@ export default { ...@@ -163,6 +164,9 @@ export default {
selectBtn(row) { selectBtn(row) {
this.$emit('selectBtn',row) this.$emit('selectBtn',row)
}, },
cancelBtn(row) {
this.$emit('cancelBtn',row)
},
goEditor(row,flag) { goEditor(row,flag) {
this.$emit('goEditor',row,flag) this.$emit('goEditor',row,flag)
}, },
......
src/utils/constants.js
浏览文件 @ 756b4716
...@@ -39,7 +39,7 @@ export const PAY_LIST = [ ...@@ -39,7 +39,7 @@ export const PAY_LIST = [
} }
] ]
// 订单来源 // 订单来源
export const SOURCE_LIST = [ export const SOURCE_LIST = [
{ {
label: '全部', label: '全部',
...@@ -84,6 +84,10 @@ export const STATUS_LIST = [ ...@@ -84,6 +84,10 @@ export const STATUS_LIST = [
{ {
label: '已问诊', label: '已问诊',
value: 4 value: 4
},
{
label: '已取消',
value: 5
} }
] ]
...@@ -222,4 +226,4 @@ export const FOLLW_LIST = [ ...@@ -222,4 +226,4 @@ export const FOLLW_LIST = [
label: '长期跟进', label: '长期跟进',
value: 4 value: 4
}, },
] ]
\ No newline at end of file
src/views/IM/diagnosis-admin/diagnosis-list.vue
浏览文件 @ 756b4716
...@@ -56,77 +56,107 @@ ...@@ -56,77 +56,107 @@
<el-row :gutter="20" type="flex" justify="center"> <el-row :gutter="20" type="flex" justify="center">
<el-col :span="8" class="t-c"> <el-col :span="8" class="t-c">
<el-form-item label="创建日期" class="t-b"> <el-form-item label="创建日期" class="t-b">
<el-date-picker <el-date-picker
type="date" v-model="createRangeTime"
placeholder="开始时间" type="daterange"
v-model="searchParam.createdTimeBegin" value-format="yyyy-MM-dd"
style="width: 135px;" range-separator="至"
:picker-options="endDateOpt" start-placeholder="开始日期"
format="yyyy-MM-dd" end-placeholder="结束日期"
value-format="yyyy-MM-dd" style="width: 90%;"
> :picker-options="pickerOptions1">
</el-date-picker> </el-date-picker>
<span>-</span> <!-- <el-date-picker-->
<el-date-picker <!-- type="date"-->
type="date" <!-- placeholder="开始时间"-->
placeholder="结束时间" <!-- v-model="searchParam.createdTimeBegin"-->
v-model="searchParam.createdTimeEnd" <!-- style="width: 135px;"-->
style="width: 135px;" <!-- :picker-options="endDateOpt"-->
format="yyyy-MM-dd" <!-- format="yyyy-MM-dd"-->
:picker-options="endDateOpt1" <!-- value-format="yyyy-MM-dd"-->
value-format="yyyy-MM-dd" <!-- >-->
> <!-- </el-date-picker>-->
</el-date-picker> <!-- <span>-</span>-->
<!-- <el-date-picker-->
<!-- type="date"-->
<!-- placeholder="结束时间"-->
<!-- v-model="searchParam.createdTimeEnd"-->
<!-- style="width: 135px;"-->
<!-- format="yyyy-MM-dd"-->
<!-- :picker-options="endDateOpt1"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- >-->
<!-- </el-date-picker>-->
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" class="t-c"> <el-col :span="8" class="t-c">
<el-form-item label="匹配日期" class="t-b"> <el-form-item label="匹配日期" class="t-b">
<el-date-picker <el-date-picker
type="date" v-model="matchRangeTime"
placeholder="开始时间" type="daterange"
v-model="searchParam.operateTimeBegin" value-format="yyyy-MM-dd"
style="width: 135px;" range-separator="至"
:picker-options="endDateOpt2" start-placeholder="开始日期"
format="yyyy-MM-dd" end-placeholder="结束日期"
value-format="yyyy-MM-dd" style="width: 90%;"
> :picker-options="pickerOptions1">
</el-date-picker> </el-date-picker>
<span>-</span> <!-- <el-date-picker-->
<el-date-picker <!-- type="date"-->
type="date" <!-- placeholder="开始时间"-->
placeholder="结束时间" <!-- v-model="searchParam.operateTimeBegin"-->
v-model="searchParam.operateTimeEnd" <!-- style="width: 135px;"-->
style="width: 135px;" <!-- :picker-options="endDateOpt2"-->
format="yyyy-MM-dd" <!-- format="yyyy-MM-dd"-->
:picker-options="endDateOpt3" <!-- value-format="yyyy-MM-dd"-->
value-format="yyyy-MM-dd" <!-- >-->
> <!-- </el-date-picker>-->
</el-date-picker> <!-- <span>-</span>-->
<!-- <el-date-picker-->
<!-- type="date"-->
<!-- placeholder="结束时间"-->
<!-- v-model="searchParam.operateTimeEnd"-->
<!-- style="width: 135px;"-->
<!-- format="yyyy-MM-dd"-->
<!-- :picker-options="endDateOpt3"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- >-->
<!-- </el-date-picker>-->
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" class="t-c"> <el-col :span="8" class="t-c">
<el-form-item label="预约日期" class="t-b"> <el-form-item label="预约日期" class="t-b">
<el-date-picker <el-date-picker
type="date" v-model="orderRangeTime"
placeholder="开始时间" type="daterange"
v-model="searchParam.appointBeginTime" value-format="yyyy-MM-dd"
style="width: 135px;" range-separator="至"
:picker-options="endDateOpt4" start-placeholder="开始日期"
format="yyyy-MM-dd" end-placeholder="结束日期"
value-format="yyyy-MM-dd" style="width: 90%;"
> :picker-options="pickerOptions1">
</el-date-picker> </el-date-picker>
<span>-</span> <!-- <el-date-picker-->
<el-date-picker <!-- type="date"-->
type="date" <!-- placeholder="开始时间"-->
placeholder="结束时间" <!-- v-model="searchParam.appointBeginTime"-->
v-model="searchParam.appointEndTime" <!-- style="width: 135px;"-->
style="width: 135px;" <!-- :picker-options="endDateOpt4"-->
format="yyyy-MM-dd" <!-- format="yyyy-MM-dd"-->
:picker-options="endDateOpt5" <!-- value-format="yyyy-MM-dd"-->
value-format="yyyy-MM-dd" <!-- >-->
> <!-- </el-date-picker>-->
</el-date-picker> <!-- <span>-</span>-->
<!-- <el-date-picker-->
<!-- type="date"-->
<!-- placeholder="结束时间"-->
<!-- v-model="searchParam.appointEndTime"-->
<!-- style="width: 135px;"-->
<!-- format="yyyy-MM-dd"-->
<!-- :picker-options="endDateOpt5"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- >-->
<!-- </el-date-picker>-->
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -134,26 +164,36 @@ ...@@ -134,26 +164,36 @@
<el-col :span="8" class="t-c"> <el-col :span="8" class="t-c">
<el-form-item label="完成时间" class="t-b"> <el-form-item label="完成时间" class="t-b">
<el-date-picker <el-date-picker
type="date" v-model="completeRangeTime"
placeholder="开始时间" type="daterange"
v-model="searchParam.doneTimeBegin"
style="width: 135px;"
:picker-options="endDateOpt"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
> range-separator="至"
</el-date-picker> start-placeholder="开始日期"
<span>-</span> end-placeholder="结束日期"
<el-date-picker style="width: 90%;"
type="date" :picker-options="pickerOptions1">
placeholder="结束时间"
v-model="searchParam.doneTimeEnd"
style="width: 135px;"
format="yyyy-MM-dd"
:picker-options="endDateOpt1"
value-format="yyyy-MM-dd"
>
</el-date-picker> </el-date-picker>
<!-- <el-date-picker-->
<!-- type="date"-->
<!-- placeholder="开始时间"-->
<!-- v-model="searchParam.doneTimeBegin"-->
<!-- style="width: 135px;"-->
<!-- :picker-options="endDateOpt"-->
<!-- format="yyyy-MM-dd"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- >-->
<!-- </el-date-picker>-->
<!-- <span>-</span>-->
<!-- <el-date-picker-->
<!-- type="date"-->
<!-- placeholder="结束时间"-->
<!-- v-model="searchParam.doneTimeEnd"-->
<!-- style="width: 135px;"-->
<!-- format="yyyy-MM-dd"-->
<!-- :picker-options="endDateOpt1"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- >-->
<!-- </el-date-picker>-->
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -182,6 +222,7 @@ ...@@ -182,6 +222,7 @@
@sendMessage="sendMessage" @sendMessage="sendMessage"
@selectBtn="selectBtn" @selectBtn="selectBtn"
@goEditor="goEditor" @goEditor="goEditor"
@cancelBtn="cancelBtn"
@handleSizeChange="handleSizeChange" @handleSizeChange="handleSizeChange"
@handleCurrentChange="handleCurrentChange" @handleCurrentChange="handleCurrentChange"
></table-component> ></table-component>
...@@ -201,6 +242,7 @@ ...@@ -201,6 +242,7 @@
@sendMessage="sendMessage" @sendMessage="sendMessage"
@selectBtn="selectBtn" @selectBtn="selectBtn"
@goEditor="goEditor" @goEditor="goEditor"
@cancelBtn="cancelBtn"
@handleSizeChange="handleSizeChange" @handleSizeChange="handleSizeChange"
@handleCurrentChange="handleCurrentChange" @handleCurrentChange="handleCurrentChange"
></table-component> ></table-component>
...@@ -220,6 +262,7 @@ ...@@ -220,6 +262,7 @@
@sendMessage="sendMessage" @sendMessage="sendMessage"
@selectBtn="selectBtn" @selectBtn="selectBtn"
@goEditor="goEditor" @goEditor="goEditor"
@cancelBtn="cancelBtn"
@handleSizeChange="handleSizeChange" @handleSizeChange="handleSizeChange"
@handleCurrentChange="handleCurrentChange" @handleCurrentChange="handleCurrentChange"
></table-component> ></table-component>
...@@ -243,6 +286,25 @@ ...@@ -243,6 +286,25 @@
@handleCurrentChange="handleCurrentChange" @handleCurrentChange="handleCurrentChange"
></table-component> ></table-component>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="已取消" name="five">
<table-component
:tData="tableData"
:pageNo="searchParam.pageNo"
:pageSize="searchParam.pageSize"
:totalRows="totalRows"
:loading="loading"
:tableHeight="tableHeight"
@timeHandle="timeHandle"
@endDiagnosis="endDiagnosis"
@callAll="callAll"
@jionCommunicate="jionCommunicate"
@sendMessage="sendMessage"
@selectBtn="selectBtn"
@goEditor="goEditor"
@handleSizeChange="handleSizeChange"
@handleCurrentChange="handleCurrentChange"
></table-component>
</el-tab-pane>
</el-tabs> </el-tabs>
<!-- 预约时间 --> <!-- 预约时间 -->
...@@ -305,6 +367,10 @@ export default { ...@@ -305,6 +367,10 @@ export default {
loading: false, loading: false,
activeName: 'first', activeName: 'first',
timeVisible: false, timeVisible: false,
createRangeTime:"",
matchRangeTime:"",
orderRangeTime:"",
completeRangeTime:"",
searchParam:{ searchParam:{
searchVal: '', searchVal: '',
diagnoseType: '', diagnoseType: '',
...@@ -395,7 +461,14 @@ export default { ...@@ -395,7 +461,14 @@ export default {
time.getTime() < new Date(this.searchParam.appointBeginTime).getTime() time.getTime() < new Date(this.searchParam.appointBeginTime).getTime()
); );
} }
},
pickerOptions1: {
disabledDate: time => {
return (
time.getTime() > new Date().getTime()
); //减去一天的时间代表可以选择同一天;
} }
},
} }
}, },
activated() { activated() {
...@@ -467,6 +540,9 @@ export default { ...@@ -467,6 +540,9 @@ export default {
case 'four': case 'four':
tab = 4 tab = 4
break break
case 'five':
tab = 5
break
default: default:
break break
} }
...@@ -474,6 +550,14 @@ export default { ...@@ -474,6 +550,14 @@ export default {
this.search() this.search()
}, },
search() { search() {
this.searchParam.createdTimeBegin = this.createRangeTime[0];
this.searchParam.createdTimeEnd = this.createRangeTime[1];
this.searchParam.operateTimeBegin = this.matchRangeTime[0];
this.searchParam.operateTimeEnd = this.matchRangeTime[1];
this.searchParam.appointBeginTime = this.orderRangeTime[0];
this.searchParam.appointEndTime = this.orderRangeTime[1];
this.searchParam.doneTimeBegin = this.completeRangeTime[0];
this.searchParam.doneTimeEnd = this.completeRangeTime[1];
this.loading = true this.loading = true
let url = `/diagnose/admin/diagnose/list` let url = `/diagnose/admin/diagnose/list`
this.searchParam.bizType = 1 this.searchParam.bizType = 1
...@@ -489,6 +573,10 @@ export default { ...@@ -489,6 +573,10 @@ export default {
}, },
// 重置 // 重置
reset() { reset() {
this.createRangeTime = "";
this.matchRangeTime = "";
this.orderRangeTime = "";
this.completeRangeTime = "";
this.searchParam = { this.searchParam = {
searchVal: '', searchVal: '',
diagnoseType: '', diagnoseType: '',
...@@ -708,6 +796,38 @@ export default { ...@@ -708,6 +796,38 @@ export default {
sessionStorage.removeItem('TIME_useTime') sessionStorage.removeItem('TIME_useTime')
sessionStorage.removeItem('TIME_loseTime') sessionStorage.removeItem('TIME_loseTime')
}, },
// 取消预约
cancelBtn(row){
this.$confirm('问诊一旦取消成功将无法恢复，请谨慎操作，确定取消？', '确定取消问诊', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.clearSession()
this.POST(`/diagnose/admin/diagnose/cancel/${row.diagnoseLogId}`, '')
.then(res => {
if (res.code == "000000") {
this.$message({
message: '取消预约成功',
type: "success"
});
this.searchParam.status = ''
this.search()
}else {
this.$message({
message: res.message,
type: "error"
})
}
})
.catch((error) => {
this.$message({
message: error,
type: "error"
})
})
})
}
} }
} }
</script> </script>
...@@ -721,7 +841,7 @@ export default { ...@@ -721,7 +841,7 @@ export default {
margin-bottom: 20px; margin-bottom: 20px;
} }
.t-c { .t-c {
text-align: center; //text-align: center;
} }
.btn-wrap { .btn-wrap {
text-align: right; text-align: right;
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或