Skip to content

P
pica-admin-consultation
提交 15c8edee 编写于 作者: zhongyao.qiao's avatar zhongyao.qiao
浏览文件
操作

feat 订单管理加字段

上级 a84a66da
显示空白字符变更
内嵌 并排
正在显示 包含 842 行增加 和 833 行删除
.env
浏览文件 @ 15c8edee
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
浏览文件 @ 15c8edee
......@@ -17,4 +17,4 @@ VUE_APP_IS_LOCAL=true
VUE_APP_APPID=wxf4e66242d31c81c2
#本地token
VUE_APP_TOKEN=BD84987E12C94A659DA95DE2BF177A76
VUE_APP_TOKEN=C7D1BE8D74644C5C9073BCA21C56B6B4
.eslintrc.js
浏览文件 @ 15c8edee
......@@ -37,11 +37,7 @@ module.exports = {
'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": []
}],
"vue/script-indent": 'off',
'no-undef-init': 2,// 禁止将变量初始化为 undefined,保存时会将let a = undefined变成let a
'semi': [2, 'always'],//强制结尾必须有分号;
......
src/api/diagnosis.js
浏览文件 @ 15c8edee
......@@ -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-list-new.vue
浏览文件 @ 15c8edee
......@@ -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,
diagnoseExport,
diagnoseList,
departmentAll,
reMatchDoctor,
} from '@/api/diagnosis';
let vm = null;
import {
departmentAll,
diagnoseExport,
diagnoseList,
getCountQuery,
getDepartments,
reMatchDoctor,
} 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;
......@@ -929,11 +929,12 @@
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();
},
......@@ -1070,7 +1071,7 @@
delete this.searchParam.hasToFollowReason;
}
}
this.getsearch();
this.getsearch(true);
this.saveFresh = false;
this.$nextTick(() => {
this.saveFresh = true;
......@@ -1103,9 +1104,9 @@
this.searchParam[etime] = arrtime[1];
},
// 重置页面后搜索
getsearch() {
getsearch(isTabs) {
this.resetPage();
this.search(true);
this.search(isTabs);
},
sortfunc(data) {
// ascending 升序
......@@ -1306,16 +1307,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);
}
});
......@@ -1507,7 +1509,7 @@
this.searchParam.patientName = value ? value : null;
},
},
};
};
</script>
<style lang="scss" scoped>
.diagnosis-list-content {
......@@ -1516,24 +1518,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 +1548,7 @@
}
}
}
.select-bottom {
height: 50px;
cursor: pointer;
......@@ -1549,6 +1557,7 @@
align-items: center;
color: #0d9078;
}
.btn-wrap {
text-align: right;
}
......@@ -1557,6 +1566,7 @@
margin-bottom: 10px;
}
}
.component-content {
padding: 10px;
background: #fff;
......@@ -1569,6 +1579,7 @@
right: 5px;
top: 10px;
}
body .el-table th.gutter {
display: table-cell !important;
}
......@@ -1576,6 +1587,7 @@ body .el-table th.gutter {
body .el-table colgroup.gutter {
display: table-cell !important;
}
.el-table .warning-row {
background: oldlace;
}
......
vue.config.js
浏览文件 @ 15c8edee
......@@ -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 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或