3.0 增加

src/views/contract_manage/components/tableColums.js

@@ -26,11 +26,7 @@ export const tableColums = (type) => {
           key: "SellerName",
           widthsty: 100,
         },
-        {
-          label: "推荐人",
-          key: "InviteName",
-          widthsty: 100,
-        },
+       
         {
           label: "金额",
           key: "OrderMoney",
@@ -58,6 +54,15 @@ export const tableColums = (type) => {
           key: "OrderStatus",
           widthsty: 90,
         },
+        {
+          label: "支付时间",
+          key: "PayTime",
+        },
+        {
+          label: "推荐人",
+          key: "InviteName",
+          widthsty: 100,
+        },
       ]
     : type == 2
     ? [
@@ -85,11 +90,7 @@ export const tableColums = (type) => {
           key: "SellerName",
           widthsty: 100,
         },
-        {
-          label: "推荐人",
-          key: "InviteName",
-          widthsty: 100,
-        },
+        
         {
           label: "金额",
           key: "OrderMoney",
@@ -103,6 +104,10 @@ export const tableColums = (type) => {
           label: "付款项目",
           key: "PaymentProject",
         },
+        {
+          label: "支付渠道",
+          key: "PaymentTypeText",
+        },
         {
           label: "标题",
           key: "SourceTitle",
@@ -112,6 +117,15 @@ export const tableColums = (type) => {
           key: "OrderStatus",
           widthsty: 90,
         },
+        {
+          label: "支付时间",
+          key: "PayTime",
+        },
+        {
+          label: "推荐人",
+          key: "InviteName",
+          widthsty: 100,
+        },
       ]
     : [];
 };

src/views/contract_manage/paymentRecords.vue

@@ -33,6 +33,25 @@
         <el-select v-if="tabs_index != 1" @change="handleSelectChange" style="margin-right: 20px; width: 220px" v-model="payInfo" placeholder="付款项目" clearable>
           <el-option v-for="item in paymentProjectList" :key="item" :label="item" :value="item"> </el-option>
         </el-select>
+        <el-select v-if="tabs_index != 1" @change="handleSelectChange" style="margin-right: 20px; width: 220px" v-model="paymentType" placeholder="支付渠道" clearable>
+          <el-option v-for="item in paymentTypeList" :key="item.key" :label="item.lable" :value="item.key"> </el-option>
+        </el-select>
+
+        <el-cascader
+          v-if="tabs_index != 1"
+          v-model="salesRai"
+          placeholder="推荐人"
+          style="width: 220px; margin: 0 20px 20px 0"
+          :options="salesArrRai"
+          :props="defaultSalesProps"
+          :show-all-levels="false"
+          collapse-tags
+          clearable
+          filterable
+          @change="handleSelectChange"
+        >
+        </el-cascader>
+
         <el-select @change="handleSelectChange" style="margin-right: 20px; width: 220px" v-model="payStatus" placeholder="支付状态" clearable>
           <el-option v-for="item in payStatusList" :key="item.key" :label="item.lable" :value="item.key"> </el-option>
         </el-select>
@@ -46,7 +65,6 @@
             <span @click="handleRowClick(row, item.key)" :style="handleRowStyle(item.key)">{{ handleRowContent(row, item.key) }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="支付时间" prop="PayTime" align="center"> </el-table-column>
         <el-table-column label="操作" align="center" width="80">
           <template slot-scope="{ row }">
             <span v-if="row.OrderStatus == 2" class="editsty" @click="refundHandler(row)">退款</span>
@@ -93,10 +111,19 @@ export default {
         { lable: "已支付", key: 2 },
         { lable: "已退款", key: 3 },
       ],
+      paymentType: "",
+      paymentTypeList: [
+        { lable: "小程序", key: 1 },
+        { lable: "PC", key: 2 },
+        { lable: "H5", key: 3 },
+      ],
       tabs_index: 1,
       timeRange: [], // 时间筛选
       sales: [],
       salesArr: [], //销售
+      salesRai: [],
+      salesArrRai: [], //销售
+
       defaultSalesProps: {
         multiple: true,
         label: "RealName",
@@ -122,10 +149,19 @@ export default {
   created() {},
   mounted() {
     this.getSale();
+    this.getSaleRai();
     this.getOrderList();
     this.tableColums = tableColums(1);
   },
   methods: {
+    /* 获取权益销售 */
+    getSaleRai() {
+      customInterence.getSalesRaiData().then((res) => {
+        if (res.Ret === 200) {
+          this.salesArrRai = res.Data.List;
+        }
+      });
+    },
     // 修改页码
     pageChange(page_no) {
       this.page_no = page_no;
@@ -147,6 +183,12 @@ export default {
           return item[item.length - 1];
         });
       }
+      let salesArrRai = [];
+      if (this.salesRai.length) {
+        salesArrRai = this.salesRai.map((item) => {
+          return item[item.length - 1];
+        });
+      }
       const res = await contractInterface.getOrderList({
         PageSize: this.page_size,
         CurrentIndex: this.page_no,
@@ -158,6 +200,8 @@ export default {
         OrderCode: this.orderNumber,
         KeyWord: this.keyWord,
         OrderStatus: this.payStatus,
+        ShareId: salesArrRai.join(","),
+        PaymentType: this.paymentType,
       });
       if (res.Ret === 200) {
         this.tableOrderData = res.Data.List;

src/views/contract_manage/refundRecord.vue

@@ -33,6 +33,25 @@
         <el-select @change="handleSelectChange" style="margin-right: 20px; width: 220px" v-model="payInfo" placeholder="付款项目" clearable>
           <el-option v-for="item in paymentProjectList" :key="item" :label="item" :value="item"> </el-option>
         </el-select>
+
+        <el-select v-if="tabs_index != 1" @change="handleSelectChange" style="margin-right: 20px; width: 220px" v-model="paymentType" placeholder="支付渠道" clearable>
+          <el-option v-for="item in paymentTypeList" :key="item.key" :label="item.lable" :value="item.key"> </el-option>
+        </el-select>
+
+        <el-cascader
+          v-if="tabs_index != 1"
+          v-model="salesRai"
+          placeholder="推荐人"
+          style="width: 220px; margin: 0 20px 20px 0"
+          :options="salesArrRai"
+          :props="defaultSalesProps"
+          :show-all-levels="false"
+          collapse-tags
+          clearable
+          filterable
+          @change="handleSelectChange"
+        >
+        </el-cascader>
         <el-select @change="handleSelectChange" style="margin-right: 20px; width: 220px" v-model="payStatus" placeholder="退款状态" clearable>
           <el-option v-for="item in payStatusList" :key="item.key" :label="item.lable" :value="item.key"> </el-option>
         </el-select>
@@ -46,10 +65,9 @@
             <span @click="handleRowClick(row, item.key)" :style="handleRowStyle(item.key)">{{ handleRowContent(row, item.key) }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="支付时间" prop="PayTime" align="center"> </el-table-column>
         <el-table-column label="操作" align="center" width="80">
           <template slot-scope="{ row }">
-            <span class="editsty" v-if="row.OrderStatus == 2"  @click="closeRefundHandler(row)">关闭退款</span>
+            <span class="editsty" v-if="row.OrderStatus == 2" @click="closeRefundHandler(row)">关闭退款</span>
             <span class="editsty" v-if="row.RefundRemark" @click="refundHandler(row)">退款原因</span>
           </template>
         </el-table-column>
@@ -94,6 +112,15 @@ export default {
         { lable: "退款关闭", key: 6 },
       ],
       salesArr: [], //销售
+
+      salesRai: [],
+      salesArrRai: [], //销售
+      paymentType: "",
+      paymentTypeList: [
+        { lable: "小程序", key: 1 },
+        { lable: "PC", key: 2 },
+        { lable: "H5", key: 3 },
+      ],
       defaultSalesProps: {
         multiple: true,
         label: "RealName",
@@ -119,10 +146,19 @@ export default {
   created() {},
   mounted() {
     this.getSale();
+    this.getSaleRai();
     this.getOrderRefundList();
     this.tableColums = tableColums(1);
   },
   methods: {
+    /* 获取权益销售 */
+    getSaleRai() {
+      customInterence.getSalesRaiData().then((res) => {
+        if (res.Ret === 200) {
+          this.salesArrRai = res.Data.List;
+        }
+      });
+    },
     // 修改页码
     pageChange(page_no) {
       this.page_no = page_no;
@@ -144,6 +180,12 @@ export default {
           return item[item.length - 1];
         });
       }
+      let salesArrRai = [];
+      if (this.salesRai.length) {
+        salesArrRai = this.salesRai.map((item) => {
+          return item[item.length - 1];
+        });
+      }
       const res = await contractInterface.orderRefundList({
         PageSize: this.page_size,
         CurrentIndex: this.page_no,
@@ -155,6 +197,8 @@ export default {
         OrderCode: this.orderNumber,
         KeyWord: this.keyWord,
         OrderStatus: this.payStatus,
+        ShareId: salesArrRai.join(","),
+        PaymentType: this.paymentType,
       });
       if (res.Ret === 200) {
         this.tableOrderData = res.Data.List;