format调整

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

@@ -34,6 +34,7 @@ const props = defineProps<{
 // 表单数据
 let UpdateForm = ref({
   projectId: props.projectId, //项目
+  kind: "", //奖励分类
   prizeName: "", //奖励名称
   prizePercent: "", //奖励比例
   prizeAmount: "", //奖励固定金额
@@ -62,6 +63,12 @@ const prizeContentOptionList = [
   { id: 'recyc', label: '循环资格' },
   { id: 'coupon', label: '机具券' },
 ]
+// 奖励分类
+const kindOptionList = [
+  { id: 'pos', label: '机具奖励' },
+  { id: 'order', label: '订单奖励' },
+  { id: 'reserve', label: '额度返还' },
+]
 
 // 选项卡参数(默认值为列表某项的id)
 const activeId = ref('1')
@@ -89,6 +96,7 @@ const submit = async (formEl) => {
         });
         UpdateForm.value = {
           projectId: props.projectId, //项目
+          kind: "", //奖励分类
           prizeName: "", //奖励名称
           prizePercent: "", //奖励比例
           prizeAmount: "", //奖励固定金额
@@ -150,6 +158,7 @@ const closeVisible = () => {
   // 清空表单项;
   UpdateForm.value = {
     projectId: props.projectId, //项目
+    kind: "", //奖励分类
     prizeName: "", //奖励名称
     prizePercent: "", //奖励比例
     prizeAmount: "", //奖励固定金额
@@ -178,6 +187,13 @@ const isFullscreen = ref(false)
           clearable,
         )
           el-option(:label="item.projectName", :value="item.id" v-for="(item,index) in projectIdOptionList")
+      el-form-item(label="奖励分类", prop="kind")
+        el-select(
+          v-model="UpdateForm.kind",
+          placeholder="请选择奖励分类",
+          clearable,
+        )
+          el-option(:label="item.label", :value="item.id" v-for="(item,index) in kindOptionList")
       el-form-item(label='奖励名称' prop="prizeName")
         el-input(v-model='UpdateForm.prizeName' autocomplete='off'
           placeholder="请输入奖励名称")

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

@@ -31,6 +31,7 @@ const props = defineProps<{
 // 表单数据
 const UpdateForm: any = ref({
   id: null, //ID
+  kind: "", //奖励分类
   prizeName: "", //奖励名称
   prizePercent: "", //奖励比例
   prizeAmount: "", //奖励固定金额
@@ -52,6 +53,12 @@ const prizeContentOptionList = [
   { id: 'recyc', label: '循环资格' },
   { id: 'coupon', label: '机具券' },
 ]
+// 奖励分类
+const kindOptionList = [
+  { id: 'pos', label: '机具奖励' },
+  { id: 'order', label: '订单奖励' },
+  { id: 'reserve', label: '额度返还' },
+]
 
 // 表单实例
 const ruleFormRef = ref()
@@ -81,6 +88,7 @@ const submit = async (formEl) => {
         });
         UpdateForm.value = {
           id: null, //ID
+          kind: "", //奖励分类
           prizeName: "", //奖励名称
           prizePercent: "", //奖励比例
           prizeAmount: "", //奖励固定金额
@@ -143,6 +151,7 @@ const openVisible = async () => {
 const closeUpdatePriListVisible = () => {
   UpdateForm.value = {
     id: null, //ID
+    kind: "", //奖励分类
     prizeName: "", //奖励名称
     prizePercent: "", //奖励比例
     prizeAmount: "", //奖励固定金额
@@ -167,6 +176,13 @@ const isFullscreen = ref(false)
       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="kind")
+        el-select(
+          v-model="UpdateForm.kind",
+          placeholder="请选择奖励分类",
+          clearable,
+        )
+          el-option(:label="item.label", :value="item.id" v-for="(item,index) in kindOptionList")
       el-form-item(label='奖励名称' prop="prizeName")
         el-input(v-model='UpdateForm.prizeName' autocomplete='off'
           placeholder="请输入奖励名称")

src/views/pri/priList/hook.tsx

@@ -49,6 +49,14 @@ export function usePriList() {
       prop: "id",
       minWidth: 200
     },
+    {
+      label: "奖励分类",
+      prop: "kind",
+      minWidth: 200,
+      formatter: ({ kind }) => {
+        return kindOptionList.find(item => item.id == kind).label
+      },
+    },
     {
       label: "奖励名称",
       prop: "prizeName",
@@ -166,6 +174,12 @@ export function usePriList() {
     { id: 'recyc', label: '循环资格' },
     { id: 'coupon', label: '机具券' },
   ]
+  // 奖励分类
+  const kindOptionList = [
+    { id: 'pos', label: '机具奖励' },
+    { id: 'order', label: '订单奖励' },
+    { id: 'reserve', label: '额度返还' },
+  ]
 
 
 

src/views/pri/priPrizeInField/hook.tsx

@@ -16,9 +16,9 @@ export function usePriPrizeInField() {
 
   });
   let form = reactive({
-  fieldName:"", //字段名称
-  fieldEnName:"", //字段名
-  inTableId:null, //入库表
+    fieldName: "", //字段名称
+    fieldEnName: "", //字段名
+    inTableId: null, //入库表
 
 
   });
@@ -73,9 +73,6 @@ export function usePriPrizeInField() {
       label: "入库表",
       prop: "inTableId",
       minWidth: 200
-      formatter: ({ inTableId }) => {
-        return inTableIdOptionList.find(item => item.id == inTableId).label
-      },
     },
 
     {
@@ -142,8 +139,8 @@ export function usePriPrizeInField() {
 
 
 
-  
-    // 删除
+
+  // 删除
   function handleDelete(row) {
     ElMessageBox.confirm(
       `是否删除该奖励入库字段? `,
@@ -163,20 +160,20 @@ export function usePriPrizeInField() {
         onSearch(ruleFormRef.value);
       } else {
         ElMessageBox.alert(msg, "提示", {
-        confirmButtonText: "关闭",
-        type: "warning"
-      });
+          confirmButtonText: "关闭",
+          type: "warning"
+        });
       };
     })
   }
 
-    // 新增
+  // 新增
   const addVisible = ref(false);
   function handleAdd() {
     addVisible.value = true;
   };
 
-    // 修改
+  // 修改
   const editUpdatePriPrizeInFieldVisible = ref(false);
   const editUpdatePriPrizeInFieldFormData = ref({});
   function handleUpdatePriPrizeInField(row) {

src/views/pri/priPrizeInQueryField/hook.tsx

@@ -16,9 +16,9 @@ export function usePriPrizeInQueryField() {
 
   });
   let form = reactive({
-  fieldName:"", //字段名称
-  fieldEnName:"", //字段名
-  inTableId:null, //入库表
+    fieldName: "", //字段名称
+    fieldEnName: "", //字段名
+    inTableId: null, //入库表
 
 
   });
@@ -83,9 +83,6 @@ export function usePriPrizeInQueryField() {
       label: "入库表",
       prop: "inTableId",
       minWidth: 200
-      formatter: ({ inTableId }) => {
-        return inTableIdOptionList.find(item => item.id == inTableId).label
-      },
     },
 
     {
@@ -152,8 +149,8 @@ export function usePriPrizeInQueryField() {
 
 
 
-  
-    // 删除
+
+  // 删除
   function handleDelete(row) {
     ElMessageBox.confirm(
       `是否删除该奖励入库条件字段? `,
@@ -173,20 +170,20 @@ export function usePriPrizeInQueryField() {
         onSearch(ruleFormRef.value);
       } else {
         ElMessageBox.alert(msg, "提示", {
-        confirmButtonText: "关闭",
-        type: "warning"
-      });
+          confirmButtonText: "关闭",
+          type: "warning"
+        });
       };
     })
   }
 
-    // 新增
+  // 新增
   const addVisible = ref(false);
   function handleAdd() {
     addVisible.value = true;
   };
 
-    // 修改
+  // 修改
   const editUpdatePriPrizeInQueryFieldVisible = ref(false);
   const editUpdatePriPrizeInQueryFieldFormData = ref({});
   function handleUpdatePriPrizeInQueryField(row) {

src/views/pri/priRecord/hook.tsx

@@ -52,9 +52,9 @@ export function usePriRecord() {
     {
       label: "配置ID",
       prop: "listId",
-      minWidth: 200
+      minWidth: 200,
       formatter: ({ listId }) => {
-        return listIdOptionList.find(item => item.id == listId).label
+        return listIdOptionList.value.find(item => item.id == listId).label
       },
     },
     {

src/views/pri/priRecursionEndField/hook.tsx

@@ -16,9 +16,9 @@ export function usePriRecursionEndField() {
 
   });
   let form = reactive({
-  fieldName:"", //字段名称
-  fieldEnName:"", //字段名
-  objectTableId:null, //对象表
+    fieldName: "", //字段名称
+    fieldEnName: "", //字段名
+    objectTableId: null, //对象表
 
 
   });
@@ -83,9 +83,6 @@ export function usePriRecursionEndField() {
       label: "对象表",
       prop: "objectTableId",
       minWidth: 200
-      formatter: ({ objectTableId }) => {
-        return objectTableIdOptionList.find(item => item.id == objectTableId).label
-      },
     },
 
     {
@@ -152,8 +149,8 @@ export function usePriRecursionEndField() {
 
 
 
-  
-    // 删除
+
+  // 删除
   function handleDelete(row) {
     ElMessageBox.confirm(
       `是否删除该递归停止条件字段? `,
@@ -173,20 +170,20 @@ export function usePriRecursionEndField() {
         onSearch(ruleFormRef.value);
       } else {
         ElMessageBox.alert(msg, "提示", {
-        confirmButtonText: "关闭",
-        type: "warning"
-      });
+          confirmButtonText: "关闭",
+          type: "warning"
+        });
       };
     })
   }
 
-    // 新增
+  // 新增
   const addVisible = ref(false);
   function handleAdd() {
     addVisible.value = true;
   };
 
-    // 修改
+  // 修改
   const editUpdatePriRecursionEndFieldVisible = ref(false);
   const editUpdatePriRecursionEndFieldFormData = ref({});
   function handleUpdatePriRecursionEndField(row) {