调整奖励日志和记录

src/views/pri/priLog/hook.tsx

@@ -47,33 +47,51 @@ export function usePriLog() {
     {
       label: "ID",
       prop: "id",
-      minWidth: 200
+      width: 100
     },
     {
-      label: "配置ID",
+      label: "奖励",
       prop: "listId",
-      minWidth: 200
+      width: 200,
+      formatter: ({ listId }) => {
+        return listIdOptionList.value.find(item => item.id == listId).prizeName
+      },
     },
     {
-      label: "发放对象",
-      prop: "prizeObjId",
-      minWidth: 200
+      label: "批次号",
+      prop: "batchNo",
+      width: 200
     },
     {
-      label: "日志说明",
-      prop: "logSummary",
-      minWidth: 200
+      label: "时间",
+      prop: "createDate",
+      width: 200
     },
     {
-      label: "批次号",
-      prop: "batchNo",
-      minWidth: 200
+      label: "请求参数",
+      prop: "requestParam",
+      width: 200
+    },
+    {
+      label: "入参地址",
+      prop: "prizeInUrl",
+      width: 200
+    },
+    {
+      label: "出的路径",
+      prop: "prizeOutUrl",
+      width: 200
+    },
+    {
+      label: "出的内容",
+      prop: "prizeOutContent",
+      minWidth: 1200
     },
 
     {
       label: "操作",
       fixed: "right",
-      width: 200,
+      width: 130,
       slot: "operation"
     }
   ];

src/views/pri/priLog/index.vue

@@ -65,13 +65,13 @@ provide('closeEditUpdatePriLogVisible', closeEditUpdatePriLogVisible)
       ref="ruleFormRef"
       :rules="rules"
     )
-      el-form-item(label="配置ID", prop="listId")
+      el-form-item(label="奖励", prop="listId")
         el-select(
           v-model="form.listId",
-          placeholder="请选择配置ID",
+          placeholder="请选择奖励",
           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="batchNo")
         el-input(v-model='form.batchNo' autocomplete='off'
           placeholder="请输入批次号")
@@ -86,7 +86,6 @@ provide('closeEditUpdatePriLogVisible', closeEditUpdatePriLogVisible)
     //- 表格组件
     PureTableBar(title="奖励发放日志", @refresh="onSearch(ruleFormRef)" )
       template(#buttons)
-        el-button(type="primary" :icon="useRenderIcon(Addicon)" @click="handleAdd()" v-if="hasAuth(['add'])") 新增
 
       template(v-slot="{ size, checkList }")
         pure-table( 
@@ -114,23 +113,15 @@ provide('closeEditUpdatePriLogVisible', closeEditUpdatePriLogVisible)
               size="small"
               @click="handleUpdatePriLog(row)"
               :icon="useRenderIcon(EditPen)"
-              v-if="hasAuth(['updatePriLog'])"
-            ) 编辑
+            ) 日志
             el-button.reset-margin(
               link
               type="primary"
               size="small"
-              @click="handleDelete(row)"
-              :icon="useRenderIcon(Delete)"
-              v-if="hasAuth(['delete'])"
-            ) 删除
-
-
-
-    Add(:addVisible="addVisible" :listId="form.listId")
-    EditUpdatePriLog(:editVisible="editUpdatePriLogVisible" :formData="editUpdatePriLogFormData")
+              @click="handleUpdatePriLog(row)"
+              :icon="useRenderIcon(EditPen)"
+            ) 报错
 
-                    
 </template>
 
 <style scoped lang="scss">

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

@@ -40,7 +40,7 @@ let UpdateForm = ref({
   fieldQueryValue: "", //匹配值
   fieldQueryValueType: "", //匹配值类型
   queryTableId: props.queryTableId, //匹配表
-  groupByFlag: "", //聚合查询
+  groupByFlag: false, //聚合查询
 
 
 });
