Skip to content

P
pica-admin-consultation
提交 ffdf3b17 编写于 作者: wenxuan.liang's avatar wenxuan.liang
浏览文件
操作

Merge branch 'dev-20210702' of... 

Merge branch 'dev-20210702' of 192.168.110.53:com.pica.cloud.education.frontend/pica-admin-consultation into dev-20210702
上级 8fa6b719 2c022429
隐藏空白字符变更
内嵌 并排
正在显示 包含 279 行增加 和 43 行删除
src/components/common/coordinating-doctor.vue
浏览文件 @ ffdf3b17
...@@ -13,9 +13,9 @@ ...@@ -13,9 +13,9 @@
size="mini" size="mini"
style="width: 100%;"> style="width: 100%;">
<el-form-item label="备注" class="required-label" prop="userName"> <el-form-item label="备注" class="required-label">
<el-col :span="15"> <el-col :span="15">
<el-input type="textarea" v-model="model.userName" style="width: 90%;" size="small" minlength="2" maxlength="500" placeholder="请输入备注"></el-input> <el-input type="textarea" v-model="model.coordinatedRemark" style="width: 90%;" size="small" minlength="2" maxlength="500" placeholder="请输入备注"></el-input>
</el-col> </el-col>
</el-form-item> </el-form-item>
...@@ -42,14 +42,13 @@ export default { ...@@ -42,14 +42,13 @@ export default {
cancleTxt: '', cancleTxt: '',
_promise: null, _promise: null,
model:{ model:{
userName:"", coordinatedRemark:""
title:""
}, },
commissionTypeList:[], commissionTypeList:[],
addRules:{ addRules:{
userName: [ // coordinatedRemark: [
{required: true, message: "请输入稍后跟进原因", trigger: 'blur'} // {required: true, message: "（选填）请输入备注信息", trigger: 'blur'}
] // ]
} }
} }
}, },
......
src/components/common/diagnosis-time.vue 0 → 100644
浏览文件 @ ffdf3b17
<template>
<div>
<el-dialog
:title="title"
:visible.sync="appointmentTimeVisible">
<!-- <el-row :gutter="30" class="row search" type="flex" style="margin-bottom:0;">-->
<el-form ref="setForm"
:rules="addRules"
:model="model"
label-width="250px"
label-suffix=":"
label-position="right"
size="mini"
style="width: 100%;">
<el-form-item label="助诊意向时间">
<el-date-picker
v-model="rangeTime"
type="daterange"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
:picker-options="pickerOptions1">
</el-date-picker>
</el-form-item>
<el-form-item label="备注" class="required-label">
<el-col :span="15">
<el-input type="textarea" v-model="model.assistantRemark" style="width: 90%;" size="small" minlength="2" maxlength="500" placeholder="请输入备注"></el-input>
</el-col>
</el-form-item>
</el-form>
<!-- </el-row>-->
<span slot="footer" class="dialog-footer" style="text-align: center;">
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="confirm">确定</el-button>
</span>
</el-dialog>
</div>
</template>
<script>
export default {
props:[
'appointmentTimeVisible'
],
data() {
return {
show: false,
title: '设置预约时间（问诊时间）',
confirmTxt: '确定',
cancleTxt: '',
_promise: null,
model:{
assistantRemark:""
},
rangeTime:'',
addRules:{
userName: [
{required: true, message: "请输入稍后跟进原因", trigger: 'blur'}
]
},
pickerOptions1: {
disabledDate: time => {
return (
time.getTime() > new Date().getTime()
); //减去一天的时间代表可以选择同一天;
}
},
}
},
created() {},
methods: {
reset() {
this.title = ''
this.confirmTxt = '确定'
this.cancleTxt = ''
this._promise = null
},
init(obj={}) {
Object.assign(this,obj)
this.show = true
return new Promise((resolve,reject) => {
this._promise = {
resolve,
reject
};
})
},
async cancle() {
this.show = false
await this._promise.reject && this._promise.reject()
this.reset()
},
async confirm() {
this.show = false
await this._promise.resolve && this._promise.resolve()
this.reset()
},
hide() {
this.show = false
this.reset()
},
cancel(){
this.$emit('update:appointmentTimeVisible', false);
}
}
}
</script>
<style lang="scss" scoped>
</style>
src/components/common/followup.vue
浏览文件 @ ffdf3b17
...@@ -13,9 +13,9 @@ ...@@ -13,9 +13,9 @@
size="mini" size="mini"
style="width: 100%;"> style="width: 100%;">
<el-form-item label="稍后跟进原因" class="required-label" prop="userName"> <el-form-item label="稍后跟进原因" class="required-label" prop="toFollowReason">
<el-col :span="15"> <el-col :span="15">
<el-input type="textarea" v-model="model.userName" style="width: 130%;" size="small" minlength="2" maxlength="500" placeholder="请输入原因"></el-input> <el-input type="textarea" v-model="model.toFollowReason" style="width: 130%;" size="small" minlength="2" maxlength="500" placeholder="请输入原因"></el-input>
</el-col> </el-col>
</el-form-item> </el-form-item>
...@@ -43,11 +43,10 @@ export default { ...@@ -43,11 +43,10 @@ export default {
cancleTxt: '', cancleTxt: '',
_promise: null, _promise: null,
model:{ model:{
userName:"", toFollowReason:""
title:""
}, },
addRules:{ addRules:{
userName: [ toFollowReason: [
{required: true, message: "请输入稍后跟进原因", trigger: 'blur'} {required: true, message: "请输入稍后跟进原因", trigger: 'blur'}
] ]
} }
......
src/components/common/match.vue
浏览文件 @ ffdf3b17
...@@ -40,9 +40,23 @@ ...@@ -40,9 +40,23 @@
<!-- 实际收入（接诊后实际到账金额）: ￥{{tempPrice | rounding}}--> <!-- 实际收入（接诊后实际到账金额）: ￥{{tempPrice | rounding}}-->
<!-- </el-col>--> <!-- </el-col>-->
<el-form-item label="运营名称" class="required-label" prop="userName"> <el-form-item label="运营名称" class="required-label" prop="operatorName">
<el-col :span="15"> <el-col :span="15">
<el-input v-model="model.userName" style="width: 130%;" size="small" ></el-input>
<el-select
v-model="model.operatorName"
placeholder="请选择运营名称"
filterable
clearable
style="width:110%;height: 32px;line-height: 32px;"
>
<el-option
v-for="item in adminList"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-col> </el-col>
</el-form-item> </el-form-item>
...@@ -58,6 +72,8 @@ ...@@ -58,6 +72,8 @@
</template> </template>
<script> <script>
import { updateDiagnosis } from '../../utils/diagnosis';
export default { export default {
props:[ props:[
'matchVisible' 'matchVisible'
...@@ -70,17 +86,20 @@ export default { ...@@ -70,17 +86,20 @@ export default {
cancleTxt: '', cancleTxt: '',
_promise: null, _promise: null,
model:{ model:{
userName:"", operatorName:"",
title:"" operatorId:""
}, },
adminList:'',
addRules:{ addRules:{
userName: [ operatorName: [
{required: true, message: "请输入运营名称", trigger: 'blur'} {required: true, message: "请输入运营名称", trigger: 'blur'}
] ]
} }
} }
}, },
created() {}, created() {
this.getAdminList();
},
methods: { methods: {
reset() { reset() {
this.title = '' this.title = ''
...@@ -114,6 +133,19 @@ export default { ...@@ -114,6 +133,19 @@ export default {
}, },
cancel(){ cancel(){
this.$emit('update:matchVisible', false); this.$emit('update:matchVisible', false);
},
getAdminList(){
let url = `/diagnose/admin/diagnose/operator/query`
let params = {
"token":localStorage.getItem("storageToken")
};
this.loading = true;
this.GET(url, null).then(res => {
this.loading = false
if (res.code == "000000") {
this.adminList = res.data;
}
});
} }
} }
} }
......
src/components/common/refund.vue
浏览文件 @ ffdf3b17
...@@ -13,11 +13,11 @@ ...@@ -13,11 +13,11 @@
size="mini" size="mini"
style="width: 100%;"> style="width: 100%;">
<div style="margin-bottom: 20px;margin-top: -20px;text-align: center;"><span style="color: red;">温馨提示：订单一旦退款，订单关联的预约单将被同步取消，请谨慎操作退款</span></div> <div style="margin-bottom: 20px;margin-top: -20px;text-align: center;"><span style="color: #ff0000;">温馨提示：订单一旦退款，订单关联的预约单将被同步取消，请谨慎操作退款</span></div>
<el-form-item label="退款原因" class="required-label" prop="userName"> <el-form-item label="退款原因" class="required-label" prop="refundReason">
<el-col :span="15"> <el-col :span="15">
<el-input type="textarea" v-model="model.userName" style="width: 130%;" size="small" placeholder="请输入原因"></el-input> <el-input type="textarea" v-model="model.refundReason" style="width: 130%;" size="small" placeholder="请输入原因"></el-input>
</el-col> </el-col>
</el-form-item> </el-form-item>
...@@ -33,10 +33,19 @@ ...@@ -33,10 +33,19 @@
</template> </template>
<script> <script>
import { updateDiagnosis } from '../../utils/diagnosis';
export default { export default {
props:[ props: {
'refundVisible' refundVisible:{
], type: Boolean,
default: false
},
diagnoseLogId: {
type: String,
default: ''
}
},
data() { data() {
return { return {
show: false, show: false,
...@@ -45,11 +54,10 @@ export default { ...@@ -45,11 +54,10 @@ export default {
cancleTxt: '', cancleTxt: '',
_promise: null, _promise: null,
model:{ model:{
userName:"", refundReason:""
title:""
}, },
addRules:{ addRules:{
userName: [ refundReason: [
{required: true, message: "请输入退款原因", trigger: 'blur'} {required: true, message: "请输入退款原因", trigger: 'blur'}
] ]
} }
...@@ -78,10 +86,30 @@ export default { ...@@ -78,10 +86,30 @@ export default {
await this._promise.reject && this._promise.reject() await this._promise.reject && this._promise.reject()
this.reset() this.reset()
}, },
async confirm() { confirm() {
this.show = false let req = {
await this._promise.resolve && this._promise.resolve() id:this.diagnoseLogId,
this.reset() bizType:2,
refundReason:this.model.refundReason
}
// this.loading = true;
// let url = `/diagnose/admin/diagnose/model/save`;
// this.POST(url, req).then((res) => {
// this.loading = false;
// if (res.code == "000000") {
// // this.tableData = res.data.list;
// // this.totalRows = res.data.allSize;
// }
// });
updateDiagnosis(req).then(function (res) {
if(res.code == "000000") {
// vm.formData = res.data;
}
}).catch(function (error) {
// vm.$message.error(error);
});
}, },
hide() { hide() {
this.show = false this.show = false
...@@ -89,7 +117,7 @@ export default { ...@@ -89,7 +117,7 @@ export default {
}, },
cancel(){ cancel(){
this.$emit('update:refundVisible', false); this.$emit('update:refundVisible', false);
} },
} }
} }
</script> </script>
......
src/components/list/table-c.vue
浏览文件 @ ffdf3b17
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,25)" @click="witeDiagnose(scope.row)">设为待问诊</el-button> <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,25)" @click="witeDiagnose(scope.row)">设为待问诊</el-button>
<el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,21,22,23,24,25,26,3)" @click="changeRun(scope.row)">更换运营</el-button> <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,21,22,23,24,25,26,3)" @click="changeRun(scope.row)">更换运营</el-button>
<el-button type="primary" size="small" class="btn" @click="goDetail(scope.row)">查看详情</el-button> <el-button type="primary" size="small" class="btn" @click="goDetail(scope.row)">查看详情</el-button>
<el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,2,21,22,23,24,25,26,3,4)" @click="goDetail(scope.row)">取消/退款</el-button> <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,2,21,22,23,24,25,26,3,4)" @click="cancelRefund(scope.row)">取消/退款</el-button>
<el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,21)" @click="witeGo(scope.row)">设为稍后跟进</el-button> <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,21)" @click="witeGo(scope.row)">设为稍后跟进</el-button>
<el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,21,22)" @click="waitMatchDot(scope.row)">设为待匹配医生</el-button> <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,21,22)" @click="waitMatchDot(scope.row)">设为待匹配医生</el-button>
<el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,3,4,5,6,21,22,23,24,25,26)" @click="sendMessage(scope.row)">发送消息</el-button> <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,3,4,5,6,21,22,23,24,25,26)" @click="sendMessage(scope.row)">发送消息</el-button>
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,3,25,26)" @click="reMatchDot(scope.row)">重新匹配医生</el-button> <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,3,25,26)" @click="reMatchDot(scope.row)">重新匹配医生</el-button>
<el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,3,26)" @click="changeTime(scope.row)">修改时间</el-button> <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,3,26)" @click="changeTime(scope.row)">修改时间</el-button>
<el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,26)" @click="call(scope.row)">发起问诊</el-button> <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,26)" @click="call(scope.row)">发起问诊</el-button>
<el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,3)" @click="doneHandle(scope.row)">设为已完成</el-button> <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,3)" @click="doneHandle(scope.row)">设为已完成</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -105,11 +105,11 @@ export default { ...@@ -105,11 +105,11 @@ export default {
}; };
}, },
mounted() { mounted() {
}, },
methods: { methods: {
showBtn(row,...arr) { showBtn(row,...arr) {
return arr.includes(row.status) return arr.includes(row.status)
}, },
// 选择 // 选择
handleSelectionChange(val) { handleSelectionChange(val) {
...@@ -128,8 +128,8 @@ export default { ...@@ -128,8 +128,8 @@ export default {
this.$emit("goDetail", row); this.$emit("goDetail", row);
}, },
//取消/退款 //取消/退款
cancelBtn(row) { cancelRefund(row) {
this.$emit("cancelBtn", row); this.$emit("cancelRefund", row);
}, },
//设为稍后跟进 //设为稍后跟进
witeGo(row) { witeGo(row) {
...@@ -172,7 +172,7 @@ export default { ...@@ -172,7 +172,7 @@ export default {
this.$emit("reMatchDot", row); this.$emit("reMatchDot", row);
}, },
//修改时间 //修改时间
changeTime(row) { changeTime(row) {
this.$emit("changeTime", row); this.$emit("changeTime", row);
}, },
//发起问诊 //发起问诊
......
src/utils/diagnosis/index.js 0 → 100644
浏览文件 @ ffdf3b17
import fetch from '../fetch';
import { getBaseUrl } from '@/utils/index'
let headers = {
'Content-Type': 'application/json;charset=UTF-8',
token: localStorage.getItem('storageToken'),
};
/*保存问诊相关信息*/
export const updateDiagnosis = (params) => {
return fetch({
headers,
url: getBaseUrl(`/diagnose/admin/diagnose/model/save`),
method: 'post',
data: params,
description: '保存问诊相关信息',
})
};
src/views/IM/diagnosis-admin/diagnosis-list-new.vue
浏览文件 @ ffdf3b17
...@@ -201,6 +201,7 @@ ...@@ -201,6 +201,7 @@
@witeDiagnose="witeDiagnose" @witeDiagnose="witeDiagnose"
@changeRun="changeRun" @changeRun="changeRun"
@goDetail="goDetail" @goDetail="goDetail"
@cancelRefund="cancelRefund"
@witeGo="witeGo" @witeGo="witeGo"
@waitMatchDot="waitMatchDot" @waitMatchDot="waitMatchDot"
@sendMessage="sendMessage" @sendMessage="sendMessage"
...@@ -219,6 +220,14 @@ ...@@ -219,6 +220,14 @@
></table-component> ></table-component>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<match-component :matchVisible.sync="matchVisible"></match-component>
<refund-component :refundVisible.sync="refundVisible" :diagnoseLogId="diagnoseLogId"></refund-component>
<followup-component :followupVisible.sync="followupVisible"></followup-component>
<matching-doctor :doctorVisible.sync="doctorVisible"></matching-doctor>
<diagnosis-component :diagnosisVisible.sync="diagnosisVisible"></diagnosis-component>
<coordinating-doctor :coordinatingVisible.sync="coordinatingVisible"></coordinating-doctor>
<diagnosis-doctor :diagnosisDoctorVisible.sync="diagnosisDoctorVisible"></diagnosis-doctor>
<appointment-time :appointmentTimeVisible.sync="appointmentTimeVisible"></appointment-time>
</div> </div>
</div> </div>
</template> </template>
...@@ -233,9 +242,25 @@ import { ...@@ -233,9 +242,25 @@ import {
RECEPTION_TAB_LIST, RECEPTION_TAB_LIST,
RUN_TAB_LIST RUN_TAB_LIST
} from "@/utils/constants"; } from "@/utils/constants";
import MatchComponent from '@/components/common/match'
import RefundComponent from '@/components/common/refund'
import FollowupComponent from "../../../components/common/followup";
import MatchingDoctor from "../../../components/common/matching-doctor"
import DiagnosisComponent from "../../../components/common/diagnosis"
import CoordinatingDoctor from "../../../components/common/coordinating-doctor"
import DiagnosisDoctor from "../../../components/common/diagnosis-doctor"
import AppointmentTime from "../../../components/common/appointment-time"
export default { export default {
components: { components: {
TableComponent, TableComponent,
FollowupComponent,
MatchComponent,
RefundComponent,
MatchingDoctor,
DiagnosisComponent,
CoordinatingDoctor,
DiagnosisDoctor,
AppointmentTime
}, },
data() { data() {
return { return {
...@@ -274,6 +299,15 @@ export default { ...@@ -274,6 +299,15 @@ export default {
totalRows: 0, totalRows: 0,
timeClickFlag: true, timeClickFlag: true,
tableHeight: 500, tableHeight: 500,
diagnoseLogId:"",
matchVisible:false,
refundVisible:false,
followupVisible:false,
doctorVisible:false,
diagnosisVisible:false,
coordinatingVisible:false,
diagnosisDoctorVisible:false,
appointmentTimeVisible:false,
pickerOptions1: { pickerOptions1: {
disabledDate: (time) => { disabledDate: (time) => {
return time.getTime() > new Date().getTime(); //减去一天的时间代表可以选择同一天; return time.getTime() > new Date().getTime(); //减去一天的时间代表可以选择同一天;
...@@ -382,11 +416,22 @@ export default { ...@@ -382,11 +416,22 @@ export default {
//设为待问诊 //设为待问诊
witeDiagnose(row) {}, witeDiagnose(row) {},
//更换运营 //更换运营
changeRun(row) {}, changeRun(row) {
this.matchVisible = true;
},
//查看详情 //查看详情
goDetail(row) {console.log(row)}, goDetail(row) {
this.$router.push({
path: "/diagnosis-editor",
query: { id: row.diagnoseLogId, editorType: false },
});
},
//取消/退款 //取消/退款
cancelBtn(row) {}, cancelRefund(row) {
this.refundVisible = true;
this.diagnoseLogId = row.diagnoseLogId;
console.log(row);
},
//设为稍后跟进 //设为稍后跟进
witeGo(row) {}, witeGo(row) {},
//设为待匹配医生 //设为待匹配医生
...@@ -434,7 +479,7 @@ export default { ...@@ -434,7 +479,7 @@ export default {
sessionStorage.removeItem("TIME_loseTime"); sessionStorage.removeItem("TIME_loseTime");
}, },
// 取消预约 // 取消预约
cancelBtn(row) {}, // cancelBtn(row) {},
}, },
}; };
</script> </script>
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或