diff --git a/src/views/serviceDirective/directivePackage/DirectivePackage.api.ts b/src/views/serviceDirective/directivePackage/DirectivePackage.api.ts
index 0057c16..cf61547 100644
--- a/src/views/serviceDirective/directivePackage/DirectivePackage.api.ts
+++ b/src/views/serviceDirective/directivePackage/DirectivePackage.api.ts
@@ -5,6 +5,7 @@ const { createConfirm } = useMessage();
enum Api {
list = '/directivePackage/directivePackage/list',
+ queryById = '/directivePackage/directivePackage/queryById',
save='/directivePackage/directivePackage/add',
edit='/directivePackage/directivePackage/edit',
deleteOne = '/directivePackage/directivePackage/delete',
@@ -30,6 +31,12 @@ export const getImportUrl = Api.importExcel;
*/
export const list = (params) => defHttp.get({ url: Api.list, params });
+/**
+ * 详情接口
+ * @param params
+ */
+export const queryById = (params) => defHttp.get({ url: Api.queryById, params });
+
/**
* 删除单个
* @param params
diff --git a/src/views/serviceDirective/directivePackage/DirectivePackageList.vue b/src/views/serviceDirective/directivePackage/DirectivePackageList.vue
index d4fa7b3..0651608 100644
--- a/src/views/serviceDirective/directivePackage/DirectivePackageList.vue
+++ b/src/views/serviceDirective/directivePackage/DirectivePackageList.vue
@@ -2,13 +2,12 @@
-
-
-
-
- 新增
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ {{ directive.description }}
+ {{ directive.createTime }} - {{ directive.createBy }}
+
+
+
+
+
diff --git a/src/views/serviceDirective/directivePackage/components/ConfigServiceDirectiveList.vue b/src/views/serviceDirective/directivePackage/components/ConfigServiceDirectiveList.vue
new file mode 100644
index 0000000..6b3a6fe
--- /dev/null
+++ b/src/views/serviceDirective/directivePackage/components/ConfigServiceDirectiveList.vue
@@ -0,0 +1,465 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 移除
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/serviceDirective/directivePackage/components/ConfigServiceDirectiveModal.vue b/src/views/serviceDirective/directivePackage/components/ConfigServiceDirectiveModal.vue
new file mode 100644
index 0000000..0aecc0f
--- /dev/null
+++ b/src/views/serviceDirective/directivePackage/components/ConfigServiceDirectiveModal.vue
@@ -0,0 +1,78 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/serviceDirective/directivePackage/components/DirectivePackageForm.vue b/src/views/serviceDirective/directivePackage/components/DirectivePackageForm.vue
index 63d0d6b..66caa4c 100644
--- a/src/views/serviceDirective/directivePackage/components/DirectivePackageForm.vue
+++ b/src/views/serviceDirective/directivePackage/components/DirectivePackageForm.vue
@@ -2,28 +2,33 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -32,135 +37,148 @@
diff --git a/src/views/serviceDirective/directivePackage/components/DirectivePackageModal.vue b/src/views/serviceDirective/directivePackage/components/DirectivePackageModal.vue
index 846a2e1..1c4e1ab 100644
--- a/src/views/serviceDirective/directivePackage/components/DirectivePackageModal.vue
+++ b/src/views/serviceDirective/directivePackage/components/DirectivePackageModal.vue
@@ -1,77 +1,187 @@
-
+
+
+
+
+
+
+ 新增
+
+ {{ directive.directiveName }}
+
+
+
+
+
+
+ 分类标签:{{ derectiveInfo.instructionTagId_dictText }}
+ 服务类别:{{ derectiveInfo.categoryId_dictText }}
+ 服务类型:{{ derectiveInfo.typeId_dictText }}
+ 服务指令名称:{{ derectiveInfo.directiveName }}
+
+ 周期类型:{{ derectiveInfo.cycleType }}
+ 服务时长(分钟):{{ derectiveInfo.serviceDuration }}
+ 服务说明:{{ derectiveInfo.serviceContent }}
+ 指令标签:{{ derectiveInfo.tags }}
+
+ 视频文件:
+ 暂无文件
+
+
+
+
+
+
+
+
+
+
+ 关闭
+ 确定
+
+
+
+
+ 关闭
+ 确定
+
+
+
-
diff --git a/src/views/serviceDirective/serviceDirective/ConfigServiceDirectiveList.vue b/src/views/serviceDirective/serviceDirective/ConfigServiceDirectiveList.vue
index 447e1b5..05011b2 100644
--- a/src/views/serviceDirective/serviceDirective/ConfigServiceDirectiveList.vue
+++ b/src/views/serviceDirective/serviceDirective/ConfigServiceDirectiveList.vue
@@ -61,13 +61,21 @@
dictCode="institutional_discount" :ignoreDisabled="true" placeholder="请选择机构优惠" allowClear />
-
+
+
+
+ 指令标签
+
+
+
周期类型
@@ -205,6 +213,7 @@ import ConfigServiceCategoryList from '../serviceCategory/ConfigServiceCategoryL
import ConfigServiceTypeList from '../serviceType/ConfigServiceTypeList.vue';
import DirectiveTagList from '../directiveTag/DirectiveTagList.vue';
import { getFileAccessHttpUrl } from '/@/utils/common/compUtils';
+import JSelectMultiple from '/@/components/Form/src/jeecg/components/JSelectMultiple.vue';
const formRef = ref();
const queryParam = reactive({});