@dongkboy 8 mesi fa
parent
commit
38d0f2ff04

+ 3 - 5
config/dev.env.js

@@ -5,11 +5,11 @@ const prodEnv = require('./prod.env')
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
-  // BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
+  BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"',//正式服务器
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
-  // BASE_URL: '"http://192.168.0.115:8080/"', //凯森
-  BASE_URL: '"http://192.168.0.106:8080/"',//屈晨
+  // BASE_URL: '"http://192.168.0.59:8080/"', //凯森
+  // BASE_URL: '"http://192.168.0.253:8080/"',//屈晨
   // BASE_URL: '"http://192.168.0.253:8080/"',//田智
   // BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
   // BASE_URL: '"http:///192.168.0.253:8080/"',//田智
@@ -25,8 +25,6 @@ module.exports = merge(prodEnv, {
   APP_BASE_URL: '"https://pre.baoxianzhanggui.com/web-api"',    // app打包上传地址
   SOCKET_Url: '"ws://192.168.0.52:8080/"',
   // SOCKET_Url: '"wss://sxzgkj.baoxianzhanggui.com/web-api/"',
-
-
 })
 
 

+ 8 - 0
src/http/moudules/user.js

@@ -764,3 +764,11 @@ export const transferPost = (data) => {
     data
   })
 }
+// 代理人注销记录
+export const revokeUserLogoutList = (data) => {
+  return axios({
+    url: '/user/revokeUserLogoutList',
+    method: 'post',
+    data
+  })
+}

+ 9 - 8
src/views/DistributionManage/PartnerManagement/UpgradeDowngradeRecord.vue

@@ -129,6 +129,7 @@
 <!-- 行为区域 -->
 <script>
 import templateTable from "../components/templateTable.vue";
