代码上传

src/HManagement/accountManage/modules/list.vue

@@ -135,8 +135,6 @@ export default {
       this.$api.requested(this.param).then((res) => {
         this.list = res.data;
         this.total = res.total;
-        console.log(this.total);
-
         this.currentPage = res.pageNumber;
       });
     },

src/HManagement/clueManage/clue_public/index.vue

@@ -1,7 +1,11 @@
 <template>
   <div>
-    <distribution v-if="tool.checkAuth($route.name,'distribution')" @onSuccess="onSuccess"></distribution>
-    <list ref="list">
+    <div class="container normal-panel normal-margin flex">
+      <distribution v-if="tool.checkAuth($route.name,'distribution')" @onSuccess="onSuccess"></distribution>
+      <exportBtn :params="params" :exportData="exportData" v-if="tool.checkAuth($route.name,'export')"></exportBtn>
+    </div>
+    
+    <list ref="list" @seleteParams="seleteParams" @exportDataUpdata="exportDataUpdata">
       <template v-slot:detail="scope">
         <el-button class="inline-16" size="small" type="text" @click="$router.push({path:'/clueDetail',query:{id:scope.data.data.sat_orderclueid}})">详 情</el-button>
       </template>
@@ -25,22 +29,42 @@ import recall from './modules/recall.vue'
 import onDel from './modules/del.vue'
 
 import edit from './modules/edit.vue'
+import exportBtn from './modules/exportBtn'
+import { log } from '@antv/g2plot/lib/utils'
 
 export default {
+  data() {
+    return {
+      exportData: '',
+      params:''
+    }
+  },
   components:{
     distribution,
     list,
     edit,
     recall,
-    onDel
+    onDel,
+    exportBtn
   },
   methods:{
     onSuccess () {
       this.$refs['list'].listData()
+    },
+    seleteParams(params) {
+      let temp = JSON.parse(JSON.stringify(params))
+      temp.content.isExport = true   
+      this.params = temp
+    },
+    exportDataUpdata(data) {
+      this.exportData = data
     }
   }
 }
 
 </script>
-<style>
+<style scoped>
+.flex {
+  display: flex;
+}
 </style>

src/HManagement/clueManage/clue_public/modules/distribution.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="container normal-panel normal-margin">
+  <div>
     <el-button type="default" size="small" @click="getWaitClue">分配经销商</el-button>
     <el-dialog title="数据预览" :visible.sync="dialogTableVisible" width="90%" top="30px">
       <p class="normal-margin">总共:&nbsp;{{total}}条</p>
@@ -113,7 +113,7 @@ export default {
         this.dialogTableVisible = false
         this.$emit('onSuccess')
       })
