临时版本

.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

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 });
+}

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',},
+};

src/views/config/directivePackage/DirectivePackageList.vue

@@ -0,0 +1,268 @@
+<template>
+  <div class="p-2">
+    <!--查询区域-->
+    <div class="jeecg-basic-table-form-container">
+      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol"
+        :wrapper-col="wrapperCol">
+        <a-row :gutter="24">
+          <a-col :lg="6">
+            <a-form-item name="packageName">
+              <template #label><span title="服务指令包名称">服务指令包</span></template>
+              <JInput v-model:value="queryParam.packageName" />
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+              <a-col :lg="6">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset"
+                  style="margin-left: 8px">重置</a-button>
+                <!-- <a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
+                  {{ toggleSearchStatus ? '收起' : '展开' }}
+                  <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
+                </a> -->
+              </a-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <a-button type="primary" v-auth="'directivePackage:directive_package:add'" @click="handleAdd"
+          preIcon="ant-design:plus-outlined"> 新增</a-button>
+        <!-- <a-button type="primary" v-auth="'directivePackage:directive_package:exportXls'"
+          preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <j-upload-button type="primary" v-auth="'directivePackage:directive_package:importExcel'"
+          preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <template #overlay>
+            <a-menu>
+              <a-menu-item key="1" @click="batchHandleDelete">
+                <Icon icon="ant-design:delete-outlined"></Icon>
+                删除
+              </a-menu-item>
+            </a-menu>
+          </template>
+          <a-button v-auth="'directivePackage:directive_package:deleteBatch'">批量操作
+            <Icon icon="mdi:chevron-down"></Icon>
+          </a-button>
+        </a-dropdown> -->
+        <!-- 高级查询 -->
+        <!-- <super-query :config="superQueryConfig" @search="handleSuperQuery" /> -->
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
+      </template>
+      <template v-slot:bodyCell="{ column, record, index, text }">
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <DirectivePackageModal ref="registerModal" @success="handleSuccess"></DirectivePackageModal>
+  </div>
+</template>
+
+<script lang="ts" name="directivePackage-directivePackage" setup>
+import { ref, reactive } from 'vue';
+import { BasicTable, useTable, TableAction } from '/@/components/Table';
+import { useListPage } from '/@/hooks/system/useListPage';
+import { columns, superQuerySchema } from './DirectivePackage.data';
+import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './DirectivePackage.api';
+import { downloadFile } from '/@/utils/common/renderUtils';
+import DirectivePackageModal from './components/DirectivePackageModal.vue'
+import { useUserStore } from '/@/store/modules/user';
+import JInput from "/@/components/Form/src/jeecg/components/JInput.vue";
+
+const formRef = ref();
+const queryParam = reactive<any>({});
+const toggleSearchStatus = ref<boolean>(false);
+const registerModal = ref();
+const userStore = useUserStore();
+//注册table数据
+const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+  tableProps: {
+    title: '服务指令包',
+    api: list,
+    columns,
+    canResize: false,
+    useSearchForm: false,
+    actionColumn: {
+      width: 120,
+      fixed: 'right',
+    },
+    beforeFetch: async (params) => {
+      return Object.assign(params, queryParam);
+    },
+  },
+  exportConfig: {
+    name: "服务指令包",
+    url: getExportUrl,
+    params: queryParam,
+  },
+  importConfig: {
+    url: getImportUrl,
+    success: handleSuccess
+  },
+});
+console.log("🎅 ~ tableContext:", tableContext)
+const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
+const labelCol = reactive({
+  xs: 24,
+  sm: 4,
+  xl: 6,
+  xxl: 6
+});
+const wrapperCol = reactive({
+  xs: 24,
+  sm: 20,
+  xl: 14,
+  xxl: 14
+});
+
+// 高级查询配置
+const superQueryConfig = reactive(superQuerySchema);
+
+/**
+ * 高级查询事件
+ */
+function handleSuperQuery(params) {
+  Object.keys(params).map((k) => {
+    queryParam[k] = params[k];
+  });
+  searchQuery();
+}
+
+/**
+ * 新增事件
+ */
+function handleAdd() {
+  registerModal.value.disableSubmit = false;
+  registerModal.value.add();
+}
+
+/**
+ * 编辑事件
+ */
+function handleEdit(record: Recordable) {
+  registerModal.value.disableSubmit = false;
+  registerModal.value.edit(record);
+}
+
+/**
+ * 详情
+ */
+function handleDetail(record: Recordable) {
+  registerModal.value.disableSubmit = true;
+  registerModal.value.edit(record);
+}
+
+/**
+ * 删除事件
+ */
+async function handleDelete(record) {
+  await deleteOne({ id: record.id }, handleSuccess);
+}
+
+/**
+ * 批量删除事件
+ */
+async function batchHandleDelete() {
+  await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+}
+
+/**
+ * 成功回调
+ */
+function handleSuccess() {
+  (selectedRowKeys.value = []) && reload();
+}
+
+/**
+ * 操作栏
+ */
+function getTableAction(record) {
+  return [
+    {
+      label: '编辑',
+      onClick: handleEdit.bind(null, record),
+      auth: 'directivePackage:directive_package:edit'
+    },
+  ];
+}
+
+/**
+ * 下拉操作栏
+ */
+function getDropDownAction(record) {
+  return [
+    {
+      label: '详情',
+      onClick: handleDetail.bind(null, record),
+    }, {
+      label: '删除',
+      popConfirm: {
+        title: '是否确认删除',
+        confirm: handleDelete.bind(null, record),
+        placement: 'topLeft',
+      },
+      auth: 'directivePackage:directive_package:delete'
+    }
+  ]
+}
+
+/**
+ * 查询
+ */
+function searchQuery() {
+  reload();
+}
+
+/**
+ * 重置
+ */
+function searchReset() {
+  formRef.value.resetFields();
+  selectedRowKeys.value = [];
+  //刷新数据
+  reload();
+}
+
+
+
+
+</script>
+
+<style lang="less" scoped>
+.jeecg-basic-table-form-container {
+  padding: 0;
+
+  .table-page-search-submitButtons {
+    display: block;
+    margin-bottom: 24px;
+    white-space: nowrap;
+  }
+
+  .query-group-cust {
+    min-width: 100px !important;
+  }
+
+  .query-group-split-cust {
+    width: 30px;
+    display: inline-block;
+    text-align: center
+  }
+
+  .ant-form-item:not(.ant-form-item-with-help) {
+    margin-bottom: 16px;
+    height: 32px;
+  }
+
+  :deep(.ant-picker),
+  :deep(.ant-input-number) {
+    width: 100%;
+  }
+}
+</style>

