@@ -105,7 +105,6 @@ export default {
diff --git a/src/components/echarts/yanya.vue b/src/components/echarts/yanya.vue
index 402cfbb..f3c9c90 100644
--- a/src/components/echarts/yanya.vue
+++ b/src/components/echarts/yanya.vue
@@ -50,19 +50,23 @@ export default {
if (this.chartData && this.chartData.length > 0) {
this.disabled = false
this.chartData.forEach(item => {
- this.date.push(moment(item.date).format('l'))
- if (item.type === 'OD') {
- this.typeList.OD.push([item.date, item.value])
- this.legendData[0] = 'OD'
- }
- if (item.type === 'OS') {
- this.typeList.OS.push([item.date, item.value])
- this.legendData[1] = 'OS'
- }
- if (item.type === null) {
- this.typeList.typeNull.push([item.date, item.value])
- this.legendData = []
- }
+ this.date.push(moment(item.examTime).format('l'))
+ this.typeList.OD.push([item.examTime, item.odVan])
+ this.legendData[0] = 'OD'
+ this.typeList.OS.push([item.examTime, item.osVan])
+ this.legendData[1] = 'OS'
+ // if (item.type === 'OD') {
+ // this.typeList.OD.push([item.date, item.value])
+ // this.legendData[0] = 'OD'
+ // }
+ // if (item.type === 'OS') {
+ // this.typeList.OS.push([item.date, item.value])
+ // this.legendData[1] = 'OS'
+ // }
+ // if (item.type === null) {
+ // this.typeList.typeNull.push([item.date, item.value])
+ // this.legendData = []
+ // }
})
} else {
this.disabled = true
@@ -102,7 +106,7 @@ export default {
// 基于准备好的dom，初始化echarts实例
yanya.setOption({
title: {
- text: this.desc,
+ text: '',
textStyle: {
'color': '#000000'
},
@@ -110,7 +114,7 @@ export default {
},
tooltip: {
// trigger: 'axis'
- backgroundColor: '#000000',
+ backgroundColor: '#ece6e6',
textStyle: {
color: '#000000' // 设置文字颜色
},
diff --git a/src/components/hm-crf/tinymce/themes/silver/theme.js b/src/components/hm-crf/tinymce/themes/silver/theme.js
index fc42f89..ab57fc4 100644
--- a/src/components/hm-crf/tinymce/themes/silver/theme.js
+++ b/src/components/hm-crf/tinymce/themes/silver/theme.js
@@ -23637,12 +23637,12 @@
eventOrder: (_d = {}, _d[mousedown()] = [
'focusing',
'alloy.base.behaviour',
- 'common-button-display-events'
+ 'commonForm-button-display-events'
], _d),
buttonBehaviours: derive$1([
DisablingConfigs.toolbarButton(providersBackstage.isDisabled),
receivingConfig(),
- config('common-button-display-events', [run(mousedown(), function (button, se) {
+ config('commonForm-button-display-events', [run(mousedown(), function (button, se) {
se.event.prevent();
emit(button, focusButtonEvent);
})])
diff --git a/src/mixins/view-module.js b/src/mixins/view-module.js
index 727ea15..5a7e7cc 100644
--- a/src/mixins/view-module.js
+++ b/src/mixins/view-module.js
@@ -1,6 +1,6 @@
// import Cookies from 'js-cookie'
-import qs from 'qs'
+import qs from "qs";
// import qs from 'qs'
export default {
@@ -9,162 +9,205 @@ export default {
return {
// 设置属性
mixinViewModuleOptions: {
- createdIsNeed: true, // 此页面是否在创建时，调用查询数据列表接口？
- activatedIsNeed: false, // 此页面是否在激活（进入）时，调用查询数据列表接口？
- getDataListURL: '', // 数据列表接口，API地址
+ createdIsNeed: true, // 此页面是否在创建时，调用查询数据列表接口？
+ activatedIsNeed: false, // 此页面是否在激活（进入）时，调用查询数据列表接口？
+ getDataListURL: "", // 数据列表接口，API地址
getDataListIsPage: false, // 数据列表接口，是否需要分页？
- deleteURL: '', // 删除接口，API地址
- deleteIsBatch: false, // 删除接口，是否需要批量？
- deleteIsBatchKey: 'id', // 删除接口，批量状态下由那个key进行标记操作？比如：pid，uid...
- exportURL: '' // 导出接口，API地址
+ deleteURL: "", // 删除接口，API地址
+ deleteIsBatch: false, // 删除接口，是否需要批量？
+ deleteIsBatchKey: "id", // 删除接口，批量状态下由那个key进行标记操作？比如：pid，uid...
+ exportURL: "", // 导出接口，API地址
},
// 默认属性
- dataForm: {}, // 查询条件
- dataList: [], // 数据列表
- order: '', // 排序，asc／desc
- orderField: '', // 排序，字段
- page: 1, // 当前页码
- limit: 10, // 每页数
- total: 0, // 总条数
- dataListLoading: false, // 数据列表，loading状态
- dataListSelections: [], // 数据列表，多选项
- addOrUpdateVisible: false, // 新增／更新，弹窗visible状态
- deleteParams:{}
- }
+ dataForm: {}, // 查询条件
+ dataList: [], // 数据列表
+ order: "", // 排序，asc／desc
+ orderField: "", // 排序，字段
+ page: 1, // 当前页码
+ limit: 10, // 每页数
+ total: 0, // 总条数
+ dataListLoading: false, // 数据列表，loading状态
+ dataListSelections: [], // 数据列表，多选项
+ addOrUpdateVisible: false, // 新增／更新，弹窗visible状态
+ deleteParams: {},
+ };
/* eslint-enable */
},
created() {
if (this.mixinViewModuleOptions.createdIsNeed) {
- this.getDataList()
+ this.getDataList();
}
},
activated() {
if (this.mixinViewModuleOptions.activatedIsNeed) {
- this.getDataList()
+ this.getDataList();
}
},
methods: {
// 获取数据列表
getDataList() {
- this.dataListLoading = true
- this.mixinViewModuleOptions.getDataListURL ? this.$http.get(
- this.mixinViewModuleOptions.getDataListURL, {
- params: {
- // order: this.order,
- // orderField: this.orderField,
- page: this.mixinViewModuleOptions.getDataListIsPage ? this.page : null,
- limit: this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null,
- ...this.dataForm
- }
- }
- ).then(({ data: res }) => {
- this.dataListLoading = false
- if (res.code !== 0) {
- this.dataList = []
- this.total = 0
- return this.$message.error(res.msg)
+ this.dataListLoading = true;
+ let params = {
+ page: this.mixinViewModuleOptions.getDataListIsPage ? this.page : null,
+ limit: this.mixinViewModuleOptions.getDataListIsPage
+ ? this.limit
+ : null,
+ ...this.dataForm,
+ };
+ params = this.dealObjectValue(params);
+ this.mixinViewModuleOptions.getDataListURL
+ ? this.$http
+ .get(this.mixinViewModuleOptions.getDataListURL, {
+ params: params,
+ })
+ .then(({ data: res }) => {
+ this.dataListLoading = false;
+ if (res.code !== 0) {
+ this.dataList = [];
+ this.total = 0;
+ return this.$message.error(res.msg);
+ }
+ this.dataList = this.mixinViewModuleOptions.getDataListIsPage
+ ? res.data.list
+ : res.data;
+ res.data.drgsName ? (this.drgsName = res.data.drgsName) : "";
+ this.total = this.mixinViewModuleOptions.getDataListIsPage
+ ? res.data.total
+ : 0;
+ })
+ .catch(() => {
+ this.dataListLoading = false;
+ })
+ : "";
+ },
+ dealObjectValue(obj) {
+ const param = {};
+ if (obj === null || obj === undefined || obj === "") return param;
+ for (var key in obj) {
+ if (obj[key] !== null && obj[key] !== undefined && obj[key] !== "") {
+ param[key] = obj[key];
}
- this.dataList = this.mixinViewModuleOptions.getDataListIsPage ? res.data.list : res.data
- res.data.drgsName ? this.drgsName = res.data.drgsName : ''
- this.total = this.mixinViewModuleOptions.getDataListIsPage ? res.data.total : 0
- }).catch(() => {
- this.dataListLoading = false
- }) : ''
+ }
+ return param;
},
// 多选
dataListSelectionChangeHandle(val) {
- this.dataListSelections = val
+ this.dataListSelections = val;
},
// 排序
dataListSortChangeHandle(data) {
if (!data.order || !data.prop) {
- this.order = ''
- this.orderField = ''
- return false
+ this.order = "";
+ this.orderField = "";
+ return false;
}
- this.order = data.order.replace(/ending$/, '')
- this.orderField = data.prop.replace(/([A-Z])/g, '_$1').toLowerCase()
- this.getDataList()
+ this.order = data.order.replace(/ending$/, "");
+ this.orderField = data.prop.replace(/([A-Z])/g, "_$1").toLowerCase();
+ this.getDataList();
},
// 分页, 每页条数
pageSizeChangeHandle(val) {
- this.page = 1
- this.limit = val
- this.getDataList()
+ this.page = 1;
+ this.limit = val;
+ this.getDataList();
},
// 分页, 当前页
pageCurrentChangeHandle(val) {
- this.page = val
- this.getDataList()
+ this.page = val;
+ this.getDataList();
},
// 初始化查询
getDataListInitial() {
- this.page = 1
- this.getDataList()
+ this.page = 1;
+ this.getDataList();
},
// 新增 / 修改
addOrUpdateHandle(id, params, title, noParams) {
- this.addOrUpdateVisible = true
+ this.addOrUpdateVisible = true;
this.$nextTick(() => {
- this.$refs.addOrUpdate.dataForm.id = id
- noParams ? '' : this.$refs.addOrUpdate.params = params || {}
- this.$refs.addOrUpdate.dataForm.title = title
+ this.$refs.addOrUpdate.dataForm.id = id;
+ noParams ? "" : (this.$refs.addOrUpdate.params = params || {});
+ this.$refs.addOrUpdate.dataForm.title = title;
// 存在BUG，params无法覆盖，弃用
// this.$refs.addOrUpdate.dataForm = { id, ...params, title }
- this.$refs.addOrUpdate.init()
- })
+ this.$refs.addOrUpdate.init();
+ });
},
// 分配人员
assignPeopleHandle(scope) {
- this.currentPeopleId = scope.id
- this.dialogVisible = true
+ this.currentPeopleId = scope.id;
+ this.dialogVisible = true;
// 添加科研人员时，获取人员列表
- this.getUserList(scope.id)
+ this.getUserList(scope.id);
},
// 关闭当前窗口
closeCurrentTab(data) {
- var tabName = this.$store.state.contentTabsActiveName
- this.$store.state.contentTabs = this.$store.state.contentTabs.filter(item => item.name !== tabName)
+ var tabName = this.$store.state.contentTabsActiveName;
+ this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
+ (item) => item.name !== tabName
+ );
if (this.$store.state.contentTabs.length <= 0) {
- this.$store.state.sidebarMenuActiveName = this.$store.state.contentTabsActiveName = 'home'
- return false
+ this.$store.state.sidebarMenuActiveName =
+ this.$store.state.contentTabsActiveName = "home";
+ return false;
}
if (tabName === this.$store.state.contentTabsActiveName) {
- this.$router.push({ name: this.$store.state.contentTabs[this.$store.state.contentTabs.length - 1].name })
+ this.$router.push({
+ name: this.$store.state.contentTabs[
+ this.$store.state.contentTabs.length - 1
+ ].name,
+ });
}
},
// 删除
deleteHandle(id, callback) {
- if (this.mixinViewModuleOptions.deleteIsBatch && !id && this.dataListSelections.length <= 0) {
+ if (
+ this.mixinViewModuleOptions.deleteIsBatch &&
+ !id &&
+ this.dataListSelections.length <= 0
+ ) {
return this.$message({
- message: this.$t('prompt.deleteBatch'),
- type: 'warning',
- duration: 500
- })
+ message: this.$t("prompt.deleteBatch"),
+ type: "warning",
+ duration: 500,
+ });
}
- this.$confirm(this.$t('prompt.info', { handle: this.$t('delete') }), this.$t('prompt.title'), {
- confirmButtonText: this.$t('confirm'),
- cancelButtonText: this.$t('cancel'),
- type: 'warning'
- }).then(() => {
- (Array.isArray(id) ? this.$http({
- url: this.mixinViewModuleOptions.deleteURL,
- method: 'delete',
- data: id
- }) : this.$http.delete(this.mixinViewModuleOptions.deleteURL + `/${id}`)).then(({ data: res }) => {
- if (res.code !== 0) {
- return this.$message.error(res.msg)
- }
- this.$message({
- message: this.$t('prompt.success'),
- type: 'success',
- duration: 500,
- onClose: () => {
- callback ? callback() : this.getDataList()
- }
- })
- }).catch(() => {})
- }).catch(() => {})
+ this.$confirm(
+ this.$t("prompt.info", { handle: this.$t("delete") }),
+ this.$t("prompt.title"),
+ {
+ confirmButtonText: this.$t("confirm"),
+ cancelButtonText: this.$t("cancel"),
+ type: "warning",
+ }
+ )
+ .then(() => {
+ (Array.isArray(id)
+ ? this.$http({
+ url: this.mixinViewModuleOptions.deleteURL,
+ method: "delete",
+ data: id,
+ })
+ : this.$http.delete(
+ this.mixinViewModuleOptions.deleteURL + `/${id}`
+ )
+ )
+ .then(({ data: res }) => {
+ if (res.code !== 0) {
+ return this.$message.error(res.msg);
+ }
+ this.$message({
+ message: this.$t("prompt.success"),
+ type: "success",
+ duration: 500,
+ onClose: () => {
+ callback ? callback() : this.getDataList();
+ },
+ });
+ })
+ .catch(() => {});
+ })
+ .catch(() => {});
},
// 导出
exportHandle() {
@@ -173,6 +216,6 @@ export default {
// ...this.dataForm
// })
// window.location.href = `${window.SITE_CONFIG.apiURL}${this.mixinViewModuleOptions.exportURL}?${params}`
- }
- }
-}
+ },
+ },
+};
diff --git a/src/page-subspecialty/router/index.js b/src/page-subspecialty/router/index.js
index 0324155..609a8d3 100644
--- a/src/page-subspecialty/router/index.js
+++ b/src/page-subspecialty/router/index.js
@@ -9,9 +9,8 @@ Vue.use(Router);
// 解决Vue-Router升级导致的Uncaught(in promise) navigation guard问题----------
const originalPush = Router.prototype.push;
Router.prototype.push = function push(location, onResolve, onReject) {
- if (onResolve || onReject) {
+ if (onResolve || onReject)
return originalPush.call(this, location, onResolve, onReject);
- }
return originalPush.call(this, location).catch((err) => err);
};
// 解决Vue-Router升级导致的Uncaught(in promise) navigation guard问题----------
@@ -38,6 +37,12 @@ export const pageRoutes = [
name: "login",
meta: { title: "登录" },
},
+ {
+ path: "/pacs",
+ component: () => import("@/page-subspecialty/views/pages/pacsManage/index"),
+ name: "pacs",
+ meta: { title: "pacs浏览器", isTab: true },
+ },
// 录音
{
path: "/luyin",
@@ -123,12 +128,6 @@ export const moduleRoutes = {
name: "redirect",
component: () => import("@/page-subspecialty/views/redirect"),
},
- {
- path: "/ot",
- name: "ot",
- component: () =>
- import("@/page-subspecialty/views/modules/formList/deveopmentFIle.vue"),
- },
],
};
@@ -266,51 +265,39 @@ function getInitData() {
// if (res.code !== 0) { return }
// window.SITE_CONFIG['dictList'] = res.data
// })
-
- // 获取【字段字典表】, 添加并全局变量保存
- http.get("/table/dict/optionsColumn").then(({ data: res }) => {
- window.SITE_CONFIG["dict_colAll"] = res.data;
- });
-
- // 获取【字段字典表】, 添加并全局变量保存
- http
- .get("/table/dict/optionsColumn", { params: { type: 1 } })
- .then(({ data: res }) => {
- window.SITE_CONFIG["dict_colSearch"] = res.data;
- });
-
// 获取【字段字典表】, 添加并全局变量保存
- http
- .get("/table/dict/optionsColumn", { params: { type: 2 } })
- .then(({ data: res }) => {
- window.SITE_CONFIG["dict_colChart"] = res.data;
- });
-
- // 获取【字段字典表】, 添加并全局变量保存
- http
- .get("/table/dict/optionsColumn", { params: { type: 3 } })
- .then(({ data: res }) => {
- window.SITE_CONFIG["dict_colCrf"] = res.data;
- });
-
- // 获取【字段字典表】, 添加并全局变量保存
- http
- .get("/table/dict/optionsColumn", { params: { type: 4 } })
- .then(({ data: res }) => {
- window.SITE_CONFIG["dict_colExport"] = res.data;
- });
-
+ // http.get('/table/dict/optionsColumn').then(({ data: res }) => {
+ // window.SITE_CONFIG['dict_colAll'] = res.data
+ // })
+ //
+ // // 获取【字段字典表】, 添加并全局变量保存
+ // http.get('/table/dict/optionsColumn', { params: { type: 1 }}).then(({ data: res }) => {
+ // window.SITE_CONFIG['dict_colSearch'] = res.data
+ // })
+ //
+ // // 获取【字段字典表】, 添加并全局变量保存
+ // http.get('/table/dict/optionsColumn', { params: { type: 2 }}).then(({ data: res }) => {
+ // window.SITE_CONFIG['dict_colChart'] = res.data
+ // })
+ //
+ // // 获取【字段字典表】, 添加并全局变量保存
+ // http.get('/table/dict/optionsColumn', { params: { type: 3 }}).then(({ data: res }) => {
+ // window.SITE_CONFIG['dict_colCrf'] = res.data
+ // })
+ //
+ // // 获取【字段字典表】, 添加并全局变量保存
+ // http.get('/table/dict/optionsColumn', { params: { type: 4 }}).then(({ data: res }) => {
+ // window.SITE_CONFIG['dict_colExport'] = res.data
+ // })
// 获取【检查项目字典】, 添加并全局变量保存
// http.get('/table/dict/examItem').then(({ data: res }) => {
// sortChinese(res.data, 'itemName')
// window.SITE_CONFIG['dict_examItem'] = res.data
// })
-
// 获取【设备信息字典】, 添加并全局变量保存
// http.get('/device/getData2RelDeviceList').then(({ data: res }) => {
// window.SITE_CONFIG['dict_device'] = res.data
// })
-
// 获取【设备与检查项目字典】, 添加并全局变量保存
// http.get('/device/getData2RelDeviceItemList').then(({ data: res }) => {
// window.SITE_CONFIG['dict_device_item'] = res.data
diff --git a/src/page-subspecialty/views/modules/optometryManagement/cornea/index.vue b/src/page-subspecialty/views/modules/optometryManagement/cornea/index.vue
index 856f150..99665d5 100644
--- a/src/page-subspecialty/views/modules/optometryManagement/cornea/index.vue
+++ b/src/page-subspecialty/views/modules/optometryManagement/cornea/index.vue
@@ -113,7 +113,7 @@ export default {
data() {
return {
mixinViewModuleOptions: {
- getDataListURL: '/sg/patient/page',
+ getDataListURL: '/patient/page',
getDataListIsPage: true
},
cheackAllFooter: false,
diff --git a/src/page-subspecialty/views/modules/optometryManagement/dioptric/HIS-add.vue b/src/page-subspecialty/views/modules/optometryManagement/dioptric/HIS-add.vue
index 08c457a..3d4200b 100644
--- a/src/page-subspecialty/views/modules/optometryManagement/dioptric/HIS-add.vue
+++ b/src/page-subspecialty/views/modules/optometryManagement/dioptric/HIS-add.vue
@@ -1,150 +1,167 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
-
-
-
-
- {{ tableText }}
-
-
-
-
-
-
-
-
- 引入
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+ {{ tableText }}
+
+
+
+
+
+
+
+
+ 引入
+
+
+
+
+
+
+
+
+
diff --git a/src/page-subspecialty/views/modules/optometryManagement/dioptric/index.vue b/src/page-subspecialty/views/modules/optometryManagement/dioptric/index.vue
index 829ac6a..023784b 100644
--- a/src/page-subspecialty/views/modules/optometryManagement/dioptric/index.vue
+++ b/src/page-subspecialty/views/modules/optometryManagement/dioptric/index.vue
@@ -1,185 +1,234 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
-
-
-
-
-
-
-
-
- 全部
- 未报到
- 未诊
- 回诊
- 就诊中
- 已诊
-
-
- 新增
-
-
- HIS引入
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+ {{ item.label }}
-
-
-
-
-
-
-
-
- {{ scope.row.patientBirthday ? $options.filters.dateFilterTwo( scope.row.patientBirthday): '- ' }}
-
-
-
-
-
-
-
-
-
- 叫号
- 接诊
- 患者360
-
-
-
-
+
+ 新增
+
+
+ HIS引入
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ scope.row.patientStatus | patientStatus }}
+
+
+
+
+ {{ scope.row.patientName }}
+
+
+
+
+
+ {{ scope.row.patientBirthday ? $options.filters.dateFilterTwo( scope.row.patientBirthday): '- ' }}
+
+
+
+
+
+
+
+
+ {{ scope.row.callStatus | callStatus }}
+
+
+
+
+
+
+
+
+
+
+ 接诊
+ 患者360
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/page-subspecialty/views/modules/optometryManagement/dioptric/patient-add-or-update.vue b/src/page-subspecialty/views/modules/optometryManagement/dioptric/patient-add-or-update.vue
index a0d83f1..27e4b92 100644
--- a/src/page-subspecialty/views/modules/optometryManagement/dioptric/patient-add-or-update.vue
+++ b/src/page-subspecialty/views/modules/optometryManagement/dioptric/patient-add-or-update.vue
@@ -1,216 +1,214 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ $t('cancel') }}
- {{ $t('confirm') }}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 男
+ 女
+ 保密
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('cancel') }}
+ {{ $t('confirm') }}
+
+
+
+
+
+
+
diff --git a/src/page-subspecialty/views/modules/outpatientManagement/call/HIS-add.vue b/src/page-subspecialty/views/modules/outpatientManagement/call/HIS-add.vue
index 615844c..3d4200b 100644
--- a/src/page-subspecialty/views/modules/outpatientManagement/call/HIS-add.vue
+++ b/src/page-subspecialty/views/modules/outpatientManagement/call/HIS-add.vue
@@ -19,7 +19,7 @@
查询
-
+
{{ tableText }}
@@ -43,6 +43,10 @@ export default {
patientTypeList: {
type: Array,
default: () => []
+ },
+ isSearch: {
+ type: String,
+ default: ''
}
},
data() {
@@ -89,7 +93,7 @@ export default {
if (flag === 2 && !this.dataFormHis.patientId && !this.dataFormHis.patientName && !this.dataFormHis.patientIdNumber) {
return this.$message.error('搜索内容不能为空')
}
- const { data: res } = await this.$http.get('/patient/manage/getHisPatientList', {
+ const { data: res } = await this.$http.get('/patient/getHisPatient', {
params: this.dataFormHis
})
if (res.code === 0) {
@@ -107,8 +111,21 @@ export default {
}
},
// 点击引入按钮
- introduceHandle(scopwRow) {
- this.$parent.addOrUpdateHandle('', scopwRow, 'HIS引入')
+ async introduceHandle(item) {
+ console.log(item)
+ const { data: res } = await this.$http.get('/patient/doLeadIn', {
+ params: {
+ patientId: item.patientId,
+ platform: this.isSearch
+ }
+ })
+ if (res.code === 0) {
+ this.$message.success('引入成功!')
+ this.$parent.getDataListInitial()
+ } else {
+ this.tableText = res.msg
+ this.$message.error(res.msg)
+ }
}
}
}
diff --git a/src/page-subspecialty/views/modules/outpatientManagement/call/index.vue b/src/page-subspecialty/views/modules/outpatientManagement/call/index.vue
index e8a6043..b82da27 100644
--- a/src/page-subspecialty/views/modules/outpatientManagement/call/index.vue
+++ b/src/page-subspecialty/views/modules/outpatientManagement/call/index.vue
@@ -5,13 +5,13 @@
-
+
-
+
-
+
-
+
- {{ item.value }}
+ {{ item.label }}
新增
@@ -58,7 +58,11 @@
style="width: 100%"
>
-
+
+
+ {{ scope.row.patientStatus | patientStatus }}
+
+
{{ scope.row.patientName }}
@@ -70,27 +74,32 @@
{{ scope.row.patientBirthday ? $options.filters.dateFilterTwo( scope.row.patientBirthday): '- ' }}
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
叫号
- 接诊
患者360
@@ -101,9 +110,9 @@
-
+
-
+
+
+
diff --git a/static/js/jquery-3.5.1/jquery.js b/static/js/jquery-3.5.1/jquery.js
index 5546015..2c1a258 100644
--- a/static/js/jquery-3.5.1/jquery.js
+++ b/static/js/jquery-3.5.1/jquery.js
@@ -41,7 +41,7 @@
// Edge <= 12 - 13+, Firefox <=18 - 45+, IE 10 - 11, Safari 5.1 - 9+, iOS 6 - 9.1
// throw exceptions when non-strict code (e.g., ASP.NET 4.5) accesses strict mode
-// arguments.callee.caller (trac-13335). But as of jQuery 3.0 (2016), strict mode should be common
+// arguments.callee.caller (trac-13335). But as of jQuery 3.0 (2016), strict mode should be commonForm
// enough that all such attempts are guarded in a try block.
"use strict";
@@ -1581,7 +1581,7 @@ setDocument = Sizzle.setDocument = function( node ) {
return i ?
- // Do a sibling check if the nodes have a common ancestor
+ // Do a sibling check if the nodes have a commonForm ancestor
siblingCheck( ap[ i ], bp[ i ] ) :
// Otherwise nodes in our document sort first
@@ -5789,7 +5789,7 @@ jQuery.Event.prototype = {
}
};
-// Includes all common event props including KeyEvent and MouseEvent specific props
+// Includes all commonForm event props including KeyEvent and MouseEvent specific props
jQuery.each( {
altKey: true,
bubbles: true,
@@ -8449,7 +8449,7 @@ jQuery.fn.extend( {
ret = elem.value;
- // Handle most common string cases
+ // Handle most commonForm string cases
if ( typeof ret === "string" ) {
return ret.replace( rreturn, "" );
}