1231233

src/constant/statusMap.js

@@ -338,3 +338,16 @@ export const topStatusList = [
   { value: 2, label: '过期', listClass: listClass.info},
   { value: 3, label: '待生效', listClass: listClass.warning},
 ]
+
+/**
+ *  PAY("1","充值"),
+ *     SYSTEM("2","系统调整"),
+ *     INVITE("3","分销"),
+ *     USE("4","抽奖"),
+ */
+export const pointChangeLogActionTypeList = [
+  { value: "1", label: '充值',listClass: listClass.info},
+  { value: "2", label: '系统调整',listClass: listClass.danger},
+  { value: "3", label: '分销',listClass: listClass.primary},
+  { value: "4", label: '抽奖',listClass: listClass.primary},
+]

src/views/cai/pointChangeLog/index.vue

@@ -1,203 +1,75 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="用户ID" prop="userId">
+      <el-form-item :label="systemName+'号'" prop="usercode">
         <el-input
-          v-model="queryParams.userId"
+            v-model="queryParams.usercode"
-          placeholder="请输入用户ID"
+            :placeholder="'请输入'+systemName+'号'"
-          clearable
+            clearable
-          @keyup.enter.native="handleQuery"
+            @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="用户" prop="usercode">
+      <el-form-item label="来源" prop="actionType">
-        <el-input
+        <el-select v-model="queryParams.actionType" placeholder="来源" clearable size="small">
-          v-model="queryParams.usercode"
+          <el-option
-          placeholder="请输入用户"
+              v-for="dict in pointChangeLogActionTypeList"
-          clearable
+              :key="dict.value"
-          @keyup.enter.native="handleQuery"
+              :label="dict.label"
-        />
+              :value="dict.value"
+              @keyup.enter.native="handleQuery"
+          />
+        </el-select>
       </el-form-item>
-      <el-form-item label="账户明细说明" prop="message">
+      <el-form-item label="链路号" prop="traceId">
         <el-input
