zhaoxiaoqiang
2023-09-05 f867c1a87123e0dae74ec36591433082df094b75
订单选择导出角色管理
1 files deleted
10 files modified
531 ■■■■ changed files
src/api/latefee.js 5 ●●●●● patch | view | raw | blame | history
src/api/listapi.js 9 ●●●●● patch | view | raw | blame | history
src/api/order.js 69 ●●●●● patch | view | raw | blame | history
src/api/user.js 7 ●●●●● patch | view | raw | blame | history
src/components/table.vue 4 ●●●● patch | view | raw | blame | history
src/views/account-management/account-list.vue 67 ●●●● patch | view | raw | blame | history
src/views/qyp-project-management/index.vue 12 ●●●●● patch | view | raw | blame | history
src/views/qyp-project-order/admin.vue 12 ●●●● patch | view | raw | blame | history
src/views/qyp-project-order/index.vue 16 ●●●●● patch | view | raw | blame | history
src/views/role-management/role-list.vue 304 ●●●●● patch | view | raw | blame | history
src/views/role-management/role-manager.vue 26 ●●●● patch | view | raw | blame | history
src/api/latefee.js
@@ -1,8 +1,8 @@
/*
 * @Author: zxq
 * @Date: 2021-12-23 15:19:23
 * @LastEditors: zxq
 * @LastEditTime: 2022-07-05 14:34:37
 * @LastEditors: zhaoxiaoqiang 287285524@qq.com
 * @LastEditTime: 2023-09-05 16:02:33
 * @Description: Description
 * @FilePath: \qyp-plat\src\api\latefee.js
 */
