完善奖励后台

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

@@ -65,7 +65,8 @@ const fieldQueryModelOptionList = [
 const fieldQueryValueTypeOptionList = [
   { id: 'text', label: '文本' },
   { id: 'number', label: '数字' },
-  { id: 'range', label: '范围' },
+  { id: 'date', label: '日期' },
+  { id: 'datetime', label: '时间' },
 ]
 
 // 选项卡参数(默认值为列表某项的id)

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

@@ -59,7 +59,8 @@ const fieldQueryModelOptionList = [
 const fieldQueryValueTypeOptionList = [
   { id: 'text', label: '文本' },
   { id: 'number', label: '数字' },
-  { id: 'range', label: '范围' },
+  { id: 'date', label: '日期' },
+  { id: 'datetime', label: '时间' },
 ]
 
 // 表单实例

src/views/pri/priList/hook.tsx

@@ -193,6 +193,14 @@ export function usePriList() {
   function linkToPriListAmountSet(row) {
     router.push({ path: '../../pri/PriListAmountSet/index', query: { listId: row.id } });
   }
+  //跳转到递归开始条件对象表
+  function linkToPriRecursionStartTable(row) {
+    router.push({ path: '../../pri/priRecursionStartTable/index', query: { listId: row.id } });
+  }
+  //跳转到递归停止条件对象表
+  function linkToPriRecursionEndTable(row) {
+    router.push({ path: '../../pri/priRecursionEndTable/index', query: { listId: row.id } });
+  }
 
   // 删除
   function handleDelete(row) {
@@ -264,6 +272,8 @@ export function usePriList() {
     linkToPriLog,
     linkToPriPrizeInTable,
     linkToPriListAmountSet,
+    linkToPriRecursionStartTable,
+    linkToPriRecursionEndTable,
 
   };
 }

src/views/pri/priList/index.vue

@@ -43,6 +43,8 @@ const {
   linkToPriLog,
   linkToPriPrizeInTable,
   linkToPriListAmountSet,
+  linkToPriRecursionStartTable,
+  linkToPriRecursionEndTable,
 } = usePriList();
 // 关闭添加
 const closeAddVisible = () => {
@@ -151,6 +153,15 @@ provide('closeEditUpdatePriListVisible', closeEditUpdatePriListVisible)
               el-button.ml-3(class="mt-[2px]" link type='primary' :size='size' :icon='useRenderIcon(More)')
               template(#dropdown)
                 el-dropdown-menu
+                  el-dropdown-item
+                    el-button.reset-margin.edit-btn(
+                      link
+                      type="primary"
+                      size="small"
+                      @click="linkToPriListAmountSet(row)"
+                      :icon="useRenderIcon(EditPen)"
+                      v-if="hasAuth(['linkToPriListAmountSet'])"
+                    ) 奖励金额设置
                   el-dropdown-item
                     el-button.reset-margin.edit-btn(
                       link
@@ -169,6 +180,24 @@ provide('closeEditUpdatePriListVisible', closeEditUpdatePriListVisible)
                       :icon="useRenderIcon(EditPen)"
                       v-if="hasAuth(['linkToPriLoopSet'])"
                     ) 递归配置
+                  el-dropdown-item
+                    el-button.reset-margin.edit-btn(
+                      link
+                      type="primary"
+                      size="small"
+                      @click="linkToPriRecursionStartTable(row)"
+                      :icon="useRenderIcon(EditPen)"
+                      v-if="hasAuth(['linkToPriRecursionStartTable'])"
+                    ) 递归开始条件对象表
+                  el-dropdown-item
+                    el-button.reset-margin.edit-btn(
+                      link
+                      type="primary"
+                      size="small"
+                      @click="linkToPriRecursionEndTable(row)"
+                      :icon="useRenderIcon(EditPen)"
+                      v-if="hasAuth(['linkToPriRecursionEndTable'])"
+                    ) 递归停止条件对象表
                   el-dropdown-item
                     el-button.reset-margin.edit-btn(
                       link

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

@@ -72,10 +72,10 @@ const submit = async (formEl) => {
           type: "success"
         });
         UpdateForm.value = {
-                listId: props.listId, //配置ID
-      prizePercent: "", //奖励比例
-      prizeAmount: "", //奖励固定金额
-      prizeSourceField: "", //奖励金额来源数据
+          listId: props.listId, //配置ID
+          prizePercent: "", //奖励比例
+          prizeAmount: "", //奖励固定金额
+          prizeSourceField: "", //奖励金额来源数据
 
         };
         // 关闭新增弹窗;
@@ -99,7 +99,7 @@ const submit = async (formEl) => {
 
 //获取配置ID数据
 const listIdQuery = async () => {
-  const { status, data }: any = await http.Request({ method: UrlList.prizeSet.prigetPriListDic.method, url: UrlList.prizeSet.prigetPriListDic.url, params: { } });
+  const { status, data }: any = await http.Request({ method: UrlList.prizeSet.prigetPriListDic.method, url: UrlList.prizeSet.prigetPriListDic.url, params: {} });
   if (status === 1) {
     listIdOptionList.value = data.records;
   }
@@ -119,7 +119,7 @@ const closeFn: any = inject("closeAddVisible");
 const closeVisible = () => {
   // 清空表单项;
   UpdateForm.value = {
-        listId: props.listId, //配置ID
+    listId: props.listId, //配置ID
     prizePercent: "", //奖励比例
     prizeAmount: "", //奖励固定金额
     prizeSourceField: "", //奖励金额来源数据
@@ -142,7 +142,7 @@ const isFullscreen = ref(false)
           placeholder="请选择配置ID",
           clearable,
         )
-          el-option(:label="item.id", :value="item.prizeName" v-for="(item,index) in listIdOptionList")
+          el-option(:label="item.prizeName", :value="item.id" v-for="(item,index) in listIdOptionList")
       el-form-item(label='奖励比例' prop="prizePercent")
         el-input-number(v-model='UpdateForm.prizePercent' :min="0" :max="100000"
           placeholder="请输入奖励比例")

src/views/pri/priListAmountSet/hook.tsx

@@ -12,12 +12,12 @@ export function usePriListAmountSet() {
 
     UrlList = await getGroupUrl(["prizeSet"]);
     onSearch(ruleFormRef.value);
-  listIdQuery();
+    listIdQuery();
 
   });
   let form = reactive({
-  listId:null, //配置ID
-  prizeSourceField:"", //奖励金额来源数据
+    listId: null, //配置ID
+    prizeSourceField: "", //奖励金额来源数据
 
 
   });
@@ -125,11 +125,11 @@ export function usePriListAmountSet() {
       }
     })
   }
-    // 配置ID选项数据
-    const listIdOptionList = ref([]);
+  // 配置ID选项数据
+  const listIdOptionList = ref([]);
   //获取配置ID数据
   async function listIdQuery() {
-    const { status, data }: any = await http.Request({ method: UrlList.prizeSet.prigetPriListDic.method, url: UrlList.prizeSet.prigetPriListDic.url, params: { } });
+    const { status, data }: any = await http.Request({ method: UrlList.prizeSet.prigetPriListDic.method, url: UrlList.prizeSet.prigetPriListDic.url, params: {} });
     if (status === 1) {
       listIdOptionList.value = data.records;
     }
@@ -137,8 +137,8 @@ export function usePriListAmountSet() {
 
 
 
-  
-    // 删除
+
+  // 删除
   function handleDelete(row) {
     ElMessageBox.confirm(
       `是否删除该奖励金额设置? `,
@@ -158,20 +158,20 @@ export function usePriListAmountSet() {
         onSearch(ruleFormRef.value);
       } else {
         ElMessageBox.alert(msg, "提示", {
-        confirmButtonText: "关闭",
-        type: "warning"
-      });
+          confirmButtonText: "关闭",
+          type: "warning"
+        });
       };
     })
   }
 
-    // 新增
+  // 新增
   const addVisible = ref(false);
   function handleAdd() {
     addVisible.value = true;
   };
 
-    // 修改
+  // 修改
   const editUpdatePriListAmountSetVisible = ref(false);
   const editUpdatePriListAmountSetFormData = ref({});
   function handleUpdatePriListAmountSet(row) {

src/views/pri/priListAmountSet/index.vue

@@ -71,7 +71,7 @@ provide('closeEditUpdatePriListAmountSetVisible', closeEditUpdatePriListAmountSe
           placeholder="请选择配置ID",
           clearable,
         )
-          el-option(:label="item.id", :value="item.prizeName" v-for="(item,index) in listIdOptionList")
+          el-option(:label="item.prizeName", :value="item.id" v-for="(item,index) in listIdOptionList")
       el-form-item(label='奖励金额来源数据' prop="prizeSourceField")
         el-input(v-model='form.prizeSourceField' autocomplete='off'
           placeholder="请输入奖励金额来源数据")

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

@@ -39,6 +39,8 @@ let UpdateForm = ref({
   sonField: "", //子ID字段
   tableEnName: "", //查询表
   levelDiffFlag: "", //级差
+  afterPrizeFlag: "", //发奖后是否继续
+  conditionMode: "", //条件模式
 
 
 });
@@ -52,6 +54,11 @@ const listIdOptionList = ref([]);
 const loopModelOptionList = [
   { id: 'field', label: '父子关联字段' },
 ]
+// 条件模式选项数据
+const conditionModeOptionList = [
+  { id: 'all', label: '全部满足' },
+  { id: 'one', label: '一个满足' },
+]
 
 // 选项卡参数(默认值为列表某项的id)
 const activeId = ref('1')
@@ -84,6 +91,8 @@ const submit = async (formEl) => {
           sonField: "", //子ID字段
           tableEnName: "", //查询表
           levelDiffFlag: "", //级差
+          afterPrizeFlag: "", //发奖后是否继续
+          conditionMode: "", //条件模式
 
         };
         // 关闭新增弹窗;
@@ -148,6 +157,8 @@ const closeVisible = () => {
     sonField: "", //子ID字段
     tableEnName: "", //查询表
     levelDiffFlag: "", //级差
+    afterPrizeFlag: "", //发奖后是否继续
+    conditionMode: "", //条件模式
 
   };
   closeFn();
@@ -167,7 +178,7 @@ const isFullscreen = ref(false)
           placeholder="请选择配置ID",
           clearable,
         )
-          el-option(:label="item.id", :value="item.prizeName" v-for="(item,index) in listIdOptionList")
+          el-option(:label="item.prizeName", :value="item.id" v-for="(item,index) in listIdOptionList")
       el-form-item(label="执行模式", prop="loopModel")
         el-select(
           v-model="UpdateForm.loopModel",
@@ -186,6 +197,15 @@ const isFullscreen = ref(false)
           placeholder="请输入查询表")
       el-form-item(label='级差' prop="levelDiffFlag")
         el-switch(v-model="UpdateForm.levelDiffFlag")
+      el-form-item(label='发奖后是否继续' prop="afterPrizeFlag")
+        el-switch(v-model="UpdateForm.afterPrizeFlag")
+      el-form-item(label="条件模式", prop="conditionMode")
+        el-select(
+          v-model="UpdateForm.conditionMode",
+          placeholder="请选择条件模式",
+          clearable,
+        )
+          el-option(:label="item.label", :value="item.id" v-for="(item,index) in conditionModeOptionList")
 
     .flex.justify-end
       el-button(

src/views/pri/priLoopSet/components/updatePriLoopSet/index.vue

@@ -36,12 +36,19 @@ const UpdateForm: any = ref({
   sonField: "", //子ID字段
   tableEnName: "", //查询表
   levelDiffFlag: "", //级差
+  afterPrizeFlag: "", //发奖后是否继续
+  conditionMode: "", //条件模式
 
 });
 // 执行模式选项数据
 const loopModelOptionList = [
   { id: 'field', label: '父子关联字段' },
 ]
+// 条件模式选项数据
+const conditionModeOptionList = [
+  { id: 'all', label: '全部满足' },
+  { id: 'one', label: '一个满足' },
+]
 
 // 表单实例
 const ruleFormRef = ref()
@@ -76,6 +83,8 @@ const submit = async (formEl) => {
           sonField: "", //子ID字段
           tableEnName: "", //查询表
           levelDiffFlag: "", //级差
+          afterPrizeFlag: "", //发奖后是否继续
+          conditionMode: "", //条件模式
 
         };
         // 关闭修改弹窗;
@@ -141,6 +150,8 @@ const closeUpdatePriLoopSetVisible = () => {
     sonField: "", //子ID字段
     tableEnName: "", //查询表
     levelDiffFlag: "", //级差
+    afterPrizeFlag: "", //发奖后是否继续
+    conditionMode: "", //条件模式
 
   };
   closeFn();
@@ -175,6 +186,15 @@ const isFullscreen = ref(false)
           placeholder="请输入查询表")
       el-form-item(label='级差' prop="levelDiffFlag")
         el-switch(v-model="UpdateForm.levelDiffFlag")
+      el-form-item(label='发奖后是否继续' prop="afterPrizeFlag")
+        el-switch(v-model="UpdateForm.afterPrizeFlag")
+      el-form-item(label="条件模式", prop="conditionMode")
+        el-select(
+          v-model="UpdateForm.conditionMode",
+          placeholder="请选择条件模式",
+          clearable,
+        )
+          el-option(:label="item.label", :value="item.id" v-for="(item,index) in conditionModeOptionList")
 
     .flex.justify-end
       el-button(

src/views/pri/priLoopSet/index.vue

@@ -71,7 +71,7 @@ provide('closeEditUpdatePriLoopSetVisible', closeEditUpdatePriLoopSetVisible)
           placeholder="请选择配置ID",
           clearable,
         )
-          el-option(:label="item.id", :value="item.prizeName" v-for="(item,index) in listIdOptionList")
+          el-option(:label="item.prizeName", :value="item.id" v-for="(item,index) in listIdOptionList")
 
       el-form-item
         el-button(

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

@@ -62,7 +62,8 @@ const fieldQueryModelOptionList = [
 const fieldQueryValueTypeOptionList = [
   { id: 'text', label: '文本' },
   { id: 'number', label: '数字' },
-  { id: 'range', label: '范围' },
+  { id: 'date', label: '日期' },
+  { id: 'datetime', label: '时间' },
 ]
 
 // 选项卡参数(默认值为列表某项的id)

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

@@ -56,7 +56,8 @@ const fieldQueryModelOptionList = [
 const fieldQueryValueTypeOptionList = [
   { id: 'text', label: '文本' },
   { id: 'number', label: '数字' },
-  { id: 'range', label: '范围' },
+  { id: 'date', label: '日期' },
+  { id: 'datetime', label: '时间' },
 ]
 
 // 表单实例

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

@@ -63,7 +63,8 @@ const fieldQueryModelOptionList = [
 const fieldQueryValueTypeOptionList = [
   { id: 'text', label: '文本' },
   { id: 'number', label: '数字' },
-  { id: 'range', label: '范围' },
+  { id: 'date', label: '日期' },
+  { id: 'datetime', label: '时间' },
 ]
 // 对象表选项数据
 const objectTableIdOptionList = ref([]);

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

@@ -57,7 +57,8 @@ const fieldQueryModelOptionList = [
 const fieldQueryValueTypeOptionList = [
   { id: 'text', label: '文本' },
   { id: 'number', label: '数字' },
-  { id: 'range', label: '范围' },
+  { id: 'date', label: '日期' },
+  { id: 'datetime', label: '时间' },
 ]
 // 对象表选项数据
 const objectTableIdOptionList = ref([]);

src/views/pri/priProject/hook.tsx

@@ -166,14 +166,6 @@ export function usePriProject() {
   function linkToPriRequestLog(row) {
     router.push({ path: '../../pri/priRequestLog/index', query: { projectId: row.id } });
   }
-  //跳转到递归开始条件对象表
-  function linkToPriRecursionStartTable(row) {
-    router.push({ path: '../../pri/priRecursionStartTable/index', query: { projectId: row.id } });
-  }
-  //跳转到递归停止条件对象表
-  function linkToPriRecursionEndTable(row) {
-    router.push({ path: '../../pri/priRecursionEndTable/index', query: { projectId: row.id } });
-  }
 
   // 删除
   function handleDelete(row) {
@@ -242,8 +234,6 @@ export function usePriProject() {
     linkToPriDatabaseSet,
     linkToPriPrizeObjectTable,
     linkToPriRequestLog,
-    linkToPriRecursionStartTable,
-    linkToPriRecursionEndTable,
 
   };
 }

src/views/pri/priProject/index.vue

@@ -41,8 +41,6 @@ const {
   linkToPriDatabaseSet,
   linkToPriPrizeObjectTable,
   linkToPriRequestLog,
-  linkToPriRecursionStartTable,
-  linkToPriRecursionEndTable,
 
 } = usePriProject();
 // 关闭添加
@@ -192,24 +190,6 @@ provide('closeEditUpdatePriProjectVisible', closeEditUpdatePriProjectVisible)
                       :icon="useRenderIcon(EditPen)"
                       v-if="hasAuth(['linkToPriRequestLog'])"
                     ) 请求和响应日志
-                  el-dropdown-item
-                    el-button.reset-margin.edit-btn(
-                      link
-                      type="primary"
-                      size="small"
-                      @click="linkToPriRecursionStartTable(row)"
-                      :icon="useRenderIcon(EditPen)"
-                      v-if="hasAuth(['linkToPriRecursionStartTable'])"
-                    ) 递归开始条件对象表
-                  el-dropdown-item
-                    el-button.reset-margin.edit-btn(
-                      link
-                      type="primary"
-                      size="small"
-                      @click="linkToPriRecursionEndTable(row)"
-                      :icon="useRenderIcon(EditPen)"
-                      v-if="hasAuth(['linkToPriRecursionEndTable'])"
-                    ) 递归停止条件对象表
 
     Add(:addVisible="addVisible")
     EditUpdatePriProject(:editVisible="editUpdatePriProjectVisible" :formData="editUpdatePriProjectFormData")

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

@@ -64,6 +64,8 @@ const fieldQueryModelOptionList = [
 const fieldQueryValueTypeOptionList = [
   { id: 'text', label: '文本' },
   { id: 'number', label: '数字' },
+  { id: 'date', label: '日期' },
+  { id: 'datetime', label: '时间' },
 ]
 // 匹配表选项数据
 const queryTableIdOptionList = ref([]);

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

@@ -56,6 +56,8 @@ const fieldQueryModelOptionList = [
 const fieldQueryValueTypeOptionList = [
   { id: 'text', label: '文本' },
   { id: 'number', label: '数字' },
+  { id: 'date', label: '日期' },
+  { id: 'datetime', label: '时间' },
 ]
 
 // 表单实例

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

@@ -62,7 +62,8 @@ const fieldQueryModelOptionList = [
 const fieldQueryValueTypeOptionList = [
   { id: 'text', label: '文本' },
   { id: 'number', label: '数字' },
-  { id: 'range', label: '范围' },
+  { id: 'date', label: '日期' },
+  { id: 'datetime', label: '时间' },
 ]
 
 // 选项卡参数(默认值为列表某项的id)
@@ -90,13 +91,13 @@ const submit = async (formEl) => {
           type: "success"
         });
         UpdateForm.value = {
-      fieldName: "", //字段名称
-      fieldEnName: "", //字段名
-      fieldQueryKind: "", //匹配条件
-      fieldQueryModel: "", //匹配方式
-      fieldQueryValue: "", //匹配值
-      fieldQueryValueType: "", //匹配值类型
-      objectTableId: props.objectTableId, //对象表
+          fieldName: "", //字段名称
+          fieldEnName: "", //字段名
+          fieldQueryKind: "", //匹配条件
+          fieldQueryModel: "", //匹配方式
+          fieldQueryValue: "", //匹配值
+          fieldQueryValueType: "", //匹配值类型
+          objectTableId: props.objectTableId, //对象表
 
         };
         // 关闭新增弹窗;

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

@@ -56,7 +56,8 @@ const fieldQueryModelOptionList = [
 const fieldQueryValueTypeOptionList = [
   { id: 'text', label: '文本' },
   { id: 'number', label: '数字' },
-  { id: 'range', label: '范围' },
+  { id: 'date', label: '日期' },
+  { id: 'datetime', label: '时间' },
 ]
 
 // 表单实例
@@ -86,14 +87,14 @@ const submit = async (formEl) => {
           type: "success"
         });
         UpdateForm.value = {
-      id: null, //ID
-      fieldName: "", //字段名称
-      fieldEnName: "", //字段名
-      fieldQueryKind: "", //匹配条件
-      fieldQueryModel: "", //匹配方式
-      fieldQueryValue: "", //匹配值
-      fieldQueryValueType: "", //匹配值类型
-      objectTableId: null, //对象表
+          id: null, //ID
+          fieldName: "", //字段名称
+          fieldEnName: "", //字段名
+          fieldQueryKind: "", //匹配条件
+          fieldQueryModel: "", //匹配方式
+          fieldQueryValue: "", //匹配值
+          fieldQueryValueType: "", //匹配值类型
+          objectTableId: null, //对象表
 
         };
         // 关闭修改弹窗;
@@ -126,7 +127,7 @@ const rules = reactive({
 const closeFn: any = inject('closeEditUpdatePriRecursionEndFieldVisible');
 const openVisible = async () => {
   //通过ID获取表格数据
-  const { status, data }: any = await http.Request({ method: UrlList.prizeSet.prigetPriRecursionEndFieldQuery.method, url: UrlList.prizeSet.prigetPriRecursionEndFieldQuery.url, params: { id: props.formData.id }});
+  const { status, data }: any = await http.Request({ method: UrlList.prizeSet.prigetPriRecursionEndFieldQuery.method, url: UrlList.prizeSet.prigetPriRecursionEndFieldQuery.url, params: { id: props.formData.id } });
   if (status === 1) {
     UpdateForm.value = data;
 

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

@@ -11,6 +11,7 @@ let UrlList = reactive(null)
 // 获取当前板块接口列表
 onMounted(async () => {
   UrlList = await getGroupUrl(["prizeSet"]);
+  objectTableIdQuery();
 
 })
 // 组件传参对象
@@ -48,9 +49,9 @@ const ruleFormRef = ref()
 // 传参选项数据
 // 匹配条件选项数据
 const fieldQueryKindOptionList = [
-  { id: 1, label: '模糊匹配' },
-  { id: 2, label: '精确匹配' },
-  { id: 3, label: '范围匹配' },
+  { id: '1', label: '模糊匹配' },
+  { id: '2', label: '精确匹配' },
+  { id: '3', label: '范围匹配' },
 ]
 // 匹配方式选项数据
 const fieldQueryModelOptionList = [
@@ -62,8 +63,11 @@ const fieldQueryModelOptionList = [
 const fieldQueryValueTypeOptionList = [
   { id: 'text', label: '文本' },
   { id: 'number', label: '数字' },
-  { id: 'range', label: '范围' },
+  { id: 'date', label: '日期' },
+  { id: 'datetime', label: '时间' },
 ]
+// 对象表选项数据
+const objectTableIdOptionList = ref([]);
 
 // 选项卡参数(默认值为列表某项的id)
 const activeId = ref('1')
@@ -90,13 +94,13 @@ const submit = async (formEl) => {
           type: "success"
         });
         UpdateForm.value = {
-      fieldName: "", //字段名称
-      fieldEnName: "", //字段名
-      fieldQueryKind: "", //匹配条件
-      fieldQueryModel: "", //匹配方式
-      fieldQueryValue: "", //匹配值
-      fieldQueryValueType: "", //匹配值类型
-      objectTableId: props.objectTableId, //对象表
+          fieldName: "", //字段名称
+          fieldEnName: "", //字段名
+          fieldQueryKind: "", //匹配条件
+          fieldQueryModel: "", //匹配方式
+          fieldQueryValue: "", //匹配值
+          fieldQueryValueType: "", //匹配值类型
+          objectTableId: props.objectTableId, //对象表
 
         };
         // 关闭新增弹窗;
@@ -118,6 +122,13 @@ const submit = async (formEl) => {
   })
 };
 
+//获取对象表数据
+const objectTableIdQuery = async () => {
+  const { status, data }: any = await http.Request({ method: UrlList.prizeSet.prigetPriRecursionStartTableDic.method, url: UrlList.prizeSet.prigetPriRecursionStartTableDic.url, params: {} });
+  if (status === 1) {
+    objectTableIdOptionList.value = data.records;
+  }
+};
 
 
 
@@ -180,9 +191,13 @@ const isFullscreen = ref(false)
           clearable,
         )
           el-option(:label="item.label", :value="item.id" v-for="(item,index) in fieldQueryValueTypeOptionList")
-      el-form-item(label='对象表' prop="objectTableId")
-        el-input-number(v-model='UpdateForm.objectTableId' :min="1" :max="1000"
-          placeholder="请输入对象表")
+      el-form-item(label="对象表", prop="objectTableId")
+        el-select(
+          v-model="UpdateForm.objectTableId",
+          placeholder="请选择对象表",
+          clearable,
+        )
+          el-option(:label="item.tableEnName", :value="item.id" v-for="(item,index) in objectTableIdOptionList")
 
     .flex.justify-end
       el-button(

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

@@ -11,6 +11,7 @@ let UrlList = reactive(null)
 // 获取当前板块接口列表
 onMounted(async () => {
   UrlList = await getGroupUrl(["prizeSet"]);
+  objectTableIdQuery();
 
 })
 const props = defineProps<{
@@ -42,9 +43,9 @@ const UpdateForm: any = ref({
 });
 // 匹配条件选项数据
 const fieldQueryKindOptionList = [
-  { id: 1, label: '模糊匹配' },
-  { id: 2, label: '精确匹配' },
-  { id: 3, label: '范围匹配' },
+  { id: '1', label: '模糊匹配' },
+  { id: '2', label: '精确匹配' },
+  { id: '3', label: '范围匹配' },
 ]
 // 匹配方式选项数据
 const fieldQueryModelOptionList = [
@@ -56,8 +57,11 @@ const fieldQueryModelOptionList = [
 const fieldQueryValueTypeOptionList = [
   { id: 'text', label: '文本' },
   { id: 'number', label: '数字' },
-  { id: 'range', label: '范围' },
+  { id: 'date', label: '日期' },
+  { id: 'datetime', label: '时间' },
 ]
+// 对象表选项数据
+const objectTableIdOptionList = ref([]);
 
 // 表单实例
 const ruleFormRef = ref()
@@ -86,14 +90,14 @@ const submit = async (formEl) => {
           type: "success"
         });
         UpdateForm.value = {
-      id: null, //ID
-      fieldName: "", //字段名称
-      fieldEnName: "", //字段名
-      fieldQueryKind: "", //匹配条件
-      fieldQueryModel: "", //匹配方式
-      fieldQueryValue: "", //匹配值
-      fieldQueryValueType: "", //匹配值类型
-      objectTableId: null, //对象表
+          id: null, //ID
+          fieldName: "", //字段名称
+          fieldEnName: "", //字段名
+          fieldQueryKind: "", //匹配条件
+          fieldQueryModel: "", //匹配方式
+          fieldQueryValue: "", //匹配值
+          fieldQueryValueType: "", //匹配值类型
+          objectTableId: null, //对象表
 
         };
         // 关闭修改弹窗;
@@ -115,6 +119,13 @@ const submit = async (formEl) => {
   })
 };
 
+//获取对象表数据
+const objectTableIdQuery = async () => {
+  const { status, data }: any = await http.Request({ method: UrlList.prizeSet.prigetPriRecursionStartTableDic.method, url: UrlList.prizeSet.prigetPriRecursionStartTableDic.url, params: {} });
+  if (status === 1) {
+    objectTableIdOptionList.value = data.records;
+  }
+};
 
 
 
@@ -126,7 +137,7 @@ const rules = reactive({
 const closeFn: any = inject('closeEditUpdatePriRecursionStartFieldVisible');
 const openVisible = async () => {
   //通过ID获取表格数据
-  const { status, data }: any = await http.Request({ method: UrlList.prizeSet.prigetPriRecursionStartFieldQuery.method, url: UrlList.prizeSet.prigetPriRecursionStartFieldQuery.url, params: { id: props.formData.id }});
+  const { status, data }: any = await http.Request({ method: UrlList.prizeSet.prigetPriRecursionStartFieldQuery.method, url: UrlList.prizeSet.prigetPriRecursionStartFieldQuery.url, params: { id: props.formData.id } });
   if (status === 1) {
     UpdateForm.value = data;
 
@@ -157,7 +168,7 @@ const isFullscreen = ref(false)
   el-dialog(v-model='props.editVisible' draggable width="50%" :fullscreen="isFullscreen" title="修改" @close="closeUpdatePriRecursionStartFieldVisible" @open="openVisible")
     el-form(:model='UpdateForm' label-position="right" ref="ruleFormRef" :rules="rules" label-width="100px")
       el-form-item(label='ID' prop="id")
-        el-input-number(v-model='UpdateForm.id' :min="1" :max="1000"
+        el-input-number(v-model='UpdateForm.id' :min="0" :max="100000"
           placeholder="请输入ID")
       el-form-item(label='字段名称' prop="fieldName")
         el-input(v-model='UpdateForm.fieldName' autocomplete='off'
@@ -189,9 +200,13 @@ const isFullscreen = ref(false)
           clearable,
         )
           el-option(:label="item.label", :value="item.id" v-for="(item,index) in fieldQueryValueTypeOptionList")
-      el-form-item(label='对象表' prop="objectTableId")
-        el-input-number(v-model='UpdateForm.objectTableId' :min="1" :max="1000"
-          placeholder="请输入对象表")
+      el-form-item(label="对象表", prop="objectTableId")
+        el-select(
+          v-model="UpdateForm.objectTableId",
+          placeholder="请选择对象表",
+          clearable,
+        )
+          el-option(:label="item.tableEnName", :value="item.id" v-for="(item,index) in objectTableIdOptionList")
 
     .flex.justify-end
       el-button(

src/views/pri/priRecursionStartField/hook.tsx

@@ -1,6 +1,5 @@
 import { reactive, onMounted, ref, ElMessage, ElMessageBox, http, getGroupUrl, RegularVerification, verification, PaginationProps } from "@/utils/importUsed";
 import { useRoute } from "vue-router";
-import router from "@/router";
 // 表单实例
 const ruleFormRef = ref()
 export function usePriRecursionStartField() {
@@ -13,12 +12,13 @@ export function usePriRecursionStartField() {
 
     UrlList = await getGroupUrl(["prizeSet"]);
     onSearch(ruleFormRef.value);
+    objectTableIdQuery();
 
   });
   let form = reactive({
-  fieldName:"", //字段名称
-  fieldEnName:"", //字段名
-  objectTableId:null, //对象表
+    fieldName: "", //字段名称
+    fieldEnName: "", //字段名
+    objectTableId: null, //对象表
 
 
   });
@@ -83,9 +83,6 @@ export function usePriRecursionStartField() {
       label: "对象表",
       prop: "objectTableId",
       minWidth: 200
-      formatter: ({ objectTableId }) => {
-        return objectTableIdOptionList.find(item => item.id == objectTableId).label
-      },
     },
 
     {
@@ -149,11 +146,20 @@ export function usePriRecursionStartField() {
       }
     })
   }
+  // 对象表选项数据
+  const objectTableIdOptionList = ref([]);
+  //获取对象表数据
+  async function objectTableIdQuery() {
+    const { status, data }: any = await http.Request({ method: UrlList.prizeSet.prigetPriRecursionStartTableDic.method, url: UrlList.prizeSet.prigetPriRecursionStartTableDic.url, params: {} });
+    if (status === 1) {
+      objectTableIdOptionList.value = data.records;
+    }
+  }
+
 
 
 
-  
-    // 删除
+  // 删除
   function handleDelete(row) {
     ElMessageBox.confirm(
       `是否删除该递归开始条件字段? `,
@@ -173,20 +179,20 @@ export function usePriRecursionStartField() {
         onSearch(ruleFormRef.value);
       } else {
         ElMessageBox.alert(msg, "提示", {
-        confirmButtonText: "关闭",
-        type: "warning"
-      });
+          confirmButtonText: "关闭",
+          type: "warning"
+        });
       };
     })
   }
 
-    // 新增
+  // 新增
   const addVisible = ref(false);
   function handleAdd() {
     addVisible.value = true;
   };
 
-    // 修改
+  // 修改
   const editUpdatePriRecursionStartFieldVisible = ref(false);
   const editUpdatePriRecursionStartFieldFormData = ref({});
   function handleUpdatePriRecursionStartField(row) {
@@ -206,6 +212,8 @@ export function usePriRecursionStartField() {
     handleCurrentChange,
     handleSelectionChange,
     ruleFormRef,
+    objectTableIdQuery,
+    objectTableIdOptionList,
 
     handleAdd,
     addVisible,

src/views/pri/priRecursionStartField/index.vue

@@ -28,6 +28,7 @@ const {
   handleCurrentChange,
   handleSelectionChange,
   ruleFormRef,
+  objectTableIdOptionList,
   handleAdd,
   addVisible,
   handleUpdatePriRecursionStartField,
@@ -70,9 +71,13 @@ provide('closeEditUpdatePriRecursionStartFieldVisible', closeEditUpdatePriRecurs
       el-form-item(label='字段名' prop="fieldEnName")
         el-input(v-model='form.fieldEnName' autocomplete='off'
           placeholder="请输入字段名")
-      el-form-item(label='对象表' prop="objectTableId")
-        el-input-number(v-model='form.objectTableId' :min="1" :max="1000"
-          placeholder="请输入对象表")
+      el-form-item(label="对象表", prop="objectTableId")
+        el-select(
+          v-model="form.objectTableId",
+          placeholder="请选择对象表",
+          clearable,
+        )
+          el-option(:label="item.tableEnName", :value="item.id" v-for="(item,index) in objectTableIdOptionList")
 
       el-form-item
         el-button(

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

@@ -11,8 +11,7 @@ let UrlList = reactive(null)
 // 获取当前板块接口列表
 onMounted(async () => {
   UrlList = await getGroupUrl(["prizeSet"]);
-  projectIdQuery();
-
+  listIdQuery();
 })
 // 组件传参对象
 const props = defineProps<{
@@ -25,7 +24,7 @@ const props = defineProps<{
     type: Number;
     default: 50;
   };
-  projectId: {
+  listId: {
     type: Number;
     default: 0;
   },
@@ -34,16 +33,12 @@ const props = defineProps<{
 // 表单数据
 let UpdateForm = ref({
   tableEnName: "", //查询表
-  projectId: props.projectId, //项目
-
-
+  listId: props.listId
 });
 // 表单实例
 const ruleFormRef = ref()
 
 // 传参选项数据
-// 项目选项数据
-const projectIdOptionList = ref([]);
 
 // 选项卡参数(默认值为列表某项的id)
 const activeId = ref('1')
@@ -70,9 +65,8 @@ const submit = async (formEl) => {
           type: "success"
         });
         UpdateForm.value = {
-      tableEnName: "", //查询表
-      projectId: props.projectId, //项目
-
+          tableEnName: "", //查询表
+          listId: props.listId
         };
         // 关闭新增弹窗;
         closeVisible()
@@ -93,16 +87,17 @@ 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: { } });
+// 配置ID选项数据
+const listIdOptionList = ref([]);
+//获取配置ID数据
+const listIdQuery = async () => {
+  const { status, data }: any = await http.Request({ method: UrlList.prizeSet.prigetPriListDic.method, url: UrlList.prizeSet.prigetPriListDic.url, params: {} });
   if (status === 1) {
-    projectIdOptionList.value = data.records;
+    listIdOptionList.value = data.records;
   }
 };
 
 
-
 // 表单校验规则
 const rules = reactive({
   tableEnName: [
@@ -119,8 +114,7 @@ const closeVisible = () => {
   // 清空表单项;
   UpdateForm.value = {
     tableEnName: "", //查询表
-    projectId: props.projectId, //项目
-
+    listId: props.listId
   };
   closeFn();
 };
@@ -136,13 +130,13 @@ const isFullscreen = ref(false)
       el-form-item(label='查询表' prop="tableEnName")
         el-input(v-model='UpdateForm.tableEnName' autocomplete='off'
           placeholder="请输入查询表")
-      el-form-item(label="项目", prop="projectId")
+      el-form-item(label="配置ID", prop="listId")
         el-select(
-          v-model="UpdateForm.projectId",
-          placeholder="请选择项目",
+          v-model="UpdateForm.listId",
+          placeholder="请选择配置ID",
           clearable,
         )
-          el-option(:label="item.projectName", :value="item.id" v-for="(item,index) in projectIdOptionList")
+          el-option(:label="item.prizeName", :value="item.id" v-for="(item,index) in listIdOptionList")
 
     .flex.justify-end
       el-button(

src/views/pri/priRecursionStartTable/components/updatePriRecursionStartTable/index.vue

@@ -62,8 +62,8 @@ const submit = async (formEl) => {
           type: "success"
         });
         UpdateForm.value = {
-      id: null, //ID
-      tableEnName: "", //查询表
+          id: null, //ID
+          tableEnName: "", //查询表
 
         };
         // 关闭修改弹窗;
@@ -99,7 +99,7 @@ const rules = reactive({
 const closeFn: any = inject('closeEditUpdatePriRecursionStartTableVisible');
 const openVisible = async () => {
   //通过ID获取表格数据
-  const { status, data }: any = await http.Request({ method: UrlList.prizeSet.prigetPriRecursionStartTableQuery.method, url: UrlList.prizeSet.prigetPriRecursionStartTableQuery.url, params: { id: props.formData.id }});
+  const { status, data }: any = await http.Request({ method: UrlList.prizeSet.prigetPriRecursionStartTableQuery.method, url: UrlList.prizeSet.prigetPriRecursionStartTableQuery.url, params: { id: props.formData.id } });
   if (status === 1) {
     UpdateForm.value = data;
 
@@ -124,7 +124,7 @@ const isFullscreen = ref(false)
   el-dialog(v-model='props.editVisible' draggable width="50%" :fullscreen="isFullscreen" title="修改" @close="closeUpdatePriRecursionStartTableVisible" @open="openVisible")
     el-form(:model='UpdateForm' label-position="right" ref="ruleFormRef" :rules="rules" label-width="100px")
       el-form-item(label='ID' prop="id")
-        el-input-number(v-model='UpdateForm.id' :min="1" :max="1000"
+        el-input-number(v-model='UpdateForm.id' :min="0" :max="100000"
           placeholder="请输入ID")
       el-form-item(label='查询表' prop="tableEnName")
         el-input(v-model='UpdateForm.tableEnName' autocomplete='off'

src/views/pri/priRecursionStartTable/hook.tsx

@@ -1,6 +1,7 @@
 import { reactive, onMounted, ref, ElMessage, ElMessageBox, http, getGroupUrl, RegularVerification, verification, PaginationProps } from "@/utils/importUsed";
 import { useRoute } from "vue-router";
 import router from "@/router";
+
 // 表单实例
 const ruleFormRef = ref()
 export function usePriRecursionStartTable() {
@@ -9,17 +10,16 @@ export function usePriRecursionStartTable() {
   // 获取当前板块接口列表
   onMounted(async () => {
     const route = useRoute();
-    form.projectId = Number(route.query.projectId);
+    form.listId = Number(route.query.listId);
 
     UrlList = await getGroupUrl(["prizeSet"]);
     onSearch(ruleFormRef.value);
-  projectIdQuery();
+    listIdQuery();
 
   });
   let form = reactive({
-  tableEnName:"", //查询表
-  projectId:null, //项目
-
+    tableEnName: "", //查询表
+    listId: null,
 
   });
   const dataList = ref([]);
@@ -126,24 +126,25 @@ export function usePriRecursionStartTable() {
       }
     })
   }
-    // 项目选项数据
-    const projectIdOptionList = ref([]);
-  //获取项目数据
-  async function projectIdQuery() {
-    const { status, data }: any = await http.Request({ method: UrlList.prizeSet.prigetPriProjectDic.method, url: UrlList.prizeSet.prigetPriProjectDic.url, params: { } });
+
+  // 配置ID选项数据
+  const listIdOptionList = ref([]);
+  //获取配置ID数据
+  async function listIdQuery() {
+    const { status, data }: any = await http.Request({ method: UrlList.prizeSet.prigetPriListDic.method, url: UrlList.prizeSet.prigetPriListDic.url, params: {} });
     if (status === 1) {
-      projectIdOptionList.value = data.records;
+      listIdOptionList.value = data.records;
     }
   }
 
 
 
-    //跳转到递归开始条件字段
+  //跳转到递归开始条件字段
   function linkToPriRecursionStartField(row) {
     router.push({ path: '../../pri/priRecursionStartField/index', query: { objectTableId: row.id } });
   }
 
-    // 删除
+  // 删除
   function handleDelete(row) {
     ElMessageBox.confirm(
       `是否删除该递归开始条件对象表? `,
@@ -163,20 +164,20 @@ export function usePriRecursionStartTable() {
         onSearch(ruleFormRef.value);
       } else {
         ElMessageBox.alert(msg, "提示", {
-        confirmButtonText: "关闭",
-        type: "warning"
-      });
+          confirmButtonText: "关闭",
+          type: "warning"
+        });
       };
     })
   }
 
-    // 新增
+  // 新增
   const addVisible = ref(false);
   function handleAdd() {
     addVisible.value = true;
   };
 
-    // 修改
+  // 修改
   const editUpdatePriRecursionStartTableVisible = ref(false);
   const editUpdatePriRecursionStartTableFormData = ref({});
   function handleUpdatePriRecursionStartTable(row) {
@@ -196,8 +197,6 @@ export function usePriRecursionStartTable() {
     handleCurrentChange,
     handleSelectionChange,
     ruleFormRef,
-    projectIdQuery,
-    projectIdOptionList,
 
     handleAdd,
     addVisible,
@@ -206,6 +205,7 @@ export function usePriRecursionStartTable() {
     editUpdatePriRecursionStartTableFormData,
     handleDelete,
     linkToPriRecursionStartField,
+    listIdOptionList,
 
   };
 }

src/views/pri/priRecursionStartTable/index.vue

@@ -28,7 +28,6 @@ const {
   handleCurrentChange,
   handleSelectionChange,
   ruleFormRef,
-  projectIdOptionList,
   handleAdd,
   addVisible,
   handleUpdatePriRecursionStartTable,
@@ -36,6 +35,7 @@ const {
   editUpdatePriRecursionStartTableFormData,
   handleDelete,
   linkToPriRecursionStartField,
+  listIdOptionList,
 
 } = usePriRecursionStartTable();
 // 关闭添加
@@ -69,13 +69,13 @@ provide('closeEditUpdatePriRecursionStartTableVisible', closeEditUpdatePriRecurs
       el-form-item(label='查询表' prop="tableEnName")
         el-input(v-model='form.tableEnName' autocomplete='off'
           placeholder="请输入查询表")
-      el-form-item(label="项目", prop="projectId")
+      el-form-item(label="配置ID", prop="listId")
         el-select(
-          v-model="form.projectId",
-          placeholder="请选择项目",
+          v-model="form.listId",
+          placeholder="请选择配置ID",
           clearable,
         )
-          el-option(:label="item.projectName", :value="item.id" v-for="(item,index) in projectIdOptionList")
+          el-option(:label="item.prizeName", :value="item.id" v-for="(item,index) in listIdOptionList")
 
       el-form-item
         el-button(
@@ -141,7 +141,7 @@ provide('closeEditUpdatePriRecursionStartTableVisible', closeEditUpdatePriRecurs
                       v-if="hasAuth(['linkToPriRecursionStartField'])"
                     ) 递归开始条件字段
 
-    Add(:addVisible="addVisible" :projectId="form.projectId")
+    Add(:addVisible="addVisible" :listId="form.listId")
     EditUpdatePriRecursionStartTable(:editVisible="editUpdatePriRecursionStartTableVisible" :formData="editUpdatePriRecursionStartTableFormData")