Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/DirectCustomer/list.vue

+<template>
+    <div>
+        <directCustomerList :CustomerMsg="CustomerMsg" :pagesTitle="pagesTitle"></directCustomerList>
+    </div>
+</template>
+<script>
+ import directCustomerList from "./components/directCustomerList.vue";
+  export default {
+    components: {
+      directCustomerList
+    },
+    data() {
+      return {
+        CustomerMsg:{},
+        pagesTitle:"全部",
+      }
+    },
+    watch: {
+        $route: {
+            handler(val, oldVal) {
+
+            },
+            deep: true,
+        } ,
+         pagesTitle(val,oldval){
+
+      },
+    }
+  }
+</script>
\ No newline at end of file

src/components/DirectCustomer/listSale.vue

+<template>
+    <div>
+        <directCustomerList :CustomerMsg="CustomerMsg" :pagesTitle="title"></directCustomerList>
+    </div>
+</template>
+<script>
+ import directCustomerList from "./components/directCustomerList.vue";
+  export default {
+    components: {
+      directCustomerList
+    },
+    data() {
+      return {
+        CustomerMsg:{
+
+        },
+         pagesTitle:"自己",
+      }
+    },
+    watch: {
+        $route: {
+            handler(val, oldVal) {
+
+            },
+            deep: true,
+        },
+         pagesTitle(val,oldval){
+
+      },
+    }
+  }
+</script>
\ No newline at end of file

src/components/SalesModule/CouponsList.vue

@@ -241,23 +241,6 @@
               <el-dropdown-item v-for="(item,index) in ScopeOfUseList" :key="index"
                 @click.native="dropdownText = item.Id>0?item.Name:$t('pub.unlimitedSel'), msg.CouponsUseScope = item.Id, getList(), resetPageIndex()">{{ item.Name }}
               </el-dropdown-item>
-              <!-- <el-dropdown-item
-                @click.native="dropdownText = $t('active.cl_tongyong'), msg.couponsUseScope = 1, getList(), resetPageIndex()">{{$t('active.cl_tongyong')}}
-              </el-dropdown-item>
-              <el-dropdown-item
-                @click.native="dropdownText = $t('objFill.gentuanyou'), msg.couponsUseScope = 2, getList(), resetPageIndex()">{{$t('objFill.gentuanyou')}}
-              </el-dropdown-item>
-              <el-dropdown-item @click.native="dropdownText = $t('MarketingActi.local')">{{$t('MarketingActi.local')}}</el-dropdown-item>
-              <el-dropdown-item @click.native="dropdownText = $t('objFill.dinzhiyou')">{{$t('objFill.dinzhiyou')}}</el-dropdown-item>
-              <el-dropdown-item
-                @click.native="dropdownText = $t('active.cl_qianzheng'), msg.couponsUseScope = 3, getList(), resetPageIndex()">{{$t('active.cl_qianzheng')}}
-              </el-dropdown-item>
-              <el-dropdown-item
-                @click.native="dropdownText = $t('active.cl_jipiao'), msg.couponsUseScope = 4, getList(), resetPageIndex()">{{$t('active.cl_jipiao')}}
-              </el-dropdown-item>
-              <el-dropdown-item
-                @click.native="dropdownText = $t('hotel.hotel'), msg.couponsUseScope = 10, getList(), resetPageIndex()">{{$t('hotel.hotel')}}
-              </el-dropdown-item> -->
             </el-dropdown-menu>
           </el-dropdown>
         </li>
@@ -332,13 +315,24 @@
       };
     },
     computed: {},