src/views/config/directivePackage/components/DirectivePackageForm.vue

@@ -0,0 +1,166 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <JFormContainer :disabled="disabled">
+      <template #detail>
+        <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="DirectivePackageForm">
+          <a-row>
+						<a-col :span="24">
+							<a-form-item label="服务指令包名称" v-bind="validateInfos.packageName" id="DirectivePackageForm-packageName" name="packageName">
+								<a-input v-model:value="formData.packageName" placeholder="请输入服务指令包名称"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="备注" v-bind="validateInfos.description" id="DirectivePackageForm-description" name="description">
+								<a-textarea v-model:value="formData.description" :rows="4" placeholder="请输入备注" />
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="排序" v-bind="validateInfos.sort" id="DirectivePackageForm-sort" name="sort">
+								<a-input-number v-model:value="formData.sort" placeholder="请输入排序" style="width: 100%" />
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="是否启用 0启用 1未启用" v-bind="validateInfos.izEnabled" id="DirectivePackageForm-izEnabled" name="izEnabled">
+								<j-dict-select-tag type='radio' v-model:value="formData.izEnabled" dictCode="iz_enabled" placeholder="请选择是否启用 0启用 1未启用"  allow-clear />
+							</a-form-item>
+						</a-col>
+          </a-row>
+        </a-form>
+      </template>
+    </JFormContainer>
+  </a-spin>
+</template>
+
+<script lang="ts" setup>
+  import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import { getValueType } from '/@/utils';
+  import { saveOrUpdate } from '../DirectivePackage.api';
+  import { Form } from 'ant-design-vue';
+  import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
+  const props = defineProps({
+    formDisabled: { type: Boolean, default: false },
+    formData: { type: Object, default: () => ({})},
+    formBpm: { type: Boolean, default: true }
+  });
+  const formRef = ref();
+  const useForm = Form.useForm;
+  const emit = defineEmits(['register', 'ok']);
+  const formData = reactive<Record<string, any>>({
+    id: '',
+    packageName: '',   
+    description: '',   
+    sort: 99,
+    izEnabled: '0',   
+  });
+  const { createMessage } = useMessage();
+  const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
+  const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
+  const confirmLoading = ref<boolean>(false);
+  //表单验证
+  const validatorRules = reactive({
+    packageName: [{ required: true, message: '请输入服务指令包名称!'},],
+    sort: [{ required: true, message: '请输入排序!'}, { pattern: /^-?\d+$/, message: '请输入整数!'},],
+  });
+  const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
+
+  // 表单禁用
+  const disabled = computed(()=>{
+    if(props.formBpm === true){
+      if(props.formData.disabled === false){
+        return false;
+      }else{
+        return true;
+      }
+    }
+    return props.formDisabled;
+  });
+
+  
+  /**
+   * 新增
+   */
+  function add() {
+    edit({});
+  }
+
+  /**
+   * 编辑
+   */
+  function edit(record) {
+    nextTick(() => {
+      resetFields();
+      const tmpData = {};
+      Object.keys(formData).forEach((key) => {
+        if(record.hasOwnProperty(key)){
+          tmpData[key] = record[key]
+        }
+      })
+      //赋值
+      Object.assign(formData, tmpData);
+    });
+  }
+
+  /**
+   * 提交数据
+   */
+  async function submitForm() {
+    try {
+      // 触发表单验证
+      await validate();
+    } catch ({ errorFields }) {
+      if (errorFields) {
+        const firstField = errorFields[0];
+        if (firstField) {
+          formRef.value.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
+        }
+      }
+      return Promise.reject(errorFields);
+    }
+    confirmLoading.value = true;
+    const isUpdate = ref<boolean>(false);
+    //时间格式化
+    let model = formData;
+    if (model.id) {
+      isUpdate.value = true;
+    }
+    //循环数据
+    for (let data in model) {
+      //如果该数据是数组并且是字符串类型
+      if (model[data] instanceof Array) {
+        let valueType = getValueType(formRef.value.getProps, data);
+        //如果是字符串类型的需要变成以逗号分割的字符串
+        if (valueType === 'string') {
+          model[data] = model[data].join(',');
+        }
+      }
+    }
+    await saveOrUpdate(model, isUpdate.value)
+      .then((res) => {
+        if (res.success) {
+          createMessage.success(res.message);
+          emit('ok');
+        } else {
+          createMessage.warning(res.message);
+        }
+      })
+      .finally(() => {
+        confirmLoading.value = false;
+      });
+  }
+
+
+  defineExpose({
+    add,
+    edit,
+    submitForm,
+  });
+</script>
+
+<style lang="less" scoped>
+  .antd-modal-form {
+    padding: 14px;
+  }
+</style>

