提交 8d40e2c3 编写于 作者: qian.jie's avatar qian.jie

合并代码

上级 b4848d8a
......@@ -4,6 +4,8 @@
<div class="title">
我的工作台
</div>
<!-- 时间 -->
<!-- tab栏 -->
<el-radio-group
v-model="tabPositionValue"
class="workbench-tab"
......@@ -18,10 +20,12 @@
</el-radio-button>
</el-radio-group>
</div>
<div class="workbench-content">
<div
v-if="tabPositionValue == '3'"
class="workbench-li-c"
v-if="currentDiagList.length || tabPositionValue == 3"
class="workbench-content">
<div
v-if="tabPositionValue == 3"
class="workbench-li-depar"
>
<div class="grid-c">
<department-doctor
......@@ -37,24 +41,6 @@
class="con-depar"
@click="confirmDoctorList"
>确定</el-button>
<div
v-if="tabPositionValue == '3'"
class="grid-c"
>
<el-checkbox-group
v-model="checkedValues"
@change="handleCheckedCitiesChange"
>
<el-checkbox
v-for="item in cityOptions"
:key="item.id"
:label="item.value"
>
{{ item.value }}
</el-checkbox>
</el-checkbox-group>
<div class="search-botton">
<el-button>确定</el-button>
</div>
</div>
<div
......@@ -105,16 +91,17 @@
</div>
</div>
</div>
<!-- <div v-else class="search-wait">
<div class="wait-show-num">
辛苦你!今日已处理 <span>20次</span>
</div>
<div class="search-list">
<div class="search-list-info">
<inquiryList-component :item="item" />
</div>
<div
v-else
class="nodata-container"
>
<img
src="../../../assets/image/workbench/no_data_wz.png"
alt=""
>
<div class="nodata-title">
暂时没有问诊
</div>
</div> -->
</div>
<el-dialog
:visible.sync="showIsReset"
......@@ -144,19 +131,17 @@
</div>
</el-dialog>
</div>
</div>
</template>
<script>
import { createNamespacedHelpers } from 'vuex';
const { mapState } = createNamespacedHelpers('main');
import storejs from 'storejs';
import consultationCard from '@/components/common/consultationCard/index.vue';
import DepartmentDoctor from '../../../components/common/department-doctor.vue';
// import InquiryListComponent from '../../../components/common/inquiryNew-list.vue';
import { conditionNewList } from '@/api/workbench';
import { doctorListAnd, doctorListRest } from '@/api/workbench';
import {doctorDeparList} from '@/api/diagnosis';
import _ from 'lodash';
import consultationCard from '@/components/common/consultationCard/index.vue';
// import { conditionNewList } from '@/api/workbench';
export default {
components: {
consultationCard,
......@@ -170,11 +155,11 @@
currentCalListNew: [
{
id: 3,
name: '医生认领',
name: '全部订单',
},
{
id:1,
name:'我的待处理'
id: 1,
name: '我的待处理',
},
{
id: 2,
......@@ -291,6 +276,14 @@
userTrtcEntryStatus: 2,
},
],
departDoctorList:[],
newCheckList:[],
cancelCheckList:[],
checkDoctorIdList:[],
activeMoutendName:'',
operatId:'',
showIsReset:false
};
},
computed: {
......@@ -302,15 +295,34 @@
},
watch: {},
created() {
console.log('currentCalList---------------------', this.currentCalList);
this.operatId = this.$route.query.id;
console.log('currentDiagList---------------------', this.currentDiagList);
},
mounted() {
const s = storejs.get('soketQuest');
const id =
s && s.operateUserId ? s.operateUserId : this.isSuperAdmin.userID;
this.operateUserId = id;
this.userInfo = storejs.get('initSocketInfo');
console.log(
this.userInfo.userId,
'userInfouserInfo',
this.tabPositionValue
);
this.initCard();
const that = this;
// if(this.tabPositionValue != 3) {
// 轮循
this.timer = window.setInterval(() => {
setTimeout(() => {
// that.isShowCardData = false;
that.initCard();
}, 0);
}, 4000);
this.doctorDeparList();
// }
},
destroyed() {
window.clearInterval(this.timer);
},
methods: {
doctorDeparList() {
......@@ -379,6 +391,46 @@
}
});
},
initCard() {
console.log(this.isShowCardData);
const parms = {
bizType: this.tabPositionValue, // 1,异常的列表 2,不需要处理的列表
userId: this.userInfo.userId || this.operateUserId, // userId
condition: this.orderOrName || '',
};
// this.currentDiagList = this.mockData;
conditionNewList(parms)
.then((res) => {
if (res.code === '000000') {
this.handleData(res.data.length > 0 ? res.data : this.mockData);
} else {
this.$message({
message: res.message,
type: 'warning',
duration: 1000,
});
}
})
.catch((err) => {
console.log(err);
// mock 数据
this.handleData(this.mockData);
});
},
handleData(data) {
console.log(data, 'data');
this.currentDiagList = [];
data.forEach((item, index) => {
item.diagnoseLogId = '--' + Math.random() * 10;
item['definitionRandom'] = Math.random() * 10;
this.$set(this.currentDiagList, index, item);
});
console.log('this.currentDiagList', this.currentDiagList);
this.isShowCardData = true;
// this.$nextTick(() => {
// });
},
getSerachValue(value) {
this.orderOrName = value;
},
......@@ -474,7 +526,7 @@
.input-item {
width: 333px;
}
.el-input__inner{
.el-input__inner {
height: 40px;
}
}
......@@ -515,7 +567,6 @@
}
}
.workbench-li-c {
padding: 20px 10px;
width: 100%;
.grid-c {
display: grid;
......@@ -531,6 +582,56 @@
padding: 8px;
}
}
.search-botton {
display: flex;
justify-content: flex-end;
margin-right: 150px;
.el-button {
width: 180px;
height: 40px;
background: #0d9078;
border-radius: 20px;
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #ffffff;
}
}
.workbench-li {
margin: 0 auto;
width: 100%;
}
}
}
.pagination-container {
background-color: #fff;
height: 71px;
background: #ffffff;
border-radius: 18px;
display: flex;
justify-content: flex-end;
align-items: center;
margin-top: 10px;
padding: 0 20px;
}
.workbench-li-depar{
padding: 20px 10px;
width: 100%;
.grid-c {
display: grid;
grid-row-gap: 20px;
grid-column-gap: 20px;
padding: 25px 30px;
background: #fff;
border-radius: 10px;
overflow-y: auto;
.el-checkbox-group{
.el-checkbox{
width: 20%;
padding: 8px;
}
}
.search-botton{
display: flex;
justify-content: flex-end;
......@@ -551,6 +652,7 @@
width: 100%;
}
}
}
.depart-footer{
margin-top: 20px;
.rest-depar{
......@@ -571,22 +673,6 @@
}
}
}
.search-wait{
border-top: solid 1px #E9E9E9;
.wait-show-num{
background: #fff;
height: 40px;
display: flex;
align-items: center;
justify-content: center;
}
.search-list{
padding: 20px 17px;
.search-list-info{
background: #fff;
}
}
}
.nodata-container {
background-color: #fff;
padding: 0 20px;
......@@ -611,46 +697,6 @@
margin-top: 50px;
}
}
.pagination-container {
background-color: #fff;
height: 71px;
background: #ffffff;
border-radius: 18px;
display: flex;
justify-content: flex-end;
align-items: center;
margin-top: 10px;
padding: 0 20px;
}
}
.show-info-title{
text-align: center;
padding: 30px;
font-size: 18px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #02120F;
}
.dialog-footer {
.contest {
min-width: 160px;
height: 40px;
background: #0d9078;
border-radius: 20px;
}
.cancel-submit {
min-width: 160px;
height: 40px;
border-radius: 20px;
border: 1px solid #0d9078;
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #0d9078;
}
}
}
.bg-purple-dark {
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册