-    created() {},
+    created() {
+       if (this.$route.query.customerId) {
+        this.msg.userId = this.$route.query.customerId;
+      }
+       if (this.$route.query.customerType) {
+        this.msg.CustomerType = this.$route.query.customerType;
+      }
+    },
     mounted() {
-      this.getScopeOfUse()
-      this.getList();
-      if (this.$route.query.customerId) {
+       if (this.$route.query.customerId) {
         this.msg.userId = this.$route.query.customerId;
       }
+       if (this.$route.query.customerType) {
+        this.msg.CustomerType = this.$route.query.customerType;
+      }
+      this.getScopeOfUse()
+      this.getList();
+     
     },
     methods: {
       getScopeOfUse() {

src/components/administrative/empBankAccount.vue

@@ -481,6 +481,7 @@
         }
       },
       getSupplierGetPageList() {
+       
         if (this.addMsg.Type == 10) {
           return
         }
@@ -573,6 +574,19 @@
             AlCode: "",
             TicketCode: "",
           }
+        } if (this.addMsg.Type == 14) {
+          //{"msg":{"pageIndex":1,"pageSize":14,"KeyWord":"","IsVip":"-1","BranchId":"","EnterID":"0","CStartTime":"","CEndDate":"","total":85,"currentPage":1,"IsAll":1,"Blacklist":"0"},"cmd":"post_GetDirectCustomerPageList","timestamp":1742456340888,"token":"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE3NDI0MzQ2NDcuMCwiZXhwIjoxNzQyNjkzODQ3LjAsInVzZXJJbmZvIjp7InVpZCI6IjUiLCJncm91cElkIjoyLCJyZXF1ZXN0RnJvbSI6MSwiZXhwaXJlVGltZSI6bnVsbH19.XjicqVVYxCNdW6FeljZLLEF6zztziqN-sFkzg1V4TdQ","sign":"dba6d746e901f6f1340c436505b36366","languageId":0}
+          url = "post_GetDirectCustomerPageList"
+          msg = {
+            pageIndex: 1,
+            pageSize: this.supplierMsg.pageSize,
+            KeyWord: this.supplierMsg.Name,
+            IsVip: "-1",
+            BranchId: "",
+            EnterID: "0",
+            CStartTime: "",
+             CEndDate: ""
+          }
         }
         this.supplierLoading = true
         this.apipost(
@@ -700,7 +714,7 @@
           this.$message.error(this.$t('rule.qxzkhmingcheng'))
           return
         }
-        if (this.addMsg.Type != 7 && this.addMsg.Type != 9 && this.addMsg.Type != 10 && this.addMsg.Type != 12) {
+        if (this.addMsg.Type != 7 && this.addMsg.Type != 9 && this.addMsg.Type != 10 && this.addMsg.Type != 12&& this.addMsg.Type != 14) {
           if (this.addMsg.DutyNo == '' || this.addMsg.DutyNo == undefined) {
             this.$message.error(this.$t('objFill.qingtxsh'))
             return

src/components/administrative/empBankAccountAll.vue

@@ -749,6 +749,20 @@ export default {
           TicketCode:"",
         }
       }
+      if (this.addMsg.Type == 14) {
+          url = "post_GetDirectCustomerPageList"
+          msg = {
+            pageIndex: 1,
+            pageSize: this.supplierMsg.pageSize,
+            KeyWord: this.supplierMsg.Name,
+            IsVip: "-1",
+            BranchId: "",
+            EnterID: "0",
+            CStartTime: "",
+            CEndDate: "",
+            IsAll:1,
+          }
+        }
       this.supplierLoading = true
       this.apipost(
         url,
@@ -793,7 +807,12 @@ export default {
                   Name:x.Name,
                   ID: x.Id
                 }
-              } else{
+              } else if(this.addMsg.Type==14){
+                Obj = {
+                  Name: x.Name,
+                  ID: x.Id
+                }
+              }else{
                 Obj = {
                   Name:x.Name,
                   ID: x.ID
@@ -896,7 +915,7 @@ export default {
     },
     addData() {
       //添加角色
-      if (this.addMsg.Type!=7&&this.addMsg.Type!=9&&this.addMsg.Type!=10) {
+      if (this.addMsg.Type!=7&&this.addMsg.Type!=9&&this.addMsg.Type!=10&&this.addMsg.Type!=14) {
             if(this.addMsg.DutyNo==''||this.addMsg.DutyNo==undefined){
               this.$message.error(this.$t('objFill.qingtxsh'))
               return

src/router/config.js

@@ -2921,6 +2921,22 @@ export default {
                 title: '客户地图'
               },
             },
+            {
+              path: '/directCustomerList', //直客管理
+              name: 'directCustomerList',
+              component: resolve => require(['@/components/DirectCustomer/list'], resolve),
+              meta: {
+                title: '直客管理'
+              },
+            },
+            {
+              path: '/directCustomerListSale', //直客管理
+              name: 'directCustomerListSale',
+              component: resolve => require(['@/components/DirectCustomer/listSale'], resolve),
+              meta: {
+                title: '我的直客'
+              },
+            },
             {
               path: '/ActivityStatistics', // 销售=>活动统计
               name: 'ActivityStatistics',