Skip to content

P
pica-admin-consultation
提交 8b4a0f51 编写于 作者: changdi.hao's avatar changdi.hao
浏览文件
操作

Merge branch 'feature/jqTable' into 'release' 

Feature/jq table

See merge request com.pica.cloud.education.frontend/pica-admin-consultation!146
上级 1c9d9c3d 8115f0db
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 1065 行增加 和 58 行删除
.vscode/settings.json
浏览文件 @ 8b4a0f51
{
"editor.fontSize": 15
}
\ No newline at end of file
// 是否允许自定义的snippet片段提示
"editor.snippetSuggestions": "top",
// vscode默认启用了根据文件类型自动设置tabsize的选项
"editor.detectIndentation": false,
// 重新设定tabsize
"editor.tabSize": 2,
// #每次保存的时候自动格式化
"editor.formatOnSave": false,
// #每次保存的时候将代码按eslint格式进行修复
"eslint.autoFixOnSave": true,
"editor.fontWeight": "300",
"editor.formatOnType": false,
"workbench.iconTheme": "material-icon-theme",
"git.confirmSync": false,
"team.showWelcomeMessage": false,
"window.zoomLevel": 0,
// "editor.renderWhitespace": "boundary",
"editor.cursorBlinking": "smooth",
"editor.minimap.enabled": true,
// "editor.minimap.renderCharacters": false,
"window.title": "${dirty}${activeEditorMedium}${separator}${rootName}",
"editor.codeLens": true,
//eslint 代码自动检查相关配置
"eslint.enable": true,
"eslint.run": "onType",
"eslint.options": {
"extensions": [
".js",
".vue"
]
},
// 添加 vue 支持
"eslint.validate": [
"javascriptreact",
"vue",
"javascript",
{
"language": "vue",
"autoFix": true
},
"html",
{
"language": "html",
"autoFix": true
}
],
// #让prettier使用eslint的代码格式进行校验
"prettier.eslintIntegration": true,
// #去掉代码结尾的分号
"prettier.semi": false,
// #使用带引号替代双引号
"prettier.singleQuote": true,
// #让函数(名)和后面的括号之间加个空格
"javascript.format.insertSpaceBeforeFunctionParenthesis": true,
// #这个按用户自身习惯选择
"vetur.format.defaultFormatter.html": "js-beautify-html",
// #让vue中的js按编辑器自带的ts格式进行格式化
"vetur.format.defaultFormatter.js": "vscode-typescript",
"explorer.confirmDelete": false,
"vetur.format.defaultFormatterOptions": {
"js-beautify-html": {
"wrap_attributes": "force-aligned"
// #vue组件中html代码格式化样式
}
},
"files.associations": {
"*.cjson": "jsonc",
"*.wxss": "css",
"*.wxs": "javascript"
},
"emmet.includeLanguages": {
"wxml": "html"
},
"minapp-vscode.disableAutoConfig": true,
"window.menuBarVisibility": "visible",
"git.enableSmartCommit": true,
"git.autofetch": true,
"liveServer.settings.donotShowInfoMsg": true,
"[html]": {
"editor.defaultFormatter": "vscode.html-language-features"
},
"javascript.updateImportsOnFileMove.enabled": "always",
"workbench.colorTheme": "SynthWave '84",
"editor.fontSize": 16,
"search.followSymlinks": false,
"workbench.sideBar.location": "left",
// 是否开启保存自动格式化
"zenMode.restore": true,
"breadcrumbs.enabled": true,
"gitlens.advanced.messages": {
"suppressLineUncommittedWarning": true
},
"javascript.format.placeOpenBraceOnNewLineForControlBlocks": true,
"editor.formatOnPaste": false,
"editor.cursorStyle": "line-thin",
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
}
}
package-lock.json
浏览文件 @ 8b4a0f51
......@@ -2840,6 +2840,25 @@
"slash": "^2.0.0"
}
},
"has-flag": {
"version": "4.0.0",
"resolved": "http://192.168.110.93:4873/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
"dev": true,
"optional": true
},
"loader-utils": {
"version": "2.0.0",
"resolved": "http://192.168.110.93:4873/loader-utils/-/loader-utils-2.0.0.tgz",
"integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
},
"ms": {
"version": "2.1.2",
"resolved": "http://192.168.110.93:4873/ms/-/ms-2.1.2.tgz",
......@@ -2858,6 +2877,41 @@
"integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
"dev": true
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.7.0",
"resolved": "http://192.168.110.93:4873/vue-loader/-/vue-loader-16.7.0.tgz",
"integrity": "sha1-7hYbL2wnsLRZJkw8I9NAaLRx1XQ=",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
},
"dependencies": {
"chalk": {
"version": "4.1.2",
"resolved": "http://192.168.110.93:4873/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"supports-color": {
"version": "7.2.0",
"resolved": "http://192.168.110.93:4873/supports-color/-/supports-color-7.2.0.tgz",
"integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
"dev": true,
"optional": true,
"requires": {
"has-flag": "^4.0.0"
}
}
}
},
"webpack-bundle-analyzer": {
"version": "3.9.0",
"resolved": "http://192.168.110.93:4873/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.9.0.tgz",
......@@ -20340,32 +20394,6 @@
}
}
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.5.0",
"resolved": "http://192.168.110.93:4873/vue-loader/-/vue-loader-16.5.0.tgz",
"integrity": "sha1-CcTgcSRmiZ40uZpoZSTxkWX7KJI=",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
},
"dependencies": {
"loader-utils": {
"version": "2.0.0",
"resolved": "http://192.168.110.93:4873/loader-utils/-/loader-utils-2.0.0.tgz",
"integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
}
}
},
"vue-router": {
"version": "3.5.2",
"resolved": "http://192.168.110.93:4873/vue-router/-/vue-router-3.5.2.tgz",
......
src/components/common/inquirylist.vue
浏览文件 @ 8b4a0f51
......@@ -94,7 +94,13 @@
</div>
</div>
<div class="inquiry-user-status">
<span class="status-cll-user-answer">{{ doctorCallStatus }}</span>
<span
:class="
doctorCallStatus === '已拨打完成'
? 'status-cll-user-finish'
: 'status-cll-user-answer'
"
>{{ doctorCallStatus }}</span>
</div>
<div
class="line-btn"
......@@ -170,7 +176,13 @@
</div>
</div>
<div class="inquiry-user-status">
<span class="status-cll-user-answer">{{ userCallStatus }}</span>
<span
:class="
userCallStatus === '已拨打完成'
? 'status-cll-user-finish'
: 'status-cll-user-answer'
"
>{{ userCallStatus }}</span>
</div>
<div
class="line-btn"
......@@ -350,7 +362,6 @@
created() {},
mounted() {
console.log('this.item', this.item);
if (this.item.returnStatus == 1 || this.item.returnStatus == 3) {
const nowData = new Date().getTime();
const timeleft = this.item.appointBeginTime - nowData;
......@@ -473,7 +484,6 @@
})
.then((res) => {
if (res.code == '000000') {
console.log(res.data);
this.$store.commit('main/updateShowAdvice', true);
this.$store.commit('main/updateCurrentAdvice', res.data);
} else {
......@@ -632,11 +642,11 @@
}
}
}
.inquiry-user-status{
.inquiry-user-status {
width: calc(100% - 130px);
padding-bottom: 15px;
height: 38px;
.status-cll-user-answer{
.status-cll-user-answer {
background: rgba(255, 94, 87, 0.07);
border-radius: 10px;
border: 1px solid rgba(255, 94, 87, 0.15);
......@@ -645,7 +655,20 @@
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #FF5E57;
color: #ff5e57;
line-height: 20px;
margin-right: 6px;
}
.status-cll-user-finish {
background: rgba(0, 189, 165, 0.07);
border-radius: 10px;
border: 1px solid rgba(0, 189, 165, 0.17);
padding: 0 4px;
height: 20px;
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #0d9078;
line-height: 20px;
margin-right: 6px;
}
......@@ -723,7 +746,7 @@
width: 12px;
height: 12px;
display: inline-block;
background: url('../../assets/image/workbench/appointment.png') no-repeat;
background: url("../../assets/image/workbench/appointment.png") no-repeat;
background-size: cover;
margin-right: 5px;
}
......@@ -731,21 +754,21 @@
width: 12px;
height: 12px;
display: inline-block;
background: url('../../assets/image/workbench/video.png') no-repeat;
background: url("../../assets/image/workbench/video.png") no-repeat;
background-size: cover;
}
.photo {
width: 12px;
height: 12px;
display: inline-block;
background: url('../../assets/image/workbench/photo.png') no-repeat;
background: url("../../assets/image/workbench/photo.png") no-repeat;
background-size: cover;
}
.voice {
width: 12px;
height: 12px;
display: inline-block;
background: url('../../assets/image/workbench/voice.png') no-repeat;
background: url("../../assets/image/workbench/voice.png") no-repeat;
background-size: cover;
}
}
......
src/components/common/tab-set.vue 0 → 100644
浏览文件 @ 8b4a0f51
<template>
<div class="tab-set-wrap">
<div class="tab-set">
<el-popover
v-model="visible"
placement="bottom"
width="200"
trigger="click"
@hide="popoverHide"
>
<div class="tab-set-title">
自定义表头
</div>
<div class="tab-set-select">
<div class="select-list">
<el-checkbox
v-model="checkAll"
:indeterminate="isIndeterminate"
@change="handleCheckAllChange"
>
全选
</el-checkbox>
<el-checkbox-group
v-model="checkedProps"
class="checkbox-group"
@change="handlecheckedPropsChange"
>
<el-checkbox
v-for="tb in tabProps"
:key="tb"
:label="tb"
class="select-checkbox"
/>
</el-checkbox-group>
</div>
<div class="select-btn-wrap">
<el-button
size="mini"
@click="cancleTp"
>
取消
</el-button>
<el-button
type="primary"
size="mini"
@click="confirmTp"
>
确定
</el-button>
</div>
</div>
<div
slot="reference"
class="set-btn"
>
<i class="el-icon-setting" />自定义表头
</div>
</el-popover>
</div>
</div>
</template>
<script>
export default {
props: {
allProps: {
// 所有的props
type: Array,
default() {
return [];
},
},
showProps: {
// 已经展示的props
type: Array,
default() {
return [];
},
},
},
data() {
return {
checkAll: false, // 是否全选
checkedProps: [], // 需要展示的props（选中的props）
tabProps: [], // 所有的props
isIndeterminate: true, // 表示 checkbox 的不确定状态，一般用于实现全选的效果
visible: false,
filtrateData: [], // 筛选后的需要展示数据
};
},
watch: {
allProps: {
immediate: true,
handler(val) {
this.tabProps = this.setData(val);
// 设置默认全选状态
this.handlecheckedPropsChange(this.checkedProps);
},
deep: true,
},
showProps: {
immediate: true,
handler(val) {
this.checkedProps = this.setData(val);
// 设置默认全选状态
this.handlecheckedPropsChange(this.checkedProps);
},
deep: true,
},
},
methods: {
// reFeach() {
// this.$emit('reFeach');
// },
// 全选
handleCheckAllChange(val) {
this.checkedProps = val ? this.tabProps : [];
this.isIndeterminate = false;
},
// 单选
handlecheckedPropsChange(value) {
const checkedCount = value.length;
this.checkAll = checkedCount === this.tabProps.length;
this.isIndeterminate =
checkedCount > 0 && checkedCount < this.tabProps.length;
},
/**
* 数据格式化
* @param arr 需要格式化的数组[{ prop: "ID",label: "医生ID",showtooltip: false,}]
* @return newArr 格式化后数组 [label]
*/
setData(arr) {
const newData = [];
for (const item of arr) {
newData.push(item.label);
}
return newData;
},
// 将数据格式还原
confirmTp() {
const newArr = [];
for (const obj of this.allProps) {
for (const item of this.checkedProps) {
if (obj.label == item) {
newArr.push(obj);
}
}
}
this.filtrateData = newArr;
this.$emit('updateTableProps', this.filtrateData);
this.$emit('reFeach');
this.visible = false;
},
cancleTp() {
this.visible = false;
},
popoverHide() {},
},
};
</script>
<style lang="scss" scoped>
.tab-set-wrap {
.tab-set {
cursor: pointer;
display: flex;
justify-content: flex-end;
padding: 20px 0;
.set-btn {
color: #0d9078;
}
}
}
.tab-set-title {
background: #0d9078;
color: #fff;
margin: -10px -12px 0;
padding: 8px;
text-align: center;
}
.tab-set-select {
position: relative;
height: 400px;
width: 200px;
background: #fff;
z-index: 100;
border-radius: 4px;
display: flex;
flex-direction: column;
.select-list {
padding: 4px 10px;
overflow-y: scroll;
flex: 1;
.checkbox-group {
padding-top: 10px;
.select-checkbox {
display: block;
}
}
}
.select-btn-wrap {
padding: 10px 0;
}
}
</style>
src/components/list/table-set-component.vue 0 → 100644
浏览文件 @ 8b4a0f51
此差异已折叠。
src/utils/GeneralData/diagnosis-list-new.js 0 → 100644
浏览文件 @ 8b4a0f51
export const DIAGNOS_LIST_NEW = [
{
prop: 'diagnoseLogId',
label: 'ID',
showtooltip: false,
},
{
prop: 'orderNo',
label: '订单ID',
showtooltip: false,
},
{
prop: 'diagnoseTypeStr',
label: '预约类型',
showtooltip: false,
with:'200'
},
{
prop: 'statusStr',
label: '状态',
showtooltip: false,
},
{
prop: 'statusRemark',
label: '状态备注',
showtooltip: true,
},
{
prop: 'toFollowReason',
label: '稍后跟进状态',
showtooltip: false,
},
{
prop: 'appointBeginTime',
label: '预约时间',
showtooltip: false,
},
// appointBeginTime appointEndTime 预约时间
{
prop: 'operateUserId',
label: '运营人员ID',
showtooltip: false,
},
{
prop: 'operateUserName',
label: '运营人员',
showtooltip: false,
},
{
prop: 'userName',
label: '助诊医生',
showtooltip: false,
},
{
prop: 'userMobile',
label: '助诊电话',
showtooltip: false,
},
{
prop: 'assistantBeginTime',
label: '助诊医生意向时间',
showtooltip: false,
},
// assistantBeginTime assistantEndTime 助诊医生意向时间
{
prop: 'assistantRemark',
label: '助诊备注',
showtooltip: true,
},
{
prop: 'department',
label: '预约科室',
showtooltip: false,
},
{
prop: 'triageDepartment',
label: '分诊科室',
showtooltip: false,
},
{
prop: 'triageRemark',
label: '分诊备注',
showtooltip: true,
},
{
prop: 'doctorName',
label: '接诊医生',
showtooltip: false,
},
{
prop: 'outsideDoctor',
label: '站外医生姓名',
showtooltip: false,
},
{
prop: 'receptionBeginTime',
label: '接诊医生意向时间',
showtooltip: false,
},
// receptionBeginTime receptionEndTime 接诊医生意向时间
{
prop: 'patientName',
label: '患者姓名',
showtooltip: false,
},
{
prop: 'age',
label: '患者年龄',
showtooltip: false,
},
{
prop: 'patientMobilePhone',
label: '患者电话',
showtooltip: false,
},
{
prop: 'illnessDetail',
label: '病情描述',
showtooltip: true,
},
{
prop: 'idCard',
label: '证件号',
showtooltip: false,
},
{
prop: 'sexStr',
label: '性别',
showtooltip: false,
},
{
prop: 'diagnoseStageStr',
label: '初/复诊',
showtooltip: false,
},
{
prop: 'determineFlagStr',
label: '确诊',
showtooltip: false,
},
{
prop: 'diagnoseDisease',
label: '确诊疾病',
showtooltip: false,
},
{
prop: 'triageOperatorName',
label: '分诊运营',
showtooltip: false,
},
{
prop: 'receptionOperatorName',
label: '接诊运营',
showtooltip: false,
},
{
prop: 'diagnoseAdvice',
label: '诊断建议',
showtooltip: true,
},
{
prop: 'crrsName',
label: '招募人',
showtooltip: false,
},
{
prop: 'diagnoseChannelStr',
label: '问诊方式',
showtooltip: false,
},
{
prop: 'doneTime',
label: '完成时间',
showtooltip: false,
},
{
prop: 'cancelTime',
label: '退款时间',
showtooltip: false,
},
{
prop: 'createdTime',
label: '创建时间',
showtooltip: false,
},
{
prop: 'followFlagStr',
label: '是否跟进',
showtooltip: false,
},
{
prop: 'drugFollowStatusStr',
label: '药品跟进状态',
showtooltip: false,
},
{
prop: 'drugFollow',
label: '药品跟进',
showtooltip: false,
},
{
prop: 'checkFollow',
label: '检查跟进',
showtooltip: false,
},
{
prop: 'otherFollowStatusStr',
label: '其他跟进事项状态',
showtooltip: false,
},
{
prop: 'otherFollow',
label: '其他跟进事项',
showtooltip: false,
},
{
prop: 'remark',
label: '跟进备注',
showtooltip: true,
}
];
src/views/IM/diagnosis-admin/diagnosis-list-new.vue
浏览文件 @ 8b4a0f51
......@@ -276,15 +276,16 @@
</el-badge>
</span>
</div>
<table-component
<table-set-component
v-if="saveFresh"
:menu-type="searchParam.menuType"
:t-data="tableData"
:page-no="searchParam.pageNo"
:page-size="searchParam.pageSize"
:total-rows="totalRows"
:loading="loading"
:table-data="tableData"
:search-param="searchParam"
:table-height="tableHeight"
:total-rows="totalRows"
:multiple-selection.sync="multipleSelection"
:save-table-data="saveTableData"
@sortfunc="sortfunc"
@witeDiagnose="witeDiagnose"
@changeRun="changeRun"
......@@ -304,6 +305,7 @@
@setOffice="setOffice"
@handleSizeChange="handleSizeChange"
@handleCurrentChange="handleCurrentChange"
@getTableData="getTableData"
/>
</el-tab-pane>
</el-tabs>
......@@ -386,7 +388,7 @@
let vm = null;
import { updateDiagnosis } from '../../../utils/diagnosis';
import { base64decode } from '../../../utils/utils.js';
import TableComponent from '@/components/list/table-c';
import { DIAGNOS_LIST_NEW } from '@/utils/GeneralData/diagnosis-list-new';
import {
TYPE_LIST,
IS_FLLOW,
......@@ -414,9 +416,10 @@
import AppointmentTime from '../../../components/common/appointment-time';
import DiagnosisTime from '../../../components/common/diagnosis-time';
import RematchingDoctor from '../../../components/common/rematching-doctor';
import TableSetComponent from '@/components/list/table-set-component';
export default {
components: {
TableComponent,
TableSetComponent,
FollowupComponent,
MatchComponent,
RefundComponent,
......@@ -430,6 +433,7 @@
},
data() {
return {
saveFresh:true,
isUp: false,
endFlag: false,
beginFlag: false,
......@@ -493,7 +497,7 @@
doctorId: 0,
operateUserID: '',
triageDepartmentId: 0,
saveTableData:DIAGNOS_LIST_NEW,
pickerOptions1: {
disabledDate: (time) => {
return time.getTime() > new Date().getTime(); // 减去一天的时间代表可以选择同一天;
......@@ -532,6 +536,9 @@
clearInterval(this.timer);
},
methods: {
getTableData(val) {
this.saveTableData = val || [];
},
selectToggle() {
this.isUp = !this.isUp;
},
......@@ -548,7 +555,6 @@
return getCountQuery().then((res) => {
if (res.code == '000000') {
this.setTable(res.data);
this.tabrefresh = false;
this.$nextTick(() => {
this.tabrefresh = true;
......@@ -557,7 +563,6 @@
}
});
},
init() {
const fullPath = this.$route.fullPath;
let fromType = 1;
......@@ -574,7 +579,6 @@
this.searchParam.status = '';
this.Raw_tabpaneList = [];
this.getTabs().then((res) => {
console.log(res);
if (res) {
this.getsearch();
}
......@@ -669,7 +673,6 @@
},
// tab切换
handleClick(val) {
console.log('this.fromType', this.fromType);
for (let i = 0; i < this.tabpaneList.length; i++) {
if (this.tabpaneList[i].active == val.paneName) {
this.tabpaneList[i].isdot = false;
......@@ -691,19 +694,30 @@
} else if (val.paneName == 102) {
this.searchParam.hasToFollowReason = 2;
} else {
if (Object.prototype.hasOwnProperty.call(this.searchParam, 'hasToFollowReason')) {
if (
Object.prototype.hasOwnProperty.call(
this.searchParam,
'hasToFollowReason'
)
) {
delete this.searchParam.hasToFollowReason;
}
}
} else {
if ( Object.prototype.hasOwnProperty.call(this.searchParam, 'hasToFollowReason')) {
if (
Object.prototype.hasOwnProperty.call(
this.searchParam,
'hasToFollowReason'
)
) {
delete this.searchParam.hasToFollowReason;
}
}
this.getsearch();
this.saveFresh = false;
this.$nextTick(() => {
this.saveFresh = true;
});
},
// 初始化时间
......@@ -762,7 +776,6 @@
search(isTabs) {
this.loading = true;
if (!isTabs) {
console.log('isTabs', isTabs);
this.getTabs();
}
this.initTime();
......@@ -1122,4 +1135,19 @@
right: 5px;
top: 10px;
}
body .el-table th.gutter{
display: table-cell!important;
}
body .el-table colgroup.gutter{
display: table-cell!important;
}
.el-table .warning-row {
background: oldlace;
}
.el-table .success-row {
background: #f0f9eb;
}
</style>
vue.config.js
浏览文件 @ 8b4a0f51
......@@ -71,7 +71,7 @@ module.exports = {
port: 8080,
proxy: {
'/proxy': {
target: 'https://test1-sc.yunqueyi.com/',
target: 'https://dev-sc.yunqueyi.com/',
ws: false,
changeOrigin: true,
secure: true,
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或