-          v-model="queryParams.message"
+            v-model="queryParams.traceId"
-          placeholder="请输入账户明细说明"
+            placeholder="请输入链路号"
-          clearable
+            clearable
-          @keyup.enter.native="handleQuery"
+            @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="目标ID，用户、抽奖ID" prop="tarUserId">
-        <el-input
-          v-model="queryParams.tarUserId"
-          placeholder="请输入目标ID，用户、抽奖ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="目标用户Code，有用户才有用" prop="tarUsercode">
-        <el-input
-          v-model="queryParams.tarUsercode"
-          placeholder="请输入目标用户Code，有用户才有用"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="目标名称，用户名称，抽奖名称" prop="tarName">
-        <el-input
-          v-model="queryParams.tarName"
-          placeholder="请输入目标名称，用户名称，抽奖名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="礼物价值" prop="tarPrice">
-        <el-input
-          v-model="queryParams.tarPrice"
-          placeholder="请输入礼物价值"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="目标提前缓存的" prop="tarImg">
-        <el-input
-          v-model="queryParams.tarImg"
-          placeholder="请输入目标提前缓存的"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="变化值，为正 或者为负" prop="changeValue">
-        <el-input
-          v-model="queryParams.changeValue"
-          placeholder="请输入变化值，为正 或者为负"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="操作IP" prop="operateIp">
-        <el-input
-          v-model="queryParams.operateIp"
-          placeholder="请输入操作IP"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="跟踪ID 订单号-礼物ID" prop="traceId">
-        <el-input
-          v-model="queryParams.traceId"
-          placeholder="请输入跟踪ID 订单号-礼物ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="是否兑换" prop="getFlag">
-        <el-input
-          v-model="queryParams.getFlag"
-          placeholder="请输入是否兑换"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="兑换时间" prop="getTime">
-        <el-date-picker clearable
-          v-model="queryParams.getTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择兑换时间">
-        </el-date-picker>
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['cai:pointChangeLog:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['cai:pointChangeLog:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['cai:pointChangeLog:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['cai:pointChangeLog:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
     <el-table v-loading="loading" :data="pointChangeLogList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column :label="systemName+'号'" align="center" prop="usercode" />
-      <el-table-column label="子账户ID" align="center" prop="id" v-if="true"/>
+      <el-table-column label="来源" align="center" prop="actionType" >
-      <el-table-column label="用户ID" align="center" prop="userId" />
+        <template v-slot="scope">
-      <el-table-column label="用户" align="center" prop="usercode" />
+          <cai-dict-tag :options="pointChangeLogActionTypeList" :value="scope.row.actionType"/>
-      <el-table-column label="账户明细说明" align="center" prop="message" />
-      <el-table-column label="目标ID，用户、抽奖ID" align="center" prop="tarUserId" />
-      <el-table-column label="目标用户Code，有用户才有用" align="center" prop="tarUsercode" />
-      <el-table-column label="目标名称，用户名称，抽奖名称" align="center" prop="tarName" />
-      <el-table-column label="礼物价值" align="center" prop="tarPrice" />
-      <el-table-column label="目标提前缓存的" align="center" prop="tarImg" />
-      <el-table-column label="目标额外字段" align="center" prop="tarJson" />
-      <el-table-column label="变化值，为正 或者为负" align="center" prop="changeValue" />
-      <el-table-column label="操作IP" align="center" prop="operateIp" />
-      <el-table-column label="是否为后台用户手动调整" align="center" prop="isAdmin" />
-      <el-table-column label="跟踪类型 1-充值 2-分销 3-抽奖" align="center" prop="traceLinkType" />
-      <el-table-column label="跟踪ID 订单号-礼物ID" align="center" prop="traceId" />
-      <el-table-column label="是否兑换" align="center" prop="getFlag" />
-      <el-table-column label="兑换时间" align="center" prop="getTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.getTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="变动" align="center" prop="changeValue" >
-        <template slot-scope="scope">
+        <template v-slot="scope" >
-          <el-button
+          <span :class="scope.row.changeValue >= 0 ?'font-red':'font-green'">{{scope.row.changeValue}}</span>
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['cai:pointChangeLog:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['cai:pointChangeLog:remove']"
-          >删除</el-button>
         </template>
       </el-table-column>
+      <el-table-column label="说明" align="center" prop="message" min-width="200">
+        <template v-slot="scope">
+          <div class="context-avatar-center">
+            <span>{{scope.row.message}}</span><image-preview v-if="scope.row.tarImg" :src="scope.row.tarImg" :width="32" :height="32"/>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="后台操作" align="center" prop="isAdmin" >
+        <template v-slot="scope">
+          <cai-dict-tag :options="yesOrNoList" :value="scope.row.isAdmin?1:0"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作时间" align="center" prop="createTime" width="160" />
+      <el-table-column label="链路号" align="center" prop="traceId" show-overflow-tooltip/>
+<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-info"
+              v-if="scope.row.traceId"
+              @click="handleInfo(scope.row)"
+          >关联业务</el-button>
+        </template>
+      </el-table-column>-->
     </el-table>
 
     <pagination
@@ -208,69 +80,19 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改积分记录对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="用户ID" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入用户ID" />
-        </el-form-item>
-        <el-form-item label="用户" prop="usercode">
-          <el-input v-model="form.usercode" placeholder="请输入用户" />
-        </el-form-item>
-        <el-form-item label="账户明细说明" prop="message">
-          <el-input v-model="form.message" placeholder="请输入账户明细说明" />
-        </el-form-item>
-        <el-form-item label="目标ID，用户、抽奖ID" prop="tarUserId">
-          <el-input v-model="form.tarUserId" placeholder="请输入目标ID，用户、抽奖ID" />
-        </el-form-item>
-        <el-form-item label="目标用户Code，有用户才有用" prop="tarUsercode">
-          <el-input v-model="form.tarUsercode" placeholder="请输入目标用户Code，有用户才有用" />
-        </el-form-item>
-        <el-form-item label="目标名称，用户名称，抽奖名称" prop="tarName">
-          <el-input v-model="form.tarName" placeholder="请输入目标名称，用户名称，抽奖名称" />
-        </el-form-item>
-        <el-form-item label="礼物价值" prop="tarPrice">
-          <el-input v-model="form.tarPrice" placeholder="请输入礼物价值" />
-        </el-form-item>
-        <el-form-item label="目标提前缓存的" prop="tarImg">
-          <el-input v-model="form.tarImg" placeholder="请输入目标提前缓存的" />
-        </el-form-item>
-        <el-form-item label="变化值，为正 或者为负" prop="changeValue">
-          <el-input v-model="form.changeValue" placeholder="请输入变化值，为正 或者为负" />
-        </el-form-item>
-        <el-form-item label="操作IP" prop="operateIp">
-          <el-input v-model="form.operateIp" placeholder="请输入操作IP" />
-        </el-form-item>
-        <el-form-item label="跟踪ID 订单号-礼物ID" prop="traceId">
-          <el-input v-model="form.traceId" placeholder="请输入跟踪ID 订单号-礼物ID" />
-        </el-form-item>
-        <el-form-item label="是否兑换" prop="getFlag">
-          <el-input v-model="form.getFlag" placeholder="请输入是否兑换" />
-        </el-form-item>
-        <el-form-item label="兑换时间" prop="getTime">
-          <el-date-picker clearable
-            v-model="form.getTime"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="请选择兑换时间">
-          </el-date-picker>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listPointChangeLog, getPointChangeLog, delPointChangeLog, addPointChangeLog, updatePointChangeLog } from "@/api/cai/pointChangeLog";
+import {listPointChangeLog} from "@/api/cai/pointChangeLog";
+import {pointChangeLogActionTypeList, yesOrNoList} from "@/constant/statusMap";
 
 export default {
   name: "PointChangeLog",
   data() {
     return {
+      systemName: process.env.VUE_APP_SYSTEM_HOME,
+      pointChangeLogActionTypeList,yesOrNoList,
       // 按钮loading
       buttonLoading: false,
       // 遮罩层
@@ -287,90 +109,14 @@ export default {
       total: 0,
       // 积分记录表格数据
       pointChangeLogList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        userId: undefined,
         usercode: undefined,
-        message: undefined,
+        actionType: undefined,
-        tarUserId: undefined,
+        traceId:undefined
-        tarUsercode: undefined,
-        tarName: undefined,
-        tarPrice: undefined,
-        tarImg: undefined,
-        tarJson: undefined,
-        changeValue: undefined,
-        operateIp: undefined,
-        isAdmin: undefined,
-        traceLinkType: undefined,
-        traceId: undefined,
-        getFlag: undefined,
-        getTime: undefined
       },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "子账户ID不能为空", trigger: "blur" }
-        ],
-        userId: [
-          { required: true, message: "用户ID不能为空", trigger: "blur" }
-        ],
-        usercode: [
-          { required: true, message: "用户不能为空", trigger: "blur" }
-        ],
-        message: [
-          { required: true, message: "账户明细说明不能为空", trigger: "blur" }
-        ],
-        tarUserId: [
-          { required: true, message: "目标ID，用户、抽奖ID不能为空", trigger: "blur" }
-        ],
-        tarUsercode: [
-          { required: true, message: "目标用户Code，有用户才有用不能为空", trigger: "blur" }
-        ],
-        tarName: [
-          { required: true, message: "目标名称，用户名称，抽奖名称不能为空", trigger: "blur" }
-        ],
-        tarPrice: [
-          { required: true, message: "礼物价值不能为空", trigger: "blur" }
-        ],
-        tarImg: [
-          { required: true, message: "目标提前缓存的不能为空", trigger: "blur" }
-        ],
-        tarJson: [
-          { required: true, message: "目标额外字段不能为空", trigger: "blur" }
-        ],
-        changeValue: [
-          { required: true, message: "变化值，为正 或者为负不能为空", trigger: "blur" }
-        ],
-        operateIp: [
-          { required: true, message: "操作IP不能为空", trigger: "blur" }
-        ],
-        isAdmin: [
-          { required: true, message: "是否为后台用户手动调整不能为空", trigger: "blur" }
-        ],
-        traceLinkType: [
-          { required: true, message: "跟踪类型 1-充值 2-分销 3-抽奖不能为空", trigger: "change" }
-        ],
-        traceId: [
-          { required: true, message: "跟踪ID 订单号-礼物ID不能为空", trigger: "blur" }
-        ],
-        getFlag: [
-          { required: true, message: "是否兑换不能为空", trigger: "blur" }
-        ],
-        createTime: [
-          { required: true, message: "不能为空", trigger: "blur" }
-        ],
-        getTime: [
-          { required: true, message: "兑换时间不能为空", trigger: "blur" }
-        ]
-      }
     };
   },
   created() {
@@ -386,35 +132,6 @@ export default {
         this.loading = false;
       });
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: undefined,
-        userId: undefined,
-        usercode: undefined,
-        message: undefined,
-        tarUserId: undefined,
-        tarUsercode: undefined,
-        tarName: undefined,
-        tarPrice: undefined,
-        tarImg: undefined,
-        tarJson: undefined,
-        changeValue: undefined,
-        operateIp: undefined,
-        isAdmin: undefined,
-        traceLinkType: undefined,
-        traceId: undefined,
-        getFlag: undefined,
-        createTime: undefined,
-        getTime: undefined
-      };
-      this.resetForm("form");
-    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -431,70 +148,6 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加积分记录";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.loading = true;
-      this.reset();
-      const id = row.id || this.ids
-      getPointChangeLog(id).then(response => {
-        this.loading = false;
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改积分记录";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          this.buttonLoading = true;
-          if (this.form.id != null) {
-            updatePointChangeLog(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          } else {
-            addPointChangeLog(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除积分记录编号为"' + ids + '"的数据项？').then(() => {
-        this.loading = true;
-        return delPointChangeLog(ids);
-      }).then(() => {
-        this.loading = false;
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {
-      }).finally(() => {
-        this.loading = false;
-      });
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('cai/pointChangeLog/export', {
-        ...this.queryParams
-      }, `pointChangeLog_${new Date().getTime()}.xlsx`)
-    }
   }
 };
 </script>