-    }
+    },
   },
   created () {
     this.tablecols = this.tool.tabelCol(this.$route.name)['distributionTable'].tablecols

src/HManagement/clueManage/clue_public/modules/exportBtn.vue

@@ -0,0 +1,80 @@
+<template>
+  <div>
+    <el-button type="success" size="small" icon="el-icon-download" style="margin-left:10px" @click="submit">导 出</el-button>
+    <el-dialog title="导出汇总" :visible.sync="dialogFormVisible" width="1200px">
+      <tableLayout :layout="tablecols" :data="exportData" :custom="true" :height="tableHieght">
+        <template v-slot:customcol="scope">
+          <div v-if="scope.column.columnname === 'status'">
+            <span v-if="scope.column.data.status === '待分配'" style="color:#3874F6">{{scope.column.data.status}}</span>
+            <span v-if="scope.column.data.status === '待跟进'" style="color:#FA8C16">{{scope.column.data.status}}</span>
+            <span v-if="scope.column.data.status === '跟进中'" style="color:#52C41A">{{scope.column.data.status}}</span>
+            <span v-if="scope.column.data.status === '已过期'" style="color:#999999">{{scope.column.data.status}}</span>
+            <span v-if="scope.column.data.status === '丢单'" style="color:#FF3B30">{{scope.column.data.status}}</span>
+            <span v-if="scope.column.data.status === '已成交'" style="color:#333333">{{scope.column.data.status}}</span>
+            <span v-if="scope.column.data.status === '无效'" style="color:#333333">{{scope.column.data.status}}</span>
+          </div>
+          <div v-else-if="scope.column.columnname === 'province'">
+            <span>{{scope.column.data.province}} - {{scope.column.data.city}} - {{scope.column.data.county}}</span>
+          </div>
+          <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
+        </template>
+      </tableLayout>
+      <div class="dialog-footer">
+        <el-button size="small" @click="dialogFormVisible = false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" type="warning" @click="exportDataFun" class="normal-btn-width btn-warning">导出</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { log } from '@antv/g2plot/lib/utils';
+export default {
+  name: '',
+  data() {
+    return {
+      dialogFormVisible:false,
+    };
+  },
+  props:['exportData','params'],
+  computed:{
+  },
+  watch:{
+  },
+  methods: {
+    submit() {
+      this.dialogFormVisible = true
+    },
+    async exportDataFun() {
+      let res
+      if(!this.params) {
+        res = await this.$api.requested({
+          "classname": "webmanage.saletool.orderclue.publicclue.PublicClue",
+          "method": "selectList",
+          "content": {
+              "isExport": true,
+              "pageNumber": 1,
+              "pageSize": 20,
+              "where": {
+                  "condition": "",
+                  "status": "",
+                  "startdate": "",
+                  "enddate": ""
+              }
+            }
+        })
+      } else {
+        res = await this.$api.requested(this.params)
+      }
+      window.open(res.data[0].url,'_self')
+    }
+  },
+  async created() {
+    this.tablecols = this.tool.tabelCol(this.$route.name)['cluePublicTable'].tablecols.filter(item => item.title != '操作')
+  }
+};
+</script>
+
+<style scoped>
+
+</style>

src/HManagement/clueManage/clue_public/modules/list.vue

@@ -13,6 +13,9 @@
             :value="item.value">
           </el-option>
         </el-select>
+      </el-form-item>&emsp;
+      <el-form-item label="时间筛选" label-width="100">
+        <TimeSelect @timeChange="timeChange" @clearSelect="clearSelect" />
       </el-form-item>
     </el-form>
     <tableLayout :layout="tablecols" :data="list" :custom="true" :height="tableHieght">
@@ -56,21 +59,26 @@
 
 <script>
 import {mapGetters} from 'vuex'
+import TimeSelect from '@/SManagement/submitedit_one/components/TimeSelect'
+import LineShapeFactory from '@antv/g2/lib/geometry/shape/line'
 
 export default {
   data () {
     return {
       params:{
-        "classname": "webmanage.saletool.orderclue.publicclue.PublicClue",
-        "method": "selectList",
-        "content": {
-          "pageNumber": 1,
-          "pageSize": 20,
-          "where": {
-              "condition": "",
-              "status": ""
+          "classname": "webmanage.saletool.orderclue.publicclue.PublicClue",
+          "method": "selectList",
+          "content": {
+              "isExport": false,
+              "pageNumber": 1,
+              "pageSize": 20,
+              "where": {
+                  "condition": "",
+                  "status": "",
+                  "startdate": "",
+                  "enddate": ""
+              }
           }
-        }
       },
       options:[],
       tablecols:[],
@@ -79,18 +87,32 @@ export default {
       currentPage:0
     }
   },
+  components:{TimeSelect},
   computed:{
     ...mapGetters({
       sys_options:'sys_options'
     })
   },
+  watch: {
+    params: {
+      handler(val) {
+        this.$emit('seleteParams',val)
+      },
+      deep:true
+    }
+  },
   methods:{
     async listData () {
       const res = await this.$api.requested(this.params)
+      this.params.content.pageSize = 999999999
+      const res2 = await this.$api.requested(this.params)
+      this.params.content.pageSize = 20
       this.list = res.data
       this.total = res.total
       this.currentPage = res.pageNumber
-
+      console.log(this.list);
+      
+      this.$emit('exportDataUpdata',res2.data)
       this.$store.dispatch('optiontypeselect','cluepublic')
     },
     handleSizeChange(val) {
@@ -103,6 +125,18 @@ export default {
       this.params.content.pageNumber = val
       this.listData()
     },
+    clearSelect() {
+      this.params.content.where.startdate = ''
+      this.params.content.where.enddate = ''
+      this.listData()
+    },
+    timeChange(data) {
+      
+      this.params.content.where.startdate = data[0] + ' 01:00:00'
+      this.params.content.where.enddate = data[1] + ' 23:59:59'
+      console.log(this.params.content.where);
+      this.listData()
+    }
   },
   mounted (){
     this.listData()

src/HManagement/marketing/agent/modules/add_agent.vue

@@ -82,13 +82,17 @@
 
 <script>
 import selectAgent from '../../../../components/selectAgent/index.vue'
+import Search from '@/components/search/index.vue'
+import addAgentBtn from './add_agent_btn'
 export default {
   components:{
-    selectAgent
+    selectAgent,
+    Search,
+    addAgentBtn
   },
   data () {
     return {
-      
+      activeName:'first',
       form:{
         "value":[],
         "sa_agentsid": 0,
@@ -106,6 +110,25 @@ export default {
         "city":"",
         "county":""
       },
+      /* 查代理列表配置 */
+      agentArea: {
+        "classname": "webmanage.sale.agentscope.agentscope",
+        "method": "query_areascope",
+        "content": {
+            "sa_agentsid":0
+        }
+      },
+      addArea: {
+        "classname": "webmanage.sale.agentscope.agentscope",
+        "method": "insertormodify_areascope",
+        "content": {
+            "sa_agents_salescopeid":0,
+            "sa_agentsid":0,
+            "province":"浙江省",
+            "city":"嘉兴市",
+            "county":"嘉善县"
+        }
+      },
       rule:{
         agentnum:[{ required: true, message: '请输入经销商编号', trigger: 'blur' }],
         agentname:[{ required: true, message: '请输入经销商名称', trigger: 'blur' }],
@@ -125,7 +148,8 @@ export default {
       },
       arealist:[],
       agent_type:[],
-      agent_level:[]
+      agent_level:[],
+      tablecols:[]
     }
   },
   methods:{
@@ -141,6 +165,10 @@ export default {
         }
       })
       this.arealist = this.tool.createMenu(res.data)
+    },
+    /* 获取代理区域列表 */
+    async getAgentArea() {
+
     },
     cascaderChange (val) {
       if (val.length === 1) 
@@ -179,7 +207,14 @@ export default {
         }
       })
       res.code === 1?this.$router.replace({path:'/agent_detail',query:{id:sa_agentsid}}):''
-    }
+    },
+    async createArea() {
+
+    },
+  },
+  created() {
+    this.tablecols = this.tool.tabelCol(this.$route.name)['agentGrouptable'].tablecols
+
   },
   mounted () {
     this.initializeData()
@@ -195,4 +230,8 @@ export default {
 .width-240{
   width: 240px;
 }
+.area-header {
+  display: flex;
+  justify-content: space-between;
+}
 </style>

src/HManagement/marketing/agent/modules/add_agent_btn.vue

@@ -0,0 +1,97 @@
+<template>
+  <div>
+    <el-button class="normal-margin" type="primary" size="small" @click="dialogVisible=true">创建代理区域</el-button>
+    <el-dialog
+      title="创建代理区域"
+      :visible.sync="dialogVisible"
+      width="30%"
+      :before-close="handleClose">
+      <el-form :model="form" :rules="ruleFrom" ref="ruleFrom" label-width="100px" class="demo-ruleForm">
+        <el-form-item label="省市县" prop="result">
+          <el-cascader
+            :options="arealist"
+            :props="{ checkStrictly: true }"
+            clearable
+            size="small"
+            class="width-100"
+            v-model="form.result">
+          </el-cascader>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer" style="display:flex;justify-content: space-evenly;">
+        <div>
+          <el-button @click="dialogVisible = false" size="small">取 消</el-button>
+          <el-button type="primary" @click="createArea" size="small">确 定</el-button>
+        </div>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  name: '',
+  data() {
+    let checkLength = (rule,value,callback) => {
+      if(value.length < 1) {
+        return callback(new Error('必须选择省'))
+      } else {
+        callback()
+      }
+    }
+    return {
+      dialogVisible:false,
+      result:[],//选择结果
+      ruleFrom: {
+        result:[
+          { required: true, message: '必须选择省', trigger: 'blur' },
+        ]
+      },
+      form: {
+        result:[]
+      }
+    };
+  },
+  props: ['arealist'],
+  computed:{
+  },
+  watch:{
+  },
+  methods: {
+    createArea() {
+      this.$refs.ruleFrom.validate(async val => {
+        if(val) {
+          let res = await this.$api.requested({
+            "classname": "webmanage.sale.agentscope.agentscope",
+            "method": "insertormodify_areascope",
+            "content": {
+                "sa_agents_salescopeid":0,
+                "sa_agentsid":this.$route.query.id,
+                "province":this.form.result[0],
+                "city":this.form.result[1] || '',
+                "county":this.form.result[2] || ''
+            }
+          })
+          this.tool.showMessage(res,() => {
+            this.dialogVisible = false
+            this.$refs.ruleFrom.resetFields()
+            this.$emit('areaAddSuccess',res.data)
+          })
+        }
+      })
+    },
+    handleClose() {
+      this.dialogVisible = false
+    },
+  },
+};
+</script>
+
+<style scoped>
+.width-100 {
+  width: 100%;
+}
+/deep/.el-dialog__body {
+  padding-bottom: 0 !important;
+}
+</style>

src/HManagement/marketing/agent/modules/agent_detail.vue

@@ -24,11 +24,13 @@
     <div  class="my-tabs" style="padding:0 16px">
       <el-tabs v-model="activeName" type="card">
         <el-tab-pane label="经销商团队" name="first"></el-tab-pane>
-        <el-tab-pane label="业绩目标" name="second"></el-tab-pane>
+        <el-tab-pane label="代理区域" name="area"></el-tab-pane>
+        <!-- <el-tab-pane label="业绩目标" name="second"></el-tab-pane> -->
       </el-tabs>
     </div>
     <div class="container normal-panel">
-      <tableLayout :layout="tablecols" :data="form.hrs" :custom="false" height="300px"></tableLayout>
+      <tableLayout :layout="tablecols" :data="form.hrs" :custom="false" height="300px" v-if="activeName=='first'"></tableLayout>
+      <tableLayout :layout="tablecols2" :data="agentAreaList" :custom="false" height="300px" v-if="activeName=='area'"></tableLayout>
     </div>
     <div>
     </div>
@@ -86,7 +88,9 @@ export default {
       arealist:[],
       agent_type:[],
       agent_level:[],
-      tablecols:[]
+      tablecols:[],
+      tablecols2:[],
+      agentAreaList:''
     }
   },
   methods:{
@@ -128,6 +132,19 @@ export default {
       const res1 = await this.$store.dispatch('optiontypeselect','agenttype')
       this.agent_type = res1.data
     },
+    async query_agent_areaList() {
+      let res = await this.$api.requested({
+        "accesstoken": "9c3a065cb578fc27cabd392bcad7eec1",
+        "classname": "webmanage.sale.agentscope.agentscope",
+        "method": "query_areascope",
+        "content": {
+            "nocache": true,
+            "sa_agentsid":this.$route.query.id
+        }
+      })
+      this.agentAreaList = res.data
+      
+    },
     selectAgent (data) {
       this.form.parentid = data.sa_agentsid
     },
@@ -150,6 +167,8 @@ export default {
   created () {
     // 获取表结构
     this.tablecols = this.tool.tabelCol(this.$route.name)['agentGrouptable'].tablecols
+    this.tablecols2 = (this.tool.tabelCol(this.$route.name)['agentAreaTable'].tablecols).filter(item => item.title != '操作')
+    this.query_agent_areaList()
   },
   mounted () {
     this.query_arealist()

src/HManagement/marketing/agent/modules/del_agent_area.vue

@@ -0,0 +1,32 @@
+<template>
+  <div style="display:inline;margin-left:10px">
+    <el-popconfirm
+      title="确定删除吗？"
+      @confirm="deleteRow">
+      <el-button size="small" :type="type" :icon="icon" slot="reference">删 除</el-button>
+    </el-popconfirm>
+  </div>
+</template>
+
+<script>
+export default {
+  props:['data','type','icon'],
+  methods:{
+    deleteRow () {
+      this.$api.requested({
+          "classname": "webmanage.sale.agentscope.agentscope",
+          "method": "delete_areascope",
+          "content": {
+              "sa_agents_salescopeid":this.data.sa_agents_salescopeid
+          }
+      }).then(res=>{
+        this.tool.showMessage(res)
+        this.type === 'default'?this.$router.go(-1):this.$emit('onAgentSuccess')
+      })
+    },
+  }
+}
+
+</script>
+<style>
+</style>

src/HManagement/marketing/agent/modules/edit_agent.vue

@@ -87,13 +87,31 @@
     <div  class="my-tabs" style="padding:0 16px">
       <el-tabs v-model="activeName" type="card">
         <el-tab-pane label="经销商团队" name="first"></el-tab-pane>
-        <el-tab-pane label="业绩目标" name="second"></el-tab-pane>
+        <!-- <el-tab-pane label="业绩目标" name="second"></el-tab-pane> -->
+        <el-tab-pane label="代理区域" name="area"></el-tab-pane>
       </el-tabs>
     </div>
     <div class="container normal-panel">
-      <el-button class="normal-margin" type="primary" size="small" @click="createAgentMainUser">创建经销商主账号</el-button>
-      <tableLayout :layout="tablecols" :data="form.hrs" :custom="false" height="300px"></tableLayout>
+      <template v-if="activeName=='first'">
+        <el-button class="normal-margin" type="primary" size="small" @click="createAgentMainUser">创建经销商主账号</el-button>
+        <tableLayout :layout="tablecols" :data="form.hrs" :custom="false" height="300px"></tableLayout>
+      </template>
+      <template v-if="activeName=='area'">
+        <div class="area-header">
+          <!-- <Search /> -->
+          <add-agent-btn :arealist="arealist" @areaAddSuccess="areaAddSuccess"></add-agent-btn>
+        </div>
+        <tableLayout :layout="tablecols2" :data="agentAreaList" :custom="false" height="300px">
+          <template v-slot:opreation="scope">
+            <div class="handle">
+              <delAgentArea :data="scope.data" type="text" @onAgentSuccess="onAgentSuccess" v-if="tool.checkAuth($route.name,'agent_area_delete')" />
+              <editAgentArea :arealist="arealist" :areaData="scope.data" @areaAddSuccess="areaAddSuccess" v-if="tool.checkAuth($route.name,'agent_area_edit')" />
+            </div>
+          </template>
+        </tableLayout>
+      </template>
     </div>
+    
     <div>
     </div>
   </div>
@@ -102,10 +120,18 @@
 <script>
 import selectAgent from '../../../../components/selectAgent/index.vue'
 import arealist from '../../area/list.vue'
+import Search from '@/components/search/index.vue'
+import addAgentBtn from './add_agent_btn'
+import delAgentArea from './del_agent_area'
+import editAgentArea from './edit_agent_area'
 export default {
   components:{
     selectAgent,
-    arealist
+    arealist,
+    Search,
+    addAgentBtn,
+    delAgentArea,
+    editAgentArea
   },
   data () {
     return {
@@ -145,7 +171,9 @@ export default {
       arealist:[],
       agent_type:[],
       agent_level:[],
-      tablecols:[]
+      tablecols:[],
+      tablecols2:[],
+      agentAreaList:[]
     }
   },
   methods:{
@@ -174,6 +202,20 @@ export default {
       })
       this.arealist = this.tool.createMenu(res.data)
     },
+    async query_agent_areaList() {
+      let res = await this.$api.requested({
+        "accesstoken": "9c3a065cb578fc27cabd392bcad7eec1",
+        "classname": "webmanage.sale.agentscope.agentscope",
+        "method": "query_areascope",
+        "content": {
+            "nocache": true,
+            "sa_agentsid":this.$route.query.id
+        }
+      })
+      this.agentAreaList = res.data
+      console.log(this.agentAreaList);
+      
+    },
     cascaderChange (val) {
       if (val.length === 1) 
         return this.form = Object.assign({},this.form,{province:val[0],city:'',county:''})
@@ -187,6 +229,11 @@ export default {
       const res1 = await this.$store.dispatch('optiontypeselect','agenttypemx')
       this.agent_type = res1.data
     },
+    areaAddSuccess(data) {
+      console.log(data);
+      
+      this.agentAreaList = data
+    },
     selectAgent (data) {
       this.form.parentid = data.sa_agentsid
     },
@@ -216,11 +263,16 @@ export default {
         this.tool.showMessage(res)
         res.code === 1?this.$router.replace({path:'/agent_detail',query:{id:this.form.sa_agentsid}}):''
       });
+    },
+    onAgentSuccess() {
+      this.query_agent_areaList()      
     }
   },
   created () {
+    this.query_agent_areaList()
     // 获取表结构
     this.tablecols = this.tool.tabelCol(this.$route.name)['agentGrouptable'].tablecols
+    this.tablecols2 = this.tool.tabelCol(this.$route.name)['agentAreaTable'].tablecols
     // 验证权限
     console.log(this.tool.checkAuth(this.$route.name,'agent_update'))
     this.tool.checkAuth(this.$route.name,'agent_update')?'':this.$router.go(-1)
@@ -239,5 +291,12 @@ export default {
 .width-240{
   width: 240px;
 }
-
+.area-header {
+  display: flex;
+  justify-content: space-between;
+}
+.handle {
+  display: flex;
+  justify-content: space-evenly;
+}
 </style>

src/HManagement/marketing/agent/modules/edit_agent_area.vue

@@ -0,0 +1,110 @@
+<template>
+  <div>
+    <el-button type="text" size="small" @click="editBtn">编辑</el-button>
+    <el-dialog
+      title="编辑代理区域"
+      :visible.sync="dialogVisible"
+      width="30%"
+      :before-close="handleClose">
+      <el-form :model="form" :rules="ruleFrom" ref="ruleFrom" label-width="100px" class="demo-ruleForm">
+        <el-form-item label="省市县" prop="result">
+          <el-cascader
+            :options="arealist"
+            :props="{ checkStrictly: true }"
+            clearable
+            size="small"
+            class="width-100"
+            v-model="form.result"
+            @change="selectChange">
+          </el-cascader>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer" style="display:flex;justify-content: space-evenly;">
+        <div>
+          <el-button @click="dialogVisible = false" size="small">取 消</el-button>
+          <el-button type="primary" @click="createArea" size="small">确 定</el-button>
+        </div>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  name: '',
+  data() {
+    let checkLength = (rule,value,callback) => {
+      if(value.length < 1) {
+        return callback(new Error('必须选择省'))
+      } else {
+        callback()
+      }
+    }
+    return {
+      dialogVisible:false,
+      ruleFrom: {
+        result:[
+          { required: true, message: '必须选择省', trigger: 'blur' },
+        ]
+      },
+      form: {
+        result:[]
+      }
+    };
+  },
+  props: ['arealist','areaData'],
+  computed:{
+  },
+  watch:{
+  },
+  created() {
+  },
+  methods: {
+    createArea() {
+      this.$refs.ruleFrom.validate(async val => {
+        if(val) {
+          let res = await this.$api.requested({
+            "classname": "webmanage.sale.agentscope.agentscope",
+            "method": "insertormodify_areascope",
+            "content": {
+                "sa_agents_salescopeid":this.areaData.sa_agents_salescopeid,
+                "sa_agentsid":this.$route.query.id,
+                "province":this.form.result[0],
+                "city":this.form.result[1] || '',
+                "county":this.form.result[2] || ''
+            }
+          })
+          this.tool.showMessage(res,() => {
+            this.dialogVisible = false
+            this.$refs.ruleFrom.resetFields()
+            this.$emit('areaAddSuccess',res.data)
+          })
+        }
+      })
+    },
+    editBtn() {
+      this.dialogVisible = true
+      this.form.result = []
+      this.areaData.province && this.form.result.push(this.areaData.province)
+      this.areaData.city && this.form.result.push(this.areaData.city)
+      this.areaData.county && this.form.result.push(this.areaData.county)
+    },
+    handleClose() {
+      this.dialogVisible = false
+    },
+    selectChange(result) {
+      console.log(result);
+      
+    }
+  },
+};
+</script>
+
+<style scoped>
+.width-100 {
+  width: 100%;
+}
+/deep/.el-dialog__body {
+  padding-bottom: 0 !important;
+}
+</style>

src/HManagement/marketing/saler/list.vue

@@ -33,6 +33,7 @@
 </template>
 
 <script>
+import { log } from '@antv/g2plot/lib/utils'
 export default {
   props:['data'],
   data () {
@@ -60,6 +61,8 @@ export default {
       this.list = res.data
       this.total = res.total
       this.currentPage = res.pageNumber
+      console.log(this.list);
+      
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);

yos/img/message.99a6561b.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="30" height="30" viewBox="0 0 30 30"><defs><style>.a{fill:none;}.b{fill:#fff;}</style></defs><g transform="translate(-32 -103)"><rect class="a" width="30" height="30" transform="translate(32 103)"/><path class="b" d="M269.787,379.677a14.041,14.041,0,0,0-14,14v13.25a.769.769,0,0,0,.75.75h13.25a14,14,0,0,0,0-28Zm3.3,21.6h-6.6a1,1,0,0,1,0-2h6.65a1,1,0,0,1,1,1A1.047,1.047,0,0,1,273.087,401.277Zm2.65-5.25h-11.9a1,1,0,1,1,0-2h11.9a1,1,0,1,1,0,2Zm0-5.35h-11.9a1,1,0,1,1,0-2h11.9a1,1,0,1,1,0,2Z" transform="translate(-222.787 -275.677)"/></g></svg>

yos/img/work_station.550df9c4.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="30" height="30" viewBox="0 0 30 30"><defs><style>.a{fill:none;}.b{fill:#fff;}</style></defs><g transform="translate(80 -466)"><rect class="a" width="30" height="30" transform="translate(-80 466)"/><path class="b" d="M86.087,724.24l-4.151,4.15a2.607,2.607,0,0,1-3.688,0L74.1,724.24a2.608,2.608,0,0,1,0-3.689l4.151-4.151a2.607,2.607,0,0,1,3.688,0l4.151,4.151a2.608,2.608,0,0,1,0,3.689Zm-16.757,17.4H63.46a2.608,2.608,0,0,1-2.609-2.609v-5.87a2.609,2.609,0,0,1,2.609-2.609h5.87a2.609,2.609,0,0,1,2.609,2.609v5.87a2.608,2.608,0,0,1-2.609,2.609Zm0-13.7H63.46a2.609,2.609,0,0,1-2.609-2.609v-5.87a2.608,2.608,0,0,1,2.609-2.609h5.87a2.609,2.609,0,0,1,2.609,2.609v5.87a2.609,2.609,0,0,1-2.609,2.609Zm7.827,2.609h5.87a2.609,2.609,0,0,1,2.609,2.609v5.87a2.608,2.608,0,0,1-2.609,2.609h-5.87a2.608,2.608,0,0,1-2.609-2.609v-5.87a2.609,2.609,0,0,1,2.609-2.609Zm0,0" transform="translate(-138.851 -247.636)"/></g></svg>