Skip to content

P
pica-admin-consultation
提交 ab1de42d 编写于 作者: vino's avatar vino
浏览文件
操作

Merge remote-tracking branch 'origin/dev-20210702' into dev-20210702

上级 888ed373 0770deeb
隐藏空白字符变更
内嵌 并排
正在显示 包含 74 行增加 和 54 行删除
src/components/list/table-c.vue
浏览文件 @ ab1de42d
......@@ -32,14 +32,14 @@
<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,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,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,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,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,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>
......@@ -113,7 +113,7 @@ export default {
},
// 选择
handleSelectionChange(val) {
this.multipleSelection = val;
this.multipleSelection = val;
},
//设为待问诊
witeDiagnose(row) {
......@@ -123,9 +123,9 @@ export default {
changeRun(row) {
this.$emit("changeRun", row);
},
//查看详情
goDetail(row) {
this.$emit("goDetail", row);
// 查看详情 \编辑
goDetail(row, flag) {
this.$emit("goDetail", row, flag);
},
//取消/退款
cancelRefund(row) {
......@@ -151,10 +151,6 @@ export default {
matchRun(row) {
this.$emit("matchRun", row);
},
//编辑
goEditor(row, flag) {
this.$emit("goEditor", row, flag);
},
//设为待分诊
waitDiagnose(row) {
this.$emit("waitDiagnose", row);
......@@ -183,6 +179,9 @@ export default {
doneHandle(row) {
this.$emit("doneHandle", row);
},
goEdite(row) {
this.$emit("goEdite", row);
},
handleSizeChange(value) {
this.$emit("handleSizeChange", value);
},
......
src/views/IM/diagnosis-admin/diagnosis-list-new.vue
浏览文件 @ ab1de42d
......@@ -172,13 +172,13 @@
>
</el-col>
</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-button type="success" class="submit-btn"
<el-button type="success" class="submit-btn big-btn"
>批量设置运营</el-button
>
<el-button type="info" class="submit-btn" @click="download"
>导出</el-button
>全部导出</el-button
>
</el-col>
</el-row>
......@@ -207,7 +207,6 @@
@sendMessage="sendMessage"
@joinDiagnose="joinDiagnose"
@matchRun="matchRun"
@goEditor="goEditor"
@waitDiagnose="waitDiagnose"
@waitHzeDot="waitHzeDot"
@waitMatchTime="waitMatchTime"
......@@ -232,6 +231,8 @@
</div>
</template>
<script>
const DOWN_URL= '/diagnose/admin/diagnose/export';
const LIST_URL= '/diagnose/admin/diagnose/list';
import TableComponent from "@/components/list/table-c";
import {
TYPE_LIST,
......@@ -290,6 +291,7 @@ export default {
pageSize: 15,
pageNo: 1,
menuType: 1, // 菜单类型：1、all 2、运营 3、待分诊 4、待接诊
status: ''
},
tyleList: TYPE_LIST,
fllowList: IS_FLLOW,
......@@ -379,10 +381,10 @@ export default {
},
// tab切换
handleClick(val) {
this.searchParam.status = val.paneName;
this.searchParam.status = val.paneName == 99 ? '' : val.paneName;
this.search();
},
search() {
initTime() {
this.searchParam.createdTimeBegin = this.createRangeTime[0] || "";
this.searchParam.createdTimeEnd = this.createRangeTime[1] || "";
this.searchParam.cancelTimeBegin = this.cancelRangeTime[0] || "";
......@@ -391,8 +393,11 @@ export default {
this.searchParam.appointEndTime = this.orderRangeTime[1] || "";
this.searchParam.doneTimeBegin = this.completeRangeTime[0] || "";
this.searchParam.doneTimeEnd = this.completeRangeTime[1] || "";
},
search() {
this.loading = true;
let url = `/diagnose/admin/diagnose/list`;
this.initTime()
let url = LIST_URL;
this.POST(url, this.searchParam).then((res) => {
this.loading = false;
if (res.code == "000000") {
......@@ -412,6 +417,23 @@ export default {
},
// 导出
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) {},
......@@ -420,11 +442,11 @@ export default {
this.matchVisible = true;
this.diagnoseLogId = row.diagnoseLogId;
},
//查看详情
goDetail(row) {
//查看详情/编辑详情
goDetail(row,flag) {
this.$router.push({
path: "/diagnosis-editor",
query: { id: row.diagnoseLogId, editorType: false },
query: { id: row.diagnoseLogId, editorType: flag },
});
},
//取消/退款
......@@ -456,13 +478,6 @@ export default {
call(row) {},
//设为已完成
doneHandle(row) {},
// 编辑页面
goEditor(row, flag) {
this.$router.push({
path: "/diagnosis-editor",
query: { id: row.diagnoseLogId, editorType: flag },
});
},
handleSizeChange(value) {
this.searchParam.pageSize = value;
this.search();
......@@ -501,6 +516,9 @@ export default {
.submit-btn {
margin-right: 50px;
margin-top: 10px;
&.big-btn {
margin-right: 20px;
}
}
.t-b {
margin-bottom: 10px;
......
src/views/IM/diagnosis-admin/down-list.vue
浏览文件 @ ab1de42d
......@@ -96,35 +96,38 @@ export default {
</script>
<style lang="less" scoped>
.status_base {
width: 100%;
height: 100%;
display: flex;
align-items: center;
justify-content: center;
.status-circle {
content: '';
display: block;
width: 8px;
height: 8px;
border-radius: 4px;
margin-right: 5px;
}
.status-1 {
background-color: rgb(219, 223, 12);;
.down-list {
margin: 15px;
.status_base {
width: 100%;
height: 100%;
display: flex;
align-items: center;
justify-content: center;
.status-circle {
content: '';
display: block;
width: 8px;
height: 8px;
border-radius: 4px;
margin-right: 5px;
}
.status-1 {
background-color: rgb(219, 223, 12);;
}
.status-2 {
background-color: rgb(87, 238, 82);;
}
.status-3 {
background-color: rgb(238, 68, 16);;
}
}
.status-2 {
background-color: rgb(87, 238, 82);;
.download-btn {
color: rgb(7, 180, 59);
cursor: pointer;
}
.status-3 {
background-color: rgb(238, 68, 16);;
.download-btn:hover {
color: rgb(98, 233, 86);
}
}
.download-btn {
color: rgb(7, 180, 59);
cursor: pointer;
}
.download-btn:hover {
color: rgb(98, 233, 86);
}
</style>
\ No newline at end of file
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或