分销机构v1

src/api/api.js

@@ -105,6 +105,7 @@ import systemExam from '../newApi/systemExam'//模考活动列表
 
 import poster from '../fxApi/poster'//海报列表
 import temp from '../fxApi/temp'//分销活动列表
+import check from '../fxApi/check'//分销审核
 
 
 
@@ -112,6 +113,7 @@ import temp from '../fxApi/temp'//分销活动列表
 export default {
     ...poster,
     ...temp,
+    ...check,
     ...courseEducationType,
     ...courseProjectType,
     ...applyAreas,

src/components/salesmanInfo/index.vue

@@ -0,0 +1,194 @@
+<template>
+  <div id="">
+    <BaseDialog
+      width="1000px"
+      :isShow.sync="isShow"
+      title="业务员分销订单"
+      @close="close"
+      @submit="submit"
+      :isShowFooter="false"
+    >
+      <template>
+        <table-list
+          rowKey="orderGoodsId"
+          ref="tableList"
+          :tableSets="tableSet"
+          :tableData="tableData"
+          :navText="navText"
+          :loading="loading"
+        >
+          <template slot="btn" slot-scope="props">
+            <el-button type="text" @click="editClick(props.scope.row)"
+              >详情</el-button
+            >
+          </template>
+        </table-list>
+        <pagination
+          :total="total"
+          :pageSize="formData.pageSize"
+          :currentPage="formData.pageNum"
+          @handleSizeChange="handleSizeChange"
+          @handleCurrentChange="handleCurrentChange"
+        />
+      </template>
+    </BaseDialog>
+  </div>
+</template>
+
+<script>
+import tableList from "@/components/tableList";
+import pagination from "@/components/pagination";
+export default {
+  components: { tableList, pagination },
+  data() {
+    return {
+      isShow: false,
+      loading: false, //当前表单加载是否加载动画
+      navText: {
+        tableHide: true,
+        title: "业务员分销订单",
+        index: 0,
+        ch: "条",
+        num: true,
+        choice: false,
+        addHide: true,
+        openCheckMore: true,
+        changeWidth: "100px",
+        backFatherBtn: {
+          status: false,
+          title: "配置下单填选模板",
+        },
+      },
+      tableSet: [
+        {
+          label: "订单号",
+          prop: "orderSn",
+          width: "180",
+          hidden: true,
+        },
+        {
+          label: "订单金额",
+          prop: "orderPrice",
+          hidden: true,
+        },
+        {
+          label: "订单时间",
+          prop: "orderTime",
+          scope: "aTimeList",
+          width: "160",
+          hidden: true,
+        },
+        {
+          label: "所属活动",
+          prop: "distributionName",
+          width: "180",
+          hidden: true,
+        },
+        {
+          label: "下单人",
+          prop: "orderUserName",
+          hidden: true,
+        },
+        {
+          label: "佣金类型",
+          prop: "cashType",
+          hidden: true,
+          scope: "isOptions",
+          options: [
+            {
+              label: "百分比",
+              value: 1,
+            },
+            {
+              label: "固定金额",
+              value: 2,
+            },
+          ],
+        },
+        {
+          label: "佣金比例",
+          prop: "cashRatio",
+          hidden: true,
+          scope:"cashRatio"
+        },
+        {
+          label: "佣金金额（元）",
+          prop: "cash",
+          hidden: true,
+        },
+        {
+          label: "佣金结算时间",
+          prop: "cashTime",
+          hidden: true,
+          scope: "aTimeList",
+          width: "160",
+        },
+        {
+          label: "佣金状态",
+          prop: "cashStatus",
+          hidden: true,
+          scope: "isOptions",
+          options: [
+            {
+              label: "冻结",
+              value: 1,
+            },
+            {
+              label: "正常",
+              value: 2,
+            },
+            {
+              label: "退款",
+              value: 3,
+            },
+          ],
+        },
+      ],
+      tableData: [],
+      formData: {
+        sellerId: "",
+        pageSize: 10,
+        pageNum: 1,
+      },
+      total: 0,
+    };
+  },
+  methods: {
+    showBox(id) {
+      this.formData.sellerId = id;
+      this.search(2);
+      this.isShow = true;
+    },
+    search(e) {
+      this.loading = true;
+      if (e === 2) {
+        this.formData.pageSiz = 10;
+        this.formData.pageNum = 1;
+      }
+      this.$api
+        .distributionactivitysellerorder(this.formData)
+        .then((res) => {
+          this.tableData = res.rows;
+          this.total = res.total;
+          this.navText.index = res.total;
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+    close() {},
+    submit() {},
+    handleSizeChange(v) {
+      this.formData.pageSize = v;
+      this.formData.pageNum = 1;
+      this.search();
+    },
+    handleCurrentChange(v) {
+      this.formData.pageNum = v;
+      this.search();
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped></style>

src/components/searchBoxNew.vue

@@ -116,7 +116,10 @@
           >
             <el-option
               v-for="(items, indexs) in educationType"
-              v-show="!item.filter || (item.filter && items.educationName === '继续教育')"
+              v-show="
+                !item.filter ||
+                (item.filter && items.educationName === '继续教育')
+              "
               :key="indexs"
               :label="items.educationName"
               :value="items.id"
@@ -147,7 +150,13 @@
             <el-option
               v-for="(items, indexs) in newBusinessLevel"
               :key="indexs"
-              v-show="!item.filter || (item.filter && (items.projectName === '造价师' || items.projectName === '建造师') && items.businessName === '二级')"
+              v-show="
+                !item.filter ||
+                (item.filter &&
+                  (items.projectName === '造价师' ||
+                    items.projectName === '建造师') &&
+                  items.businessName === '二级')
+              "
               :label="items.projectName + '-' + items.businessName"
               :value="items.id"
             ></el-option>
@@ -166,6 +175,20 @@
               :value="items.id"
             ></el-option>
           </el-select>
+          <el-select
+            v-else-if="item.scope === 'distributionList'"
+            clearable
+            v-model="formData[item.prop]"
+            :placeholder="item.placeholder"
+            :size="size"
+          >
+            <el-option
+              v-for="(items, indexs) in distributionList"
+              :key="indexs"
+              :label="items.name"
+              :value="items.distributionId"
+            ></el-option>
+          </el-select>
 
           <!-- 专业-根据教育类型筛选 -->
           <el-select
@@ -694,6 +717,7 @@ export default {
       "beforeLists",
       "applySiteAddress",
       "certificate",
+      "distributionList",
     ]),
     /**
      * @remarks 过滤选择器列表
@@ -1030,4 +1054,4 @@ export default {
     margin-bottom: 0px;
   }
 }
-</style>
+</style>

src/components/tableList.vue

@@ -1102,6 +1102,10 @@
                 : ""
             }}
           </span>
+          <span v-else-if="item.scope === 'cashRatio'">
+            {{ scope.row[item.prop]
+            }}{{ scope.row["cashType"] === 1 ? "%" : "" }}
+          </span>
           <div
             v-else-if="item.scope === 'openBox'"
             class="open_style"

src/fxApi/check.js

@@ -0,0 +1,26 @@
+import request from '@/utils/request' //引入axios请求及拦截器
+export default {
+    //审核
+    editdistributioncheckhandle(data) {
+        return request({
+            url: '/distribution/check/handle',
+            method: 'post',
+            data
+        })
+    },
+    //审核列表
+    inquiredistributionchecklist(data) {
+        return request({
+            url: '/distribution/check/list',
+            method: 'get',
+            params: data
+        })
+    },
+    //审核详情
+    obtaindistributioncheckdetail(data) {
+        return request({
+            url: `/distribution/check/detail/` + data,
+            method: 'get',
+        })
+    },
+}

src/fxApi/temp.js

@@ -116,5 +116,55 @@ export default {
             data
         })
     },
+    //批量新增关联分销业务员
+    distributionsellerbatchAdd(data) {
+        return request({
+            url: '/distribution/seller/batchAdd',
+            method: 'post',
+            data
+        })
+    },
+    
+    //业务员所有分销订单
+    distributionactivitysellerorder(data) {
+        return request({
+            url: '/distribution/activity/seller/order',
+            method: 'get',
+            params: data
+        })
+    },
+    //查询业务员分销排行榜
+    distributionactivitysellersortnotice(data) {
+        return request({
+            url: '/distribution/activity/seller/sort/notice',
+            method: 'get',
+            params: data
+        })
+    },
+    //佣金列表
+    distributionactivitycashlist(data) {
+        return request({
+            url: '/distribution/activity/cash/list',
+            method: 'get',
+            params: data
+        })
+    },
+    //分销订单列表
+    distributionactivityorderlist(data) {
+        return request({
+            url: '/distribution/activity/order/list',
+            method: 'get',
+            params: data
+        })
+    },
+    //打款
+    distributionwithdrawalpayCash(data) {
+        return request({
+            url: '/distribution/withdrawal/payCash',
+            method: 'post',
+            data
+        })
+    },
+    
     
 }

src/store/getters.js

@@ -21,6 +21,14 @@ const getters = {
   topbarRouters: state => state.permission.topbarRouters,
   defaultRoutes: state => state.permission.defaultRoutes,
   sidebarRouters: state => state.permission.sidebarRouters,
+  distributionList(state) {
+    if (!state.dict.distributionList) {
+      api.distributiontemplist({ status: 1 }).then(res => {
+        state.dict.distributionList = res.rows
+      })
+    }
+    return state.dict.distributionList
+  },
   indexnum(state) {
     if (!state.dict.indexnum) {
       api.inquireGradegradelistUserPeriod({ status: 1, periodStatus: 2, pageSize: 1, pageNum: 1 }).then(res => {

src/store/modules/dict.js

@@ -31,8 +31,15 @@ const state = {
   beforeList: null,//前培安排过滤
   beforeLists: null,//前培安排
   indexnum: null,//模拟
+  distributionList:null,//活动列表
 }
 const mutations = {
+  //更新活动列表
+  DISTRIBUTIONLIST(state) {
+    api.distributiontemplist({ status: 1 }).then(res => {
+      state.distributionList = res.rows
+    })
+  },
   //更新角色列表
   EDICROLELIST(state) {
     api.obtainRoleList({ status: 1 }).then(res => {

src/utils/request.js

@@ -7,8 +7,8 @@ import methods from '@/utils/methodsTool';
 
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 // 创建axios实例
-// export const baseURL = process.env.VUE_APP_BASE_API
-export const baseURL = 'http://192.168.1.7:5030/'
+export const baseURL = process.env.VUE_APP_BASE_API
+// export const baseURL = 'http://192.168.1.7:5030/'
 export const BASE_IMG_URL = process.env.VUE_APP_IMG_API
 const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分

src/views/2Cport/pageSettings/H5_small.vue

@@ -5,7 +5,7 @@
       status-icon
       :rules="rulesMove"
       ref="moveInfo"
-      label-width="100px"
+      label-width="120px"
       class="demo-ruleForm"
     >
       <el-form-item label="H5-logo" prop="h5Logo">
@@ -77,6 +77,34 @@
         >
         </el-switch>
       </el-form-item>
+      <el-form-item label="PC移动二维码" prop="mobileImage">
+        <div class="imageStyBox" v-if="!moveInfo.mobileImage">
+          <label for="uplose3"><i class="btn_upload">上传图片</i></label>
+          <input
+            type="file"
+            style="display: none"
+            id="uplose3"
+            @change="getImgFile($event, 'mobileImage')"
+          />
+        </div>
+        <div v-else>
+          <el-image
+            class="imageStyBoxShow"
+            :src="$methodsTools.splitImgHost(moveInfo.mobileImage)"
+            :preview-src-list="[
+              $methodsTools.splitImgHost(moveInfo.mobileImage),
+            ]"
+          >
+          </el-image>
+          <el-button
+            style="margin-left: 20px"
+            type="danger"
+            size="mini"
+            @click="moveInfo.mobileImage = ''"
+            >删除</el-button
+          >
+        </div>
+      </el-form-item>
       <el-form-item>
         <el-button
           size="small"
@@ -111,6 +139,13 @@ export default {
             trigger: ["blur", "change"],
           },
         ],
+        mobileImage: [
+          {
+            required: false,
+            message: "请上传PC移动二维码",
+            trigger: ["blur", "change"],
+          },
+        ],
         hostH5: [{ required: false, message: "请输入hostH5", trigger: "blur" }],
         hostLive: [
           { required: false, message: "请输入hostLive", trigger: "blur" },
@@ -171,7 +206,7 @@ export default {
       this.$upload
         .upload(file, 0)
         .then((res) => {
-          self.moveInfo[name] = res;
+          self.$set(self.moveInfo, name, res);
         })
         .finally(() => {
           e.target.value = "";
@@ -182,6 +217,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.imageStyBoxShow {
+  max-width: 200px;
+}
 .btn_upload {
   font-style: normal;
   display: inline-block;

src/views/Marketing/activitySystem/activityList/activityInfo/index.vue

@@ -79,7 +79,7 @@ export default {
           parseInt(res.data.startTime * 1000),
           parseInt(res.data.endTime * 1000),
         ];
-        res.data.goodsList = res.data.goodsList || []
+        res.data.goodsList = res.data.goodsList || [];
         this.$nextTick(() => {
           this.ruleForm = res.data;
         });
@@ -103,6 +103,7 @@ export default {
                   : "distributiontempsave"
               ](data).then((res) => {
                 this.$message.success("成功");
+                this.$store.commit("DISTRIBUTIONLIST");
                 setTimeout(() => {
                   this.$store
                     .dispatch("tagsView/exitView", this.$route)

src/views/Marketing/distribution/commissionList/index.vue

@@ -8,7 +8,7 @@
       @init="init"
     />
     <table-list
-      rowKey="id"
+      rowKey="sellerId"
       ref="tableList"
       :tableSets="tableSet"
       :tableData="tableData"
@@ -28,52 +28,20 @@
       @handleSizeChange="handleSizeChange"
       @handleCurrentChange="handleCurrentChange"
     />
-    <BaseDialog
-      width="860px"
-      :isShow.sync="isShow"
-      title="佣金详情"
-      @close="close"
-      @submit="submit"
-      :isShowFooter="false"
-    >
-      <template>
-        <el-table row-key="id" :data="InfotableData" border style="width: 100%">
-          <template v-for="(item, index) in InfotableList">
-            <el-table-column
-              header-align="center"
-              :align="item.align ? item.align : 'center'"
-              :prop="item.prop"
-              :label="item.label"
-              :width="item.width || ''"
-            >
-              <template slot-scope="scope">
-                <div v-if="item.scope === 'options'">
-                  <template v-for="(itemt, indext) in item.options">
-                    <span v-if="itemt.value === scope.row[item.prop]">{{
-                      itemt.label
-                    }}</span>
-                  </template>
-                </div>
-                <span v-else>{{ scope.row[item.prop] }}</span>
-              </template>
-            </el-table-column>
-          </template>
-        </el-table>
-      </template>
-    </BaseDialog>
+    <salesmanInfo ref="salesmanInfo"></salesmanInfo>
   </div>
 </template>
 
 <script>
+import salesmanInfo from "@/components/salesmanInfo";
 import searchBoxNew from "@/components/searchBoxNew";
 import tableList from "@/components/tableList";
 import pagination from "@/components/pagination";
 export default {
   name: "CommissionList",
-  components: { searchBoxNew, tableList, pagination },
+  components: { salesmanInfo,searchBoxNew, tableList, pagination },
   data() {
     return {
-      isShow: false,
       disabledBtn: false,
       loading: false, //当前表单加载是否加载动画
       navText: {
@@ -93,171 +61,93 @@ export default {
       //搜索
       formList: [
         {
-          prop1: "classStartTime",
-          prop2: "classEndTime",
+          prop1: "startTime",
+          prop2: "endTime",
           placeholder1: "开始时间",
           placeholder2: "结束时间",
           scope: "moreDataPicker",
         },
         {
-          lable: "邀请人",
-          prop: "name",
-          placeholder: "请输入邀请人",
-        },
-        {
-          lable: "订单",
-          prop: "name",
-          placeholder: "请输入订单",
-        },
-        {
-          lable: "业务员姓名",
-          prop: "name",
-          placeholder: "请输入业务员姓名",
+          prop: "sellerName",
+          placeholder: "请输入业务员名称",
         },
       ],
       formData: {
-        status: "0,1",
         pageSize: 10,
         pageNum: 1,
       },
       // 表单
       tableSet: [
-        {
-          label: "业务员ID",
-          prop: "id",
-          hidden: true,
-        },
         {
           label: "业务员名称",
-          prop: "name",
+          prop: "sellerName",
           hidden: true,
         },
         {
           label: "联系方式",
-          prop: "name",
+          prop: "telphone",
           hidden: true,
         },
         {
           label: "邀请人ID",
-          prop: "name",
+          prop: "parentId",
           hidden: true,
         },
         {
           label: "邀请人姓名",
-          prop: "name",
+          prop: "parentName",
           hidden: true,
         },
         {
           label: "累计客户数",
-          prop: "name",
+          prop: "subordinateNum",
           hidden: true,
         },
         {
           label: "累计推广员数",
-          prop: "name",
+          prop: "shareNum",
           hidden: true,
         },
         {
           label: "加入时间",
-          prop: "name",
-          hidden: true,
-        },
-        {
-          label: "所属机构",
-          prop: "name",
+          prop: "createTime",
           hidden: true,
+          scope: "aTimeList",
         },
         {
           label: "佣金总金额",
-          prop: "name",
+          prop: "cashTotal",
           hidden: true,
         },
       ],
       tableData: [], //表单数据
       total: 0, //一共多少条
-      InfotableData: [],
-      InfotableList: [
-        {
-          label: "佣金ID",
-          prop: "name",
-          width: "120",
-        },
-        {
-          label: "所属订单",
-          prop: "name",
-          width: "120",
-        },
-        {
-          label: "下单人",
-          prop: "name",
-          width: "120",
-        },
-        {
-          label: "订单时间",
-          prop: "name",
-          width: "120",
-        },
-        {
-          label: "订单金额",
-          prop: "name",
-          width: "120",
-        },
-        {
-          label: "佣金分成方式",
-          prop: "name",
-          width: "120",
-        },
-        {
-          label: "佣金等级",
-          prop: "name",
-          width: "120",
-        },
-        {
-          label: "佣金金额（元）",
-          prop: "name",
-          width: "120",
-        },
-        {
-          label: "佣金结算时间",
-          prop: "name",
-          width: "120",
-        },
-        {
-          label: "佣金状态",
-          prop: "name",
-          width: "120",
-        },
-      ],
     };
   },
   created() {
     this.search();
   },
   methods: {
-    submit() {},
-    close() {},
     editClick(e) {
-      this.isShow = true;
-      console.log("详情", e);
+      this.$refs.salesmanInfo.showBox(e.sellerId);
     },
     search(v) {
       this.loading = true;
       if (v === 2) {
         this.formData = {
-          status: "0,1",
           pageSize: 10,
           pageNum: 1,
         };
       }
       var data = JSON.parse(JSON.stringify(this.formData));
-      if (this.formData.classStartTime) {
-        data.classStartTime = parseInt(data.classStartTime / 1000);
+      if (this.formData.startTime) {
+        data.startTime = parseInt(data.startTime / 1000);
       }
-      if (this.formData.classEndTime) {
-        data.classEndTime = parseInt(data.classEndTime / 1000);
+      if (this.formData.endTime) {
+        data.endTime = parseInt(data.endTime / 1000);
       }
       this.$api
-        .inquirebusinessList(data)
+        .distributionactivitycashlist(data)
         .then((res) => {
           this.tableData = res.rows;
           this.total = res.total;
@@ -270,26 +160,6 @@ export default {
     init() {
       this.search(2);
     },
-    del(v) {
-      this.$alert(
-        "确定删除此内容？<br />内容删除后将无法恢复，请慎重考虑",
-        "提示",
-        {
-          dangerouslyUseHTMLString: true,
-        }
-      )
-        .then(() => {
-          this.$message.success("删除成功");
-          this.search();
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消删除",
-          });
-        });
-    },
-
     handleSizeChange(v) {
       this.formData.pageSize = v;
       this.formData.pageNum = 1;

src/views/Marketing/distribution/distributionOrder/index.vue

@@ -28,6 +28,26 @@
       @handleSizeChange="handleSizeChange"
       @handleCurrentChange="handleCurrentChange"
     />
+    <BaseDialog
+      width="1000px"
+      :isShow.sync="isShow"
+      title="业务员分销订单"
+      @close="close"
+      @submit="submit"
+      :isShowFooter="false"
+    >
+      <template>
+        <table-list
+          rowKey="orderGoodsId"
+          ref="tableList"
+          :tableSets="tableSetOther"
+          :tableData="tableDataOther"
+          :navText="navTextOther"
+          :loading="loadingOther"
+        >
+        </table-list>
+      </template>
+    </BaseDialog>
   </div>
 </template>
 
@@ -36,12 +56,13 @@ import searchBoxNew from "@/components/searchBoxNew";
 import tableList from "@/components/tableList";
 import pagination from "@/components/pagination";
 export default {
-  name: "DistributionOrder",
+  // name: "DistributionOrder",
   components: { searchBoxNew, tableList, pagination },
   data() {
     return {
       disabledBtn: false,
       loading: false, //当前表单加载是否加载动画
+      loadingOther: false,
       navText: {
         title: "分销订单列表",
         index: 0,
@@ -56,37 +77,50 @@ export default {
           title: "配置下单填选模板",
         },
       },
+      navTextOther: {
+        tableHide: true,
+        title: "分销订单详情",
+        index: 0,
+        ch: "条",
+        num: true,
+        choice: false,
+        addHide: true,
+        openCheckMore: true,
+        changeWidth: "100px",
+        backFatherBtn: {
+          status: false,
+          title: "配置下单填选模板",
+        },
+      },
       //搜索
       formList: [
         {
-          lable: "机构",
-          prop: "name",
-          placeholder: "请输入机构",
+          prop: "tenantId",
+          placeholder: "请选择机构",
+          scope: "systemtenantlist",
         },
         {
-          prop1: "classStartTime",
-          prop2: "classEndTime",
+          prop1: "startTime",
+          prop2: "endTime",
           placeholder1: "开始时间",
           placeholder2: "结束时间",
           scope: "moreDataPicker",
         },
         {
-          lable: "姓名",
-          prop: "name",
-          placeholder: "请输入姓名",
+          lable: "业务员姓名",
+          prop: "sellerName",
+          placeholder: "请输入业务员姓名",
         },
         {
           lable: "订单号",
-          prop: "name",
+          prop: "orderSn",
           placeholder: "请输入订单号",
         },
         {
           prop: "status",
           placeholder: "状态",
           scope: "select",
-          noClear: false,
           options: [
-            { label: "全部", value: "1,2,3" },
             { label: "已支付", value: 1 },
             { label: "未支付", value: 2 },
             { label: "已退款", value: 3 },
@@ -94,7 +128,6 @@ export default {
         },
       ],
       formData: {
-        status: "0,1",
         pageSize: 10,
         pageNum: 1,
       },
@@ -102,89 +135,188 @@ export default {
       tableSet: [
         {
           label: "编号",
-          prop: "id",
+          prop: "orderGoodsId",
           hidden: true,
         },
         {
           label: "订单号",
-          prop: "name",
+          prop: "orderSn",
           hidden: true,
         },
         {
           label: "订单价格",
-          prop: "name",
+          prop: "orderPrice",
           hidden: true,
         },
         {
           label: "所属活动",
-          prop: "name",
+          prop: "distributionName",
           hidden: true,
         },
         {
-          label: "课程",
-          prop: "name",
+          label: "手机号",
+          prop: "telphone",
           hidden: true,
         },
         {
-          label: "学员",
-          prop: "name",
+          label: "下单人",
+          prop: "orderUserName",
           hidden: true,
         },
         {
-          label: "手机号",
-          prop: "name",
+          label: "所属机构",
+          prop: "tenantName",
           hidden: true,
         },
+        {
+          label: "交易时间",
+          prop: "orderTime",
+          hidden: true,
+          scope: "aTimeList",
+        },
+        {
+          label: "支付状态",
+          prop: "payStatus",
+          hidden: true,
+          scope: "isOptions",
+          options: [
+            {
+              label: "未收费",
+              value: 1,
+            },
+            {
+              label: "部分收费",
+              value: 2,
+            },
+            {
+              label: "完全收费",
+              value: 3,
+            },
+            {
+              label: "免费",
+              value: 4,
+            },
+          ],
+        },
+      ],
+      tableData: [], //表单数据
+      total: 0, //一共多少条
+      tableSetOther: [
+        {
+          label: "佣金类型",
+          prop: "cashType",
+          hidden: true,
+          scope: "isOptions",
+          options: [
+            {
+              label: "百分比",
+              value: 1,
+            },
+            {
+              label: "固定金额（元）",
+              value: 2,
+            },
+          ],
+        },
+        {
+          label: "佣金比例",
+          prop: "cashRatio",
+          hidden: true,
+          scope: "cashRatio",
+        },
         {
           label: "业务员",
-          prop: "name",
+          prop: "sellerName",
           hidden: true,
         },
         {
-          label: "所属机构",
-          prop: "name",
+          label: "时间",
+          prop: "cashTime",
           hidden: true,
+          scope: "aTimeList",
         },
         {
-          label: "交易时间",
-          prop: "name",
+          label: "金额",
+          prop: "cash",
           hidden: true,
         },
         {
-          label: "支付状态",
-          prop: "name",
+          label: "佣金状态",
+          prop: "cashStatus",
           hidden: true,
+          scope: "isOptions",
+          options: [
+            {
+              label: "冻结",
+              value: 1,
+            },
+            {
+              label: "正常",
+              value: 2,
+            },
+            {
+              label: "退款",
+              value: 3,
+            },
+          ],
         },
       ],
-      tableData: [], //表单数据
-      total: 0, //一共多少条
+      tableDataOther: [],
+      isShow: false,
     };
   },
   created() {
+    this.formData.tenantId = this.$route.params.id || "";
     this.search();
   },
   methods: {
+    close() {},
+    submit() {},
+    statusChange() {
+      switch (this.formData.status) {
+        case 1:
+          this.formData.refundStatus = 0;
+          this.formData.payStatus = "3,4";
+          break;
+        case 2:
+          this.formData.refundStatus = 0;
+          this.formData.payStatus = 1;
+          break;
+        case 3:
+          this.formData.refundStatus = 2;
+          this.formData.payStatus = 3;
+          break;
+        default:
+          this.formData.refundStatus = undefined;
+          this.formData.payStatus = undefined;
+          break;
+      }
+    },
     editClick(e) {
+      this.isShow = true;
+      this.navTextOther.index = e.cashVoList.length;
+      console.log(e.cashVoList);
+      this.tableDataOther = e.cashVoList;
       console.log("详情", e);
     },
     search(v) {
       this.loading = true;
       if (v === 2) {
         this.formData = {
-          status: "0,1",
           pageSize: 10,
           pageNum: 1,
         };
       }
+      this.statusChange();
       var data = JSON.parse(JSON.stringify(this.formData));
-      if (this.formData.classStartTime) {
-        data.classStartTime = parseInt(data.classStartTime / 1000);
+      if (this.formData.startTime) {
+        data.startTime = parseInt(data.startTime / 1000);
       }
-      if (this.formData.classEndTime) {
-        data.classEndTime = parseInt(data.classEndTime / 1000);
+      if (this.formData.endTime) {
+        data.endTime = parseInt(data.endTime / 1000);
       }
       this.$api
-        .inquirebusinessList(data)
+        .distributionactivityorderlist(data)
         .then((res) => {
           this.tableData = res.rows;
           this.total = res.total;
@@ -197,25 +329,6 @@ export default {
     init() {
       this.search(2);
     },
-    del(v) {
-      this.$alert(
-        "确定删除此内容？<br />内容删除后将无法恢复，请慎重考虑",
-        "提示",
-        {
-          dangerouslyUseHTMLString: true,
-        }
-      )
-        .then(() => {
-          this.$message.success("删除成功");
-          this.search();
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消删除",
-          });
-        });
-    },
 
     handleSizeChange(v) {
       this.formData.pageSize = v;

src/views/Marketing/distribution/rankingList/index.vue

@@ -8,13 +8,18 @@
       @init="init"
     />
     <table-list
-      rowKey="id"
+      rowKey="sellerId"
       ref="tableList"
       :tableSets="tableSet"
       :tableData="tableData"
       :navText="navText"
       :loading="loading"
     >
+      <template slot="btn" slot-scope="props">
+        <el-button type="text" @click="editClick(props.scope.row)"
+          >详情</el-button
+        >
+      </template>
     </table-list>
     <pagination
       :total="total"
@@ -23,22 +28,24 @@
       @handleSizeChange="handleSizeChange"
       @handleCurrentChange="handleCurrentChange"
     />
+    <salesmanInfo ref="salesmanInfo"></salesmanInfo>
   </div>
 </template>
 
 <script>
+import salesmanInfo from "@/components/salesmanInfo";
 import searchBoxNew from "@/components/searchBoxNew";
 import tableList from "@/components/tableList";
 import pagination from "@/components/pagination";
 export default {
   name: "RankingList",
-  components: { searchBoxNew, tableList, pagination },
+  components: { salesmanInfo, searchBoxNew, tableList, pagination },
   data() {
     return {
       disabledBtn: false,
       loading: false, //当前表单加载是否加载动画
       navText: {
-        tableHide:true,
+        tableHide: false,
         title: "排行榜",
         index: 0,
         ch: "条",
@@ -55,63 +62,48 @@ export default {
       //搜索
       formList: [
         {
-          prop1: "classStartTime",
-          prop2: "classEndTime",
+          prop1: "startTime",
+          prop2: "endTime",
           placeholder1: "开始时间",
           placeholder2: "结束时间",
           scope: "moreDataPicker",
+          Diszing: true,
         },
         {
-          prop: "status1",
-          placeholder: "范围",
-          scope: "select",
-          noClear: false,
-          options: [
-            { label: "是", value: 1 },
-            { label: "否", value: 0 },
-          ],
+          prop: "distributionId",
+          placeholder: "分销活动",
+          scope: "distributionList",
         },
         {
-          prop: "status2",
-          placeholder: "活动",
+          prop: "sortType",
+          placeholder: "排行榜类型",
           scope: "select",
-          noClear: false,
           options: [
-            { label: "是", value: 1 },
-            { label: "否", value: 0 },
+            { label: "佣金", value: 1 },
+            { label: "订单数", value: 2 },
           ],
         },
       ],
       formData: {
-        status: "0,1",
+        sortType: 1,
         pageSize: 10,
         pageNum: 1,
       },
       // 表单
       tableSet: [
         {
-          label: "排序",
-          prop: "sort",
-          hidden: true,
-        },
-        {
-          label: "名称",
-          prop: "name",
+          label: "业务员名称	",
+          prop: "sellerName",
           hidden: true,
         },
         {
           label: "佣金总额",
-          prop: "name",
+          prop: "cashTotal",
           hidden: true,
         },
         {
-          label: "时间",
-          prop: "name",
-          hidden: true,
-        },
-        {
-          label: "所属活动",
-          prop: "name",
+          label: "订单数",
+          prop: "orderNum",
           hidden: true,
         },
       ],
@@ -123,24 +115,27 @@ export default {
     this.search();
   },
   methods: {
+    editClick(e) {
+      this.$refs.salesmanInfo.showBox(e.sellerId);
+    },
     search(v) {
       this.loading = true;
       if (v === 2) {
         this.formData = {
-          status: "0,1",
+          sortType: this.formData.sortType,
           pageSize: 10,
           pageNum: 1,
         };
       }
       var data = JSON.parse(JSON.stringify(this.formData));
-      if (this.formData.classStartTime) {
-        data.classStartTime = parseInt(data.classStartTime / 1000);
+      if (this.formData.startTime) {
+        data.startTime = parseInt(data.startTime / 1000);
       }
-      if (this.formData.classEndTime) {
-        data.classEndTime = parseInt(data.classEndTime / 1000);
+      if (this.formData.endTime) {
+        data.endTime = parseInt(data.endTime / 1000);
       }
       this.$api
-        .inquirebusinessList(data)
+        .distributionactivitysellersortnotice(data)
         .then((res) => {
           this.tableData = res.rows;
           this.total = res.total;
@@ -153,25 +148,6 @@ export default {
     init() {
       this.search(2);
     },
-    del(v) {
-      this.$alert(
-        "确定删除此内容？<br />内容删除后将无法恢复，请慎重考虑",
-        "提示",
-        {
-          dangerouslyUseHTMLString: true,
-        }
-      )
-        .then(() => {
-          this.$message.success("删除成功");
-          this.search();
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消删除",
-          });
-        });
-    },
 
     handleSizeChange(v) {
       this.formData.pageSize = v;

src/views/Marketing/distribution/salesmanList/salesCheckout.vue

@@ -17,7 +17,7 @@
         :formData="formData"
         :formList="formList"
         @search="search"
-        @init="search(1)"
+        @init="init"
       />
       <table-list
         rowKey="userId"
@@ -63,7 +63,7 @@ export default {
     return {
       loading: false, //当前表单加载是否加载动画
       navText: {
-        title: "学员端账号",
+        title: "账号管理",
         index: 0,
         ch: "条",
         num: true,
@@ -81,16 +81,16 @@ export default {
       disabledBtn: false,
       //   弹窗数据
       formData: {
-        realname:"",
-        status: "0,1",
+        userName: "",
+        statusArray: "0,1",
         pageSize: 10,
         pageNum: 1,
       },
       formList: [
         {
-          lable: "用户昵称",
-          prop: "nickname",
-          placeholder: "请输入用户昵称",
+          lable: "账号名称",
+          prop: "userName",
+          placeholder: "请输入账号名称",
         },
       ],
       tableData: [], //表单数据
@@ -99,66 +99,46 @@ export default {
       tableSet: [
         {
           label: "用户编码",
-          prop: "studentCode",
+          prop: "code",
           hidden: true,
         },
         {
-          label: "头像",
-          prop: "avatar",
+          label: "账号名称",
+          prop: "userName",
           hidden: true,
-          scope: "img",
         },
         {
-          label: "昵称",
-          prop: "nickname",
+          label: "角色名称",
+          prop: "roles",
+          prop1: "roleName",
+          scope: "aboutChapter",
           hidden: true,
         },
         {
-          label: "性别",
-          prop: "sex",
+          label: "真实姓名",
+          prop: "nickName",
           hidden: true,
-          scope: "sex",
         },
         {
-          label: "姓名",
-          prop: "realname",
-          hidden: true,
-        },
-        {
-          label: "身份证",
+          label: "身份证号码",
           prop: "idCard",
           hidden: true,
         },
         {
           label: "手机号码",
-          prop: "telphone",
-          hidden: true,
-        },
-        {
-          label: "所在城市",
-          prop1: "province",
-          prop2: "city",
-          prop3: "district",
+          prop: "phonenumber",
           hidden: true,
-          scope: "address",
         },
         {
-          label: "注册时间",
-          prop: "createTime",
+          label: "邮箱",
+          prop: "email",
           hidden: true,
-          scope: "aTimeList",
         },
         {
-          label: "归属来源",
-          prop: "registerPlat",
+          label: "状态",
+          prop: "status",
           hidden: true,
-          scope: "ptai",
-        },
-        {
-          label: "最后一次登录时间",
-          prop: "lastLoginTime",
-          hidden: true,
-          scope: "aTimeList",
+          scope: "status",
         },
       ],
     };
@@ -172,18 +152,8 @@ export default {
     },
     search(int) {
       this.loading = true;
-      if (int === 1) {
-        this.formData = {
-        realname:"",
-          status: "0,1",
-          pageSize: 10,
-          pageNum: 1,
-        };
-        this.$refs.tableList.clearMoreActive();
-      }
-      console.log(this.formData)
       this.$api
-        .inquireappuserlists(this.formData)
+        .obtainUserList(this.formData)
         .then((res) => {
           this.tableData = res.rows;
           this.total = res.total;
@@ -193,7 +163,15 @@ export default {
           this.loading = false;
         });
     },
-
+    init() {
+      this.formData = {
+        userName: "",
+        statusArray: "0,1",
+        pageSize: 10,
+        pageNum: 1,
+      };
+      this.search();
+    },
     submit() {
       if (this.$refs.tableList.allCheckData.length === 0) {
         this.$message.error("请勾选数据");
@@ -204,7 +182,7 @@ export default {
       );
       this.disabledBtn = true;
       this.$api
-        .distributionsellerbatchAdd({ userIds: Array })
+        .distributionsellerbatchAdd({ sysUserIds: Array })
         .then((res) => {
           this.$message.success("操作成功");
           this.dialogVisible = false;

src/views/classHoursReview/component/ChapterTable.vue

@@ -68,18 +68,18 @@ export default {
   data() {
     return {};
   },
-  computed:{
-    chapterClassHours : function(){
-      return function(arr){
-        var num = 0
-        arr.classPeriodSectionList.forEach(item => {
-          if(item.durationTime){
-            num += parseFloat((item.durationTime / 60 / 45).toFixed(1))
+  computed: {
+    chapterClassHours: function () {
+      return function (arr) {
+        var num = 0;
+        arr.classPeriodSectionList.forEach((item) => {
+          if (item.durationTime) {
+            num += parseInt(item.durationTime);
           }
-        })
-        return num
-      }
-    }
+        });
+        return num ? (parseInt(num) / 60 / 45).toFixed(1) : 0;
+      };
+    },
   },
   components: {
     LessonTable,
@@ -87,5 +87,4 @@ export default {
 };
 </script>
 
-<style>
-</style>
+<style></style>

src/views/finance/paymentList/index.vue

@@ -1,300 +1,21 @@
 <template>
-  <div id="paymentList">
-    <search-box-new
-      ref="searchBox"
-      :formData="formData"
-      :formList="formList"
-      @search="search"
-      @init="init"
-    />
-    <table-list
-      rowKey="id"
-      ref="tableList"
-      :tableSets="tableSet"
-      :tableData="tableData"
-      :navText="navText"
-      :loading="loading"
-    >
-      <template slot="customize">
-        <el-button size="medium" @click="batch" type="warning"
-          >批量支付</el-button
-        > </template
-      ><template slot="btn" slot-scope="props">
-        <el-button type="text" @click="editClick(props.scope.row)"
-          >支付</el-button
-        >
-      </template>
-    </table-list>
-    <pagination
-      :total="total"
-      :pageSize="formData.pageSize"
-      :currentPage="formData.pageNum"
-      @handleSizeChange="handleSizeChange"
-      @handleCurrentChange="handleCurrentChange"
-    />
+  <div id="">
+
   </div>
 </template>
 
 <script>
-import searchBoxNew from "@/components/searchBoxNew";
-import tableList from "@/components/tableList";
-import pagination from "@/components/pagination";
 export default {
-  name: "PaymentList",
-  components: { searchBoxNew, tableList, pagination },
-  data() {
+  data () {
     return {
-      disabledBtn: false,
-      loading: false, //当前表单加载是否加载动画
-      navText: {
-        title: "提现支付列表",
-        index: 0,
-        ch: "条",
-        num: true,
-        choice: true,
-        addHide: true,
-        openCheckMore: true,
-        changeWidth: "100px",
-        backFatherBtn: {
-          status: false,
-          title: "配置下单填选模板",
-        },
-      },
-      //搜索
-      formList: [
-        {
-          prop1: "classStartTime",
-          prop2: "classEndTime",
-          placeholder1: "开始时间",
-          placeholder2: "结束时间",
-          scope: "moreDataPicker",
-        },
-        {
-          lable: "提现单号",
-          prop: "name",
-          placeholder: "请输入提现单号",
-        },
-        {
-          lable: "姓名",
-          prop: "name",
-          placeholder: "请输入姓名",
-        },
-        {
-          prop: "status1",
-          placeholder: "状态",
-          scope: "select",
-          noClear: false,
-          options: [
-            { label: "待处理", value: 2 },
-            { label: "已处理", value: 1 },
-            { label: "全部", value: 0 },
-          ],
-        },
-      ],
-      formData: {
-        status: "0,1",
-        pageSize: 10,
-        pageNum: 1,
-      },
-      // 表单
-      tableSet: [
-        {
-          label: "排序",
-          prop: "sort",
-          hidden: true,
-        },
-        {
-          label: "名称",
-          prop: "name",
-          hidden: true,
-        },
-        {
-          label: "佣金总额",
-          prop: "name",
-          hidden: true,
-        },
-        {
-          label: "时间",
-          prop: "name",
-          hidden: true,
-        },
-        {
-          label: "所属活动",
-          prop: "name",
-          hidden: true,
-        },
-      ],
-      tableData: [], //表单数据
-      total: 0, //一共多少条
-    };
-  },
-  created() {
-    this.search();
+    }
   },
   methods: {
-    batch() {
-      if (!this.$refs.tableList.allCheckData.length) {
-        this.$message.warning("请勾选需要批量支付的数量");
-        return;
-      }
-    },
-    editClick(e) {
-      console.log("支付", e);
-    },
-    search(v) {
-      this.loading = true;
-      if (v === 2) {
-        this.formData = {
-          status: "0,1",
-          pageSize: 10,
-          pageNum: 1,
-        };
-      }
-      var data = JSON.parse(JSON.stringify(this.formData));
-      if (this.formData.classStartTime) {
-        data.classStartTime = parseInt(data.classStartTime / 1000);
-      }
-      if (this.formData.classEndTime) {
-        data.classEndTime = parseInt(data.classEndTime / 1000);
-      }
-      this.$api
-        .inquirebusinessList(data)
-        .then((res) => {
-          this.tableData = res.rows;
-          this.total = res.total;
-          this.navText.index = res.total;
-        })
-        .finally(() => {
-          this.loading = false;
-        });
-    },
-    init() {
-      this.search(2);
-    },
-    del(v) {
-      this.$alert(
-        "确定删除此内容？<br />内容删除后将无法恢复，请慎重考虑",
-        "提示",
-        {
-          dangerouslyUseHTMLString: true,
-        }
-      )
-        .then(() => {
-          this.$message.success("删除成功");
-          this.search();
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消删除",
-          });
-        });
-    },
 
-    handleSizeChange(v) {
-      this.formData.pageSize = v;
-      this.formData.pageNum = 1;
-      this.search();
-    },
-    handleCurrentChange(v) {
-      this.formData.pageNum = v;
-      this.search();
-    },
-  },
-};
+  }
+}
 </script>
 
 <style lang="scss" scoped>
-/deep/.el-button {
-  border-radius: 8px;
-}
-/deep/.el-dialog {
-  border-radius: 8px;
-  .el-dialog__header {
-    padding: 0;
-    .hearders {
-      height: 40px;
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      padding: 0px 18px 0px 20px;
-      border-bottom: 1px solid #e2e2e2;
-      .leftTitle {
-        font-size: 14px;
-        font-weight: bold;
-        color: #2f4378;
-      }
-      .rightBoxs {
-        display: flex;
-        align-items: center;
-        img {
-          width: 14px;
-          height: 14px;
-          margin-left: 13px;
-          cursor: pointer;
-        }
-      }
-    }
-  }
-  .el-dialog__footer {
-    padding: 0;
-    .dialog-footer {
-      padding: 0px 40px;
-      height: 70px;
-      border-top: 1px solid #e2e2e2;
-      display: flex;
-      align-items: center;
-      justify-content: flex-end;
-    }
-  }
-}
-.imgBox {
-  width: 100%;
-  // height: 210px;
-  border: 1px solid #e2e2e2;
-  border-radius: 8px;
-  padding: 8px 8px 3px;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  .imgLabel {
-    flex: 1;
-    width: 100%;
-    border: 1px dotted #e2e2e2;
-    color: #999;
-    font-size: 14px;
-    cursor: pointer;
-    border-radius: 8px;
-    .msPhoto {
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      max-width: 100%;
-      max-height: 270px;
-      img {
-        max-width: 100%;
-        max-height: 270px;
-      }
-    }
-    .imgbbx {
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      justify-content: center;
-      width: 100%;
-      height: 100%;
-      i {
-        font-weight: bold;
-        margin: 14px 0;
-        font-size: 24px;
-      }
-    }
-  }
-  p {
-    margin: 5px 0px;
-  }
-}
-.numInputs {
-  width: 150px;
-}
+
 </style>

src/views/finance/withdrawal/audit.vue

@@ -7,12 +7,30 @@
       :close-on-click-modal="false"
     >
       <div slot="title" class="hearders">
-        <div class="leftTitle">业务员</div>
+        <div class="leftTitle">提现审核</div>
         <div class="rightBoxs">
           <img src="@/assets/images/Close@2x.png" alt="" @click="close" />
         </div>
       </div>
       <div>
+        <div class="auto_flow">
+          <div v-for="(item, index) in recordList" :key="index" class="recordBox">
+          <p class="one">
+            第<span class="color_red_bold">{{ index + 1 }}</span
+            >次审核记录
+          </p>
+          <p><span>审核人：</span>{{ item.auditor }}</p>
+          <p>
+            <span>审核结果：</span
+            ><span class="color_red_bold">{{
+              item.checkResult === 1 ? "同意" : "拒绝"
+            }}</span>
+          </p>
+          <p><span>审核意见：</span>{{ item.checkReason }}</p>
+          <p><span>审核状态：</span>{{ showCheckStatus(item.checkStatus) }}</p>
+        </div>
+        </div>
+        
         <el-form
           label-position="right"
           label-width="110px"
@@ -21,22 +39,25 @@
           ref="listData"
         >
           <el-form-item label="申请详情">
-            <div><span>tang</span><span>发起了提现申请</span></div>
-            <div>本次提现金额：￥1500.00</div>
+            <div>
+              <span>{{ listData.sellerName }}</span
+              ><span>发起了提现申请</span>
+            </div>
+            <div>本次提现金额：￥{{ listData.checkCash }}</div>
           </el-form-item>
 
-          <el-form-item label="审核结果" prop="jg">
-            <el-radio-group v-model="listData.jg">
+          <el-form-item label="审核结果" prop="checkResult">
+            <el-radio-group v-model="listData.checkResult">
               <el-radio :label="1">同意</el-radio>
-              <el-radio :label="0">拒绝</el-radio>
+              <el-radio :label="2">拒绝</el-radio>
             </el-radio-group>
           </el-form-item>
 
-          <el-form-item label="审核意见" prop="yj">
+          <el-form-item label="审核意见" prop="checkReason">
             <el-input
               type="textarea"
               :rows="2"
-              v-model="listData.yj"
+              v-model="listData.checkReason"
             ></el-input>
           </el-form-item>
         </el-form>
@@ -64,14 +85,14 @@ export default {
       listData: {},
       //表单验证
       rules: {
-        jg: [
+        checkResult: [
           {
             required: true,
             message: "请选择审核结果",
             trigger: "change",
           },
         ],
-        yj: [
+        checkReason: [
           {
             required: true,
             message: "请输入审核意见",
@@ -79,10 +100,39 @@ export default {
           },
         ],
       },
+      recordList: [],
     };
   },
   methods: {
+    showCheckStatus(int) {
+      var a = "";
+      switch (int) {
+        case 0:
+          a = "初审";
+          break;
+        case 1:
+          a = "二审";
+          break;
+        case 2:
+          a = "三审";
+          break;
+        default:
+          break;
+      }
+      return a;
+    },
     showBox(e) {
+      this.listData = {
+        checkCash: e.cash,
+        sellerName: e.sellerName,
+        checkStatus: e.cwStatus,
+        checkReason: "",
+        checkResult: "",
+        cwId: e.id,
+      };
+      this.$api.obtaindistributioncheckdetail(e.id).then((res) => {
+        this.recordList = res.data;
+      });
       this.dialogVisible = true;
     },
     submit(formName) {
@@ -96,12 +146,16 @@ export default {
     },
     rulesTableSumbit() {
       this.disabledBtn = true;
-      setTimeout(() => {
-        this.$message.success("提交成功");
-        this.disabledBtn = false;
-        this.dialogVisible = false;
-        this.search();
-      }, 500);
+      this.$api
+        .editdistributioncheckhandle(this.listData)
+        .then((res) => {
+          this.$message.success("操作成功");
+          this.dialogVisible = false;
+          this.$parent.search();
+        })
+        .finally(() => {
+          this.disabledBtn = false;
+        });
     },
     close() {
       this.$refs.listData.clearValidate();
@@ -112,6 +166,22 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.auto_flow{
+  overflow: auto;
+  max-height: 380px;
+}
+.recordBox {
+  padding: 4px 10px;
+  margin-bottom: 10px;
+  background-color: #fceaec;
+  & > .one {
+    font-weight: bold;
+  }
+}
+.color_red_bold {
+  color: red;
+  font-weight: bold;
+}
 .header_img {
   & > .imageStyBoxShow {
     border-radius: 50%;

src/views/finance/withdrawal/index.vue

@@ -8,18 +8,23 @@
       @init="init"
     />
     <table-list
-      rowKey="id"
+      rowKey="cwId"
       ref="tableList"
       :tableSets="tableSet"
       :tableData="tableData"
       :navText="navText"
       :loading="loading"
       ><template slot="btn" slot-scope="props"
-        ><el-button type="text" @click="audit(props.scope.row)"
+        ><el-button
+          v-if="props.scope.row.cwStatus >= 0 && props.scope.row.cwStatus < 3"
+          type="text"
+          @click="audit(props.scope.row)"
           >审核</el-button
-        >
-        <el-button type="text" @click="editClick(props.scope.row)"
-          >详情</el-button
+        ><el-button
+          v-if="props.scope.row.cwStatus === 3"
+          type="text"
+          @click="payCash(props.scope.row.cwSn)"
+          >打款</el-button
         >
       </template>
     </table-list>
@@ -38,10 +43,10 @@
 import searchBoxNew from "@/components/searchBoxNew";
 import tableList from "@/components/tableList";
 import pagination from "@/components/pagination";
-import audit from "./audit.vue"
+import audit from "./audit.vue";
 export default {
   name: "Withdrawal",
-  components: { searchBoxNew, tableList, pagination,audit },
+  components: { searchBoxNew, tableList, pagination, audit },
   data() {
     return {
       disabledBtn: false,
@@ -63,36 +68,35 @@ export default {
       //搜索
       formList: [
         {
-          prop1: "classStartTime",
-          prop2: "classEndTime",
+          prop1: "applyStartTime",
+          prop2: "applyEndTime",
           placeholder1: "开始时间",
           placeholder2: "结束时间",
           scope: "moreDataPicker",
         },
         {
           lable: "提现单号",
-          prop: "name",
+          prop: "cwSn",
           placeholder: "请输入提现单号",
         },
         {
           lable: "姓名",
-          prop: "name",
+          prop: "sellerName",
           placeholder: "请输入姓名",
         },
         {
-          prop: "status1",
-          placeholder: "状态",
+          prop: "cwStatus",
+          placeholder: "审核状态",
           scope: "select",
           noClear: false,
           options: [
-            { label: "待处理", value: 2 },
-            { label: "已处理", value: 1 },
-            { label: "全部", value: 0 },
+            { label: "初审通过", value: 1 },
+            { label: "二审通过", value: 2 },
+            { label: "三审通过", value: 3 },
           ],
         },
       ],
       formData: {
-        status: "0,1",
         pageSize: 10,
         pageNum: 1,
       },
@@ -100,58 +104,65 @@ export default {
       tableSet: [
         {
           label: "提现单号",
-          prop: "sort",
+          prop: "cwSn",
           hidden: true,
         },
         {
           label: "申请时间",
-          prop: "name",
-          hidden: true,
-        },
-        {
-          label: "业务员ID",
-          prop: "name",
+          prop: "applyTime",
           hidden: true,
+          scope: "aTimeList",
         },
         {
           label: "业务员姓名",
-          prop: "name",
-          hidden: true,
-        },
-        {
-          label: "所属机构",
-          prop: "name",
+          prop: "sellerName",
           hidden: true,
         },
         {
           label: "手机号",
-          prop: "name",
-          hidden: true,
-        },
-        {
-          label: "对应活动",
-          prop: "name",
-          hidden: true,
-        },
-        {
-          label: "提现方式",
-          prop: "name",
-          hidden: true,
-        },
-        {
-          label: "账号",
-          prop: "name",
+          prop: "telphone",
           hidden: true,
         },
         {
           label: "金额（元）",
-          prop: "name",
+          prop: "cash",
           hidden: true,
         },
         {
           label: "状态",
-          prop: "name",
+          prop: "cwStatus",
           hidden: true,
+          scope: "isOptions",
+          options: [
+            {
+              label: "待审核",
+              value: 0,
+            },
+            {
+              label: "初审通过",
+              value: 1,
+            },
+            {
+              label: "二审通过",
+              value: 2,
+            },
+            {
+              label: "三审通过",
+              value: 3,
+            },
+            {
+              label: "已打款",
+              value: 4,
+            },
+            {
+              label: "已拒绝",
+              value: -1,
+            },
+            {
+              label: "已取消",
+              value: -2,
+            },
+          ],
         },
       ],
       tableData: [], //表单数据
@@ -162,8 +173,8 @@ export default {
     this.search();
   },
   methods: {
-    audit(e){
-      this.$refs.audit.showBox(e)
+    audit(e) {
+      this.$refs.audit.showBox(JSON.parse(JSON.stringify(e)));
     },
     editClick(e) {
       console.log("支付", e);
@@ -172,20 +183,19 @@ export default {
       this.loading = true;
       if (v === 2) {
         this.formData = {
-          status: "0,1",
           pageSize: 10,
           pageNum: 1,
         };
       }
       var data = JSON.parse(JSON.stringify(this.formData));
-      if (this.formData.classStartTime) {
-        data.classStartTime = parseInt(data.classStartTime / 1000);
+      if (this.formData.applyStartTime) {
+        data.applyStartTime = parseInt(data.applyStartTime / 1000);
       }
-      if (this.formData.classEndTime) {
-        data.classEndTime = parseInt(data.classEndTime / 1000);
+      if (this.formData.applyEndTime) {
+        data.applyEndTime = parseInt(data.applyEndTime / 1000);
       }
       this.$api
-        .inquirebusinessList(data)
+        .inquiredistributionchecklist(data)
         .then((res) => {
           this.tableData = res.rows;
           this.total = res.total;
@@ -198,23 +208,21 @@ export default {
     init() {
       this.search(2);
     },
-    del(v) {
-      this.$alert(
-        "确定删除此内容？<br />内容删除后将无法恢复，请慎重考虑",
-        "提示",
-        {
-          dangerouslyUseHTMLString: true,
-        }
-      )
+    payCash(id) {
+      this.$alert("确定进行打款操作吗？", "提示", {
+        dangerouslyUseHTMLString: true,
+      })
         .then(() => {
-          this.$message.success("删除成功");
-          this.search();
+          this.$api
+            .distributionwithdrawalpayCash({ cwSn: id })
+            .then((res) => {
+              this.$message.success("打款成功");
+              this.search();
+            })
+            .finally(() => {});
         })
         .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消删除",
-          });
+          
         });
     },