+import { Decimal } from "decimal.js";
 export default {
   components: {
     templateTable,
@@ -141,7 +142,7 @@ export default {
       showViewer: false,//大图预览开关
       imgList: [//默认回显图片
       ],
-      auditCommissionshow:true,
+      auditCommissionshow: true,
       upgradeReviewInfo: {
         originalLevel: "",//原等级
         afterChange: "",//变更后等级
@@ -303,7 +304,7 @@ export default {
         type: "",//类型
         applyTime: [],//申请时间
         auditStatus: '0',
-        upgradeType:'',//升降级标识
+        upgradeType: '',//升降级标识
       }
     },
     handleClick(tab, event) {
@@ -313,11 +314,11 @@ export default {
     //升级审核
     isOperationPassed(row) {
       console.log(row)
-      if(row.afterChange==row.originalLevel){
-        this.auditCommissionshow=false;
+      if (row.afterChange == row.originalLevel) {
+        this.auditCommissionshow = false;
       }
       this.id = row.id;
-      this.upgradeType=row.upgradeType;
+      this.upgradeType = row.upgradeType;
       this.upgradeReviewVisible = true;
       this.upgradeReviewInfo.originalLevel = this.userGradeList.find(val => val.grade == row.originalLevel).gradeName;
       this.upgradeReviewInfo.afterChange = this.userGradeList.find(val => val.grade == row.afterChange).gradeName;
@@ -325,7 +326,7 @@ export default {
     },
     //升级审核
     upgradeReviewsubmit() {
-      this.$api.retail[this.upgradeType=='1'?'liftingRecorddowngradeAudit':'liftingRecordaudit']({
+      this.$api.retail[this.upgradeType == '1' ? 'liftingRecorddowngradeAudit' : 'liftingRecordaudit']({
         id: this.id,
         auditStatus: "1",
         auditCommission: this.upgradeReviewInfo.auditCommission,
@@ -355,7 +356,7 @@ export default {
       this.$api.retail.unlockLevel(row.originalLevel).then((res) => {
         if (res.code == '200') {
           this.unlockLevelInfo.recordId = row.id;
-          this.unlockLevelInfo.paymentAmount = res.data;
+          this.unlockLevelInfo.paymentAmount =row.frozenAmount? new Decimal(row.frozenAmount).times(res.data).div(100).toNumber():0;
           this.unlockLevelVisible = true;
         } else {
           this.$message({
@@ -367,7 +368,7 @@ export default {
     },
 
     OperationVisiblesubmit() {
-      this.$api.retail[this.upgradeType=='1'?'liftingRecorddowngradeAudit':'liftingRecordaudit']({
+      this.$api.retail[this.upgradeType == '1' ? 'liftingRecorddowngradeAudit' : 'liftingRecordaudit']({
         id: this.id,
         auditStatus: "2",
         rejectReason: this.rejectReason,

+ 177 - 0
src/views/PeopleManage/Agent/DeletionLog.vue

@@ -0,0 +1,177 @@
+<!-- 模板区域 -->
+<template>
+  <div>
+    <el-form ref="queryFormRef" :model="pageRequest" label-width="120px" class="queryform">
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="工号">
+            <el-input size="small" clearable v-model.trim="pageRequest.userId" placeholder="请输入录入人"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="姓名">
+            <el-input size="small" clearable v-model.trim="pageRequest.name" placeholder="请输入录入人"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="手机号">
+            <el-input size="small" clearable v-model.trim="pageRequest.mobile" placeholder="请输入录入人"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="状态">
+            <el-select size="small" v-model="pageRequest.status" placeholder="请选择" clearable style="width: 100%">
+              <el-option v-for="(val, index) in statusList" :key="index" :label="val.name"
+                :value="val.value"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="申请时间">
+            <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="applicationTime" style="width: 100%"
+              size="small" @change="applicationChange" type="datetimerange" align="left" range-separator="至"
+              start-placeholder="开始日期" end-placeholder="结束日期">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="注销时间">
+            <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="logoutTime" style="width: 100%" size="small"
+              @change="logoutChange" type="datetimerange" align="left" range-separator="至" start-placeholder="开始日期"
+              end-placeholder="结束日期">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-button style="margin-left: 100px;margin-top: 3px;" size="small" type="primary" @click="FindPage()">查询</el-button>
+        </el-col>
+      </el-row>
+    </el-form>
+    <!-- 模板内容 -->
+    <kt-common-table :tableHeights="600" :SerialShow="false" :showOperation="false" :data="PageResult"
+      :columns="Columns" @findPage="FindPage">
+    </kt-common-table>
+  </div>
+</template>
+
+<!-- 行为区域 -->
+<script>
+import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
+export default {
+  components: {
+    KtCommonTable,
+  },
+  // 数据存放区域
+  data() {
+    return {
+      applicationTime: [],//申请时间
+      logoutTime: [],//注销时间
+      statusList: [
+        {
+          name: "全部",
+          value: null,
+        },
+        {
+          name: "已注销",
+          value: 1,
+        },
+        {
+          name: "冷静期",
+          value: 0,
+        }
+      ],
+      PageResult: [], //产品费用集合
+      Columns: [
+        //数据列
+        { prop: "deptId", label: " 机构编码", minWidth: 160 },
+        { prop: "deptName", label: "机构名称", minWidth: 150 },
+        { prop: "deptSource", label: "来源" },
+        { prop: "name", label: "姓名" },
+        { prop: "userId", label: "工号" ,minWidth: 150  },
+        { prop: "mobile", label: "手机号" },
+        { prop: "status", label: "状态", formatter: this.statusFormatter, },
+        { prop: "requestTime", label: "申请时间", minWidth: 160 },
+        { prop: "logoutTime", label: "注销时间", minWidth: 160 },
+        { prop: "money", label: "钱包余额", minWidth: 200 },
+      ],
+      pageRequest: {
+        //查询的默认条件
+        pageNum: 1,
+        pageSize: 20,
+        userId: "",//工号
+        name: "",//姓名
+        mobile: "",//手机号
+        status: "",//状态
+        requestStartTime: "",//申请开始
+        requestEndTime: "",//申请结束
+        logoutStartTime: "",//注销开始
+        logoutEndTime: "",//注销结束
+      },
+    }
+  },
+  // 生命周期函数
+  created() {
+  },
+  // 方法函数
+  methods: {
+    statusFormatter(row, column) {
+      let status = row.status;
+      switch (status) {
+        case '0':
+          return '冷静期'
+        case '1':
+          return '已注销'
+        default:
+          return "未知"
+      }
+    },
+    //产品分页json
+    FindPage(data) {
+      if (data && data.pageRequest) {
+        this.pageRequest.pageNum = data.pageRequest.pageNum;
+        this.pageRequest.pageSize = data.pageRequest.pageSize;
+      } else {
+        this.pageRequest.pageNum = 1;
+        this.pageRequest.pageSize = 20;
+      }
+      this.$api.user
+        .revokeUserLogoutList(this.pageRequest)
+        .then((res) => {
+          let pageList = {
+            content: res.data.records,
+            pageNum: res.data.current,
+            pageSize: res.data.size,
+            totalPages: res.data.pages,
+            totalSize: res.data.total,
+          };
+          this.PageResult = pageList;
+        });
+    },
+    applicationChange(e) {
+      if (e) {
+        this.pageRequest.requestStartTime = e[0];
+        this.pageRequest.requestEndTime = e[1];
+      } else {
+        this.pageRequest.requestStartTime = "";
+        this.pageRequest.requestEndTime = "";
+      }
+    },
+    logoutChange(e) {
+      if (e) {
+        this.pageRequest.logoutStartTime = e[0];
+        this.pageRequest.logoutEndTime = e[1];
+      } else {
+        this.pageRequest.logoutStartTime = "";
+        this.pageRequest.logoutEndTime = "";
+      }
+    }
+  },
+  // 计算属性
+  computed: {
+  }
+}
+</script>
+<!-- 样式区域 -->
+<style lang='scss' scoped></style>