测试

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

@@ -171,15 +171,15 @@ const isFullscreen = ref(false)
           placeholder="请选择项目",
           clearable,
         )
-          el-option(:label="item.label", :value="item.id" v-for="(item,index) in projectIdOptionList")
+          el-option(:label="item.projectName", :value="item.id" v-for="(item,index) in projectIdOptionList")
       el-form-item(label='奖励名称' prop="prizeName")
         el-input(v-model='UpdateForm.prizeName' autocomplete='off'
           placeholder="请输入奖励名称")
       el-form-item(label='奖励比例' prop="prizePercent")
-        el-input-number(v-model='UpdateForm.prizePercent' :min="1" :max="1000"
+        el-input-number(v-model='UpdateForm.prizePercent' :min="0" :max="1000"
           placeholder="请输入奖励比例")
       el-form-item(label='奖励固定金额' prop="prizeAmount")
-        el-input-number(v-model='UpdateForm.prizeAmount' :min="1" :max="1000"
+        el-input-number(v-model='UpdateForm.prizeAmount' :min="0" :max="1000"
           placeholder="请输入奖励固定金额")
       el-form-item(label="条件模式", prop="conditionMode")
         el-select(

src/views/pri/priList/components/updatePriList/index.vue

@@ -30,6 +30,7 @@ const props = defineProps<{
 }>();
 // 表单数据
 const UpdateForm: any = ref({
+  id: null, //ID
   prizeName: "", //奖励名称
   prizePercent: "", //奖励比例
   prizeAmount: "", //奖励固定金额
@@ -40,9 +41,14 @@ const UpdateForm: any = ref({
 });
 // 条件模式选项数据
 const conditionModeOptionList = [
+  { id: 'all', label: '全部满足' },
+  { id: 'one', label: '一个满足' },
 ]
 // 奖励内容选项数据
 const prizeContentOptionList = [
+  { id: 'cash', label: '现金' },
+  { id: 'recyc', label: '循环资格' },
+  { id: 'coupon', label: '机具券' },
 ]
 
 // 表单实例
@@ -72,6 +78,7 @@ const submit = async (formEl) => {
           type: "success"
         });
         UpdateForm.value = {
+          id: null, //ID
           prizeName: "", //奖励名称
           prizePercent: "", //奖励比例
           prizeAmount: "", //奖励固定金额
@@ -104,6 +111,9 @@ const submit = async (formEl) => {
 
 // 表单校验规则
 const rules = reactive({
+  id: [
+    { required: true, message: '请输入ID', trigger: 'blur' },
+  ],
   prizeName: [
     { required: true, message: '请输入奖励名称', trigger: 'blur' },
   ],
@@ -128,6 +138,7 @@ const openVisible = async () => {
 // 关闭弹窗回调函数
 const closeUpdatePriListVisible = () => {
   UpdateForm.value = {
+    id: null, //ID
     prizeName: "", //奖励名称
     prizePercent: "", //奖励比例
     prizeAmount: "", //奖励固定金额
@@ -147,14 +158,17 @@ const isFullscreen = ref(false)
 .main
   el-dialog(v-model='props.editVisible' draggable width="50%" :fullscreen="isFullscreen" title="修改" @close="closeUpdatePriListVisible" @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="0" :max="1000"
+          placeholder="请输入ID")
       el-form-item(label='奖励名称' prop="prizeName")
         el-input(v-model='UpdateForm.prizeName' autocomplete='off'
           placeholder="请输入奖励名称")
       el-form-item(label='奖励比例' prop="prizePercent")
-        el-input-number(v-model='UpdateForm.prizePercent' :min="1" :max="1000"
+        el-input-number(v-model='UpdateForm.prizePercent' :min="0" :max="1000"
           placeholder="请输入奖励比例")
       el-form-item(label='奖励固定金额' prop="prizeAmount")
-        el-input-number(v-model='UpdateForm.prizeAmount' :min="1" :max="1000"
+        el-input-number(v-model='UpdateForm.prizeAmount' :min="0" :max="1000"
           placeholder="请输入奖励固定金额")
       el-form-item(label="条件模式", prop="conditionMode")
         el-select(

src/views/pri/priList/hook.tsx

@@ -9,18 +9,18 @@ export function usePriList() {
   // 获取当前板块接口列表
   onMounted(async () => {
     const route = useRoute();
-    form.projectId = route.query.projectId.toString();
+    form.projectId = Number(route.query.projectId);
 
     UrlList = await getGroupUrl(["prizeSet"]);
     onSearch(ruleFormRef.value);
-  projectIdQuery();
+    projectIdQuery();
 
   });
   let form = reactive({
-  projectId:"", //项目
-  prizeName:"", //奖励名称
-  conditionMode:"", //条件模式
-  prizeContent:"", //奖励内容
+    projectId: null, //项目
+    prizeName: "", //奖励名称
+    conditionMode: "", //条件模式
+    prizeContent: "", //奖励内容
 
 
   });
@@ -69,7 +69,10 @@ export function usePriList() {
     {
       label: "条件模式",
       prop: "conditionMode",
-      minWidth: 200
+      minWidth: 200,
+      formatter: ({ conditionMode }) => {
+        return conditionModeOptionList.find(item => item.id == conditionMode).label
+      },
     },
     {
       label: "是否递归",
@@ -79,7 +82,10 @@ export function usePriList() {
     {
       label: "奖励内容",
       prop: "prizeContent",
-      minWidth: 200
+      minWidth: 200,
+      formatter: ({ prizeContent }) => {
+        return prizeContentOptionList.find(item => item.id == prizeContent).label
+      },
     },
 
     {
@@ -143,11 +149,11 @@ export function usePriList() {
       }
     })
   }
-    // 项目选项数据
-    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;
     }
@@ -166,8 +172,8 @@ export function usePriList() {
 
 
 
-  
-    // 删除
+
+  // 删除
   function handleDelete(row) {
     ElMessageBox.confirm(
       `是否删除该奖励配置? `,
@@ -187,20 +193,20 @@ export function usePriList() {
         onSearch(ruleFormRef.value);
       } else {
         ElMessageBox.alert(msg, "提示", {
-        confirmButtonText: "关闭",
-        type: "warning"
-      });
+          confirmButtonText: "关闭",
+          type: "warning"
+        });
       };
     })
   }
 
-    // 新增
+  // 新增
   const addVisible = ref(false);
   function handleAdd() {
     addVisible.value = true;
   };
 
-    // 修改
+  // 修改
   const editUpdatePriListVisible = ref(false);
   const editUpdatePriListFormData = ref({});
   function handleUpdatePriList(row) {
@@ -222,6 +228,8 @@ export function usePriList() {
     ruleFormRef,
     projectIdQuery,
     projectIdOptionList,
+    conditionModeOptionList,
+    prizeContentOptionList,
 
     handleAdd,
     addVisible,

src/views/pri/priList/index.vue

@@ -29,6 +29,8 @@ const {
   handleSelectionChange,
   ruleFormRef,
   projectIdOptionList,
+  conditionModeOptionList,
+  prizeContentOptionList,
   handleAdd,
   addVisible,
   handleUpdatePriList,
@@ -71,7 +73,7 @@ provide('closeEditUpdatePriListVisible', closeEditUpdatePriListVisible)
           placeholder="请选择项目",
           clearable,
         )
-          el-option(:label="item.label", :value="item.id" v-for="(item,index) in projectIdOptionList")
+          el-option(:label="item.projectName", :value="item.id" v-for="(item,index) in projectIdOptionList")
       el-form-item(label='奖励名称' prop="prizeName")
         el-input(v-model='form.prizeName' autocomplete='off'
           placeholder="请输入奖励名称")

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

@@ -44,9 +44,13 @@ const ruleFormRef = ref()
 // 传参选项数据
 // 调用方式选项数据
 const requestModeOptionList = [
+  { id: 'http', label: 'http' },
+  { id: 'mq', label: 'MQ' },
 ]
 // 返回数据类型选项数据
 const returnTypeOptionList = [
+  { id: 'sync', label: '同步' },
+  { id: 'asyn', label: '异步' },
 ]
 
 // 选项卡参数(默认值为列表某项的id)
@@ -74,7 +78,7 @@ const submit = async (formEl) => {
           type: "success"
         });
         UpdateForm.value = {
-                projectName: "", //项目名称
+      projectName: "", //项目名称
       projectDetail: "", //项目介绍
       requestMode: "", //调用方式
       noticeFlag: "", //是否通知
@@ -117,7 +121,7 @@ const closeFn: any = inject("closeAddVisible");
 const closeVisible = () => {
   // 清空表单项;
   UpdateForm.value = {
-        projectName: "", //项目名称
+    projectName: "", //项目名称
     projectDetail: "", //项目介绍
     requestMode: "", //调用方式
     noticeFlag: "", //是否通知

src/views/pri/priProject/components/updatePriProject/index.vue

@@ -30,6 +30,7 @@ const props = defineProps<{
 }>();
 // 表单数据
 const UpdateForm: any = ref({
+  id: null, //ID
   projectName: "", //项目名称
   projectDetail: "", //项目介绍
   requestMode: "", //调用方式
@@ -41,9 +42,13 @@ const UpdateForm: any = ref({
 });
 // 调用方式选项数据
 const requestModeOptionList = [
+  { id: 'http', label: 'http' },
+  { id: 'mq', label: 'MQ' },
 ]
 // 返回数据类型选项数据
 const returnTypeOptionList = [
+  { id: 'sync', label: '同步' },
+  { id: 'asyn', label: '异步' },
 ]
 
 // 表单实例
@@ -73,7 +78,8 @@ const submit = async (formEl) => {
           type: "success"
         });
         UpdateForm.value = {
-                projectName: "", //项目名称
+      id: null, //ID
+      projectName: "", //项目名称
       projectDetail: "", //项目介绍
       requestMode: "", //调用方式
       noticeFlag: "", //是否通知
@@ -124,6 +130,7 @@ const openVisible = async () => {
 // 关闭弹窗回调函数
 const closeUpdatePriProjectVisible = () => {
   UpdateForm.value = {
+    id: null, //ID
     projectName: "", //项目名称
     projectDetail: "", //项目介绍
     requestMode: "", //调用方式
@@ -144,6 +151,9 @@ const isFullscreen = ref(false)
 .main
   el-dialog(v-model='props.editVisible' draggable width="50%" :fullscreen="isFullscreen" title="修改" @close="closeUpdatePriProjectVisible" @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"
+          placeholder="请输入ID")
       el-form-item(label='项目名称' prop="projectName")
         el-input(v-model='UpdateForm.projectName' autocomplete='off'
           placeholder="请输入项目名称")

src/views/pri/priProject/hook.tsx

@@ -15,8 +15,8 @@ export function usePriProject() {
 
   });
   let form = reactive({
-    projectName: "", //项目名称
-    requestMode: "", //调用方式
+  projectName:"", //项目名称
+  requestMode:"", //调用方式
 
 
   });
@@ -72,6 +72,16 @@ export function usePriProject() {
       prop: "returnType",
       minWidth: 200
     },
+    {
+      label: "项目名称",
+      prop: "projectName",
+      minWidth: 200
+    },
+    {
+      label: "ID",
+      prop: "id",
+      minWidth: 200
+    },
 
     {
       label: "操作",
@@ -134,15 +144,20 @@ export function usePriProject() {
       }
     })
   }
+  // 调用方式选项数据
+  const requestModeOptionList = [
+    { id: 'http', label: 'http' },
+    { id: 'mq', label: 'MQ' },
+  ]
 
 
 
-  //跳转到奖励配置
+    //跳转到奖励配置
   function linkToPriList(row) {
-    router.push({ path: '../../pri/priList/index', query: { id: row.id } });
+    router.push({ path: '../../pri/priList/index', query: { projectId: row.id } });
   }
 
-  // 删除
+    // 删除
   function handleDelete(row) {
     ElMessageBox.confirm(
       `是否删除该奖励项目? `,
@@ -162,20 +177,20 @@ export function usePriProject() {
         onSearch(ruleFormRef.value);
       } else {
         ElMessageBox.alert(msg, "提示", {
-          confirmButtonText: "关闭",
-          type: "warning"
-        });
+        confirmButtonText: "关闭",
+        type: "warning"
+      });
       };
     })
   }
 
-  // 新增
+    // 新增
   const addVisible = ref(false);
   function handleAdd() {
     addVisible.value = true;
   };
 
-  // 修改
+    // 修改
   const editUpdatePriProjectVisible = ref(false);
   const editUpdatePriProjectFormData = ref({});
   function handleUpdatePriProject(row) {
@@ -195,6 +210,7 @@ export function usePriProject() {
     handleCurrentChange,
     handleSelectionChange,
     ruleFormRef,
+    requestModeOptionList,
 
     handleAdd,
     addVisible,

src/views/pri/priProject/index.vue

@@ -28,6 +28,7 @@ const {
   handleCurrentChange,
   handleSelectionChange,
   ruleFormRef,
+  requestModeOptionList,
   handleAdd,
   addVisible,
   handleUpdatePriProject,