瀏覽代碼

销售列表接口更改

cxmo 1 年之前
父節點
當前提交
9755f47c18

+ 13 - 9
src/views/custom_manage/overseasList/components/selectSaleDialog.vue

@@ -16,9 +16,9 @@
                 :key="saleCascaderKey"
                 :key="saleCascaderKey"
                 :options="AllSalesArr" 
                 :options="AllSalesArr" 
                 :props="{
                 :props="{
-                    value: 'ItemId',
-                    label: 'ItemName',
-                    children: 'Children',
+                    value: 'AdminId',
+                    label: 'RealName',
+                    children: 'ChildrenList',
                     multiple: true,
                     multiple: true,
                     emitPath:false,
                     emitPath:false,
                 }"
                 }"
@@ -43,7 +43,7 @@
 
 
 <script>
 <script>
 
 
-import {dataAuthInterface } from '@/api/api.js'
+import {dataAuthInterface , customInterence } from '@/api/api.js'
 export default {
 export default {
     props:{
     props:{
         isSelectSaleShow:{
         isSelectSaleShow:{
@@ -76,7 +76,7 @@ export default {
         //由于中英文客户的销售列表不一致,获取系统全部人员列表作为销售列表
         //由于中英文客户的销售列表不一致,获取系统全部人员列表作为销售列表
         getSalesList(){
         getSalesList(){
             this.dialogLoading = true
             this.dialogLoading = true
-            dataAuthInterface.userSearch().then(res=>{
+            customInterence.getSale({Status:0}).then(res=>{
                 this.dialogLoading = false
                 this.dialogLoading = false
                 if(res.Ret!==200) {
                 if(res.Ret!==200) {
                     this.AllSalesArr = []
                     this.AllSalesArr = []
@@ -84,7 +84,7 @@ export default {
                     this.selectList=[]
                     this.selectList=[]
                     return 
                     return 
                 }
                 }
-                this.AllSalesArr = res.Data||[]
+                this.AllSalesArr = res.Data?(res.Data.List||[]):[]
                 //有选择的指标,回显
                 //有选择的指标,回显
                 if(this.selectedSalesArr.length){
                 if(this.selectedSalesArr.length){
                     this.sales = this.selectedSalesArr.map(i=>(i.SellerId))
                     this.sales = this.selectedSalesArr.map(i=>(i.SellerId))
@@ -97,7 +97,10 @@ export default {
         changeSelect(){
         changeSelect(){
             const nodes = this.$refs.saleCascader.getCheckedNodes()
             const nodes = this.$refs.saleCascader.getCheckedNodes()
             this.selectList = nodes.filter(i=>{
             this.selectList = nodes.filter(i=>{
-                if(i.value<10000&&!i.children.length){
+                /* if(i.value<10000&&!i.children.length){
+                    return i
+                } */
+                if(!Number.isNaN(Number(i.value))&&!i.children.length){
                     return i
                     return i
                 }
                 }
             })
             })
@@ -114,14 +117,15 @@ export default {
             let AddSellerIdArr = []
             let AddSellerIdArr = []
             let DelSellerIdArr = []
             let DelSellerIdArr = []
             const oldSales = this.selectedSalesArr.map(i=>(i.SellerId))
             const oldSales = this.selectedSalesArr.map(i=>(i.SellerId))
+            const tempSales = this.sales.map(i=>(Number(i)))
             oldSales.forEach(i=>{
             oldSales.forEach(i=>{
-                if(this.sales.includes(i)){
+                if(tempSales.includes(i)){
                     AddSellerIdArr.push(i)
                     AddSellerIdArr.push(i)
                 }else{
                 }else{
                     DelSellerIdArr.push(i)
                     DelSellerIdArr.push(i)
                 }
                 }
             })
             })
-            AddSellerIdArr = Array.from(new Set([...AddSellerIdArr,...this.sales]))
+            AddSellerIdArr = Array.from(new Set([...AddSellerIdArr,...tempSales]))
             this.$emit('saveSales',{AddSellerIdArr,DelSellerIdArr,sales:this.selectList})
             this.$emit('saveSales',{AddSellerIdArr,DelSellerIdArr,sales:this.selectList})
         }
         }
     },
     },

+ 2 - 2
src/views/custom_manage/overseasList/overseasCustomList.vue

@@ -50,7 +50,7 @@
                     </ul>
                     </ul>
                 </div>
                 </div>
                 <!-- 管理员-选择销售 -->
                 <!-- 管理员-选择销售 -->
-                <div class="data-select" v-if="isDataSelectBtnShow&&this.tableData.length">
+                <div class="data-select" v-if="isDataSelectBtnShow&&this.salesArr.length">
                     <el-button type="text" @click="isSelectSaleShow=true"><i class="el-icon-plus"  style="font-weight: bold;margin-right: 5px;"/>选择销售</el-button>
                     <el-button type="text" @click="isSelectSaleShow=true"><i class="el-icon-plus"  style="font-weight: bold;margin-right: 5px;"/>选择销售</el-button>
                 </div>
                 </div>
                 <!--非管理员 筛选-->
                 <!--非管理员 筛选-->
@@ -133,7 +133,7 @@
                     </el-table-column>
                     </el-table-column>
                     <template slot="empty">
                     <template slot="empty">
                         <!-- 管理员展示按钮 -->
                         <!-- 管理员展示按钮 -->
-                        <div class="data-select" v-if="isDataSelectBtnShow">
+                        <div class="data-select" v-if="isDataSelectBtnShow&&!salesArr.length">
                             <el-button type="text" @click="isSelectSaleShow=true"><i class="el-icon-plus"  style="font-weight: bold;margin-right: 5px;" />选择销售</el-button>
                             <el-button type="text" @click="isSelectSaleShow=true"><i class="el-icon-plus"  style="font-weight: bold;margin-right: 5px;" />选择销售</el-button>
                         </div>
                         </div>
                         <!-- 非管理员显示暂无数据 -->
                         <!-- 非管理员显示暂无数据 -->