Skip to content

P
pica-admin-consultation
提交 e9956d1b 编写于 作者: 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
上级 98088537 ab1de42d
隐藏空白字符变更
内嵌 并排
正在显示 包含 92 行增加 和 118 行删除
src/components/common/match.vue
浏览文件 @ e9956d1b
...@@ -13,41 +13,15 @@ ...@@ -13,41 +13,15 @@
size="mini" size="mini"
style="width: 100%;"> style="width: 100%;">
<!-- <el-form-item label="助诊医生" class="required-label" prop="userName">-->
<!-- <el-col :span="15">-->
<!-- <el-select v-model="model.userName"-->
<!-- filterable-->
<!-- remote-->
<!-- placeholder="请输入专家姓名或医院名称,多个关键字用空格隔开，至少输入两个字符"-->
<!-- clearable-->
<!-- style="width: 130%;"-->
<!-- :remote-method="remoteMethod"-->
<!-- :disabled="isEdit"-->
<!-- @change="nameChange"-->
<!-- @visible-change="noSelectHand">-->
<!-- <el-option-->
<!-- v-for="item in nameList"-->
<!-- :key="item.id"-->
<!-- :label="item.name"-->
<!-- :value="item.id">-->
<!-- <span>{{item.value}}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-col>-->
<!-- </el-form-item>-->
<!-- <el-col :span="15" style="margin-left: 105px;">-->
<!-- 实际收入（接诊后实际到账金额）: ￥{{tempPrice | rounding}}-->
<!-- </el-col>-->
<el-form-item label="运营名称" class="required-label" prop="operatorName"> <el-form-item label="运营名称" class="required-label" prop="operatorName">
<el-col :span="15"> <el-col :span="15">
<el-select <el-select
v-model="model.operatorName" v-model="model.operatorId"
placeholder="请选择运营名称" placeholder="请选择运营名称"
filterable filterable
clearable clearable
@change="changeOperator"
style="width:110%;height: 32px;line-height: 32px;" style="width:110%;height: 32px;line-height: 32px;"
> >
<el-option <el-option
...@@ -73,11 +47,18 @@ ...@@ -73,11 +47,18 @@
<script> <script>
import { updateDiagnosis } from '../../utils/diagnosis'; import { updateDiagnosis } from '../../utils/diagnosis';
let vm = null;
export default { export default {
props:[ props: {
'matchVisible' matchVisible:{
], type: Boolean,
default: false
},
diagnoseLogId: {
type: Number,
default: 0
}
},
data() { data() {
return { return {
show: false, show: false,
...@@ -98,39 +79,30 @@ export default { ...@@ -98,39 +79,30 @@ export default {
} }
}, },
created() { created() {
vm = this;
this.getAdminList(); this.getAdminList();
}, },
methods: { methods: {
reset() { confirm() {
this.title = '' let req = {
this.confirmTxt = '确定' id:this.diagnoseLogId,
this.cancleTxt = '' bizType:1,
this._promise = null operatorId:this.model.operatorId,
}, operatorName:this.model.operatorName
init(obj={}) { }
Object.assign(this,obj) updateDiagnosis(req).then(function (res) {
this.show = true if(res.code == "000000") {
return new Promise((resolve,reject) => { vm.cancel();
this._promise = { vm.$emit('search');
resolve, }
reject else {
}; vm.$message.error(res.message);
}) }
}, }).catch(function (error) {
async cancle() { vm.$message.error(error);
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(){ cancel(){
this.$emit('update:matchVisible', false); this.$emit('update:matchVisible', false);
}, },
...@@ -146,7 +118,17 @@ export default { ...@@ -146,7 +118,17 @@ export default {
this.adminList = res.data; this.adminList = res.data;
} }
}); });
},
changeOperator(data){
for (let i=0;i < this.adminList.length; i++){
if(data == this.adminList[i].id){
this.model.operatorName = this.adminList[i].name;
break;
}
}
} }
} }
} }
</script> </script>
......
src/components/common/refund.vue
浏览文件 @ e9956d1b
...@@ -42,8 +42,8 @@ export default { ...@@ -42,8 +42,8 @@ export default {
default: false default: false
}, },
diagnoseLogId: { diagnoseLogId: {
type: String, type: Number,
default: '' default: 0
} }
}, },
data() { data() {
...@@ -65,27 +65,6 @@ export default { ...@@ -65,27 +65,6 @@ export default {
}, },
created() {}, created() {},
methods: { 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()
},
confirm() { confirm() {
let req = { let req = {
id:this.diagnoseLogId, id:this.diagnoseLogId,
...@@ -111,10 +90,6 @@ export default { ...@@ -111,10 +90,6 @@ export default {
// vm.$message.error(error); // vm.$message.error(error);
}); });
}, },
hide() {
this.show = false
this.reset()
},
cancel(){ cancel(){
this.$emit('update:refundVisible', false); this.$emit('update:refundVisible', false);
}, },
......
src/components/list/table-c.vue
浏览文件 @ e9956d1b
...@@ -32,14 +32,14 @@ ...@@ -32,14 +32,14 @@
<template slot-scope="scope"> <template slot-scope="scope">
<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,false)">查看详情</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,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>
<el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,3)" @click="joinDiagnose(scope.row)">加入问诊</el-button> <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,3)" @click="joinDiagnose(scope.row)">加入问诊</el-button>
<el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,2)" @click="matchRun(scope.row)">匹配运营</el-button> <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,2)" @click="matchRun(scope.row)">匹配运营</el-button>
<el-button type="primary" size="small" class="btn" @click="goEditor(scope.row)" >编辑</el-button> <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,3,4,6,21,22,23,24,25,26)" @click="goDetail(scope.row,true)" >编辑</el-button>
<el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,21)" @click="waitDiagnose(scope.row)">设为待分诊</el-button> <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,21)" @click="waitDiagnose(scope.row)">设为待分诊</el-button>
<el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,23)" @click="waitHzeDot(scope.row)">设为待协调医生</el-button> <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,23)" @click="waitHzeDot(scope.row)">设为待协调医生</el-button>
<el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,23,24)" @click="waitMatchTime(scope.row)">设为待确认时间</el-button> <el-button type="primary" size="small" class="btn" v-if="showBtn(scope.row,23,24)" @click="waitMatchTime(scope.row)">设为待确认时间</el-button>
...@@ -113,7 +113,7 @@ export default { ...@@ -113,7 +113,7 @@ export default {
}, },
// 选择 // 选择
handleSelectionChange(val) { handleSelectionChange(val) {
this.multipleSelection = val; this.multipleSelection = val;
}, },
//设为待问诊 //设为待问诊
witeDiagnose(row) { witeDiagnose(row) {
...@@ -123,9 +123,9 @@ export default { ...@@ -123,9 +123,9 @@ export default {
changeRun(row) { changeRun(row) {
this.$emit("changeRun", row); this.$emit("changeRun", row);
}, },
//查看详情 // 查看详情 \编辑
goDetail(row) { goDetail(row, flag) {
this.$emit("goDetail", row); this.$emit("goDetail", row, flag);
}, },
//取消/退款 //取消/退款
cancelRefund(row) { cancelRefund(row) {
...@@ -151,10 +151,6 @@ export default { ...@@ -151,10 +151,6 @@ export default {
matchRun(row) { matchRun(row) {
this.$emit("matchRun", row); this.$emit("matchRun", row);
}, },
//编辑
goEditor(row, flag) {
this.$emit("goEditor", row, flag);
},
//设为待分诊 //设为待分诊
waitDiagnose(row) { waitDiagnose(row) {
this.$emit("waitDiagnose", row); this.$emit("waitDiagnose", row);
...@@ -183,6 +179,9 @@ export default { ...@@ -183,6 +179,9 @@ export default {
doneHandle(row) { doneHandle(row) {
this.$emit("doneHandle", row); this.$emit("doneHandle", row);
}, },
goEdite(row) {
this.$emit("goEdite", row);
},
handleSizeChange(value) { handleSizeChange(value) {
this.$emit("handleSizeChange", value); this.$emit("handleSizeChange", value);
}, },
......
src/views/IM/diagnosis-admin/diagnosis-list-new.vue
浏览文件 @ e9956d1b
...@@ -172,13 +172,13 @@ ...@@ -172,13 +172,13 @@
> >
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="10" type="flex" justify="center" align="center"> <el-row :gutter="5" type="flex" justify="center" align="center">
<el-col :span="24" class="btn-wrap"> <el-col :span="24" class="btn-wrap">
<el-button type="success" class="submit-btn" <el-button type="success" class="submit-btn big-btn"
>批量设置运营</el-button >批量设置运营</el-button
> >
<el-button type="info" class="submit-btn" @click="download" <el-button type="info" class="submit-btn" @click="download"
>导出</el-button >全部导出</el-button
> >
</el-col> </el-col>
</el-row> </el-row>
...@@ -207,7 +207,6 @@ ...@@ -207,7 +207,6 @@
@sendMessage="sendMessage" @sendMessage="sendMessage"
@joinDiagnose="joinDiagnose" @joinDiagnose="joinDiagnose"
@matchRun="matchRun" @matchRun="matchRun"
@goEditor="goEditor"
@waitDiagnose="waitDiagnose" @waitDiagnose="waitDiagnose"
@waitHzeDot="waitHzeDot" @waitHzeDot="waitHzeDot"
@waitMatchTime="waitMatchTime" @waitMatchTime="waitMatchTime"
...@@ -220,7 +219,7 @@ ...@@ -220,7 +219,7 @@
></table-component> ></table-component>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<match-component :matchVisible.sync="matchVisible"></match-component> <match-component @search="search" :matchVisible.sync="matchVisible" :diagnoseLogId="diagnoseLogId"></match-component>
<refund-component :refundVisible.sync="refundVisible" :diagnoseLogId="diagnoseLogId"></refund-component> <refund-component :refundVisible.sync="refundVisible" :diagnoseLogId="diagnoseLogId"></refund-component>
<followup-component :followupVisible.sync="followupVisible"></followup-component> <followup-component :followupVisible.sync="followupVisible"></followup-component>
<matching-doctor :doctorVisible.sync="doctorVisible"></matching-doctor> <matching-doctor :doctorVisible.sync="doctorVisible"></matching-doctor>
...@@ -232,6 +231,8 @@ ...@@ -232,6 +231,8 @@
</div> </div>
</template> </template>
<script> <script>
const DOWN_URL= '/diagnose/admin/diagnose/export';
const LIST_URL= '/diagnose/admin/diagnose/list';
import TableComponent from "@/components/list/table-c"; import TableComponent from "@/components/list/table-c";
import { import {
TYPE_LIST, TYPE_LIST,
...@@ -290,6 +291,7 @@ export default { ...@@ -290,6 +291,7 @@ export default {
pageSize: 15, pageSize: 15,
pageNo: 1, pageNo: 1,
menuType: 1, // 菜单类型：1、all 2、运营 3、待分诊 4、待接诊 menuType: 1, // 菜单类型：1、all 2、运营 3、待分诊 4、待接诊
status: ''
}, },
tyleList: TYPE_LIST, tyleList: TYPE_LIST,
fllowList: IS_FLLOW, fllowList: IS_FLLOW,
...@@ -299,7 +301,7 @@ export default { ...@@ -299,7 +301,7 @@ export default {
totalRows: 0, totalRows: 0,
timeClickFlag: true, timeClickFlag: true,
tableHeight: 500, tableHeight: 500,
diagnoseLogId:"", diagnoseLogId: 0,
matchVisible:false, matchVisible:false,
refundVisible:false, refundVisible:false,
followupVisible:false, followupVisible:false,
...@@ -379,10 +381,10 @@ export default { ...@@ -379,10 +381,10 @@ export default {
}, },
// tab切换 // tab切换
handleClick(val) { handleClick(val) {
this.searchParam.status = val.paneName; this.searchParam.status = val.paneName == 99 ? '' : val.paneName;
this.search(); this.search();
}, },
search() { initTime() {
this.searchParam.createdTimeBegin = this.createRangeTime[0] || ""; this.searchParam.createdTimeBegin = this.createRangeTime[0] || "";
this.searchParam.createdTimeEnd = this.createRangeTime[1] || ""; this.searchParam.createdTimeEnd = this.createRangeTime[1] || "";
this.searchParam.cancelTimeBegin = this.cancelRangeTime[0] || ""; this.searchParam.cancelTimeBegin = this.cancelRangeTime[0] || "";
...@@ -391,8 +393,11 @@ export default { ...@@ -391,8 +393,11 @@ export default {
this.searchParam.appointEndTime = this.orderRangeTime[1] || ""; this.searchParam.appointEndTime = this.orderRangeTime[1] || "";
this.searchParam.doneTimeBegin = this.completeRangeTime[0] || ""; this.searchParam.doneTimeBegin = this.completeRangeTime[0] || "";
this.searchParam.doneTimeEnd = this.completeRangeTime[1] || ""; this.searchParam.doneTimeEnd = this.completeRangeTime[1] || "";
},
search() {
this.loading = true; this.loading = true;
let url = `/diagnose/admin/diagnose/list`; this.initTime()
let url = LIST_URL;
this.POST(url, this.searchParam).then((res) => { this.POST(url, this.searchParam).then((res) => {
this.loading = false; this.loading = false;
if (res.code == "000000") { if (res.code == "000000") {
...@@ -412,25 +417,42 @@ export default { ...@@ -412,25 +417,42 @@ export default {
}, },
// 导出 // 导出
download() { download() {
let url = DOWN_URL
this.initTime()
let params = this.searchParam
this.POST(url, params).then(res => {
this.loading = false;
if (res.code == "000000") {
this.$confirm('将于24小时内导出成功，是否跳转下载列表页?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$router.push('/down-list')
})
}
}).catch(err => {
console.log('网络出现点儿问题，稍后重试')
})
}, },
//设为待问诊 //设为待问诊
witeDiagnose(row) {}, witeDiagnose(row) {},
//更换运营 //更换运营
changeRun(row) { changeRun(row) {
this.matchVisible = true; this.matchVisible = true;
this.diagnoseLogId = row.diagnoseLogId;
}, },
//查看详情 //查看详情/编辑详情
goDetail(row) { goDetail(row,flag) {
this.$router.push({ this.$router.push({
path: "/diagnosis-editor", path: "/diagnosis-editor",
query: { id: row.diagnoseLogId, editorType: false }, query: { id: row.diagnoseLogId, editorType: flag },
}); });
}, },
//取消/退款 //取消/退款
cancelRefund(row) { cancelRefund(row) {
this.refundVisible = true; this.refundVisible = true;
this.diagnoseLogId = row.diagnoseLogId; this.diagnoseLogId = row.diagnoseLogId;
console.log(row);
}, },
//设为稍后跟进 //设为稍后跟进
witeGo(row) {}, witeGo(row) {},
...@@ -456,13 +478,6 @@ export default { ...@@ -456,13 +478,6 @@ export default {
call(row) {}, call(row) {},
//设为已完成 //设为已完成
doneHandle(row) {}, doneHandle(row) {},
// 编辑页面
goEditor(row, flag) {
this.$router.push({
path: "/diagnosis-editor",
query: { id: row.diagnoseLogId, editorType: flag },
});
},
handleSizeChange(value) { handleSizeChange(value) {
this.searchParam.pageSize = value; this.searchParam.pageSize = value;
this.search(); this.search();
...@@ -501,6 +516,9 @@ export default { ...@@ -501,6 +516,9 @@ export default {
.submit-btn { .submit-btn {
margin-right: 50px; margin-right: 50px;
margin-top: 10px; margin-top: 10px;
&.big-btn {
margin-right: 20px;
}
} }
.t-b { .t-b {
margin-bottom: 10px; margin-bottom: 10px;
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或