修改服务指令bug

src/views/services/directiveTag/bodytag/components/BodyTagForm.vue

@@ -2,11 +2,13 @@
   <a-spin :spinning="confirmLoading">
     <JFormContainer :disabled="disabled">
       <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-col :span="24">
               <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"
+                  :showCount="true"></a-input>
               </a-form-item>
             </a-col>
             <a-col :span="24">
@@ -15,8 +17,10 @@
               </a-form-item>
             </a-col>
             <a-col :span="24">
-							<a-form-item label="是否启用" v-bind="validateInfos.izEnabled" id="DirectiveTagForm-izEnabled" name="izEnabled">
+              <a-form-item label="是否启用" v-bind="validateInfos.izEnabled" id="DirectiveTagForm-izEnabled"
-								<j-dict-select-tag type='radio' v-model:value="formData.izEnabled" dictCode="iz_enabled" placeholder="请选择是否启用"  allow-clear />
+                name="izEnabled">
+                <j-dict-select-tag type='radio' v-model:value="formData.izEnabled" dictCode="iz_enabled"
+                  placeholder="请选择是否启用" allow-clear />
               </a-form-item>
             </a-col>
           </a-row>

src/views/services/directiveTag/emotiontag/components/EmotionTagForm.vue

@@ -2,11 +2,13 @@
   <a-spin :spinning="confirmLoading">
     <JFormContainer :disabled="disabled">
       <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-col :span="24">
               <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"
+                  :showCount="true"></a-input>
               </a-form-item>
             </a-col>
             <a-col :span="24">
@@ -15,8 +17,10 @@
               </a-form-item>
             </a-col>
             <a-col :span="24">
-							<a-form-item label="是否启用" v-bind="validateInfos.izEnabled" id="DirectiveTagForm-izEnabled" name="izEnabled">
+              <a-form-item label="是否启用" v-bind="validateInfos.izEnabled" id="DirectiveTagForm-izEnabled"
-								<j-dict-select-tag type='radio' v-model:value="formData.izEnabled" dictCode="iz_enabled" placeholder="请选择是否启用"  allow-clear />
+                name="izEnabled">
+                <j-dict-select-tag type='radio' v-model:value="formData.izEnabled" dictCode="iz_enabled"
+                  placeholder="请选择是否启用" allow-clear />
               </a-form-item>
             </a-col>
           </a-row>

src/views/services/serviceCategory/components/ConfigServiceCategoryModal.vue

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

src/views/services/serviceDirective/ConfigServiceDirective.api.ts

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

src/views/services/serviceDirective/ConfigServiceDirectiveList.vue

@@ -53,13 +53,13 @@
                 placeholder="请选择情绪标签" allowClear />
             </a-form-item>
           </a-col>
-          <a-col :lg="6">
+          <!-- <a-col :lg="6">
             <a-form-item name="izEnabled">
               <template #label><span title="是否启用">是否启用</span></template>
               <j-dict-select-tag type='list' v-model:value="queryParam.izEnabled" dictCode="iz_enabled"
                 :ignoreDisabled="true" placeholder="请选择是否启用" allowClear />
             </a-form-item>
-          </a-col>
+          </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">
@@ -73,7 +73,15 @@
       </a-form>
     </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-button v-else-if="!treeLoading && treeData.length < 1" type="link" class="btnPrivate" @click="addInstruction"
           preIcon="ant-design:plus-outlined">新增分类标签</a-button>
@@ -278,6 +286,7 @@ import ConfigServiceCategoryModal from '/@/views/services/serviceCategory/compon
 import ConfigServiceTypeModal from '/@/views/services/serviceType/components//ConfigServiceTypeModal.vue'
 import { queryByKey } from '/@/views/admin/sysconfig/SysConfig.api'
 import { getOrgInfo } from '@/api/common/api'
+import { CompassOutlined } from '@ant-design/icons-vue';
 
 const insRegisterModal = ref();
 const catRegisterModal = ref();
@@ -288,6 +297,7 @@ const queryParam = reactive<any>({
   instructionTagId: '',
   categoryId: '',
   typeId: '',
+  izEnabled: '0',
 });
 watch(
   () => queryParam.instructionTagId,
@@ -366,6 +376,7 @@ const typeOpen = ref(false)//服务类型抽屉
 const bodyTagOpen = ref(false)//体型标签抽屉
 const emotionTagOpen = ref(false)//情绪标签抽屉
 const mainOrgCode = ref()//指令库编码
+const filterIzEnabled = ref('enabled')//筛选全部/已启用
 
 /**
  * 高级查询事件
@@ -485,11 +496,16 @@ function expandTreeNodeToLevel4(directiveData: any) {
  * 查询
  */
 function searchQuery(reloadTree = true) {
-  if (!!queryParam.directiveName || !!queryParam.bodyTags || !!queryParam.emotionTags || !!queryParam.izEnabled) {
+  if (!!queryParam.directiveName || !!queryParam.bodyTags || !!queryParam.emotionTags) {
     queryParam.instructionTagId = '';
     queryParam.categoryId = '';
     queryParam.typeId = '';
   }
+  if (filterIzEnabled.value == 'enabled') {
+    queryParam.izEnabled = '0'
+  } else {
+    queryParam.izEnabled = ''
+  }
   reload().then(() => {
     if (reloadTree) {
       initTree();
@@ -512,7 +528,7 @@ function searchReset() {
   queryParam.directiveName = ''; // 如果你有其他需要清除的字段，也可以加到这里
   queryParam.bodyTags = '';
   queryParam.emotionTags = '';
-  queryParam.izEnabled = '';
+  // queryParam.izEnabled = '';
 
   // 刷新数据
   reload().then(() => {
@@ -932,7 +948,7 @@ function handleTreeSelect(selectedKeys: string[], { node }: any) {
   queryParam.directiveName = '';
   queryParam.bodyTags = '';
   queryParam.emotionTags = '';
-  queryParam.izEnabled = '';
+  // queryParam.izEnabled = '';
 
   // 根据节点级别设置查询条件
   switch (level) {
@@ -966,7 +982,7 @@ function handleTreeSelect(selectedKeys: string[], { node }: any) {
 
 function initTree() {
   treeLoading.value = true
-  tree().then(res => {
+  tree({ filterIzEnabled: filterIzEnabled.value }).then(res => {
     treeData.value = res;
     expandedKeys.value = []
     //默认展开每级第一个
@@ -1072,6 +1088,7 @@ audio::-webkit-media-controls-time-remaining-display {
     overflow-y: auto;
   }
 }
+
 .backClass {
 
   background: url(../../resource/img/modalback.png);

src/views/services/serviceDirective/components/DirectiveRespositoryList.vue

@@ -267,6 +267,21 @@ async function setRangeQuery() {
 const excludeIds = ref('')
 
 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 res = await idListByDS({ dataSourceCode: 'master' });
 

src/views/services/serviceType/components/ConfigServiceTypeModal.vue

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