diff --git a/public/static/apps/experEnd.html b/public/static/apps/experEnd.html
new file mode 100644
index 0000000..8076778
--- /dev/null
+++ b/public/static/apps/experEnd.html
@@ -0,0 +1,136 @@
+
+
+
+
+ APP下载
+
+
+
+
+
+
+
diff --git a/public/static/apps/expertDownLoad.html b/public/static/apps/expertDownLoad.html
new file mode 100644
index 0000000..d71d688
--- /dev/null
+++ b/public/static/apps/expertDownLoad.html
@@ -0,0 +1,107 @@
+
+
+
+
+ 健康咨询专家端APP下载
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/public/static/apps/images/android.png b/public/static/apps/images/android.png
new file mode 100644
index 0000000..90fd3f5
Binary files /dev/null and b/public/static/apps/images/android.png differ
diff --git a/public/static/apps/images/android1.png b/public/static/apps/images/android1.png
new file mode 100644
index 0000000..0a6cb43
Binary files /dev/null and b/public/static/apps/images/android1.png differ
diff --git a/public/static/apps/images/bg.png b/public/static/apps/images/bg.png
new file mode 100644
index 0000000..3f79f0b
Binary files /dev/null and b/public/static/apps/images/bg.png differ
diff --git a/public/static/apps/images/exportAndroid.png b/public/static/apps/images/exportAndroid.png
new file mode 100644
index 0000000..314fa39
Binary files /dev/null and b/public/static/apps/images/exportAndroid.png differ
diff --git a/public/static/apps/images/exportIos.png b/public/static/apps/images/exportIos.png
new file mode 100644
index 0000000..4ab5699
Binary files /dev/null and b/public/static/apps/images/exportIos.png differ
diff --git a/public/static/apps/images/interventions/bg.png b/public/static/apps/images/interventions/bg.png
new file mode 100644
index 0000000..355f390
Binary files /dev/null and b/public/static/apps/images/interventions/bg.png differ
diff --git a/public/static/apps/images/interventions/body.png b/public/static/apps/images/interventions/body.png
new file mode 100644
index 0000000..a1c12eb
Binary files /dev/null and b/public/static/apps/images/interventions/body.png differ
diff --git a/public/static/apps/images/interventions/btn.png b/public/static/apps/images/interventions/btn.png
new file mode 100644
index 0000000..08c796a
Binary files /dev/null and b/public/static/apps/images/interventions/btn.png differ
diff --git a/public/static/apps/images/ios.png b/public/static/apps/images/ios.png
new file mode 100644
index 0000000..da1a7ad
Binary files /dev/null and b/public/static/apps/images/ios.png differ
diff --git a/public/static/apps/images/noOpen.png b/public/static/apps/images/noOpen.png
new file mode 100644
index 0000000..faeaae7
Binary files /dev/null and b/public/static/apps/images/noOpen.png differ
diff --git a/public/static/apps/index.html b/public/static/apps/index.html
new file mode 100644
index 0000000..ed70f70
--- /dev/null
+++ b/public/static/apps/index.html
@@ -0,0 +1,134 @@
+
+
+
+
+ APP下载
+
+
+
+
+
+
+
diff --git a/public/static/apps/noOpen.png b/public/static/apps/noOpen.png
new file mode 100644
index 0000000..faeaae7
Binary files /dev/null and b/public/static/apps/noOpen.png differ
diff --git a/src/components/Application/src/AppLogo.vue b/src/components/Application/src/AppLogo.vue
index ebc21df..f70270b 100644
--- a/src/components/Application/src/AppLogo.vue
+++ b/src/components/Application/src/AppLogo.vue
@@ -52,7 +52,7 @@
}
switch (userStore.getUserInfo.personType) {
case '2':
- result = '健康平台小助手';
+ result = '健康平台全科医生';
break;
case '6':
result = '应急就医服务';
diff --git a/src/views/consult/helper/conHelper.api.ts b/src/views/consult/helper/conHelper.api.ts
index 2e193f2..229d3be 100644
--- a/src/views/consult/helper/conHelper.api.ts
+++ b/src/views/consult/helper/conHelper.api.ts
@@ -83,7 +83,7 @@ export const saveOrUpdate = (params, isUpdate) => {
};
/**
- * @description 获取小助手信息详情
+ * @description 获取全科医生信息详情
* @param params 请求参数
* */
export const queryById = (params) => defHttp.get({ url: Api.queryById, params });
diff --git a/src/views/consult/phrases/conPhrases.data.ts b/src/views/consult/phrases/conPhrases.data.ts
index 51fdbf0..32c8fcd 100644
--- a/src/views/consult/phrases/conPhrases.data.ts
+++ b/src/views/consult/phrases/conPhrases.data.ts
@@ -59,7 +59,7 @@ export const searchFormSchema: FormSchema[] = [
value: '1',
},
{
- label: '小助手',
+ label: '全科医生',
value: '2',
},
{
@@ -95,7 +95,7 @@ export const formSchema: FormSchema[] = [
value: '1',
},
{
- label: '小助手',
+ label: '全科医生',
value: '2',
},
{
diff --git a/src/views/consult/restTime/restTime.vue b/src/views/consult/restTime/restTime.vue
index 88f1ab8..9d57df1 100644
--- a/src/views/consult/restTime/restTime.vue
+++ b/src/views/consult/restTime/restTime.vue
@@ -27,7 +27,7 @@
const { tableContext } = useListPage({
tableProps: {
- title: '小助手休息时间',
+ title: '全科医生休息时间',
api: listApi,
columns,
tableSetting: {
diff --git a/src/views/consult/staff/doctorForHelper/doctorForHelper.data.ts b/src/views/consult/staff/doctorForHelper/doctorForHelper.data.ts
index 9c38a17..67ea243 100644
--- a/src/views/consult/staff/doctorForHelper/doctorForHelper.data.ts
+++ b/src/views/consult/staff/doctorForHelper/doctorForHelper.data.ts
@@ -53,7 +53,7 @@ export const columns: BasicColumn[] = [
dataIndex: 'resourceName',
},
{
- title: '小助手',
+ title: '全科医生',
align: 'center',
dataIndex: 'doctorName',
},
@@ -91,7 +91,7 @@ export const searchFormSchema: FormSchema[] = [
// },
},
{
- label: '小助手姓名',
+ label: '全科医生',
field: 'doctorName',
component: 'Input',
},
diff --git a/src/views/consult/staff/staffForDoctorV2/staffForDoctor.data.ts b/src/views/consult/staff/staffForDoctorV2/staffForDoctor.data.ts
index bb0ea4d..f2faf6f 100644
--- a/src/views/consult/staff/staffForDoctorV2/staffForDoctor.data.ts
+++ b/src/views/consult/staff/staffForDoctorV2/staffForDoctor.data.ts
@@ -175,7 +175,7 @@ export const columns: BasicColumn[] = [
},
},
{
- title: isQH() ? '全科医生名称' : '小助手姓名',
+ title: isQH() ? '全科医生名称' : '全科医生名称',
align: 'center',
width: 120,
customRender: ({ record }) => {
diff --git a/src/views/consult/staff/staffForHelper/staffForHelper.data.ts b/src/views/consult/staff/staffForHelper/staffForHelper.data.ts
index 5c68ce6..2124dde 100644
--- a/src/views/consult/staff/staffForHelper/staffForHelper.data.ts
+++ b/src/views/consult/staff/staffForHelper/staffForHelper.data.ts
@@ -48,7 +48,7 @@ export const columns: BasicColumn[] = [
dataIndex: 'orgCode',
},
{
- title: '小助手',
+ title: '全科医生',
align: 'center',
dataIndex: 'doctorName',
},
@@ -94,7 +94,7 @@ export const searchFormSchema: FormSchema[] = [
component: 'Input',
},
{
- label: '小助手姓名',
+ label: '全科医生姓名',
field: 'doctorName',
component: 'Input',
},
diff --git a/src/views/consult/staff/staffForHelper/staffForHelperList.vue b/src/views/consult/staff/staffForHelper/staffForHelperList.vue
index 376c498..d0c85c2 100644
--- a/src/views/consult/staff/staffForHelper/staffForHelperList.vue
+++ b/src/views/consult/staff/staffForHelper/staffForHelperList.vue
@@ -60,7 +60,7 @@
//注册table数据
const { tableContext } = useListPage({
tableProps: {
- title: '员工咨询小助手',
+ title: '员工咨询全科医生',
api: list,
columns,
canResize: false,
diff --git a/src/views/emergency/helperHistory/helperHistory.data.ts b/src/views/emergency/helperHistory/helperHistory.data.ts
index 727ac08..07c8e3b 100644
--- a/src/views/emergency/helperHistory/helperHistory.data.ts
+++ b/src/views/emergency/helperHistory/helperHistory.data.ts
@@ -70,7 +70,7 @@ export const columns: BasicColumn[] = [
case '1':
return render.renderTag('咨询专家', 'green');
case '2':
- return render.renderTag(isQH() ? '咨询全科医生' : '咨询小助手', 'blue');
+ return render.renderTag(isQH() ? '咨询全科医生' : '咨询全科医生', 'blue');
default:
return '';
}
@@ -140,7 +140,7 @@ export const columns: BasicColumn[] = [
},
},
{
- title: isQH() ? '全科医生名称' : '小助手姓名',
+ title: isQH() ? '全科医生名称' : '全科医生名称',
align: 'center',
width: 120,
customRender: ({ record }) => {
@@ -265,7 +265,7 @@ export const columns1: BasicColumn[] = [
},
},
{
- title: '小助手姓名',
+ title: '全科医生名称',
align: 'center',
customRender: ({ record }) => {
return record.toName;
@@ -438,7 +438,7 @@ export const searchFormSchema: FormSchema[] = [
componentProps: {
options: [
{ value: '1', label: '咨询专家' },
- { value: '2', label: isQH() ? '咨询全科医生' : '咨询小助手' },
+ { value: '2', label: isQH() ? '咨询全科医生' : '咨询全科医生' },
],
},
},
diff --git a/src/views/system/sysNotice/SysNotice.data.ts b/src/views/system/sysNotice/SysNotice.data.ts
index dd54830..4f3ec0f 100644
--- a/src/views/system/sysNotice/SysNotice.data.ts
+++ b/src/views/system/sysNotice/SysNotice.data.ts
@@ -1,152 +1,147 @@
-import {BasicColumn} from '/@/components/Table';
-import {FormSchema} from '/@/components/Table';
-import { rules} from '/@/utils/helper/validator';
+import { BasicColumn } from '/@/components/Table';
+import { FormSchema } from '/@/components/Table';
+import { rules } from '/@/utils/helper/validator';
import { render } from '/@/utils/common/renderUtils';
//列表数据
export const columns: BasicColumn[] = [
- {
- title: '标题',
- align:"center",
- dataIndex: 'titile'
- },
- {
- title: '摘要',
- align:"center",
- dataIndex: 'msgAbstract'
- },
- {
- title: '内容',
- align:"center",
- dataIndex: 'msgContent'
- },
- {
- title: '类型 0:隐私协议 1:用户通知 2:关于我们 ',
- align:"center",
- dataIndex: 'msgCategory'
- },
- {
- title: '发布状态(0未发布,1已发布,2已撤销)',
- align:"center",
- dataIndex: 'sendStatus'
- },
- {
- title: '所属角色(1:员工 2: 小助手 3: 专家 4: 医疗点 5: 操作人员 6: 专业人员 7:驻场人员 8:其他 9:医院管理员 10: 医院体检医生 11:医院前台 12: 健康室管理员 13: 健康打卡管理员)',
- align:"center",
- dataIndex: 'personType'
- },
- {
- title: '发布时间',
- align:"center",
- dataIndex: 'sendTime',
- customRender:({text}) =>{
- return !text?"":(text.length>10?text.substr(0,10):text)
+ {
+ title: '标题',
+ align: 'center',
+ dataIndex: 'titile',
},
- },
- {
- title: '撤销时间',
- align:"center",
- dataIndex: 'cancelTime',
- customRender:({text}) =>{
- return !text?"":(text.length>10?text.substr(0,10):text)
+ {
+ title: '摘要',
+ align: 'center',
+ dataIndex: 'msgAbstract',
+ },
+ {
+ title: '内容',
+ align: 'center',
+ dataIndex: 'msgContent',
+ },
+ {
+ title: '类型 0:隐私协议 1:用户通知 2:关于我们 ',
+ align: 'center',
+ dataIndex: 'msgCategory',
+ },
+ {
+ title: '发布状态(0未发布,1已发布,2已撤销)',
+ align: 'center',
+ dataIndex: 'sendStatus',
+ },
+ {
+ title: '所属角色(1:员工 2: 全科医生 3: 专家 4: 医疗点 5: 操作人员 6: 专业人员 7:驻场人员 8:其他 9:医院管理员 10: 医院体检医生 11:医院前台 12: 健康室管理员 13: 健康打卡管理员)',
+ align: 'center',
+ dataIndex: 'personType',
+ },
+ {
+ title: '发布时间',
+ align: 'center',
+ dataIndex: 'sendTime',
+ customRender: ({ text }) => {
+ return !text ? '' : text.length > 10 ? text.substr(0, 10) : text;
+ },
+ },
+ {
+ title: '撤销时间',
+ align: 'center',
+ dataIndex: 'cancelTime',
+ customRender: ({ text }) => {
+ return !text ? '' : text.length > 10 ? text.substr(0, 10) : text;
+ },
+ },
+ {
+ title: '发送部门(多个使用","分割)',
+ align: 'center',
+ dataIndex: 'sendDepart',
+ },
+ {
+ title: '删除状态(0,正常,1已删除)',
+ align: 'center',
+ dataIndex: 'delFlag',
+ },
+ {
+ title: '备注',
+ align: 'center',
+ dataIndex: 'memo',
},
- },
- {
- title: '发送部门(多个使用","分割)',
- align:"center",
- dataIndex: 'sendDepart'
- },
- {
- title: '删除状态(0,正常,1已删除)',
- align:"center",
- dataIndex: 'delFlag'
- },
- {
- title: '备注',
- align:"center",
- dataIndex: 'memo'
- },
];
//查询数据
-export const searchFormSchema: FormSchema[] = [
-];
+export const searchFormSchema: FormSchema[] = [];
//表单数据
export const formSchema: FormSchema[] = [
- {
- label: '标题',
- field: 'titile',
- component: 'Input',
- },
- {
- label: '摘要',
- field: 'msgAbstract',
- component: 'InputTextArea',
- },
- {
- label: '内容',
- field: 'msgContent',
- component: 'InputTextArea',
- },
- {
- label: '类型 0:隐私协议 1:用户通知 2:关于我们 ',
- field: 'msgCategory',
- component: 'Input',
- dynamicRules: ({model,schema}) => {
- return [
- { required: true, message: '请输入类型 0:隐私协议 1:用户通知 2:关于我们 !'},
- ];
- },
- },
- {
- label: '发布状态(0未发布,1已发布,2已撤销)',
- field: 'sendStatus',
- component: 'Input',
- },
- {
- label: '所属角色(1:员工 2: 小助手 3: 专家 4: 医疗点 5: 操作人员 6: 专业人员 7:驻场人员 8:其他 9:医院管理员 10: 医院体检医生 11:医院前台 12: 健康室管理员 13: 健康打卡管理员)',
- field: 'personType',
- component: 'Input',
- },
- {
- label: '发布时间',
- field: 'sendTime',
- component: 'DatePicker',
- },
- {
- label: '撤销时间',
- field: 'cancelTime',
- component: 'DatePicker',
- },
- {
- label: '发送部门(多个使用","分割)',
- field: 'sendDepart',
- component: 'Input',
- },
- {
- label: '删除状态(0,正常,1已删除)',
- field: 'delFlag',
- component: 'Input',
- },
- {
- label: '备注',
- field: 'memo',
- component: 'Input',
- },
- // TODO 主键隐藏字段,目前写死为ID
- {
- label: '',
- field: 'id',
- component: 'Input',
- show: false
- },
+ {
+ label: '标题',
+ field: 'titile',
+ component: 'Input',
+ },
+ {
+ label: '摘要',
+ field: 'msgAbstract',
+ component: 'InputTextArea',
+ },
+ {
+ label: '内容',
+ field: 'msgContent',
+ component: 'InputTextArea',
+ },
+ {
+ label: '类型 0:隐私协议 1:用户通知 2:关于我们 ',
+ field: 'msgCategory',
+ component: 'Input',
+ dynamicRules: ({ model, schema }) => {
+ return [{ required: true, message: '请输入类型 0:隐私协议 1:用户通知 2:关于我们 !' }];
+ },
+ },
+ {
+ label: '发布状态(0未发布,1已发布,2已撤销)',
+ field: 'sendStatus',
+ component: 'Input',
+ },
+ {
+ label: '所属角色(1:员工 2: 全科医生 3: 专家 4: 医疗点 5: 操作人员 6: 专业人员 7:驻场人员 8:其他 9:医院管理员 10: 医院体检医生 11:医院前台 12: 健康室管理员 13: 健康打卡管理员)',
+ field: 'personType',
+ component: 'Input',
+ },
+ {
+ label: '发布时间',
+ field: 'sendTime',
+ component: 'DatePicker',
+ },
+ {
+ label: '撤销时间',
+ field: 'cancelTime',
+ component: 'DatePicker',
+ },
+ {
+ label: '发送部门(多个使用","分割)',
+ field: 'sendDepart',
+ component: 'Input',
+ },
+ {
+ label: '删除状态(0,正常,1已删除)',
+ field: 'delFlag',
+ component: 'Input',
+ },
+ {
+ label: '备注',
+ field: 'memo',
+ component: 'Input',
+ },
+ // TODO 主键隐藏字段,目前写死为ID
+ {
+ label: '',
+ field: 'id',
+ component: 'Input',
+ show: false,
+ },
];
-
-
/**
-* 流程表单调用这个方法获取formSchema
-* @param param
-*/
-export function getBpmFormSchema(_formData): FormSchema[]{
- // 默认和原始表单保持一致 如果流程中配置了权限数据,这里需要单独处理formSchema
- return formSchema;
-}
\ No newline at end of file
+ * 流程表单调用这个方法获取formSchema
+ * @param param
+ */
+export function getBpmFormSchema(_formData): FormSchema[] {
+ // 默认和原始表单保持一致 如果流程中配置了权限数据,这里需要单独处理formSchema
+ return formSchema;
+}
diff --git a/src/views/system/user/user.data.ts b/src/views/system/user/user.data.ts
index a9548a9..c05c624 100644
--- a/src/views/system/user/user.data.ts
+++ b/src/views/system/user/user.data.ts
@@ -666,7 +666,7 @@ export const typeList: UserType[] = [
},
{
key: 3,
- title: '小助手',
+ title: '全科医生',
component: healthHelper,
auth: 'system:consultation:con_helper:list',
},