添加匹配方式

src/views/pri/priCondition/components/add/index.vue

@@ -52,9 +52,12 @@ const ruleFormRef = ref()
 const listIdOptionList = ref([]);
 // 匹配条件选项数据
 const fieldQueryKindOptionList = [
-  { id: '1', label: '模糊匹配' },
-  { id: '2', label: '精确匹配' },
-  { id: '3', label: '范围匹配' },
+  { id: "1", label: '模糊匹配' },
+  { id: "2", label: '精确匹配' },
+  { id: "4", label: '取反匹配' },
+  { id: '5', label: '数组匹配' },
+  { id: '6', label: '数组排除' },
+  { id: "3", label: '范围匹配' },
 ]
 // 匹配方式选项数据
 const fieldQueryModelOptionList = [

src/views/pri/priCondition/components/updatePriCondition/index.vue

@@ -46,9 +46,12 @@ const UpdateForm: any = ref({
 const listIdOptionList = ref([]);
 // 匹配条件选项数据
 const fieldQueryKindOptionList = [
-  { id: '1', label: '模糊匹配' },
-  { id: '2', label: '精确匹配' },
-  { id: '3', label: '范围匹配' },
+  { id: "1", label: '模糊匹配' },
+  { id: "2", label: '精确匹配' },
+  { id: "4", label: '取反匹配' },
+  { id: '5', label: '数组匹配' },
+  { id: '6', label: '数组排除' },
+  { id: "3", label: '范围匹配' },
 ]
 // 匹配方式选项数据
 const fieldQueryModelOptionList = [

src/views/pri/priPrizeInQueryField/components/add/index.vue

@@ -48,9 +48,12 @@ const ruleFormRef = ref()
 // 传参选项数据
 // 匹配条件选项数据
 const fieldQueryKindOptionList = [
-  { id: 1, label: '模糊匹配' },
-  { id: 2, label: '精确匹配' },
-  { id: 3, label: '范围匹配' },
+  { id: "1", label: '模糊匹配' },
+  { id: "2", label: '精确匹配' },
+  { id: "4", label: '取反匹配' },
+  { id: '5', label: '数组匹配' },
+  { id: '6', label: '数组排除' },
+  { id: "3", label: '范围匹配' },
 ]
 // 匹配方式选项数据
 const fieldQueryModelOptionList = [
@@ -91,13 +94,13 @@ const submit = async (formEl) => {
           type: "success"
         });
         UpdateForm.value = {
-      fieldName: "", //字段名称
-      fieldEnName: "", //字段名
-      fieldQueryKind: "", //匹配条件
-      fieldQueryModel: "", //匹配方式
-      fieldQueryValue: "", //匹配值
-      fieldQueryValueType: "", //匹配值类型
-      inTableId: props.inTableId, //入库表
+          fieldName: "", //字段名称
+          fieldEnName: "", //字段名
+          fieldQueryKind: "", //匹配条件
+          fieldQueryModel: "", //匹配方式
+          fieldQueryValue: "", //匹配值
+          fieldQueryValueType: "", //匹配值类型
+          inTableId: props.inTableId, //入库表
 
         };
         // 关闭新增弹窗;

src/views/pri/priPrizeInQueryField/components/updatePriPrizeInQueryField/index.vue

@@ -42,9 +42,12 @@ const UpdateForm: any = ref({
 });
 // 匹配条件选项数据
 const fieldQueryKindOptionList = [
-  { id: 1, label: '模糊匹配' },
-  { id: 2, label: '精确匹配' },
-  { id: 3, label: '范围匹配' },
+  { id: "1", label: '模糊匹配' },
+  { id: "2", label: '精确匹配' },
+  { id: "4", label: '取反匹配' },
+  { id: '5', label: '数组匹配' },
+  { id: '6', label: '数组排除' },
+  { id: "3", label: '范围匹配' },
 ]
 // 匹配方式选项数据
 const fieldQueryModelOptionList = [
@@ -87,14 +90,14 @@ const submit = async (formEl) => {
           type: "success"
         });
         UpdateForm.value = {
-      id: null, //ID
-      fieldName: "", //字段名称
-      fieldEnName: "", //字段名
-      fieldQueryKind: "", //匹配条件
-      fieldQueryModel: "", //匹配方式
-      fieldQueryValue: "", //匹配值
-      fieldQueryValueType: "", //匹配值类型
-      inTableId: null, //入库表
+          id: null, //ID
+          fieldName: "", //字段名称
+          fieldEnName: "", //字段名
+          fieldQueryKind: "", //匹配条件
+          fieldQueryModel: "", //匹配方式
+          fieldQueryValue: "", //匹配值
+          fieldQueryValueType: "", //匹配值类型
+          inTableId: null, //入库表
 
         };
         // 关闭修改弹窗;
@@ -127,7 +130,7 @@ const rules = reactive({
 const closeFn: any = inject('closeEditUpdatePriPrizeInQueryFieldVisible');
 const openVisible = async () => {
   //通过ID获取表格数据
-  const { status, data }: any = await http.Request({ method: UrlList.prizeSet.prigetPriPrizeInQueryFieldQuery.method, url: UrlList.prizeSet.prigetPriPrizeInQueryFieldQuery.url, params: { id: props.formData.id }});
+  const { status, data }: any = await http.Request({ method: UrlList.prizeSet.prigetPriPrizeInQueryFieldQuery.method, url: UrlList.prizeSet.prigetPriPrizeInQueryFieldQuery.url, params: { id: props.formData.id } });
   if (status === 1) {
     UpdateForm.value = data;
 

src/views/pri/priPrizeObjectField/components/add/index.vue

@@ -49,9 +49,12 @@ const ruleFormRef = ref()
 // 传参选项数据
 // 匹配条件选项数据
 const fieldQueryKindOptionList = [
-  { id: '1', label: '模糊匹配' },
-  { id: '2', label: '精确匹配' },
-  { id: '3', label: '范围匹配' },
+  { id: "1", label: '模糊匹配' },
+  { id: "2", label: '精确匹配' },
+  { id: "4", label: '取反匹配' },
+  { id: '5', label: '数组匹配' },
+  { id: '6', label: '数组排除' },
+  { id: "3", label: '范围匹配' },
 ]
 // 匹配方式选项数据
 const fieldQueryModelOptionList = [

src/views/pri/priPrizeObjectField/components/updatePriPrizeObjectField/index.vue

@@ -43,9 +43,12 @@ const UpdateForm: any = ref({
 });
 // 匹配条件选项数据
 const fieldQueryKindOptionList = [
-  { id: '1', label: '模糊匹配' },
-  { id: '2', label: '精确匹配' },
-  { id: '3', label: '范围匹配' },
+  { id: "1", label: '模糊匹配' },
+  { id: "2", label: '精确匹配' },
+  { id: "4", label: '取反匹配' },
+  { id: '5', label: '数组匹配' },
+  { id: '6', label: '数组排除' },
+  { id: "3", label: '范围匹配' },
 ]
 // 匹配方式选项数据
 const fieldQueryModelOptionList = [

src/views/pri/priQueryField/components/add/index.vue

@@ -51,8 +51,10 @@ const ruleFormRef = ref()
 const fieldQueryKindOptionList = [
   { id: "1", label: '模糊匹配' },
   { id: "2", label: '精确匹配' },
-  { id: "3", label: '范围匹配' },
   { id: "4", label: '取反匹配' },
+  { id: '5', label: '数组匹配' },
+  { id: '6', label: '数组排除' },
+  { id: "3", label: '范围匹配' },
 ]
 // 匹配方式选项数据
 const fieldQueryModelOptionList = [

src/views/pri/priQueryField/components/updatePriQueryField/index.vue

@@ -43,8 +43,10 @@ const UpdateForm: any = ref({
 const fieldQueryKindOptionList = [
   { id: "1", label: '模糊匹配' },
   { id: "2", label: '精确匹配' },
-  { id: "3", label: '范围匹配' },
   { id: "4", label: '取反匹配' },
+  { id: '5', label: '数组匹配' },
+  { id: '6', label: '数组排除' },
+  { id: "3", label: '范围匹配' },
 ]
 // 匹配方式选项数据
 const fieldQueryModelOptionList = [

src/views/pri/priQueryTable/components/add/index.vue

@@ -35,7 +35,7 @@ const props = defineProps<{
 let UpdateForm = ref({
   tableEnName: "", //查询表
   projectId: props.projectId, //项目
-
+  summary: "", //说明
 
 });
 // 表单实例
@@ -70,9 +70,9 @@ const submit = async (formEl) => {
           type: "success"
         });
         UpdateForm.value = {
-      tableEnName: "", //查询表
-      projectId: props.projectId, //项目
-
+          tableEnName: "", //查询表
+          projectId: props.projectId, //项目
+          summary: "", //说明
         };
         // 关闭新增弹窗;
         closeVisible()
@@ -95,7 +95,7 @@ const submit = async (formEl) => {
 
 //获取项目数据
 const projectIdQuery = async () => {
-  const { status, data }: any = await http.Request({ method: UrlList.prizeSet.prigetPriProjectDic.method, url: UrlList.prizeSet.prigetPriProjectDic.url, params: { } });
+  const { status, data }: any = await http.Request({ method: UrlList.prizeSet.prigetPriProjectDic.method, url: UrlList.prizeSet.prigetPriProjectDic.url, params: {} });
   if (status === 1) {
     projectIdOptionList.value = data.records;
   }
@@ -120,7 +120,7 @@ const closeVisible = () => {
   UpdateForm.value = {
     tableEnName: "", //查询表
     projectId: props.projectId, //项目
-
+    summary: "", //说明
   };
   closeFn();
 };
@@ -136,6 +136,9 @@ const isFullscreen = ref(false)
       el-form-item(label='查询表' prop="tableEnName")
         el-input(v-model='UpdateForm.tableEnName' autocomplete='off'
           placeholder="请输入查询表")
+      el-form-item(label='说明' prop="summary")
+        el-input(v-model='UpdateForm.summary' autocomplete='off'
+          placeholder="请输入说明")
       el-form-item(label="项目", prop="projectId")
         el-select(
           v-model="UpdateForm.projectId",

src/views/pri/priQueryTable/components/updatePriQueryTable/index.vue

@@ -32,7 +32,7 @@ const props = defineProps<{
 const UpdateForm: any = ref({
   id: null, //ID
   tableEnName: "", //查询表
-
+  summary: "", //说明
 });
 
 // 表单实例
@@ -62,8 +62,9 @@ const submit = async (formEl) => {
           type: "success"
         });
         UpdateForm.value = {
-      id: null, //ID
-      tableEnName: "", //查询表
+          id: null, //ID
+          tableEnName: "", //查询表
+          summary: "", //说明
 
         };
         // 关闭修改弹窗;
@@ -99,7 +100,7 @@ const rules = reactive({
 const closeFn: any = inject('closeEditUpdatePriQueryTableVisible');
 const openVisible = async () => {
   //通过ID获取表格数据
-  const { status, data }: any = await http.Request({ method: UrlList.prizeSet.prigetPriQueryTableQuery.method, url: UrlList.prizeSet.prigetPriQueryTableQuery.url, params: { id: props.formData.id }});
+  const { status, data }: any = await http.Request({ method: UrlList.prizeSet.prigetPriQueryTableQuery.method, url: UrlList.prizeSet.prigetPriQueryTableQuery.url, params: { id: props.formData.id } });
   if (status === 1) {
     UpdateForm.value = data;
 
@@ -110,6 +111,7 @@ const closeUpdatePriQueryTableVisible = () => {
   UpdateForm.value = {
     id: null, //ID
     tableEnName: "", //查询表
+    summary: "", //说明
 
   };
   closeFn();
@@ -129,6 +131,9 @@ const isFullscreen = ref(false)
       el-form-item(label='查询表' prop="tableEnName")
         el-input(v-model='UpdateForm.tableEnName' autocomplete='off'
           placeholder="请输入查询表")
+      el-form-item(label='说明' prop="summary")
+        el-input(v-model='UpdateForm.summary' autocomplete='off'
+          placeholder="请输入说明")
 
     .flex.justify-end
       el-button(

src/views/pri/priQueryTable/hook.tsx

@@ -13,12 +13,12 @@ export function usePriQueryTable() {
 
     UrlList = await getGroupUrl(["prizeSet"]);
     onSearch(ruleFormRef.value);
-  projectIdQuery();
+    projectIdQuery();
 
   });
   let form = reactive({
-  tableEnName:"", //查询表
-  projectId:null, //项目
+    tableEnName: "", //查询表
+    projectId: null, //项目
 
 
   });
@@ -55,13 +55,8 @@ export function usePriQueryTable() {
       minWidth: 200
     },
     {
-      label: "ID",
-      prop: "id",
-      minWidth: 200
-    },
-    {
-      label: "查询表",
-      prop: "tableEnName",
+      label: "说明",
+      prop: "summary",
       minWidth: 200
     },
 
@@ -126,11 +121,11 @@ export function usePriQueryTable() {
       }
     })
   }
-    // 项目选项数据
-    const projectIdOptionList = ref([]);
+  // 项目选项数据
+  const projectIdOptionList = ref([]);
   //获取项目数据
   async function projectIdQuery() {
-    const { status, data }: any = await http.Request({ method: UrlList.prizeSet.prigetPriProjectDic.method, url: UrlList.prizeSet.prigetPriProjectDic.url, params: { } });
+    const { status, data }: any = await http.Request({ method: UrlList.prizeSet.prigetPriProjectDic.method, url: UrlList.prizeSet.prigetPriProjectDic.url, params: {} });
     if (status === 1) {
       projectIdOptionList.value = data.records;
     }
@@ -138,7 +133,7 @@ export function usePriQueryTable() {
 
 
 
-    //跳转到条件返回字段
+  //跳转到条件返回字段
   function linkToPriReturnField(row) {
     router.push({ path: '../../pri/priReturnField/index', query: { queryTableId: row.id } });
   }
@@ -147,7 +142,7 @@ export function usePriQueryTable() {
     router.push({ path: '../../pri/priQueryField/index', query: { queryTableId: row.id } });
   }
 
-    // 删除
+  // 删除
   function handleDelete(row) {
     ElMessageBox.confirm(
       `是否删除该条件匹配表? `,
@@ -167,20 +162,20 @@ export function usePriQueryTable() {
         onSearch(ruleFormRef.value);
       } else {
         ElMessageBox.alert(msg, "提示", {
-        confirmButtonText: "关闭",
-        type: "warning"
-      });
+          confirmButtonText: "关闭",
+          type: "warning"
+        });
       };
     })
   }
 
-    // 新增
+  // 新增
   const addVisible = ref(false);
   function handleAdd() {
     addVisible.value = true;
   };
 
-    // 修改
+  // 修改
   const editUpdatePriQueryTableVisible = ref(false);
   const editUpdatePriQueryTableFormData = ref({});
   function handleUpdatePriQueryTable(row) {

src/views/pri/priRecursionEndField/components/add/index.vue

@@ -48,9 +48,12 @@ const ruleFormRef = ref()
 // 传参选项数据
 // 匹配条件选项数据
 const fieldQueryKindOptionList = [
-  { id: 1, label: '模糊匹配' },
-  { id: 2, label: '精确匹配' },
-  { id: 3, label: '范围匹配' },
+  { id: "1", label: '模糊匹配' },
+  { id: "2", label: '精确匹配' },
+  { id: "4", label: '取反匹配' },
+  { id: '5', label: '数组匹配' },
+  { id: '6', label: '数组排除' },
+  { id: "3", label: '范围匹配' },
 ]
 // 匹配方式选项数据
 const fieldQueryModelOptionList = [

src/views/pri/priRecursionEndField/components/updatePriRecursionEndField/index.vue

@@ -42,9 +42,12 @@ const UpdateForm: any = ref({
 });
 // 匹配条件选项数据
 const fieldQueryKindOptionList = [
-  { id: 1, label: '模糊匹配' },
-  { id: 2, label: '精确匹配' },
-  { id: 3, label: '范围匹配' },
+  { id: "1", label: '模糊匹配' },
+  { id: "2", label: '精确匹配' },
+  { id: "4", label: '取反匹配' },
+  { id: '5', label: '数组匹配' },
+  { id: '6', label: '数组排除' },
+  { id: "3", label: '范围匹配' },
 ]
 // 匹配方式选项数据
 const fieldQueryModelOptionList = [

src/views/pri/priRecursionStartField/components/add/index.vue

@@ -49,9 +49,12 @@ const ruleFormRef = ref()
 // 传参选项数据
 // 匹配条件选项数据
 const fieldQueryKindOptionList = [
-  { id: '1', label: '模糊匹配' },
-  { id: '2', label: '精确匹配' },
-  { id: '3', label: '范围匹配' },
+  { id: "1", label: '模糊匹配' },
+  { id: "2", label: '精确匹配' },
+  { id: "4", label: '取反匹配' },
+  { id: '5', label: '数组匹配' },
+  { id: '6', label: '数组排除' },
+  { id: "3", label: '范围匹配' },
 ]
 // 匹配方式选项数据
 const fieldQueryModelOptionList = [

src/views/pri/priRecursionStartField/components/updatePriRecursionStartField/index.vue

@@ -43,9 +43,12 @@ const UpdateForm: any = ref({
 });
 // 匹配条件选项数据
 const fieldQueryKindOptionList = [
-  { id: '1', label: '模糊匹配' },
-  { id: '2', label: '精确匹配' },
-  { id: '3', label: '范围匹配' },
+  { id: "1", label: '模糊匹配' },
+  { id: "2", label: '精确匹配' },
+  { id: "4", label: '取反匹配' },
+  { id: '5', label: '数组匹配' },
+  { id: '6', label: '数组排除' },
+  { id: "3", label: '范围匹配' },
 ]
 // 匹配方式选项数据
 const fieldQueryModelOptionList = [