src/views/config/directivePackage/components/DirectivePackageModal.vue

@@ -0,0 +1,77 @@
+<template>
+  <j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
+    <DirectivePackageForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></DirectivePackageForm>
+  </j-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, nextTick, defineExpose } from 'vue';
+  import DirectivePackageForm from './DirectivePackageForm.vue'
+  import JModal from '/@/components/Modal/src/JModal/JModal.vue';
+  
+  const title = ref<string>('');
+  const width = ref<number>(800);
+  const visible = ref<boolean>(false);
+  const disableSubmit = ref<boolean>(false);
+  const registerForm = ref();
+  const emit = defineEmits(['register', 'success']);
+
+  /**
+   * 新增
+   */
+  function add() {
+    title.value = '新增';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.add();
+    });
+  }
+  
+  /**
+   * 编辑
+   * @param record
+   */
+  function edit(record) {
+    title.value = disableSubmit.value ? '详情' : '编辑';
+    visible.value = true;
+    nextTick(() => {
+      registerForm.value.edit(record);
+    });
+  }
+  
+  /**
+   * 确定按钮点击事件
+   */
+  function handleOk() {
+    registerForm.value.submitForm();
+  }
+
+  /**
+   * form保存回调事件
+   */
+  function submitCallback() {
+    handleCancel();
+    emit('success');
+  }
+
+  /**
+   * 取消按钮回调事件
+   */
+  function handleCancel() {
+    visible.value = false;
+  }
+
+  defineExpose({
+    add,
+    edit,
+    disableSubmit,
+  });
+</script>
+
+<style lang="less">
+  /**隐藏样式-modal确定按钮 */
+  .jee-hidden {
+    display: none !important;
+  }
+</style>
+<style lang="less" scoped></style>

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: '收费价格',
+    title: '收费价格',
-  //   align: 'center',
+    align: 'center',
-  //   dataIndex: 'tollPrice',
+    dataIndex: 'tollPrice',
-  //   width: 100,
+    width: 100,
-  // },
+  },
-  // {
+  {
-  //   title: '提成价格',
+    title: '提成价格',
-  //   align: "center",
+    align: "center",
-  //   dataIndex: 'comPrice'
+    dataIndex: 'comPrice'
-  // },
+  },
-  // {
+  {
-  //   title: '医保报销',
+    title: '医保报销',
-  //   align: 'center',
+    align: 'center',
-  //   dataIndex: 'izReimbursement_dictText',
+    dataIndex: 'izReimbursement_dictText',
-  //   width: 100,
+    width: 100,
-  // },
+  },
-  // {
+  {
-  //   title: '机构优惠',
+    title: '机构优惠',
-  //   align: 'center',
+    align: 'center',
-  //   dataIndex: 'izPreferential_dictText',
+    dataIndex: 'izPreferential_dictText',
-  //   width: 100,
+    width: 100,
-  // },
+  },
-  // {
+  {
-  //   title: '收费频次',
+    title: '收费频次',
-  //   align: 'center',
+    align: 'center',
-  //   dataIndex: 'chargingFrequency_dictText',
+    dataIndex: 'chargingFrequency_dictText',
-  // },
+  },
   {
     title: '周期类型',
     align: 'center',

src/views/config/serviceDirective/ConfigServiceDirectiveList.vue

@@ -9,7 +9,7 @@
             <a-form-item name="categoryId">
               <template #label><span title="服务类别">服务类别</span></template>
               <j-dict-select-tag type="list" v-model:value="queryParam.categoryId"
-                :dictCode="`config_service_category,category_name,id,del_flag = 0 order by sort asc`"
+                :dictCode="`nu_config_service_category,category_name,id,del_flag = 0 order by sort asc`"
                 :ignoreDisabled="true" placeholder="请选择服务类别" allow-clear />
             </a-form-item>
           </a-col>
@@ -17,25 +17,25 @@
             <a-form-item name="typeId">
               <template #label><span title="服务类型">服务类型</span></template>
               <j-dict-select-tag type="list" v-model:value="queryParam.typeId"
-                :dictCode="`config_service_type,type_name,id,del_flag = 0 order by sort asc`" placeholder="请选择服务类型"
+                :dictCode="`nu_config_service_type,type_name,id,del_flag = 0 order by sort asc`" placeholder="请选择服务类型"
                 :ignoreDisabled="true" allowClear />
             </a-form-item>
           </a-col>
-          <!-- <template v-if="toggleSearchStatus"> -->
+          <template v-if="toggleSearchStatus">
-          <a-col :lg="6">
+            <a-col :lg="6">
-            <a-form-item name="directiveName">
+              <a-form-item name="directiveName">
-              <template #label><span title="服务指令">服务指令</span></template>
+                <template #label><span title="服务指令">服务指令</span></template>
-              <JInput v-model:value="queryParam.directiveName" placeholder="请输入服务指令名称" allowClear />
+                <JInput v-model:value="queryParam.directiveName" placeholder="请输入服务指令名称" allowClear />
-            </a-form-item>
+              </a-form-item>
-          </a-col>
+            </a-col>
-          <a-col :lg="6">
+            <a-col :lg="6">
-            <a-form-item name="instructionTagId">
+              <a-form-item name="instructionTagId">
-              <template #label><span title="分类标签">分类标签</span></template>
+                <template #label><span title="分类标签">分类标签</span></template>
-              <j-dict-select-tag v-model:value="queryParam.instructionTagId" dictCode="instruction_tag"
+                <j-dict-select-tag v-model:value="queryParam.instructionTagId" dictCode="instruction_tag"
-                :ignoreDisabled="true" placeholder="请选分类标签" allowClear />
+                  :ignoreDisabled="true" placeholder="请选分类标签" allowClear />
-            </a-form-item>
+              </a-form-item>
-          </a-col>
+            </a-col>
-          <!-- <a-col :lg="6">
+            <a-col :lg="6">
               <a-form-item name="tollPrice">
                 <template #label><span title="收费价格">收费价格</span></template>
                 <JRangeNumber v-model:value="queryParam.tollPrice" class="query-group-cust"></JRangeNumber>
@@ -46,53 +46,53 @@
                 <template #label><span title="提成价格">提成价格</span></template>
                 <JRangeNumber v-model:value="queryParam.comPrice" class="query-group-cust"></JRangeNumber>
               </a-form-item>
-            </a-col> -->
+            </a-col>
-          <!-- <a-col :lg="6">
+            <a-col :lg="6">
-            <a-form-item name="izReimbursement">
+              <a-form-item name="izReimbursement">
-              <template #label><span title="医保报销">医保报销</span></template>
+                <template #label><span title="医保报销">医保报销</span></template>
-              <j-dict-select-tag type='list' v-model:value="queryParam.izReimbursement" dictCode="med_ins_reimb"
+                <j-dict-select-tag type='list' v-model:value="queryParam.izReimbursement" dictCode="med_ins_reimb"
-                :ignoreDisabled="true" placeholder="请选择医保报销" allowClear />
+                  :ignoreDisabled="true" placeholder="请选择医保报销" allowClear />
-            </a-form-item>
+              </a-form-item>
-          </a-col>
+            </a-col>
-          <a-col :lg="6">
+            <a-col :lg="6">
-            <a-form-item name="izPreferential">
+              <a-form-item name="izPreferential">
-              <template #label><span title="机构优惠">机构优惠</span></template>
+                <template #label><span title="机构优惠">机构优惠</span></template>
-              <j-dict-select-tag type='list' v-model:value="queryParam.izPreferential" dictCode="institutional_discount"
+                <j-dict-select-tag type='list' v-model:value="queryParam.izPreferential"
-                :ignoreDisabled="true" placeholder="请选择机构优惠" allowClear />
+                  dictCode="institutional_discount" :ignoreDisabled="true" placeholder="请选择机构优惠" allowClear />
-            </a-form-item>
+              </a-form-item>
-          </a-col> -->
+            </a-col>
-          <!-- <a-col :lg="6">
+            <a-col :lg="6">
-            <a-form-item name="chargingFrequency">
+              <a-form-item name="chargingFrequency">
-              <template #label><span title="收费频次">收费频次</span></template>
+                <template #label><span title="收费频次">收费频次</span></template>
-              <j-dict-select-tag type="list" v-model:value="queryParam.chargingFrequency" dictCode="billing_frequency"
+                <j-dict-select-tag type="list" v-model:value="queryParam.chargingFrequency" dictCode="billing_frequency"
-                :ignoreDisabled="true" placeholder="请选择收费频次" allowClear />
+                  :ignoreDisabled="true" placeholder="请选择收费频次" allowClear />
-            </a-form-item>
+              </a-form-item>
-          </a-col> -->
+            </a-col>
-          <!-- <a-col :lg="6">
+            <a-col :lg="6">
-            <a-form-item name="cycleType">
+              <a-form-item name="cycleType">
-              <template #label><span title="周期类型">周期类型</span></template>
+                <template #label><span title="周期类型">周期类型</span></template>
-              <j-dict-select-tag type="list" v-model:value="queryParam.cycleType" dictCode="period_type"
+                <j-dict-select-tag type="list" v-model:value="queryParam.cycleType" dictCode="period_type"
-                :ignoreDisabled="true" placeholder="请选择周期类型" allowClear />
+                  :ignoreDisabled="true" placeholder="请选择周期类型" allowClear />
-            </a-form-item>
+              </a-form-item>
-          </a-col> -->
+            </a-col>
-          <a-col :lg="6">
+            <a-col :lg="6">
-            <a-form-item name="izEnabled">
+              <a-form-item name="izEnabled">
-              <template #label><span title="是否启用">是否启用</span></template>
+                <template #label><span title="是否启用">是否启用</span></template>
-              <j-dict-select-tag type='list' v-model:value="queryParam.izEnabled" dictCode="iz_enabled"
+                <j-dict-select-tag type='list' v-model:value="queryParam.izEnabled" dictCode="iz_enabled"
-                :ignoreDisabled="true" placeholder="请选择是否启用" allowClear />
+                  :ignoreDisabled="true" placeholder="请选择是否启用" allowClear />
-            </a-form-item>
+              </a-form-item>
-          </a-col>
+            </a-col>
-          <!-- </template> -->
+          </template>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
               <a-col :lg="6">
                 <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
                 <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset"
                   style="margin-left: 8px">重置</a-button>
-                <!-- <a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
+                <a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
                   {{ toggleSearchStatus ? '收起' : '展开' }}
                   <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
-                </a> -->
+                </a>
               </a-col>
             </span>
           </a-col>

src/views/config/serviceDirective/components/ConfigServiceDirectiveForm.vue

@@ -9,7 +9,7 @@
               <a-form-item label="服务类别" v-bind="validateInfos.categoryId" id="ConfigServiceDirectiveForm-categoryId"
                 name="categoryId">
                 <j-dict-select-tag type="list" v-model:value="formData.categoryId"
-                  :dictCode="`config_service_category,category_name,id,del_flag = 0 order by sort asc`"
+                  :dictCode="`nu_config_service_category,category_name,id,del_flag = 0 order by sort asc`"
                   placeholder="请选择服务类别" allow-clear />
               </a-form-item>
             </a-col>
@@ -47,7 +47,7 @@
                   precision="4" />
               </a-form-item>
             </a-col>
-            <!-- <a-col :span="12">
+            <a-col :span="12">
               <a-form-item label="医保报销" v-bind="validateInfos.izReimbursement"
                 id="ConfigServiceDirectiveForm-izReimbursement" name="izReimbursement">
                 <j-dict-select-tag type='radio' v-model:value="formData.izReimbursement" dictCode="med_ins_reimb"
@@ -60,14 +60,14 @@
                 <j-dict-select-tag type='radio' v-model:value="formData.izPreferential"
                   dictCode="institutional_discount" allowClear />
               </a-form-item>
-            </a-col> -->
+            </a-col>
-            <!-- <a-col :span="12">
+            <a-col :span="12">
               <a-form-item label="收费频次" v-bind="validateInfos.chargingFrequency"
                 id="ConfigServiceDirectiveForm-chargingFrequency" name="chargingFrequency">
                 <j-dict-select-tag type="list" v-model:value="formData.chargingFrequency" dictCode="billing_frequency"
                   placeholder="请选择收费频次" allowClear />
               </a-form-item>
-            </a-col> -->
+            </a-col>
             <a-col :span="12">
               <a-form-item label="周期类型" v-bind="validateInfos.cycleType" id="ConfigServiceDirectiveForm-cycleType"
                 name="cycleType">
@@ -99,7 +99,7 @@
               <a-form-item label="指令标签" id="ConfigServiceDirectiveForm-typeId" :labelCol="labelCol2"
                 :wrapperCol="wrapperCol2" name="typeId">
                 <JCheckbox v-model:value="formData.tags"
-                  :dictCode="`config_directive_tag,tag_name,id,del_flag = 0 order by sort asc`" />
+                  :dictCode="`nu_config_directive_tag,tag_name,id,del_flag = 0 order by sort asc`" />
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -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`;
     }
   }
 );

src/views/config/serviceType/ConfigServiceTypeList.vue

@@ -9,7 +9,7 @@
             <a-form-item name="categoryId">
               <template #label><span title="服务类别">服务类别</span></template>
               <j-dict-select-tag type='list' v-model:value="queryParam.categoryId"
-                :dictCode="`config_service_category,category_name,id,del_flag = 0 order by sort asc`"
+                :dictCode="`nu_config_service_category,category_name,id,del_flag = 0 order by sort asc`"
                 :ignoreDisabled="true" placeholder="请选择服务类别" allowClear />
             </a-form-item>
           </a-col>

src/views/config/serviceType/components/ConfigServiceTypeForm.vue

@@ -9,7 +9,7 @@
               <a-form-item label="服务类别" v-bind="validateInfos.categoryId" id="ConfigServiceTypeForm-categoryId"
                 name="categoryId">
                 <j-dict-select-tag type='list' v-model:value="formData.categoryId"
-                  :dictCode="`config_service_category,category_name,id,del_flag = 0 order by sort asc`"
+                  :dictCode="`nu_config_service_category,category_name,id,del_flag = 0 order by sort asc`"
                   placeholder="请选择服务类别" allowClear />
               </a-form-item>
             </a-col>