Skip to content

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

Merge branch 'release' into feature/wxl

上级 c23aef10 d84b056a
显示空白字符变更
内嵌 并排
正在显示 包含 2137 行增加 和 2079 行删除
.env
浏览文件 @ af7d58c2
NODE_ENV=development
# baseUrl
BASE_URL=/pica-admin-consultation/
BASE_URL=/consultation/pica-admin-consultation/
# 路由 base
VUE_APP_BASE_ROUTE_URL=/consultation/pica-admin-consultation/
......
.env.development.local
浏览文件 @ af7d58c2
......@@ -17,4 +17,4 @@ VUE_APP_IS_LOCAL=true
VUE_APP_APPID=wxf4e66242d31c81c2
#本地token
VUE_APP_TOKEN=BD84987E12C94A659DA95DE2BF177A76
VUE_APP_TOKEN=B638EE700AD348B8B432E7DF53A48E87
.eslintrc.js
浏览文件 @ af7d58c2
......@@ -2,7 +2,7 @@ module.exports = {
root: true,
parserOptions: {
parser: 'babel-eslint',
sourceType: 'module'
sourceType: 'module',
},
env: {
browser: true,
......@@ -12,46 +12,60 @@ module.exports = {
extends: ['plugin:vue/recommended', 'eslint:recommended'],
// 全局变量
globals: {
'gdp': true,
gdp: true,
},
// add your custom rules here
//it is base on https://github.com/vuejs/eslint-config-vue
rules: {
'no-console': 0,
'no-debugger': 0,
'comma-spacing': [2, { // 控制逗号前面没有空格，后面必须有空格
'before': false,
'after': true
}],
'arrow-spacing': [2, { // 要求箭头函数前后有空格
'before': true,
'after': true
}],
'no-multi-spaces': 2,// 禁止使用多个空格,
'no-spaced-func': 2,// 禁止 function 标识符和括号之间出现空格,this.getList () 报错
'semi-spacing': [2, {// 强制分号之前不允许有空格
'before': false,
'after': true
}],
'space-infix-ops': 2,// 要求操作符前后必须有空格: 2 + 3 2 === 2 3 > 2
'comma-spacing': [
2,
{
// 控制逗号前面没有空格，后面必须有空格
before: false,
after: true,
},
],
'arrow-spacing': [
2,
{
// 要求箭头函数前后有空格
before: true,
after: true,
},
],
'no-multi-spaces': 2, // 禁止使用多个空格,
'no-spaced-func': 2, // 禁止 function 标识符和括号之间出现空格,this.getList () 报错
'semi-spacing': [
2,
{
// 强制分号之前不允许有空格
before: false,
after: true,
},
],
'space-infix-ops': 2, // 要求操作符前后必须有空格: 2 + 3 2 === 2 3 > 2
'spaced-comment': [2, 'always'], // 强制在注释中 // 或 /* 使用一致的空格
'array-bracket-spacing': [2, 'never'],// 指定数组的元素之间要以空格隔开(, 后面)， never参数：[ 之后和 ] 之前不能带空格，always参数：[ 之后和 ] 之前必须带空格
"space-before-blocks": 2, // if/function等的大括号之前需要有空格
"vue/script-indent": ["error", 2, { // script标签缩进设置
"baseIndent": 1,
"switchCase": 0,
"ignores": []
}],
'array-bracket-spacing': [2, 'never'], // 指定数组的元素之间要以空格隔开(, 后面)， never参数：[ 之后和 ] 之前不能带空格，always参数：[ 之后和 ] 之前必须带空格
'space-before-blocks': 2, // if/function等的大括号之前需要有空格
'vue/script-indent': 'off',
'no-undef-init': 2,// 禁止将变量初始化为 undefined,保存时会将let a = undefined变成let a
'semi': [2, 'always'],//强制结尾必须有分号;
'prefer-const': 2,// 要求使用 const 声明那些声明后不再被修改的变量
'quotes': [2, 'single'],//js中强制使用单引号
'no-multiple-empty-lines': [2, {// 不允许多个空行,最多一行
'max': 1
}],
'vue/order-in-components': ['error', {
'order': [
'no-undef-init': 2, // 禁止将变量初始化为 undefined,保存时会将let a = undefined变成let a
semi: [2, 'always'], //强制结尾必须有分号;
'prefer-const': 2, // 要求使用 const 声明那些声明后不再被修改的变量
quotes: [2, 'single'], //js中强制使用单引号
'no-multiple-empty-lines': [
2,
{
// 不允许多个空行,最多一行
max: 1,
},
],
'vue/order-in-components': [
'error',
{
order: [
'el',
'name',
'parent',
......@@ -69,11 +83,14 @@ module.exports = {
'LIFECYCLE_HOOKS',
'methods',
['template', 'render'],
'renderError'
]
}],
'vue/attributes-order': ['error', {
'order': [
'renderError',
],
},
],
'vue/attributes-order': [
'error',
{
order: [
'DEFINITION',
'LIST_RENDERING',
'CONDITIONALS',
......@@ -84,8 +101,9 @@ module.exports = {
'OTHER_DIRECTIVES',
'OTHER_ATTR',
'EVENTS',
'CONTENT'
]
}],
}
}
'CONTENT',
],
},
],
},
};
src/api/diagnosis.js
浏览文件 @ af7d58c2
......@@ -92,10 +92,11 @@ export const messageSend = async (data) => {
// diagnosis-list-new
export const getCountQuery = async () => {
export const getCountQuery = async (params) => {
return request({
url: '/diagnose/admin/diagnose/countQuery',
method: 'get',
method: 'post',
data: params
});
};
......
src/views/IM/diagnosis-admin/diagnosis-editor.vue
浏览文件 @ af7d58c2
......@@ -401,6 +401,15 @@
<el-option v-for="item of sexList" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select> -->
</el-form-item>
<el-form-item label="助诊医生地区">
<el-input
:value="`${formData.userProvince || ''}${formData.userCity || ''}${
formData.userCounty || ''
}${formData.userTown || ''}`"
class="set-width"
disabled
/>
</el-form-item>
<el-form-item label="助诊医生所在机构">
<el-input
v-model="formData.userHospital"
......@@ -484,6 +493,15 @@
<el-option v-for="item of sexList" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select> -->
</el-form-item>
<el-form-item label="接诊医生地区">
<el-input
:value="`${formData.doctorProvince || ''}${
formData.doctorCity || ''
}${formData.doctorCounty || ''}${formData.doctorTown || ''}`"
class="set-width"
disabled
/>
</el-form-item>
<el-form-item label="接诊医生所在机构">
<el-input
v-model="formData.doctorHospital"
......@@ -963,32 +981,32 @@
</div>
</template>
<script>
import uploadImg from '@/components/editor/upload-img';
import uploadMusic from '@/components/editor/upload-music';
import {
TYPE_LIST,
PAY_LIST,
SOURCE_LIST,
STATUS_LIST,
import {
diagnoseUpdate,
getAdminDiagnose,
getDiagnoseLog,
getDoctorList,
} from '@/api/diagnosis';
import uploadImg from '@/components/editor/upload-img';
import uploadMusic from '@/components/editor/upload-music';
import {
CAR_LIST,
SEX_LIST,
RELATION_LIST,
D_S_LIST,
FOLLW_LIST,
} from '@/utils/constants';
import { getBirth } from '@/utils/index';
import {
getAdminDiagnose,
getDoctorList,
getDiagnoseLog,
diagnoseUpdate,
} from '@/api/diagnosis';
PAY_LIST,
RELATION_LIST,
SEX_LIST,
SOURCE_LIST,
STATUS_LIST,
TYPE_LIST,
} from '@/utils/constants';
import { getBirth } from '@/utils/index';
const PAY_TYPE = {
const PAY_TYPE = {
1: '自动付款',
2: '手动付款',
};
export default {
};
export default {
components: {
uploadImg,
uploadMusic,
......@@ -1444,7 +1462,7 @@
window.open(item.url);
},
},
};
};
</script>
<style lang="scss" scoped>
.diagnosis-list-content {
......@@ -1519,4 +1537,9 @@
}
}
}
/deep/ .el-input.is-disabled .el-input__inner,
/deep/ .el-textarea.is-disabled .el-textarea__inner {
color: #666;
}
</style>
src/views/IM/diagnosis-admin/diagnosis-list-new.vue
浏览文件 @ af7d58c2
......@@ -390,7 +390,7 @@
<el-button
type="primary"
class="submit-btn"
@click="getsearch"
@click="getsearch()"
>
搜索
</el-button>
......@@ -602,46 +602,46 @@
</div>
</template>
<script>
let vm = null;
import { updateDiagnosis, callAssistantDoctor } from '../../../utils/diagnosis';
import { outbounNote } from '../../../api/diagnosis';
import { base64decode } from '../../../utils/utils.js';
import { DIAGNOS_LIST_NEW } from '@/utils/GeneralData/diagnosis-list-new';
import {
TYPE_LIST,
IS_FLLOW,
SOURCE_LIST,
ALL_TAB_LIST,
TRIAGE_TAB_LIST,
RECEPTION_TAB_LIST,
RUN_TAB_LIST,
MATCH_TAB_LIST,
ORDER_PRICE,
MATCHING_LIST,
} from '@/utils/constants';
import {
getCountQuery,
getDepartments,
let vm = null;
import {
departmentAll,
diagnoseExport,
diagnoseList,
departmentAll,
getCountQuery,
getDepartments,
reMatchDoctor,
} from '@/api/diagnosis';
} from '@/api/diagnosis';
import { DIAGNOS_LIST_NEW } from '@/utils/GeneralData/diagnosis-list-new';
import {
ALL_TAB_LIST,
IS_FLLOW,
MATCHING_LIST,
MATCH_TAB_LIST,
ORDER_PRICE,
RECEPTION_TAB_LIST,
RUN_TAB_LIST,
SOURCE_LIST,
TRIAGE_TAB_LIST,
TYPE_LIST,
} from '@/utils/constants';
import { outbounNote } from '../../../api/diagnosis';
import { callAssistantDoctor, updateDiagnosis } from '../../../utils/diagnosis';
import { base64decode } from '../../../utils/utils.js';
import MatchComponent from '@/components/common/match';
import RefundComponent from '@/components/common/refund';
import FollowupComponent from '../../../components/common/followup';
import MatchingDoctor from '../../../components/common/matching-doctor';
import DiagnosisComponent from '../../../components/common/diagnosis';
import CoordinatingDoctor from '../../../components/common/coordinating-doctor';
import DiagnosisDoctor from '../../../components/common/diagnosis-doctor';
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';
import applyCancelComponent from '../../../components/common/applyCancel';
import updateDeparId from '../../../components/common/updateDepartId';
export default {
import MatchComponent from '@/components/common/match';
import RefundComponent from '@/components/common/refund';
import TableSetComponent from '@/components/list/table-set-component';
import applyCancelComponent from '../../../components/common/applyCancel';
import AppointmentTime from '../../../components/common/appointment-time';
import CoordinatingDoctor from '../../../components/common/coordinating-doctor';
import DiagnosisComponent from '../../../components/common/diagnosis';
import DiagnosisDoctor from '../../../components/common/diagnosis-doctor';
import DiagnosisTime from '../../../components/common/diagnosis-time';
import FollowupComponent from '../../../components/common/followup';
import MatchingDoctor from '../../../components/common/matching-doctor';
import RematchingDoctor from '../../../components/common/rematching-doctor';
import updateDeparId from '../../../components/common/updateDepartId';
export default {
components: {
TableSetComponent,
FollowupComponent,
......@@ -903,7 +903,7 @@
},
// 获取tabs数据
getTabs() {
return getCountQuery().then((res) => {
getCountQuery(this.searchParam).then((res) => {
if (res.code == '000000') {
this.setTable(res.data);
this.tabrefresh = false;
......@@ -925,15 +925,17 @@
}
// this.fromType = +(this.$route.query.fromType || 1);
this.fromType = +fromType;
this.searchParam.menuType = this.fromType || 1;
this.activeName = '99';
this.searchParam.status = '';
this.Raw_tabpaneList = [];
this.getTabs().then((res) => {
if (res) {
this.getsearch();
}
});
// this.getTabs().then((res) => {
// if (res) {
// this.getsearch();
// }
// });
this.contrastData();
},
......@@ -950,36 +952,35 @@
switch (this.fromType) {
case 1:
tabs = ALL_TAB_LIST;
this.searchParam.menuType = 1;
break;
case 2:
tabs = RUN_TAB_LIST;
this.searchParam.menuType = 2;
break;
case 3:
tabs = TRIAGE_TAB_LIST;
this.searchParam.menuType = 3;
break;
case 4:
tabs = RECEPTION_TAB_LIST;
this.searchParam.menuType = 4;
break;
case 5:
tabs = MATCH_TAB_LIST;
this.searchParam.menuType = 5;
break;
default:
tabs = ALL_TAB_LIST;
this.searchParam.menuType = 1;
break;
}
let count = 0;
for (let i = 0; i < tabs.length; i++) {
const index = data.findIndex((val) => {
return val.status == tabs[i].active;
});
if (index > 0) {
if (index > -1) {
count = count + data[index].dgCount;
let isdot = false;
if (this.Raw_tabpaneList.length > 0) {
......@@ -996,6 +997,7 @@
}
}
tabs[0].dgCount = count;
console.log('tabs', JSON.stringify(tabs));
this.tabpaneList = tabs;
if (this.Raw_tabpaneList.length == 0) {
this.Raw_tabpaneList = JSON.parse(JSON.stringify(tabs));
......@@ -1070,7 +1072,7 @@
delete this.searchParam.hasToFollowReason;
}
}
this.getsearch();
this.getsearch(true);
this.saveFresh = false;
this.$nextTick(() => {
this.saveFresh = true;
......@@ -1103,9 +1105,9 @@
this.searchParam[etime] = arrtime[1];
},
// 重置页面后搜索
getsearch() {
getsearch(isTabs) {
this.resetPage();
this.search(true);
this.search(isTabs);
},
sortfunc(data) {
// ascending 升序
......@@ -1306,16 +1308,17 @@
this.diaUpdateDeIdVisible = true;
},
callAssistant(row) {
const i = row.consultRoadType == 2 ? '确定呼叫居民吗?' : '确定呼叫助诊医生吗?';
const i =
row.consultRoadType == 2 ? '确定呼叫居民吗?' : '确定呼叫助诊医生吗?';
this.$confirm(i, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
type: 'warning',
}).then(() => {
callAssistantDoctor(row.diagnoseLogId).then(res => {
callAssistantDoctor(row.diagnoseLogId).then((res) => {
if (res.code == '000000') {
vm.$message.success('呼叫成功');
}else{
} else {
vm.$message.error(res.message);
}
});
......@@ -1323,10 +1326,16 @@
},
// 发送消息
sendMessage(row) {
this.$router.push({
path: '/diagnosis-im',
query: { tid: row.imTeamId },
});
// this.$router.push({
// path: '/diagnosis-im',
// query: { tid: row.imTeamId },
// });
const target = this.$refs.target;
const { origin } = window.location;
const u = `${origin}/consultation/pica-admin-consultation/diagnosis-im?tid=${row.imTeamId}`;
target.setAttribute('href', u);
target.click();
},
// 加入问诊
......@@ -1507,7 +1516,7 @@
this.searchParam.patientName = value ? value : null;
},
},
};
};
</script>
<style lang="scss" scoped>
.diagnosis-list-content {
......@@ -1516,24 +1525,29 @@
padding: 10px;
background: #fff;
overflow: hidden !important;
.title {
height: 50px;
display: flex;
justify-content: flex-start;
align-items: center;
}
.form-container {
display: flex;
justify-content: space-between;
.form-li {
display: flex;
flex-direction: column;
// justify-content: space-between;
}
.form-btn {
display: flex;
flex-direction: column;
justify-content: flex-start;
.form-btn-li {
display: flex;
justify-content: flex-end;
......@@ -1541,6 +1555,7 @@
}
}
}
.select-bottom {
height: 50px;
cursor: pointer;
......@@ -1549,6 +1564,7 @@
align-items: center;
color: #0d9078;
}
.btn-wrap {
text-align: right;
}
......@@ -1557,6 +1573,7 @@
margin-bottom: 10px;
}
}
.component-content {
padding: 10px;
background: #fff;
......@@ -1569,6 +1586,7 @@
right: 5px;
top: 10px;
}
body .el-table th.gutter {
display: table-cell !important;
}
......@@ -1576,6 +1594,7 @@ body .el-table th.gutter {
body .el-table colgroup.gutter {
display: table-cell !important;
}
.el-table .warning-row {
background: oldlace;
}
......
src/views/IM/diagnosis-admin/modal/newScheduling.vue
浏览文件 @ af7d58c2
......@@ -146,20 +146,20 @@
</div>
</template>
<script>
import dayjs from 'dayjs';
import FullCalendar from '@fullcalendar/vue';
import dayGridPlugin from '@fullcalendar/daygrid';
import timeGridPlugin from '@fullcalendar/timegrid';
import interactionPlugin from '@fullcalendar/interaction';
import {
import FullCalendar from '@fullcalendar/vue';
import dayGridPlugin from '@fullcalendar/daygrid';
import interactionPlugin from '@fullcalendar/interaction';
import timeGridPlugin from '@fullcalendar/timegrid';
import {
dutyRosterQuery,
saveDutyRoster,
getLevel,
getDoctorInfo,
saveLevelAndDayCount,
getLevel,
getLevelAndDayCount,
} from '@/api/serviceSchedule';
export default {
saveDutyRoster,
saveLevelAndDayCount,
} from '@/api/serviceSchedule';
import dayjs from 'dayjs';
export default {
name: 'Scheduing',
components: {
FullCalendar,
......@@ -227,8 +227,8 @@
expandRows: true,
slotMinWidth: 50,
slotDuration: '01:00:00',
slotMinTime: '09:00',
slotMaxTime: '21:00',
slotMinTime: '01:00',
slotMaxTime: '23:00',
slotLabelInterval: '',
scrollTime: false,
slotLabelFormat: {
......@@ -335,7 +335,7 @@
const day = dayjs(date).day();
const dayDate = dayjs(date).date();
const dayFormat = dayjs(date).format('YYYY-MM-DD');
let selectDate = dayFormat + ' ' + '09:00:00';
let selectDate = dayFormat + ' ' + '01:00:00';
selectDate = dayjs(selectDate).unix();
const nowDate = dayjs(new Date()).unix();
let isAddAllDay = true;
......@@ -357,10 +357,7 @@
}
if (isAddAllDay) {
// 添加日期
const selectAllDay = [
{ startTime: '09:00:00', endTime: '12:00:00' },
{ startTime: '13:00:00', endTime: '21:00:00' },
];
const selectAllDay = [{ startTime: '01:00:00', endTime: '23:00:00' }];
selectAllDay.forEach((item) => {
const allDayData = {};
allDayData.id =
......@@ -458,7 +455,7 @@
}
this.calendarOptions.events.push(selectDate);
});
this.limmitDateFun();
// this.limmitDateFun();
},
limmitDateFun() {
for (let i = 0; i < 7; i++) {
......@@ -466,6 +463,7 @@
const day = dayjs(this.getEveryDay)
.add(i, 'day')
.format('YYYY-MM-DD HH:mm:ss');
limitTime.start = dayjs(day)
.add(12, 'hour')
.format('YYYY-MM-DD HH:mm:ss');
......@@ -478,7 +476,6 @@
limitTime.editable = false;
this.calendarOptions.events.push(limitTime);
}
console.log('obj', this.getEveryDay);
},
handleDatesSet(dataInfo) {
this.getEveryDay = dayjs(dataInfo.start).format('YYYY-MM-DD HH:mm:ss');
......@@ -597,9 +594,8 @@
this.isDoIt = true;
const startDay = new Date(info.start).getDay();
const endDay = new Date(info.end).getDay();
const startHour = dayjs(info.start).hour();
console.log(dayjs(info.start).format('YYYY-MM-DD HH:mm:ss'));
if (startDay != endDay || startHour == 12) {
if (startDay != endDay) {
return false;
}
const currentDate = new Date();
......@@ -665,9 +661,10 @@
}
});
console.log('saveParms=======', saveParms);
saveParms.list = lastData.filter((item) => {
return item.startTime.split(' ')[1] !== '12:00:00';
});
// saveParms.list = lastData.filter((item) => {
// return item.startTime.split(' ')[1] !== '12:00:00';
// });
saveParms.list = lastData.slice(0);
saveDutyRoster(saveParms).then((res) => {
if (res.code === '000000') {
this.loading = false;
......@@ -690,7 +687,7 @@
}
},
},
};
};
</script>
<style lang="scss" scoped>
......
src/views/IM/diagnosis-admin/overviewScheduling.vue
浏览文件 @ af7d58c2
......@@ -106,18 +106,18 @@
</div>
</template>
<script>
import { departmentAll } from '@/api/diagnosis';
import FullCalendar from '@fullcalendar/vue';
import dayGridPlugin from '@fullcalendar/daygrid';
import timeGridPlugin from '@fullcalendar/timegrid';
import interactionPlugin from '@fullcalendar/interaction';
import resourceTimeGridPlugin from '@fullcalendar/resource-timegrid';
import {
import { departmentAll } from '@/api/diagnosis';
import {
getPlatformUpper,
previewWork,
setPlatformUpper,
getPlatformUpper,
} from '@/api/serviceSchedule';
export default {
} from '@/api/serviceSchedule';
import FullCalendar from '@fullcalendar/vue';
import dayGridPlugin from '@fullcalendar/daygrid';
import interactionPlugin from '@fullcalendar/interaction';
import resourceTimeGridPlugin from '@fullcalendar/resource-timegrid';
import timeGridPlugin from '@fullcalendar/timegrid';
export default {
name: 'Index',
components: {
FullCalendar,
......@@ -164,8 +164,8 @@
resourceAreaWidth: '5%',
allDaySlot: false, // 周，日视图时，all-day 不显示
slotDuration: '01:00:00',
slotMinTime: '09:00',
slotMaxTime: '21:00',
slotMinTime: '01:00',
slotMaxTime: '23:00',
slotLabelInterval: '',
scrollTime: false,
initialDate: '2021-10-31',
......@@ -343,7 +343,7 @@
});
},
},
};
};
</script>
<style lang="scss" scoped>
......
vue.config.js
浏览文件 @ af7d58c2
......@@ -70,7 +70,7 @@ module.exports = {
port: 8080,
proxy: {
'/proxy': {
target: 'https://uat-sc.yunqueyi.com/',
target: 'https://dev-sc.yunqueyi.com/',
ws: false,
changeOrigin: true,
secure: true,
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或