@@ -121,7 +121,6 @@
    data
  })
}
//  放款机构初期服务费管理
// 放款机构初期服务费管支付
export function loanOrgEarlySerFeePay(data) {  
  return request({
src/api/listapi.js
@@ -41,6 +41,7 @@
      data,
    });
  },
  // 管理员订单列表
  orderList(data) {
    return request({
      url: "/qyp/order/orderList",
@@ -48,6 +49,14 @@
      data,
    });
  },
  // 订单列表
  orderBaseList(data) {
    return request({
      url: "/qyp/order/orderBaseList",
      method: "post",
      data,
    });
  },
  payList(data) {
    return request({
      url: "/qyp/order/payList",
src/api/order.js
@@ -1,63 +1,42 @@
/*
 * @Author: zxq
 * @Date: 2022-01-04 17:26:04
 * @LastEditors: zxq
 * @LastEditTime: 2022-01-07 10:39:56
 * @LastEditors: zhaoxiaoqiang 287285524@qq.com
 * @LastEditTime: 2023-09-05 16:12:38
 * @Description: Description
 * @FilePath: \comn_plat\src\api\order.js
 */
// 列表接口
import request from '@/utils/request';
//放款机构管理  新增/编辑
export function loanOrgSave(data) {
// 订单导出
export function orderBaseExport(params) {
    return request({
      url: '/loanOrg/save',
    url: '/qyp/order/orderBaseExport',
    method: 'get',
    params
  })
}
// 管理员订单导出
export function orderExport(params) {
  return request({
    url: '/qyp/order/orderExport',
    method: 'get',
    params
  })
}
// 订单详情
export function orderDtl(data) {
  return request({
    url: '/qyp/order/orderDtl',
      method: 'post',
      data
    })
}
//放款机构管理  详情
export function loanOrgDtl(data) {
// 初始化订单搜索条件
export function orderInit(data) {
  return request({
    url: '/loanOrg/dtl',
    url: '/qyp/order/orderInit',
    method: 'post',
    data
  })
}
//租赁机构管理  新增/编辑
export function rentOrgSave(data) {
  return request({
    url: '/rentOrg/save',
    method: 'post',
    data
  })
}
//租赁机构管理  详情
export function rentOrgDtl(data) {
  return request({
    url: '/rentOrg/dtl',
    method: 'post',
    data
  })
}
//金融产品管理  新增/编辑
export function prodSave(data) {
  return request({
    url: '/prod/save',
    method: 'post',
    data
  })
}
//金融产品管理  详情
export function prodDtl(data) {
  return request({
    url: '/prod/dtl',
    method: 'post',
    data
  })
}
src/api/user.js
@@ -43,8 +43,9 @@
}
//新增用户
export function userAdd(data) {
  data.sysType = 4;
  return request({
    url: '/user/add',
    url: '/user/addUser',
    method: 'post',
    data
  })
@@ -52,7 +53,7 @@
//编辑保存用户信息/user/update
export function userUpdate(data) {
  return request({
    url: '/user/update',
    url: '/user/changeStatus',
    method: 'post',
    data
  })
@@ -123,7 +124,7 @@
}
export function userManageDisabled(data) {
  return request({
    url: '/user/disabledUser',
    url: 'user/changeStatus',
    method: 'post',
    data
  })
src/components/table.vue
@@ -1,7 +1,7 @@
<!--
 * @Author: zxq
 * @Date: 2021-09-13 17:29:07
 * @LastEditTime: 2023-08-31 17:14:36
 * @LastEditTime: 2023-09-05 15:30:33
 * @LastEditors: zhaoxiaoqiang 287285524@qq.com
 * @Description: In User Settings Edit
 * @FilePath: \qyp_finlean_plat\src\components\table.vue
@@ -486,6 +486,7 @@
            this.$emit("getDataList", body);
          } else if (this.nameUrl == "roleGetRoleList") {
            this.tableData = body;
            console.log(this.tableData)
            this.totals = body.total;
            this.$emit("getDataList", body);
          } else {
@@ -546,7 +547,6 @@
          data[key] = data[key].join(',');
        }
      }
      if(index==1){
       if (this.exportUrl.query) {
        data = { ...data, ...this.exportUrl.query };
src/views/account-management/account-list.vue
@@ -2,7 +2,7 @@
 * @Author: 小明丶
 * @Date: 2020-05-11 17:38:01
 * @LastEditors: zhaoxiaoqiang 287285524@qq.com
 * @LastEditTime: 2023-08-24 15:43:52
 * @LastEditTime: 2023-09-05 15:48:52
 * @Description: 账户管理
 -->
<template>
@@ -15,7 +15,7 @@
        </el-col>
        <el-col :span="18">
          <div style="float:right;">
            <button class="btn-creat" v-if="this.filterBtnById(140201)" @click="showPop(null,1)">+ 新建</button>
            <button class="btn-creat" @click="showPop(null,1)">+ 新建</button>
            <el-input
              v-model="form.keyWord"
              size="small"
@@ -34,38 +34,36 @@
    <!-- 新增弹出层 -->
    <el-dialog :title="title" width="480px" :visible.sync="dialogFormVisible">
      <!-- :rules="rules" -->
      <el-form :model="creatForm"  ref="ruleForm">
        <el-form-item label="用户名称:" :label-width="formLabelWidth" prop="name">
      <el-form :model="creatForm"  ref="ruleForm" size="small"  :label-width="formLabelWidth" >
        <el-form-item label="用户名称:" prop="name">
          <el-input
            v-model.trim="creatForm.name"
            maxlength="20"
            autocomplete="off"
            placeholder="请输入用户名称"
            style="width:200px"
          ></el-input>
        </el-form-item>
        <el-form-item label="用户手机号:" :label-width="formLabelWidth" prop="phone">
        <el-form-item label="用户手机号:"  prop="phone">
          <el-input
            v-if="isCreat"
            v-model.trim="creatForm.phone"
            maxlength="11"
            autocomplete="off"
            placeholder="请输入用户手机号"
            style="width:200px"
          ></el-input>
          <span v-else>{{creatForm.phone}}</span>
        </el-form-item>
        <el-form-item label="用户角色:" :label-width="formLabelWidth" prop="role">
        <el-form-item label="用户角色:"  prop="role">
          <el-select v-model="creatForm.role" placeholder="请选择" style="width:200px">
              <el-option
                v-for="item in roleList"
                :key="item.code"
                :label="item.name"
                :value="item.code">
                :key="item.roleId"
                :label="item.roleName"
                :value="item.roleId">
              </el-option>
            </el-select>
        </el-form-item>
        <el-form-item label="密码:" :label-width="formLabelWidth" v-show="title !== '编辑账户'" prop="password">
        <el-form-item label="密码:"  v-show="title !== '编辑账户'" prop="password">
          <el-input
            type = "password"
            v-if="isCreat"
@@ -73,10 +71,9 @@
            maxlength="20"
            autocomplete="off"
            placeholder="请输入密码"
            style="width:200px"
          ></el-input>
        </el-form-item>
        <el-form-item label="密码确认:" :label-width="formLabelWidth" v-show="title !== '编辑账户'" prop="resPassword">
        <el-form-item label="密码确认:"  v-show="title !== '编辑账户'" prop="resPassword">
          <el-input
            type = "password"
            v-if="isCreat"
@@ -84,7 +81,6 @@
            maxlength="20"
            autocomplete="off"
            placeholder="再次输入密码"
            style="width:200px"
          ></el-input>
          <span v-else>{{creatForm.resPassword}}</span>
        </el-form-item>
@@ -100,12 +96,8 @@
import md5 from "blueimp-md5";
import Etable from "../../components/table.vue";
import {roleGetRoleList,userAdd,userUpdate,userManageDisabled} from '@/api/user';
// import myTable from "../../components/myTable/myTable";
// import myApi from "../../api/api";
export default {
  components:{
     Etable
  },
  components:{ Etable  },
  data() {
    return {
      title: '',//弹出层title
@@ -114,9 +106,7 @@
      isCreat: true,
      dialogFormVisible: false,
      formLabelWidth:'120px',
      form: {
        keyWord: null
      },
      form: { keyWord: null},
      creatForm:{
          name:'',
          phone:'',
@@ -126,16 +116,6 @@
      },// 新建用户表单
      defaultVal: {},
      refresh: {},
      // tableData: {
      //   url: "userManageList",
      //   exportExcelUrl: {
      //     url: "hbOrderExport",
      //     fileName: "用户管理表格"
      //   },
      //   exportPower: {
      //     show: false,
      //     btnId: "120102"
      //   },
        column: [
          {
            prop: "userName",
@@ -190,9 +170,6 @@
                      "text-decoration": "underline",
                      color: "rgba(60,142,254,1)",
                      cursor: "pointer",
                      display: this.filterBtnById(140202)
                        ? "inline-block"
                        : "none",
                    },
                    on: {
                      click: () => {
@@ -223,7 +200,7 @@
  created(){
       roleGetRoleList().then(res => {
          if (res) {
            this.roleList = res.body.roles
        this.roleList = res.body
          }
        }).catch(err => {})
  },
@@ -234,7 +211,6 @@
        this.creatForm.phone = params.userNo;
        this.creatForm.role = params.roleId;
         this.$set(this.creatForm,'role',params.roleId)
        // this.creatForm.name = params.userName;;
        this.$set(this.creatForm,'name',params.userName)
        this.creatForm.password = params.password;
        this.creatForm.resPassword = params.resPassword;
@@ -245,7 +221,6 @@
      if (item == 1) {
        this.isCreat = true;
        this.title = '新建账户'
      }
      this.dialogFormVisible = true;
    },
@@ -322,6 +297,7 @@
      } else if (this.title === '编辑账户') {
        let data = {userName: this.creatForm.name, userId: this.rowsInfo.userId, roleId:this.creatForm.role}
        userUpdate(data).then(res => {
          console.log(res)
          if(res) {
            this.$notify({
              title: '提示',
@@ -329,25 +305,20 @@
              type: 'success'
            })
            this.dialogFormVisible = false
            this.qureys()
            this.qureys();
          }
        }).catch(err => {})
        }).catch(err => {});
      }
      // 提交请求关闭弹窗
    },
    /**取消新建、编辑账户**/ 
    cancelCreat(){
      // this.creatForm.name = ''
      // this.creatForm.phone = ''
      this.creatForm = {};
      this.dialogFormVisible = false
    },
    /**更新用户状态**/
    updateContract(params) {
      let data = {
        userId: params.row.userId
      };
      let {userId,status} = params.row;
      let data = { userId,status:status==1?0:1};
      userManageDisabled(data).then(res => {
          if(res) {
            this.$notify({
src/views/qyp-project-management/index.vue
@@ -74,7 +74,7 @@
      </div>
      <el-dialog top="2vh"  :title="title" :visible.sync="addProd" width="60%">
          <!-- 新增商品名称 -->
          <el-form :model="ruleForm" :rules="rules" ref="ruleForm" size="small" label-width="100px" class="demo-ruleForm">
          <el-form :model="ruleForm" :rules="rules" ref="ruleForm" size="small" label-width="120px" class="demo-ruleForm">
            <el-form-item label="项目名称" prop="projName">
              <el-input v-model="ruleForm.projName" :disabled="disabled" :maxlength="50"></el-input>
            </el-form-item>
@@ -95,17 +95,21 @@
            <el-form-item label="项目背景图" v-if="addProd" ref="backFilePath" prop="backFilePath">
               <uploadImg  v-if="addProd" @sendList="imgSet($event,'backFilePath')" :disabled="disabled"  :defaultList="ruleForm.backFilePath"></uploadImg>
            </el-form-item>
            <el-form-item label="项目logo" ref="logoFilePath" prop="logoFilePath">
            <el-form-item label="项目宣传标语" ref="logoFilePath" prop="logoFilePath">
              <uploadImg v-if="addProd" @sendList="imgSet($event,'logoFilePath')" :disabled="disabled"  :defaultList="ruleForm.logoFilePath"></uploadImg>
            </el-form-item>
            <el-form-item label="平台头图" ref="titleFilePath" prop="titleFilePath">
            <el-form-item label="项目优惠券图片" ref="titleFilePath" prop="titleFilePath">
              <uploadImg v-if="addProd"  @sendList="imgSet($event,'titleFilePath')" :disabled="disabled" :defaultList="ruleForm.titleFilePath"></uploadImg>
            </el-form-item>
            <el-form-item label="会员权益" ref="qyFilePath"  prop="qyFilePath">
              <uploadImg v-if="addProd" @sendList="imgSet($event,'qyFilePath')"     :disabled="disabled" :defaultList="ruleForm.qyFilePath"></uploadImg>
            </el-form-item>
            <el-form-item label="活动规则" ref="ruleFilePath" prop="ruleFilePath">
            <!-- <el-form-item label="活动规则" ref="ruleFilePath" prop="ruleFilePath">
              <uploadImg v-if="addProd"  @sendList="imgSet($event,'ruleFilePath')" :disabled="disabled" :defaultList="ruleForm.ruleFilePath"></uploadImg>
            </el-form-item> -->
            <el-form-item label="活动规则" prop="ruleContent">
              <el-input type="textarea" v-model="ruleForm.ruleContent" :disabled="disabled"></el-input>
              <!-- <uploadImg v-if="addProd"  @sendList="imgSet($event,'ruleFilePath')" :disabled="disabled" :defaultList="ruleForm.ruleFilePath"></uploadImg> -->
            </el-form-item>
            <el-form-item style="text-align:right;" v-if="!disabled">
              <el-button type="primary" @click="submitForm('ruleForm')">保存</el-button>
src/views/qyp-project-order/admin.vue
@@ -143,14 +143,15 @@
  import history from './history.vue';
  import plan from './plan.vue';
  import draw from './draw.vue';
  import {orderInit,orderDtl} from "@/api/credit";
  import {orderInit,orderDtl,orderExport} from "@/api/order";
  import uploadImg from "@/components/upload.vue";
  import downloadUrl from "@/utils/excelDownLoadConfig";
  export default {
    name: "order",
    components: { Etable,uploadImg,history,plan,draw },
    data() {
      return {
          formInline: {status:"all"},
          formInline: {promId:"all",orderStatus:"all",agencyName:'all'},
          searchData: {},
          columns: [
            {
@@ -358,6 +359,9 @@
        if(!this.exportExcelList.length){
            return this.$message.error("请选择订单后导出");
        }
        orderExport({orderIdList:this.exportExcelList.join(',')}).then((res) => {
          downloadUrl.configDate2(res, '管理员订单列表');
        });
      },
      keyupEvent(e) {
        //只能输入整数
@@ -387,7 +391,9 @@
      getDataList(e) {
      },
      handleSelectionChange(list){
        this.exportExcelList = list;
        this.exportExcelList = list.map(d=>{
          return d.orderId
        });
      },
      getProductDetail(orderId){
        orderDtl({orderId:orderId}).then(({body})=>{
src/views/qyp-project-order/index.vue
@@ -90,7 +90,7 @@
          hasIndex
          hasSelection
          rowKey="orderId"
          httpUrl="orderList"
          httpUrl="orderBaseList"
          :columns="columns"
          :searchData="searchData"
          @getDataList="getDataList"
@@ -119,15 +119,16 @@
  </template>
  
  <script>
  import Etable from "../../components/table.vue";
  import {orderInit,orderDtl} from "@/api/credit";
  import Etable from "@/components/table.vue";
  import {orderInit,orderDtl,orderBaseExport} from "@/api/order";
  import uploadImg from "@/components/upload.vue";
  import downloadUrl from "@/utils/excelDownLoadConfig";
  export default {
    name: "order",
    components: { Etable,uploadImg },
    data() {
      return {
          formInline: {status:"all"},
          formInline: {promId:"all",orderStatus:"all"},
          searchData: {},
          columns: [
            {
@@ -226,6 +227,9 @@
        if(!this.exportExcelList.length){
            return this.$message.error("请选择订单后导出");
        }
        orderBaseExport({orderIdList:this.exportExcelList.join(',')}).then((res) => {
          downloadUrl.configDate2(res, '订单列表');
        });
      },
      keyupEvent(e) {
        //只能输入整数
@@ -255,7 +259,9 @@
      getDataList(e) {
      },
      handleSelectionChange(list){
        this.exportExcelList = list;
        this.exportExcelList = list.map(d=>{
          return d.orderId
        });
      },
      getProductDetail(orderId){
        orderDtl({orderId:orderId}).then(({body})=>{
src/views/role-management/role-list.vue
File was deleted
src/views/role-management/role-manager.vue
@@ -1,8 +1,8 @@
<!--
 * @Author: 小明丶
 * @Date: 2019-10-25 10:17:56
 * @LastEditors: zxq
 * @LastEditTime: 2023-04-25 15:34:05
 * @LastEditors: zhaoxiaoqiang 287285524@qq.com
 * @LastEditTime: 2023-09-05 15:31:32
 * @Description: 
 -->
<template>
@@ -15,7 +15,7 @@
            <el-button type="primary" @click="addRoleModel = true" size="small">新增</el-button>
          </div>
          <div class="role-list-table">
            <Etable isFind httpUrl="roleGetRoleList" itemsArr="roles"  highlightCurrentRow :columns="columns" :searchData="searchData" :hasPagination="false" @operateDo="operateDo" @cellClick="powerInit" border></Etable>
            <Etable isFind httpUrl="roleGetRoleList" nameUrl="roleGetRoleList" itemsArr="roles"  highlightCurrentRow :columns="columns" :searchData="searchData" :hasPagination="false" @operateDo="operateDo" @cellClick="powerInit" border></Etable>
          </div>
        </el-card>
      </el-col>
@@ -116,7 +116,7 @@
      columns: [
        {
          lable: "角色名称",
          prop: "name",
          prop: "roleName",
        },
        {
          lable: "",
@@ -134,10 +134,11 @@
                  "div",
                  {
                    on: {
                      click: () => {
                        this.editRoleVal = params.row.name;
                      click: (e) => {
                        e.stopPropagation();
                        this.editRoleVal = params.row.roleName;
                        this.editRoleModel = true;
                        this.roleId = params.row.code;
                        this.roleId = params.row.roleId;
                      },
                    },
                  },
@@ -153,7 +154,8 @@
                  "div",
                  {
                    on: {
                      click: () => {
                      click: (e) => {
                        e.stopPropagation();
                        this.removeModel = true;
                        this.roleId = params.row.roleId;
                      },
@@ -203,10 +205,8 @@
    },
    //选择角色
    powerInit(params) {
      this.roleId = params.code;
      let obj = {
        roleId: params.code,
      };
      this.roleId = params.roleId;
      let obj = { roleId: params.roleId };
      setInit(obj).then((res) => {
        if (res.body.btnList) {
          this.btnList = res.body.btnList;
@@ -417,7 +417,7 @@
          }
        }
      });
      console.log(this.initList);
      // console.log(this.initList);
      this.loading = true;
    },
    operateDo() { },