yangjun
/
nursing_unit_vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改服务指令bug

This commit is contained in:
1378012178@qq.com 2025-08-05 10:53:13 +08:00
parent ef01bcb535
commit 10e33b08bf
9 changed files with 332 additions and 292 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
.env.development002 → .env.development102
View File

0
.env.development003 → .env.development103
View File

278
src/views/services/directiveTag/bodytag/components/BodyTagForm.vue
View File

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

278
src/views/services/directiveTag/emotiontag/components/EmotionTagForm.vue
View File

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

2
src/views/services/serviceCategory/components/ConfigServiceCategoryModal.vue
View File

@ -38,7 +38,7 @@ function add() {
* @param record * @param record
*/ */
function edit(record) { function edit(record) {
title.value = disableSubmit.value ? '详情' : '编辑'; title.value = '新增';
visible.value = true; visible.value = true;
nextTick(() => { nextTick(() => {
registerForm.value.edit(record); registerForm.value.edit(record);

2
src/views/services/serviceDirective/ConfigServiceDirective.api.ts
View File

@ -107,7 +107,7 @@ export const asyncFunc = (params) => {
* @param params * @param params
* @returns * @returns
*/ */
export const tree = () => defHttp.get({ url: Api.tree }); export const tree = (params) => defHttp.post({ url: Api.tree, params });
/** /**
* 审批通过后将指令资源同步给业务平台 * 审批通过后将指令资源同步给业务平台

37
src/views/services/serviceDirective/ConfigServiceDirectiveList.vue
View File

@ -53,13 +53,13 @@
placeholder="请选择情绪标签" allowClear /> 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> -->
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons"> <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
<a-col :lg="6"> <a-col :lg="6">
@ -73,7 +73,15 @@
</a-form> </a-form>
</div> </div>
<div> <div>
<div style="width:350px;float: left;max-height:77vh; overflow:auto;"> <div style="width:350px;float: left;max-height:77vh; overflow:auto;position: relative;">
<div
style="position: absolute; top: 4px; right: 8px; z-index: 1; background: white; padding: 0px; border-radius: 4px;">
<a-radio-group v-model:value="filterIzEnabled" size="small" @change="searchQuery">
<a-radio-button value="all">全部</a-radio-button>
<a-radio-button value="enabled">启用</a-radio-button>
</a-radio-group>
</div>
<a-empty v-if="treeLoading" /> <a-empty v-if="treeLoading" />
<a-button v-else-if="!treeLoading && treeData.length < 1" type="link" class="btnPrivate" @click="addInstruction" <a-button v-else-if="!treeLoading && treeData.length < 1" type="link" class="btnPrivate" @click="addInstruction"
preIcon="ant-design:plus-outlined">新增分类标签</a-button> preIcon="ant-design:plus-outlined">新增分类标签</a-button>
@ -243,7 +251,7 @@
<!-- 视频播放 --> <!-- 视频播放 -->
<a-modal v-model:visible="showVideoModal" title="视频播放" :footer="null" @cancel="closeVideoModal" <a-modal v-model:visible="showVideoModal" title="视频播放" :footer="null" @cancel="closeVideoModal"
:bodyStyle="{ padding: '0', maxHeight: '80vh', overflow: 'auto' }"> :bodyStyle="{ padding: '0', maxHeight: '80vh', overflow: 'auto' }">
<video ref="videoPlayer" controls style="width: 100%; max-height: 70vh; display: block; margin: 0 auto;"> <video ref="videoPlayer" controls style="width: 100%; max-height: 70vh; display: block; margin: 0 auto;">
<source :src="videoUrl"> <source :src="videoUrl">
您的浏览器不支持视频播放。 您的浏览器不支持视频播放。
</video> </video>
@ -278,6 +286,7 @@ import ConfigServiceCategoryModal from '/@/views/services/serviceCategory/compon
import ConfigServiceTypeModal from '/@/views/services/serviceType/components//ConfigServiceTypeModal.vue' import ConfigServiceTypeModal from '/@/views/services/serviceType/components//ConfigServiceTypeModal.vue'
import { queryByKey } from '/@/views/admin/sysconfig/SysConfig.api' import { queryByKey } from '/@/views/admin/sysconfig/SysConfig.api'
import { getOrgInfo } from '@/api/common/api' import { getOrgInfo } from '@/api/common/api'
import { CompassOutlined } from '@ant-design/icons-vue';
const insRegisterModal = ref(); const insRegisterModal = ref();
const catRegisterModal = ref(); const catRegisterModal = ref();
@ -288,6 +297,7 @@ const queryParam = reactive<any>({
instructionTagId: '', instructionTagId: '',
categoryId: '', categoryId: '',
typeId: '', typeId: '',
izEnabled: '0',
}); });
watch( watch(
() => queryParam.instructionTagId, () => queryParam.instructionTagId,
@ -366,6 +376,7 @@ const typeOpen = ref(false)//服务类型抽屉
const bodyTagOpen = ref(false)//体型标签抽屉 const bodyTagOpen = ref(false)//体型标签抽屉
const emotionTagOpen = ref(false)//情绪标签抽屉 const emotionTagOpen = ref(false)//情绪标签抽屉
const mainOrgCode = ref()//指令库编码 const mainOrgCode = ref()//指令库编码
const filterIzEnabled = ref('enabled')//筛选全部/已启用
/** /**
* 高级查询事件 * 高级查询事件
@ -485,11 +496,16 @@ function expandTreeNodeToLevel4(directiveData: any) {
* 查询 * 查询
*/ */
function searchQuery(reloadTree = true) { function searchQuery(reloadTree = true) {
if (!!queryParam.directiveName || !!queryParam.bodyTags || !!queryParam.emotionTags || !!queryParam.izEnabled) { if (!!queryParam.directiveName || !!queryParam.bodyTags || !!queryParam.emotionTags) {
queryParam.instructionTagId = ''; queryParam.instructionTagId = '';
queryParam.categoryId = ''; queryParam.categoryId = '';
queryParam.typeId = ''; queryParam.typeId = '';
} }
if (filterIzEnabled.value == 'enabled') {
queryParam.izEnabled = '0'
} else {
queryParam.izEnabled = ''
}
reload().then(() => { reload().then(() => {
if (reloadTree) { if (reloadTree) {
initTree(); initTree();
@ -512,7 +528,7 @@ function searchReset() {
queryParam.directiveName = ''; // 如果你有其他需要清除的字段，也可以加到这里 queryParam.directiveName = ''; // 如果你有其他需要清除的字段，也可以加到这里
queryParam.bodyTags = ''; queryParam.bodyTags = '';
queryParam.emotionTags = ''; queryParam.emotionTags = '';
queryParam.izEnabled = ''; // queryParam.izEnabled = '';
// 刷新数据 // 刷新数据
reload().then(() => { reload().then(() => {
@ -932,7 +948,7 @@ function handleTreeSelect(selectedKeys: string[], { node }: any) {
queryParam.directiveName = ''; queryParam.directiveName = '';
queryParam.bodyTags = ''; queryParam.bodyTags = '';
queryParam.emotionTags = ''; queryParam.emotionTags = '';
queryParam.izEnabled = ''; // queryParam.izEnabled = '';
// 根据节点级别设置查询条件 // 根据节点级别设置查询条件
switch (level) { switch (level) {
@ -966,7 +982,7 @@ function handleTreeSelect(selectedKeys: string[], { node }: any) {
function initTree() { function initTree() {
treeLoading.value = true treeLoading.value = true
tree().then(res => { tree({ filterIzEnabled: filterIzEnabled.value }).then(res => {
treeData.value = res; treeData.value = res;
expandedKeys.value = [] expandedKeys.value = []
//默认展开每级第一个 //默认展开每级第一个
@ -1072,8 +1088,9 @@ audio::-webkit-media-controls-time-remaining-display {
overflow-y: auto; overflow-y: auto;
} }
} }
.backClass{
background: url(../../resource/img/modalback.png); .backClass {
background: url(../../resource/img/modalback.png);
} }
</style> </style>

15
src/views/services/serviceDirective/components/DirectiveRespositoryList.vue
View File

@ -267,6 +267,21 @@ async function setRangeQuery() {
const excludeIds = ref('') const excludeIds = ref('')
async function init() { async function init() {
//重置
{
formRef.value.resetFields(); // 重置表单字段
// 清空 queryParam 中相关字段
queryParam.instructionTagId = '';
queryParam.categoryId = '';
queryParam.typeId = '';
queryParam.directiveName = ''; // 如果你有其他需要清除的字段，也可以加到这里
queryParam.bodyTags = '';
queryParam.emotionTags = '';
queryParam.izEnabled = '';
selectedRowKeys.value = [];
}
let { ids } = getSelectedIds(); let { ids } = getSelectedIds();
let res = await idListByDS({ dataSourceCode: 'master' }); let res = await idListByDS({ dataSourceCode: 'master' });

2
src/views/services/serviceType/components/ConfigServiceTypeModal.vue
View File

@ -37,7 +37,7 @@ function add() {
* @param record * @param record
*/ */
function edit(record) { function edit(record) {
title.value = disableSubmit.value ? '详情' : '编辑'; title.value = '新增';
visible.value = true; visible.value = true;
nextTick(() => { nextTick(() => {
registerForm.value.edit(record); registerForm.value.edit(record);