diff --git a/.env b/.env
index 0a392ba..ef80d4f 100644
--- a/.env
+++ b/.env
@@ -2,10 +2,10 @@
VITE_PORT = 3101
# 网站标题
-VITE_GLOB_APP_TITLE = JeecgBoot 企业级低代码平台
+VITE_GLOB_APP_TITLE = 业务系统
# 简称,此变量只能是字符/下划线
-VITE_GLOB_APP_SHORT_NAME = JeecgBoot_Pro
+VITE_GLOB_APP_SHORT_NAME = 业务系统
# 单点登录服务端地址
VITE_GLOB_APP_CAS_BASE_URL=http://cas.test.com:8443/cas
diff --git a/public/logo.png b/public/logo.png
index 8072ced..10a2805 100644
Binary files a/public/logo.png and b/public/logo.png differ
diff --git a/src/views/config/directivePackage/DirectivePackage.api.ts b/src/views/config/directivePackage/DirectivePackage.api.ts
new file mode 100644
index 0000000..0057c16
--- /dev/null
+++ b/src/views/config/directivePackage/DirectivePackage.api.ts
@@ -0,0 +1,72 @@
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+ list = '/directivePackage/directivePackage/list',
+ save='/directivePackage/directivePackage/add',
+ edit='/directivePackage/directivePackage/edit',
+ deleteOne = '/directivePackage/directivePackage/delete',
+ deleteBatch = '/directivePackage/directivePackage/deleteBatch',
+ importExcel = '/directivePackage/directivePackage/importExcel',
+ exportXls = '/directivePackage/directivePackage/exportXls',
+}
+
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) => defHttp.get({ url: Api.list, params });
+
+/**
+ * 删除单个
+ * @param params
+ * @param handleSuccess
+ */
+export const deleteOne = (params,handleSuccess) => {
+ return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+ handleSuccess();
+ });
+}
+
+/**
+ * 批量删除
+ * @param params
+ * @param handleSuccess
+ */
+export const batchDelete = (params, handleSuccess) => {
+ createConfirm({
+ iconType: 'warning',
+ title: '确认删除',
+ content: '是否删除选中数据',
+ okText: '确认',
+ cancelText: '取消',
+ onOk: () => {
+ return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+ handleSuccess();
+ });
+ }
+ });
+}
+
+/**
+ * 保存或者更新
+ * @param params
+ * @param isUpdate
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+ let url = isUpdate ? Api.edit : Api.save;
+ return defHttp.post({ url: url, params }, { isTransformResponse: false });
+}
diff --git a/src/views/config/directivePackage/DirectivePackage.data.ts b/src/views/config/directivePackage/DirectivePackage.data.ts
new file mode 100644
index 0000000..0186b46
--- /dev/null
+++ b/src/views/config/directivePackage/DirectivePackage.data.ts
@@ -0,0 +1,36 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+import { getWeekMonthQuarterYear } from '/@/utils';
+//列表数据
+export const columns: BasicColumn[] = [
+ {
+ title: '服务指令包名称',
+ align: "center",
+ dataIndex: 'packageName'
+ },
+ {
+ title: '备注',
+ align: "center",
+ dataIndex: 'description'
+ },
+ {
+ title: '排序',
+ align: "center",
+ dataIndex: 'sort'
+ },
+ {
+ title: '是否启用 0启用 1未启用',
+ align: "center",
+ dataIndex: 'izEnabled_dictText'
+ },
+];
+
+// 高级查询数据
+export const superQuerySchema = {
+ packageName: {title: '服务指令包名称',order: 0,view: 'text', type: 'string',},
+ description: {title: '备注',order: 1,view: 'textarea', type: 'string',},
+ sort: {title: '排序',order: 2,view: 'number', type: 'number',},
+ izEnabled: {title: '是否启用 0启用 1未启用',order: 3,view: 'radio', type: 'string',dictCode: 'iz_enabled',},
+};
diff --git a/src/views/config/directivePackage/DirectivePackageList.vue b/src/views/config/directivePackage/DirectivePackageList.vue
new file mode 100644
index 0000000..d4fa7b3
--- /dev/null
+++ b/src/views/config/directivePackage/DirectivePackageList.vue
@@ -0,0 +1,268 @@
+
+
+
+
+
+
+
+
+ 新增
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/config/directivePackage/components/DirectivePackageForm.vue b/src/views/config/directivePackage/components/DirectivePackageForm.vue
new file mode 100644
index 0000000..63d0d6b
--- /dev/null
+++ b/src/views/config/directivePackage/components/DirectivePackageForm.vue
@@ -0,0 +1,166 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/config/directivePackage/components/DirectivePackageModal.vue b/src/views/config/directivePackage/components/DirectivePackageModal.vue
new file mode 100644
index 0000000..846a2e1
--- /dev/null
+++ b/src/views/config/directivePackage/components/DirectivePackageModal.vue
@@ -0,0 +1,77 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/config/serviceDirective/ConfigServiceDirective.data.ts b/src/views/config/serviceDirective/ConfigServiceDirective.data.ts
index 18d8702..51f8acb 100644
--- a/src/views/config/serviceDirective/ConfigServiceDirective.data.ts
+++ b/src/views/config/serviceDirective/ConfigServiceDirective.data.ts
@@ -49,40 +49,40 @@ export const columns: BasicColumn[] = [
ellipsis: false,
format(text, record, index) {
if(!!text){
- return text.map(item => item.tagName).join(',');
+ return text.map(item => item.tagName).join('、');
}else{
- return '暂未设置'
+ return '-'
}
},
},
- // {
- // title: '收费价格',
- // align: 'center',
- // dataIndex: 'tollPrice',
- // width: 100,
- // },
- // {
- // title: '提成价格',
- // align: "center",
- // dataIndex: 'comPrice'
- // },
- // {
- // title: '医保报销',
- // align: 'center',
- // dataIndex: 'izReimbursement_dictText',
- // width: 100,
- // },
- // {
- // title: '机构优惠',
- // align: 'center',
- // dataIndex: 'izPreferential_dictText',
- // width: 100,
- // },
- // {
- // title: '收费频次',
- // align: 'center',
- // dataIndex: 'chargingFrequency_dictText',
- // },
+ {
+ title: '收费价格',
+ align: 'center',
+ dataIndex: 'tollPrice',
+ width: 100,
+ },
+ {
+ title: '提成价格',
+ align: "center",
+ dataIndex: 'comPrice'
+ },
+ {
+ title: '医保报销',
+ align: 'center',
+ dataIndex: 'izReimbursement_dictText',
+ width: 100,
+ },
+ {
+ title: '机构优惠',
+ align: 'center',
+ dataIndex: 'izPreferential_dictText',
+ width: 100,
+ },
+ {
+ title: '收费频次',
+ align: 'center',
+ dataIndex: 'chargingFrequency_dictText',
+ },
{
title: '周期类型',
align: 'center',
diff --git a/src/views/config/serviceDirective/ConfigServiceDirectiveList.vue b/src/views/config/serviceDirective/ConfigServiceDirectiveList.vue
index abd2742..447e1b5 100644
--- a/src/views/config/serviceDirective/ConfigServiceDirectiveList.vue
+++ b/src/views/config/serviceDirective/ConfigServiceDirectiveList.vue
@@ -9,7 +9,7 @@
服务类别
@@ -17,25 +17,25 @@
服务类型
-
-
-
- 服务指令
-
-
-
-
-
- 分类标签
-
-
-
-
-
-
-
-
-
- 是否启用
-
-
-
-
+
+
+
+ 医保报销
+
+
+
+
+
+ 机构优惠
+
+
+
+
+
+ 收费频次
+
+
+
+
+
+ 周期类型
+
+
+
+
+
+ 是否启用
+
+
+
+
查询
重置
-
+
diff --git a/src/views/config/serviceDirective/components/ConfigServiceDirectiveForm.vue b/src/views/config/serviceDirective/components/ConfigServiceDirectiveForm.vue
index 58f2fee..ade8f00 100644
--- a/src/views/config/serviceDirective/components/ConfigServiceDirectiveForm.vue
+++ b/src/views/config/serviceDirective/components/ConfigServiceDirectiveForm.vue
@@ -9,7 +9,7 @@
@@ -47,7 +47,7 @@
precision="4" />
-
-
+
@@ -99,7 +99,7 @@
+ :dictCode="`nu_config_directive_tag,tag_name,id,del_flag = 0 order by sort asc`" />
@@ -282,9 +282,9 @@ watch(
(newCategoryId) => {
if (!newCategoryId) {
formData.typeId = '';
- typeDictCode.value = 'config_service_type,type_name,id,del_flag = 99 order by sort asc';
+ typeDictCode.value = 'nu_config_service_type,type_name,id,del_flag = 99 order by sort asc';
} else {
- typeDictCode.value = `config_service_type,type_name,id,del_flag = 0 and category_id = '${newCategoryId}' order by sort asc`;
+ typeDictCode.value = `nu_config_service_type,type_name,id,del_flag = 0 and category_id = '${newCategoryId}' order by sort asc`;
}
}
);
diff --git a/src/views/config/serviceType/ConfigServiceTypeList.vue b/src/views/config/serviceType/ConfigServiceTypeList.vue
index b1be729..a4c007d 100644
--- a/src/views/config/serviceType/ConfigServiceTypeList.vue
+++ b/src/views/config/serviceType/ConfigServiceTypeList.vue
@@ -9,7 +9,7 @@
服务类别
diff --git a/src/views/config/serviceType/components/ConfigServiceTypeForm.vue b/src/views/config/serviceType/components/ConfigServiceTypeForm.vue
index 8070999..ac48a81 100644
--- a/src/views/config/serviceType/components/ConfigServiceTypeForm.vue
+++ b/src/views/config/serviceType/components/ConfigServiceTypeForm.vue
@@ -9,7 +9,7 @@