Merge branch 'master' of http://47.115.223.229:8888/yangjun/hldy_vue

src/views/serviceDirective/serviceDirective/ConfigServiceDirectiveList.vue

@@ -75,6 +75,14 @@
                 :ignoreDisabled="true" placeholder="请选择周期类型" allowClear />
             </a-form-item>
           </a-col> -->
+          <a-col :lg="6">
+            <a-form-item name="tags">
+              <template #label><span title="指令标签">指令标签</span></template>
+              <JSelectMultiple type="list" v-model:value="queryParam.tags"
+                :dictCode="`nu_config_directive_tag,tag_name,id,del_flag = '0' order by sort asc`"
+                :ignoreDisabled="true" placeholder="请选择指令标签" allowClear />
+            </a-form-item>
+          </a-col>
           <a-col :lg="6">
             <a-form-item name="izEnabled">
               <template #label><span title="是否启用">是否启用</span></template>
@@ -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<any>({});
@@ -225,8 +234,8 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
       fixed: 'right',
     },
     beforeFetch: async (params) => {
-      params.column = 'categoryId,typeId,instructionTagId'
-      params.order = 'asc,asc,asc'
+      params.column = 'createTime'
+      params.order = 'desc'
       let rangerQuery = await setRangeQuery();
       return Object.assign(params, rangerQuery);
     },