@@ -107,7 +107,7 @@ const submit = async (formEl) => {
           fieldQueryValue: "", //匹配值
           fieldQueryValueType: "", //匹配值类型
           queryTableId: props.queryTableId, //匹配表
-          groupByFlag: "", //聚合查询
+          groupByFlag: false, //聚合查询
 
         };
         // 关闭新增弹窗;
@@ -155,7 +155,7 @@ const closeVisible = () => {
     fieldQueryValue: "", //匹配值
     fieldQueryValueType: "", //匹配值类型
     queryTableId: props.queryTableId, //匹配表
-    groupByFlag: "", //聚合查询
+    groupByFlag: false, //聚合查询
 
   };
   closeFn();

src/views/pri/priRecord/hook.tsx

@@ -50,11 +50,11 @@ export function usePriRecord() {
       minWidth: 200
     },
     {
-      label: "配置ID",
+      label: "奖励",
       prop: "listId",
       minWidth: 200,
       formatter: ({ listId }) => {
-        return listIdOptionList.value.find(item => item.id == listId).label
+        return listIdOptionList.value.find(item => item.id == listId).prizeName
       },
     },
     {
@@ -62,6 +62,11 @@ export function usePriRecord() {
       prop: "prizeAmount",
       minWidth: 200
     },
+    {
+      label: "时间",
+      prop: "createDate",
+      minWidth: 200
+    },
     {
       label: "发放对象",
       prop: "prizeObjId",
@@ -75,14 +80,6 @@ export function usePriRecord() {
     {
       label: "入参字段",
       prop: "requestParamField",
-      minWidth: 200
-    },
-
-    {
-      label: "操作",
-      fixed: "right",
-      width: 200,
-      slot: "operation"
     }
   ];
   // 当前页数量切换

src/views/pri/priRecord/index.vue

@@ -65,13 +65,13 @@ provide('closeEditUpdatePriRecordVisible', closeEditUpdatePriRecordVisible)
       ref="ruleFormRef"
       :rules="rules"
     )
-      el-form-item(label="配置ID", prop="listId")
+      el-form-item(label="奖励", prop="listId")
         el-select(
           v-model="form.listId",
-          placeholder="请选择配置ID",
+          placeholder="请选择奖励",
           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="batchNo")
         el-input(v-model='form.batchNo' autocomplete='off'
           placeholder="请输入批次号")
@@ -86,7 +86,6 @@ provide('closeEditUpdatePriRecordVisible', closeEditUpdatePriRecordVisible)
     //- 表格组件
     PureTableBar(title="奖励记录", @refresh="onSearch(ruleFormRef)" )
       template(#buttons)
-        el-button(type="primary" :icon="useRenderIcon(Addicon)" @click="handleAdd()" v-if="hasAuth(['add'])") 新增
 
       template(v-slot="{ size, checkList }")
         pure-table( 
@@ -107,23 +106,6 @@ provide('closeEditUpdatePriRecordVisible', closeEditUpdatePriRecordVisible)
           @size-change="handleSizeChange",
           @current-change="handleCurrentChange"
         )
-          template(#operation="{ row }")
-            el-button.reset-margin(
-              link
-              type="primary"
-              size="small"
-              @click="handleUpdatePriRecord(row)"
-              :icon="useRenderIcon(EditPen)"
-              v-if="hasAuth(['updatePriRecord'])"
-            ) 编辑
-            el-button.reset-margin(
-              link
-              type="primary"
-              size="small"
-              @click="handleDelete(row)"
-              :icon="useRenderIcon(Delete)"
-              v-if="hasAuth(['delete'])"
-            ) 删除
 
 
 

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

@@ -40,6 +40,7 @@ let UpdateForm = ref({
   fieldQueryValue: "", //匹配值
   fieldQueryValueType: "", //匹配值类型
   objectTableId: props.objectTableId, //对象表
+  groupByFlag: false, //聚合查询
 
 
 });
@@ -106,6 +107,7 @@ const submit = async (formEl) => {
           fieldQueryValue: "", //匹配值
           fieldQueryValueType: "", //匹配值类型
           objectTableId: props.objectTableId, //对象表
+          groupByFlag: false, //聚合查询
 
         };
         // 关闭新增弹窗;
@@ -153,6 +155,7 @@ const closeVisible = () => {
     fieldQueryValue: "", //匹配值
     fieldQueryValueType: "", //匹配值类型
     objectTableId: props.objectTableId, //对象表
+    groupByFlag: false, //聚合查询
 
   };
   closeFn();
@@ -203,6 +206,8 @@ const isFullscreen = ref(false)
           clearable,
         )
           el-option(:label="item.tableEnName", :value="item.id" v-for="(item,index) in objectTableIdOptionList")
+      el-form-item(label='聚合查询' prop="groupByFlag")
+        el-switch(v-model="UpdateForm.groupByFlag")
 
     .flex.justify-end
       el-button(

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

@@ -39,6 +39,7 @@ const UpdateForm: any = ref({
   fieldQueryValue: "", //匹配值
   fieldQueryValueType: "", //匹配值类型
   objectTableId: null, //对象表
+  groupByFlag: "", //聚合查询
 
 });
 // 匹配条件选项数据
@@ -103,6 +104,7 @@ const submit = async (formEl) => {
           fieldQueryValue: "", //匹配值
           fieldQueryValueType: "", //匹配值类型
           objectTableId: null, //对象表
+          groupByFlag: "", //聚合查询
 
         };
         // 关闭修改弹窗;
@@ -159,6 +161,7 @@ const closeUpdatePriRecursionStartFieldVisible = () => {
     fieldQueryValue: "", //匹配值
     fieldQueryValueType: "", //匹配值类型
     objectTableId: null, //对象表
+    groupByFlag: "", //聚合查询
 
   };
   closeFn();
@@ -212,6 +215,8 @@ const isFullscreen = ref(false)
           clearable,
         )
           el-option(:label="item.tableEnName", :value="item.id" v-for="(item,index) in objectTableIdOptionList")
+      el-form-item(label='聚合查询' prop="groupByFlag")
+        el-switch(v-model="UpdateForm.groupByFlag")
 
     .flex.justify-end
       el-button(

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

@@ -50,6 +50,8 @@ const fieldReturnKindOptionList = [
   { id: '2', label: '数量' },
   { id: '3', label: '求和' },
   { id: '4', label: '平均值' },
+  { id: '5', label: '最大值' },
+  { id: '6', label: '最小值' },
 ]
 // 对象表选项数据
 const objectTableIdOptionList = ref([]);

src/views/pri/priRecursionStartReturnField/components/updatePriRecursionStartReturnField/index.vue

@@ -42,6 +42,8 @@ const fieldReturnKindOptionList = [
   { id: '2', label: '数量' },
   { id: '3', label: '求和' },
   { id: '4', label: '平均值' },
+  { id: '5', label: '最大值' },
+  { id: '6', label: '最小值' },
 ]
 
 // 表单实例

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

@@ -50,6 +50,8 @@ const fieldReturnKindOptionList = [
   { id: '2', label: '数量' },
   { id: '3', label: '求和' },
   { id: '4', label: '平均值' },
+  { id: '5', label: '最大值' },
+  { id: '6', label: '最小值' },
 ]
 // 匹配表选项数据
 const queryTableIdOptionList = ref([]);

src/views/pri/priReturnField/components/updatePriReturnField/index.vue

@@ -42,6 +42,8 @@ const fieldReturnKindOptionList = [
   { id: '2', label: '数量' },
   { id: '3', label: '求和' },
   { id: '4', label: '平均值' },
+  { id: '5', label: '最大值' },
+  { id: '6', label: '最小值' },
 ]
 
 // 表单实例