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

合并代码

上级 b4848d8a
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
<div class="title"> <div class="title">
我的工作台 我的工作台
</div> </div>
<!-- 时间 -->
<!-- tab栏 -->
<el-radio-group <el-radio-group
v-model="tabPositionValue" v-model="tabPositionValue"
class="workbench-tab" class="workbench-tab"
...@@ -15,13 +17,15 @@ ...@@ -15,13 +17,15 @@
:label="item.id" :label="item.id"
> >
{{ item.name }} {{ item.name }}
</el-radio-button> </el-radio-button>
</el-radio-group> </el-radio-group>
</div> </div>
<div class="workbench-content"> <div
v-if="currentDiagList.length || tabPositionValue == 3"
class="workbench-content">
<div <div
v-if="tabPositionValue == '3'" v-if="tabPositionValue == 3"
class="workbench-li-c" class="workbench-li-depar"
> >
<div class="grid-c"> <div class="grid-c">
<department-doctor <department-doctor
...@@ -37,84 +41,67 @@ ...@@ -37,84 +41,67 @@
class="con-depar" class="con-depar"
@click="confirmDoctorList" @click="confirmDoctorList"
>确定</el-button> >确定</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>
</div>
<div
v-else
class="workbench-content"
>
<div <div
v-else v-if="currentDiagList"
class="workbench-content" class="workbench-li-c"
> >
<div <div class="workbench-title">
v-if="currentDiagList" <div class="searh-input">
class="workbench-li-c" <el-input
> v-model="orderOrName"
<div class="workbench-title"> placeholder="输入问诊单号/医生姓名"
<div class="searh-input"> class="input-with-select"
<el-input @change="getSerachValue"
v-model="orderOrName" >
placeholder="输入问诊单号/医生姓名" <el-button
class="input-with-select" slot="append"
@change="getSerachValue" class="search-botton"
@click="getSearchValue"
> >
<el-button 搜索
slot="append" </el-button>
class="search-botton" </el-input>
@click="getSearchValue"
>
搜索
</el-button>
</el-input>
</div>
</div> </div>
<!-- 问诊状态内容 --> </div>
<!-- 问诊状态内容 -->
<div
v-if="isShowCardData"
class="grid-c"
>
<div <div
v-if="isShowCardData" v-for="(item, index) in currentDiagList"
class="grid-c" :key="index"
class="workbench-li"
> >
<div {{ item.diagnoseLogId }}
v-for="(item, index) in currentDiagList" <!-- key 动态随机无意义 促发组件数据更新 -->
:key="index" <consultation-card
class="workbench-li" :key="item.definitionRandom"
> :item="item"
{{ item.diagnoseLogId }} :order-type="tabPositionValue"
<!-- key 动态随机无意义 促发组件数据更新 --> />
<consultation-card
:key="item.definitionRandom"
:item="item"
:order-type="tabPositionValue"
/>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<!-- <div v-else class="search-wait"> </div>
<div class="wait-show-num"> <div
辛苦你!今日已处理 <span>20次</span> v-else
</div> class="nodata-container"
<div class="search-list"> >
<div class="search-list-info"> <img
<inquiryList-component :item="item" /> src="../../../assets/image/workbench/no_data_wz.png"
</div> alt=""
</div> >
</div> --> <div class="nodata-title">
暂时没有问诊
</div>
</div> </div>
<el-dialog <el-dialog
:visible.sync="showIsReset" :visible.sync="showIsReset"
...@@ -144,19 +131,17 @@ ...@@ -144,19 +131,17 @@
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
</div>
</template> </template>
<script> <script>
import { createNamespacedHelpers } from 'vuex'; import { createNamespacedHelpers } from 'vuex';
const { mapState } = createNamespacedHelpers('main'); const { mapState } = createNamespacedHelpers('main');
import storejs from 'storejs'; import storejs from 'storejs';
import consultationCard from '@/components/common/consultationCard/index.vue';
import DepartmentDoctor from '../../../components/common/department-doctor.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 { doctorListAnd, doctorListRest } from '@/api/workbench';
import {doctorDeparList} from '@/api/diagnosis'; import {doctorDeparList} from '@/api/diagnosis';
import _ from 'lodash'; import _ from 'lodash';
import consultationCard from '@/components/common/consultationCard/index.vue';
// import { conditionNewList } from '@/api/workbench';
export default { export default {
components: { components: {
consultationCard, consultationCard,
...@@ -170,11 +155,11 @@ ...@@ -170,11 +155,11 @@
currentCalListNew: [ currentCalListNew: [
{ {
id: 3, id: 3,
name: '医生认领', name: '全部订单',
}, },
{ {
id:1, id: 1,
name:'我的待处理' name: '我的待处理',
}, },
{ {
id: 2, id: 2,
...@@ -291,6 +276,14 @@ ...@@ -291,6 +276,14 @@
userTrtcEntryStatus: 2, userTrtcEntryStatus: 2,
}, },
], ],
departDoctorList:[],
newCheckList:[],
cancelCheckList:[],
checkDoctorIdList:[],
activeMoutendName:'',
operatId:'',
showIsReset:false
}; };
}, },
computed: { computed: {
...@@ -302,15 +295,34 @@ ...@@ -302,15 +295,34 @@
}, },
watch: {}, watch: {},
created() { created() {
console.log('currentCalList---------------------', this.currentCalList); console.log('currentDiagList---------------------', this.currentDiagList);
this.operatId = this.$route.query.id;
}, },
mounted() { mounted() {
const s = storejs.get('soketQuest'); const s = storejs.get('soketQuest');
const id = const id =
s && s.operateUserId ? s.operateUserId : this.isSuperAdmin.userID; s && s.operateUserId ? s.operateUserId : this.isSuperAdmin.userID;
this.operateUserId = id; 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(); this.doctorDeparList();
// }
},
destroyed() {
window.clearInterval(this.timer);
}, },
methods: { methods: {
doctorDeparList() { doctorDeparList() {
...@@ -379,6 +391,46 @@ ...@@ -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) { getSerachValue(value) {
this.orderOrName = value; this.orderOrName = value;
}, },
...@@ -474,7 +526,7 @@ ...@@ -474,7 +526,7 @@
.input-item { .input-item {
width: 333px; width: 333px;
} }
.el-input__inner{ .el-input__inner {
height: 40px; height: 40px;
} }
} }
...@@ -515,7 +567,6 @@ ...@@ -515,7 +567,6 @@
} }
} }
.workbench-li-c { .workbench-li-c {
padding: 20px 10px;
width: 100%; width: 100%;
.grid-c { .grid-c {
display: grid; display: grid;
...@@ -531,6 +582,56 @@ ...@@ -531,6 +582,56 @@
padding: 8px; 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{ .search-botton{
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
...@@ -551,43 +652,28 @@ ...@@ -551,43 +652,28 @@
width: 100%; width: 100%;
} }
} }
.depart-footer{
margin-top: 20px;
.rest-depar{
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;
}
.con-depar{
min-width: 160px;
height: 40px;
background: #0D9078;
border-radius: 20px;
}
}
} }
.search-wait{ .depart-footer{
border-top: solid 1px #E9E9E9; margin-top: 20px;
.wait-show-num{ .rest-depar{
background: #fff; min-width: 160px;
height: 40px; height: 40px;
display: flex; border-radius: 20px;
align-items: center; border: 1px solid #0D9078;
justify-content: center; font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #0D9078;
} }
.search-list{ .con-depar{
padding: 20px 17px; min-width: 160px;
.search-list-info{ height: 40px;
background: #fff; background: #0D9078;
} border-radius: 20px;
} }
} }
.nodata-container { }
.nodata-container {
background-color: #fff; background-color: #fff;
padding: 0 20px; padding: 0 20px;
border-radius: 18px; border-radius: 18px;
...@@ -611,46 +697,6 @@ ...@@ -611,46 +697,6 @@
margin-top: 50px; 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 { .bg-purple-dark {
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册