供应商管理

dsk-operate-ui/src/views/supplier/supplierlist/access.vue

@@ -25,7 +25,6 @@
               <p>
                 <label class="label">证件选择</label>
                 <span></span>
-                <!--<span>{{custmerInfo.registerCapital || '&#45;&#45;'}}</span>-->
                 <label class="label">统一社会信用代码</label>
                 <span>{{custmerInfo.unifySocialCode || '--'}}</span>
               </p>
@@ -203,9 +202,9 @@
             <div class="main3-box">
               <p>
                 <label class="label">公司意见</label>
-                <span></span>
+                <span>{{custmerInfo.purchasePrincipal || '--'}}</span>
                 <label class="label">准入时间</label>
-                <span></span>
+                <span>{{custmerInfo.approveDate2||'--'}}</span>
               </p>
             </div>
           </el-tab-pane>

dsk-operate-ui/src/views/supplier/supplierlist/laborSubcontracting.vue

@@ -9,60 +9,53 @@
       <div class="content-supplier">
         <el-form :model="formdata" label-width="82px" label-position="right"  :inline="true" >
           <el-row>
-            <el-form-item label="供应商名称">
-              <el-input v-model="formdata.user" placeholder="请输入分供方名称"></el-input>
-            </el-form-item>
-            <el-form-item label="注册地区">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
-                <el-option v-for="(item,index) in arealist" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
-              </el-select>
+            <el-form-item label="分供方名称">
+              <el-input v-model="formdata.customerName" placeholder="请输入分供方名称"></el-input>
             </el-form-item>
             <el-form-item label="注册城市">
               <el-cascader
-                v-model="formdata.user"
-                :options="addressList" :collapse-tags="true"
+                v-model="formdata.areas"
+                :options="addressList" :collapse-tags="true" :show-all-levels="false" clearable
                 :props="provienceprops"></el-cascader>
             </el-form-item>
-          </el-row>
-          <el-row>
             <el-form-item label="供应商状态">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.customerState" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in customstate" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+          </el-row>
+          <el-row>
             <el-form-item label="资质等级">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.credential" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in credential" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="专业类别">
-              <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
-              </el-select>
+              <el-cascader clearable
+                           v-model="formdata.groupSpecialtys"
+                           :options="groupSpecialty" :collapse-tags="true"
+                           :props="groupprops"></el-cascader>
             </el-form-item>
-          </el-row>
-          <el-row>
             <el-form-item label="评价等级">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.creditLevel" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in creditlevel" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+          </el-row>
+          <el-row>
             <el-form-item label="纳税人身份">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.paytaxType" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in paytaxtype" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="纳税人税率">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.taxRate" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in taxrate" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
-          </el-row>
-          <el-row>
             <el-form-item label="准入时间">
               <el-date-picker
-                v-model="formdata.time"
+                v-model="formdata.times"
                 type="daterange"
                 value-format="yyyy-MM-dd"
                 range-separator="至"
@@ -73,8 +66,8 @@
           </el-row>
           <el-divider></el-divider>
           <el-form-item label="  ">
-            <el-button type="primary" size="small">查询</el-button>
-            <el-button size="small">重置</el-button>
+            <el-button type="primary" size="small" @click="handleCurrentChange(1)">查询</el-button>
+            <el-button size="small" @click="clears">重置</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -83,6 +76,11 @@
       <div class="total-title">
         <div class="totals">共{{total}}条</div>
       </div>
+      <div class="table-item-jf table-item-jf1 empty-table" v-if="total == 0 && !isSkeleton">
+        <img class="item-jf-img" src="@/assets/images/kong.png" alt="">
+        <div class="item-jf-titel">暂无相关数据</div>
+        <div class="item-jf-text">抱歉，暂无数据，试试更换搜索条件吧</div>
+      </div>
       <skeleton v-if="isSkeleton"></skeleton>
 
       <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
@@ -93,18 +91,23 @@
 
           <el-table-column type="index" label="序号" :fixed="tableColumnFixed" width="60" :resizable="false">
             <template slot-scope="scope">
-              <span>{{(pageNum - 1) *pageSize + scope.$index + 1}}</span>
+              <span>{{(formdata.pageNum - 1) *formdata.pageSize + scope.$index + 1}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="二级市场编码" :fixed="tableColumnFixed" width="120" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.secondaryCode||"--"}}
             </template>
           </el-table-column>
-          <el-table-column label="供应商编号" :fixed="tableColumnFixed" width="120" :resizable="false">
+          <el-table-column label="供应商编号" prop="customerCode" :fixed="tableColumnFixed" width="120" :resizable="false">
           </el-table-column>
 
           <el-table-column label="供应商名称" :fixed="tableColumnFixed" width="380" :resizable="false">
             <template slot-scope="scope">
               <div class="renling">
                 <div style="display:flex;align-items:center">
-                  <router-link :to="`/enterprise/${encodeStr(scope.row.id)}`" tag="a"
-                               class="wordprimary" v-html="scope.row.name"></router-link>
+                  <router-link :to="`/enterprise/${encodeStr(scope.row.companyId)}`" tag="a"
+                               class="wordprimary" v-html="scope.row.customerName"></router-link>
                 </div>
               </div>
 
@@ -114,87 +117,87 @@
 
           <el-table-column label="推荐单位" min-width="280">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.recommendOrg||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司注册区域" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.registerRegion||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司注册省" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.registerProvince||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司注册城市" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.registerCity||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="专业类别" min-width="85" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.groupSpecialty||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="法人代表" min-width="85" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.representative||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="纳税人身份" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.paytaxType||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="纳税人税率" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.taxRate||"--"}}
             </template>
           </el-table-column>
-          <el-table-column label="施工承包范围" min-width="200" :resizable="false">
+          <el-table-column label="施工承包范围" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.constructJobScope||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="资质等级" min-width="85" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.credential||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="注册资本(万元)" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.registerCapital||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司联系人" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.contactPerson||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="联系人电话" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.contactPhone||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="准入时间" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.approveDate2||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司合作数量" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.enterpriseCooperationCount||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="合作项目数量" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              <span>{{scope.row.legalPerson||"--"}}</span>
+              <span>{{scope.row.projectCooperationCount||"--"}}</span>
             </template>
           </el-table-column>
           <el-table-column label="分包商等级" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              <span class="wordprimary" @click="getFBS(scope.row)">{{scope.row.legalPerson||"--"}}</span>
+              <span class="wordprimary" @click="getFBS(scope.row)">{{scope.row.creditLevel||"--"}}</span>
             </template>
           </el-table-column>
           <el-table-column label="链接" min-width="160" :resizable="false">
@@ -205,14 +208,14 @@
           </el-table-column>
           <el-table-column label="资源平台分类" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              --
             </template>
           </el-table-column>
 
         </el-table>
       </div>
       <div class="pagination clearfix" v-show="total>0">
-        <el-pagination background :page-size="pageSize" :current-page.sync="pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
+        <el-pagination background :page-size="formdata.pageSize" :current-page.sync="formdata.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
                        :total="total">
         </el-pagination>
       </div>
@@ -260,20 +263,19 @@
 </template>
 
 <script>
-  import { encodeStr } from "@/assets/js/common.js";
-  import "@/assets/styles/public.scss";
-  import "@/assets/styles/supplierlist.scss";
-  import skeleton from '@/views/project/projectList/component/skeleton';
-  import api from '@/api/enterpriseData/enterpriseData.js';
-  import dataRegion from '@/assets/json/provinceTree'
-  import { getDicts } from "@/api/system/dict/data";
+  import { encodeStr } from '@/assets/js/common.js'
+  import '@/assets/styles/public.scss'
+  import '@/assets/styles/supplierlist.scss'
+  import skeleton from '@/views/project/projectList/component/skeleton'
+  import { areaAll, bizDictData, custmerInfolist } from '@/api/supplier/supplier'
+  import { getDicts } from '@/api/system/dict/data'
+  import {queryConditionFiltering} from '@/utils/index'
   export default {
     name: 'laborSubcontracting',
     components:{skeleton},
     data(){
       return{
         encodeStr,
-        formdata:{},
         addressList:[],
         arealist:[],
         creditlevel:[],
@@ -281,215 +283,39 @@
         credential:[],
         paytaxtype:[],
         taxrate:[],
+        groupSpecialty:[],
         provienceprops:{
+          checkStrictly:false,
+          multiple:true,
+          label:'value',
+        },
+        groupprops:{
           checkStrictly:false,
           multiple:true,
           value:'id',
         },
-        options: [
-          {
-            value: 'zhinan',
-            label: '指南',
-            children: [{
-              value: 'shejiyuanze',
-              label: '设计原则',
-              children: [{
-                value: 'yizhi',
-                label: '一致'
-              }, {
-                value: 'fankui',
-                label: '反馈'
-              }, {
-                value: 'xiaolv',
-                label: '效率'
-              }, {
-                value: 'kekong',
-                label: '可控'
-              }]
-            }, {
-              value: 'daohang',
-              label: '导航',
-              children: [{
-                value: 'cexiangdaohang',
-                label: '侧向导航'
-              }, {
-                value: 'dingbudaohang',
-                label: '顶部导航'
-              }]
-            }]
-          }, {
-            value: 'zujian',
-            label: '组件',
-            children: [{
-              value: 'basic',
-              label: 'Basic',
-              children: [{
-                value: 'layout',
-                label: 'Layout 布局'
-              }, {
-                value: 'color',
-                label: 'Color 色彩'
-              }, {
-                value: 'typography',
-                label: 'Typography 字体'
-              }, {
-                value: 'icon',
-                label: 'Icon 图标'
-              }, {
-                value: 'button',
-                label: 'Button 按钮'
-              }]
-            }, {
-              value: 'form',
-              label: 'Form',
-              children: [{
-                value: 'radio',
-                label: 'Radio 单选框'
-              }, {
-                value: 'checkbox',
-                label: 'Checkbox 多选框'
-              }, {
-                value: 'input',
-                label: 'Input 输入框'
-              }, {
-                value: 'input-number',
-                label: 'InputNumber 计数器'
-              }, {
-                value: 'select',
-                label: 'Select 选择器'
-              }, {
-                value: 'cascader',
-                label: 'Cascader 级联选择器'
-              }, {
-                value: 'switch',
-                label: 'Switch 开关'
-              }, {
-                value: 'slider',
-                label: 'Slider 滑块'
-              }, {
-                value: 'time-picker',
-                label: 'TimePicker 时间选择器'
-              }, {
-                value: 'date-picker',
-                label: 'DatePicker 日期选择器'
-              }, {
-                value: 'datetime-picker',
-                label: 'DateTimePicker 日期时间选择器'
-              }, {
-                value: 'upload',
-                label: 'Upload 上传'
-              }, {
-                value: 'rate',
-                label: 'Rate 评分'
-              }, {
-                value: 'form',
-                label: 'Form 表单'
-              }]
-            }, {
-              value: 'data',
-              label: 'Data',
-              children: [{
-                value: 'table',
-                label: 'Table 表格'
-              }, {
-                value: 'tag',
-                label: 'Tag 标签'
-              }, {
-                value: 'progress',
-                label: 'Progress 进度条'
-              }, {
-                value: 'tree',
-                label: 'Tree 树形控件'
-              }, {
-                value: 'pagination',
-                label: 'Pagination 分页'
-              }, {
-                value: 'badge',
-                label: 'Badge 标记'
-              }]
-            }, {
-              value: 'notice',
-              label: 'Notice',
-              children: [{
-                value: 'alert',
-                label: 'Alert 警告'
-              }, {
-                value: 'loading',
-                label: 'Loading 加载'
-              }, {
-                value: 'message',
-                label: 'Message 消息提示'
-              }, {
-                value: 'message-box',
-                label: 'MessageBox 弹框'
-              }, {
-                value: 'notification',
-                label: 'Notification 通知'
-              }]
-            }, {
-              value: 'navigation',
-              label: 'Navigation',
-              children: [{
-                value: 'menu',
-                label: 'NavMenu 导航菜单'
-              }, {
-                value: 'tabs',
-                label: 'Tabs 标签页'
-              }, {
-                value: 'breadcrumb',
-                label: 'Breadcrumb 面包屑'
-              }, {
-                value: 'dropdown',
-                label: 'Dropdown 下拉菜单'
-              }, {
-                value: 'steps',
-                label: 'Steps 步骤条'
-              }]
-            }, {
-              value: 'others',
-              label: 'Others',
-              children: [{
-                value: 'dialog',
-                label: 'Dialog 对话框'
-              }, {
-                value: 'tooltip',
-                label: 'Tooltip 文字提示'
-              }, {
-                value: 'popover',
-                label: 'Popover 弹出框'
-              }, {
-                value: 'card',
-                label: 'Card 卡片'
-              }, {
-                value: 'carousel',
-                label: 'Carousel 走马灯'
-              }, {
-                value: 'collapse',
-                label: 'Collapse 折叠面板'
-              }]
-            }]
-          }, {
-            value: 'ziyuan',
-            label: '资源',
-            children: [{
-              value: 'axure',
-              label: 'Axure Components'
-            }, {
-              value: 'sketch',
-              label: 'Sketch Templates'
-            }, {
-              value: 'jiaohu',
-              label: '组件交互文档'
-            }]
-          }
-        ],
-        tableData:[
-          {name:'测试',legalPerson:'AAAA'}
-        ],
+        formdata:{
+          customerClass:'劳务分包',
+          pageNum:1,
+          pageSize:50,
+          times:[],
+          customerName:"",
+          areas:[],
+          customerState:[],
+          credential:[],
+          groupSpecialtys:[],
+          groupSpecialtyId:[],
+          creditLevel:[],
+          paytaxType:[],
+          taxRate:[],
+          registerProvince:[],
+          registerCity:[],
+          approveDate2Start:null,
+          approveDate2End:null,
+        },
+        tableData:[],
         isSkeleton:false,
-        total:100,
-        pageSize:50,
-        pageNum:1,
+        total:0,
         // table列是否悬浮
         tableColumnFixed: true,
         fbsvisib:false,
@@ -498,13 +324,10 @@
     },
     created() {
       this.init()
+      this.cusoomerInfolist()
     },
     methods:{
       init(){
-        //地区
-        getDicts('arealist').then(res=>{
-          this.arealist = res.data
-        })
         //评价等级
         getDicts('credit_level').then(res=>{
           this.creditlevel = res.data
@@ -525,24 +348,81 @@
         getDicts('credential').then(res=>{
           this.credential = res.data
         })
-        this.dataRegion()
+        // this.dataRegion()
+        //专业类别
+        bizDictData().then(res=>{
+          this.groupSpecialty = res.data
+        })
+        // 地区树
+        areaAll().then(res=>{
+          this.addressList = res.data
+        })
       },
-      handleCurrentChange(){
-
+      clears(){
+        this.formdata = {
+          customerClass: '劳务分包',
+          pageNum: 1,
+          pageSize: 50,
+          times: [],
+          customerName: '',
+          areas: [],
+          customerState: [],
+          credential: [],
+          groupSpecialtys: [],
+          groupSpecialtyId: [],
+          creditLevel: [],
+          paytaxType: [],
+          taxRate: [],
+          registerProvince: [],
+          registerCity: [],
+          approveDate2Start: null,
+          approveDate2End: null
+        }
+        this.cusoomerInfolist()
       },
-      //地区
-      async dataRegion() {
-        let addrs = JSON.parse(JSON.stringify(dataRegion))
-        addrs.forEach(item=>{
-          if (item.children) {
-            (item.children).forEach(i => {
-              if (i.children) {
-                delete i.children
+      cusoomerInfolist(){
+        this.isSkeleton = true
+        let param = this.formdata
+        if(param.times){
+          param.approveDate2Start = param.times[0]
+          param.approveDate2End = param.times[1]
+        }else{
+          param.approveDate2Start = ''
+          param.approveDate2End = ''
+        }
+        param.groupSpecialtyId = []
+        if(param.groupSpecialtys){
+          param.groupSpecialtys.forEach(item=>{
+            param.groupSpecialtyId.push(item[item.length-1])
+          })
+        }
+        if(param.areas){
+          let province = []
+          let city = []
+          param.areas.forEach(item=>{
+            if(item.length == 3){//到市
+              if(item[1].indexOf('重庆')>-1||item[1].indexOf('北京')>-1||item[1].indexOf('天津')>-1||item[1].indexOf('上海')>-1){
+                province.push(item[1])
+              }else{
+                city.push(item[2])
               }
-            })
-          }
+            }
+          })
+          param.registerProvince = province
+          param.registerCity = city
+        }else{
+          param.registerProvince = []
+          param.registerCity = []
+        }
+        custmerInfolist(queryConditionFiltering(this.formdata)).then(res=>{
+          this.isSkeleton = false
+          this.tableData = res.rows
+          this.total = res.total
         })
-        this.addressList = addrs;
+      },
+      handleCurrentChange(val){
+        this.formdata.pageNum = val
+        this.cusoomerInfolist()
       },
       setHeaderRow() {
         return "owner-table-list-header";
@@ -562,7 +442,7 @@
       },
       //点击准入
       goAccess(row){
-        this.$tab.openPage('测试一下-准入情况', '/supplier/supplierlist/access')
+        this.$tab.openPage(row.customerName+'-准入情况', '/supplier/supplierlist/access',{customerKey:row.customerKey})
       },
       //点击考评
       goAssessment(row){
@@ -575,5 +455,3 @@
 <style scoped lang="scss">
 </style>
 
-
-

dsk-operate-ui/src/views/supplier/supplierlist/laborSubcontractingTeam.vue

@@ -10,62 +10,57 @@
         <el-form :model="formdata" label-width="82px" label-position="right"  :inline="true" >
           <el-row>
             <el-form-item label="供应商名称">
-              <el-input v-model="formdata.user" placeholder="请输入分供方名称"></el-input>
+              <el-input v-model="formdata.customerName" placeholder="请输入供应商名称"></el-input>
             </el-form-item>
             <el-form-item label="劳务队长">
-              <el-input v-model="formdata.user" placeholder="请输入劳务队长"></el-input>
+              <el-input v-model="formdata.leaderName" placeholder="请输入劳务队长"></el-input>
             </el-form-item>
-            <el-form-item label="注册地区">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
-                <el-option v-for="(item,index) in arealist" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-row>
-          <el-row>
             <el-form-item label="注册城市">
               <el-cascader
-                v-model="formdata.user"
-                :options="addressList" :collapse-tags="true"
+                v-model="formdata.areas"
+                :options="addressList" :collapse-tags="true" :show-all-levels="false" clearable
                 :props="provienceprops"></el-cascader>
             </el-form-item>
+          </el-row>
+          <el-row>
             <el-form-item label="供应商状态">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.customerState" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in customstate" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="资质等级">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.credential" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in credential" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
-          </el-row>
-          <el-row>
             <el-form-item label="专业类别">
-              <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
-              </el-select>
+              <el-cascader clearable
+                           v-model="formdata.groupSpecialtys"
+                           :options="groupSpecialty" :collapse-tags="true"
+                           :props="groupprops"></el-cascader>
             </el-form-item>
+          </el-row>
+          <el-row>
             <el-form-item label="评价等级">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.creditLevel" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in creditlevel" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="纳税人身份">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.paytaxType" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in paytaxtype" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
-          </el-row>
-          <el-row>
             <el-form-item label="纳税人税率">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.taxRate" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in taxrate" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+          </el-row>
+          <el-row>
             <el-form-item label="准入时间">
               <el-date-picker
-                v-model="formdata.time"
+                v-model="formdata.times"
                 type="daterange"
                 value-format="yyyy-MM-dd"
                 range-separator="至"
@@ -76,8 +71,8 @@
           </el-row>
           <el-divider></el-divider>
           <el-form-item label="  ">
-            <el-button type="primary" size="small">查询</el-button>
-            <el-button size="small">重置</el-button>
+            <el-button type="primary" size="small" @click="handleCurrentChange(1)">查询</el-button>
+            <el-button size="small" @click="clears">重置</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -86,6 +81,11 @@
       <div class="total-title">
         <div class="totals">共{{total}}条</div>
       </div>
+      <div class="table-item-jf table-item-jf1 empty-table" v-if="total == 0 && !isSkeleton">
+        <img class="item-jf-img" src="@/assets/images/kong.png" alt="">
+        <div class="item-jf-titel">暂无相关数据</div>
+        <div class="item-jf-text">抱歉，暂无数据，试试更换搜索条件吧</div>
+      </div>
       <skeleton v-if="isSkeleton"></skeleton>
 
       <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
@@ -96,20 +96,23 @@
 
           <el-table-column type="index" label="序号" :fixed="tableColumnFixed" width="60" :resizable="false">
             <template slot-scope="scope">
-              <span>{{(pageNum - 1) *pageSize + scope.$index + 1}}</span>
+              <span>{{(formdata.pageNum - 1) *formdata.pageSize + scope.$index + 1}}</span>
             </template>
           </el-table-column>
           <el-table-column label="二级市场编码" :fixed="tableColumnFixed" width="120" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.secondaryCode||"--"}}
+            </template>
           </el-table-column>
-          <el-table-column label="供应商编号" :fixed="tableColumnFixed" width="120" :resizable="false">
+          <el-table-column label="供应商编号" prop="customerCode" :fixed="tableColumnFixed" width="120" :resizable="false">
           </el-table-column>
 
           <el-table-column label="供应商名称" :fixed="tableColumnFixed" width="380" :resizable="false">
             <template slot-scope="scope">
               <div class="renling">
                 <div style="display:flex;align-items:center">
-                  <router-link :to="`/enterprise/${encodeStr(scope.row.id)}`" tag="a"
-                               class="wordprimary" v-html="scope.row.name"></router-link>
+                  <router-link :to="`/enterprise/${encodeStr(scope.row.companyId)}`" tag="a"
+                               class="wordprimary" v-html="scope.row.customerName"></router-link>
                 </div>
               </div>
 
@@ -117,121 +120,89 @@
 
           </el-table-column>
 
-          <el-table-column label="营业执照号码" min-width="280">
-            <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
-            </template>
-          </el-table-column>
           <el-table-column label="推荐单位" min-width="280">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.recommendOrg||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司注册区域" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.registerRegion||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司注册省" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.registerProvince||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司注册城市" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
-            </template>
-          </el-table-column>
-          <el-table-column label="法人代表" min-width="85" :resizable="false">
-            <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
-            </template>
-          </el-table-column>
-          <el-table-column label="公司联系人" min-width="120" :resizable="false">
-            <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.registerCity||"--"}}
             </template>
           </el-table-column>
-          <el-table-column label="联系人电话" min-width="120" :resizable="false">
+          <el-table-column label="专业类别" min-width="85" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.groupSpecialty||"--"}}
             </template>
           </el-table-column>
-          <el-table-column label="注册资本(万元)" min-width="120" :resizable="false">
+          <el-table-column label="法人代表" min-width="85" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.representative||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="纳税人身份" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.paytaxType||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="纳税人税率" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.taxRate||"--"}}
             </template>
           </el-table-column>
-          <el-table-column label="资质等级" min-width="85" :resizable="false">
-            <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
-            </template>
-          </el-table-column>
-          <el-table-column label="主项资质" min-width="85" :resizable="false">
-            <template slot-scope="scope">
-              <!--没有值直接展示空-->
-              --
-            </template>
-          </el-table-column>
-          <el-table-column label="劳务资质" min-width="85" :resizable="false">
+          <el-table-column label="施工承包范围" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              <!--没有值直接展示空-->
-              --
-            </template>
-          </el-table-column>
-          <el-table-column label="施工队长" min-width="85" :resizable="false">
-            <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.constructJobScope||"--"}}
             </template>
           </el-table-column>
-          <el-table-column label="联系电话" min-width="85" :resizable="false">
+          <el-table-column label="资质等级" min-width="85" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.credential||"--"}}
             </template>
           </el-table-column>
-          <el-table-column label="身份证号" min-width="85" :resizable="false">
+          <el-table-column label="注册资本(万元)" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.registerCapital||"--"}}
             </template>
           </el-table-column>
-          <el-table-column label="队伍规模" min-width="85" :resizable="false">
+          <el-table-column label="公司联系人" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.contactPerson||"--"}}
             </template>
           </el-table-column>
-          <el-table-column label="专业特长" min-width="85" :resizable="false">
+          <el-table-column label="联系人电话" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.contactPhone||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="准入时间" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.approveDate2||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司合作数量" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.enterpriseCooperationCount||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="合作项目数量" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              <span>{{scope.row.legalPerson||"--"}}</span>
+              <span>{{scope.row.projectCooperationCount||"--"}}</span>
             </template>
           </el-table-column>
           <el-table-column label="分包商等级" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              <span class="wordprimary" @click="getFBS(scope.row)">{{scope.row.legalPerson||"--"}}</span>
+              <span class="wordprimary" @click="getFBS(scope.row)">{{scope.row.creditLevel||"--"}}</span>
             </template>
           </el-table-column>
           <el-table-column label="链接" min-width="160" :resizable="false">
@@ -242,14 +213,14 @@
           </el-table-column>
           <el-table-column label="资源平台分类" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              --
             </template>
           </el-table-column>
 
         </el-table>
       </div>
       <div class="pagination clearfix" v-show="total>0">
-        <el-pagination background :page-size="pageSize" :current-page.sync="pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
+        <el-pagination background :page-size="formdata.pageSize" :current-page.sync="formdata.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
                        :total="total">
         </el-pagination>
       </div>
@@ -297,13 +268,13 @@
 </template>
 
 <script>
-  import { encodeStr } from "@/assets/js/common.js";
-  import "@/assets/styles/public.scss";
-  import "@/assets/styles/supplierlist.scss";
-  import skeleton from '@/views/project/projectList/component/skeleton';
-  import api from '@/api/enterpriseData/enterpriseData.js';
-  import dataRegion from '@/assets/json/provinceTree'
-  import { getDicts } from "@/api/system/dict/data";
+  import { encodeStr } from '@/assets/js/common.js'
+  import '@/assets/styles/public.scss'
+  import '@/assets/styles/supplierlist.scss'
+  import skeleton from '@/views/project/projectList/component/skeleton'
+  import { areaAll, bizDictData, custmerInfolist } from '@/api/supplier/supplier'
+  import { getDicts } from '@/api/system/dict/data'
+  import {queryConditionFiltering} from '@/utils/index'
   export default {
     name: 'laborSubcontractingTeam',
     components:{skeleton},
@@ -317,216 +288,40 @@
         credential:[],
         paytaxtype:[],
         taxrate:[],
+        groupSpecialty:[],
         provienceprops:{
+          checkStrictly:false,
+          multiple:true,
+          label:'value',
+        },
+        groupprops:{
           checkStrictly:false,
           multiple:true,
           value:'id',
         },
-        formdata:{},
-        options: [
-          {
-            value: 'zhinan',
-            label: '指南',
-            children: [{
-              value: 'shejiyuanze',
-              label: '设计原则',
-              children: [{
-                value: 'yizhi',
-                label: '一致'
-              }, {
-                value: 'fankui',
-                label: '反馈'
-              }, {
-                value: 'xiaolv',
-                label: '效率'
-              }, {
-                value: 'kekong',
-                label: '可控'
-              }]
-            }, {
-              value: 'daohang',
-              label: '导航',
-              children: [{
-                value: 'cexiangdaohang',
-                label: '侧向导航'
-              }, {
-                value: 'dingbudaohang',
-                label: '顶部导航'
-              }]
-            }]
-          }, {
-            value: 'zujian',
-            label: '组件',
-            children: [{
-              value: 'basic',
-              label: 'Basic',
-              children: [{
-                value: 'layout',
-                label: 'Layout 布局'
-              }, {
-                value: 'color',
-                label: 'Color 色彩'
-              }, {
-                value: 'typography',
-                label: 'Typography 字体'
-              }, {
-                value: 'icon',
-                label: 'Icon 图标'
-              }, {
-                value: 'button',
-                label: 'Button 按钮'
-              }]
-            }, {
-              value: 'form',
-              label: 'Form',
-              children: [{
-                value: 'radio',
-                label: 'Radio 单选框'
-              }, {
-                value: 'checkbox',
-                label: 'Checkbox 多选框'
-              }, {
-                value: 'input',
-                label: 'Input 输入框'
-              }, {
-                value: 'input-number',
-                label: 'InputNumber 计数器'
-              }, {
-                value: 'select',
-                label: 'Select 选择器'
-              }, {
-                value: 'cascader',
-                label: 'Cascader 级联选择器'
-              }, {
-                value: 'switch',
-                label: 'Switch 开关'
-              }, {
-                value: 'slider',
-                label: 'Slider 滑块'
-              }, {
-                value: 'time-picker',
-                label: 'TimePicker 时间选择器'
-              }, {
-                value: 'date-picker',
-                label: 'DatePicker 日期选择器'
-              }, {
-                value: 'datetime-picker',
-                label: 'DateTimePicker 日期时间选择器'
-              }, {
-                value: 'upload',
-                label: 'Upload 上传'
-              }, {
-                value: 'rate',
-                label: 'Rate 评分'
-              }, {
-                value: 'form',
-                label: 'Form 表单'
-              }]
-            }, {
-              value: 'data',
-              label: 'Data',
-              children: [{
-                value: 'table',
-                label: 'Table 表格'
-              }, {
-                value: 'tag',
-                label: 'Tag 标签'
-              }, {
-                value: 'progress',
-                label: 'Progress 进度条'
-              }, {
-                value: 'tree',
-                label: 'Tree 树形控件'
-              }, {
-                value: 'pagination',
-                label: 'Pagination 分页'
-              }, {
-                value: 'badge',
-                label: 'Badge 标记'
-              }]
-            }, {
-              value: 'notice',
-              label: 'Notice',
-              children: [{
-                value: 'alert',
-                label: 'Alert 警告'
-              }, {
-                value: 'loading',
-                label: 'Loading 加载'
-              }, {
-                value: 'message',
-                label: 'Message 消息提示'
-              }, {
-                value: 'message-box',
-                label: 'MessageBox 弹框'
-              }, {
-                value: 'notification',
-                label: 'Notification 通知'
-              }]
-            }, {
-              value: 'navigation',
-              label: 'Navigation',
-              children: [{
-                value: 'menu',
-                label: 'NavMenu 导航菜单'
-              }, {
-                value: 'tabs',
-                label: 'Tabs 标签页'
-              }, {
-                value: 'breadcrumb',
-                label: 'Breadcrumb 面包屑'
-              }, {
-                value: 'dropdown',
-                label: 'Dropdown 下拉菜单'
-              }, {
-                value: 'steps',
-                label: 'Steps 步骤条'
-              }]
-            }, {
-              value: 'others',
-              label: 'Others',
-              children: [{
-                value: 'dialog',
-                label: 'Dialog 对话框'
-              }, {
-                value: 'tooltip',
-                label: 'Tooltip 文字提示'
-              }, {
-                value: 'popover',
-                label: 'Popover 弹出框'
-              }, {
-                value: 'card',
-                label: 'Card 卡片'
-              }, {
-                value: 'carousel',
-                label: 'Carousel 走马灯'
-              }, {
-                value: 'collapse',
-                label: 'Collapse 折叠面板'
-              }]
-            }]
-          }, {
-            value: 'ziyuan',
-            label: '资源',
-            children: [{
-              value: 'axure',
-              label: 'Axure Components'
-            }, {
-              value: 'sketch',
-              label: 'Sketch Templates'
-            }, {
-              value: 'jiaohu',
-              label: '组件交互文档'
-            }]
-          }
-        ],
-        tableData:[
-          {name:'测试',legalPerson:'AAAA'}
-        ],
+        formdata:{
+          customerClass:'劳务分包队伍',
+          pageNum:1,
+          pageSize:50,
+          times:[],
+          customerName:"",
+          leaderName:"",
+          areas:[],
+          customerState:[],
+          credential:[],
+          groupSpecialtys:[],
+          groupSpecialtyId:[],
+          creditLevel:[],
+          paytaxType:[],
+          taxRate:[],
+          registerProvince:[],
+          registerCity:[],
+          approveDate2Start:null,
+          approveDate2End:null,
+        },
+        tableData:[],
         isSkeleton:false,
-        total:100,
-        pageSize:50,
-        pageNum:1,
+        total:0,
         // table列是否悬浮
         tableColumnFixed: true,
         fbsvisib:false,
@@ -535,13 +330,10 @@
     },
     created() {
       this.init()
+      this.cusoomerInfolist()
     },
     methods:{
       init(){
-        //地区
-        getDicts('arealist').then(res=>{
-          this.arealist = res.data
-        })
         //评价等级
         getDicts('credit_level').then(res=>{
           this.creditlevel = res.data
@@ -562,24 +354,82 @@
         getDicts('credential').then(res=>{
           this.credential = res.data
         })
-        this.dataRegion()
+        // this.dataRegion()
+        //专业类别
+        bizDictData().then(res=>{
+          this.groupSpecialty = res.data
+        })
+        // 地区树
+        areaAll().then(res=>{
+          this.addressList = res.data
+        })
       },
-      //地区
-      async dataRegion() {
-        let addrs = JSON.parse(JSON.stringify(dataRegion))
-        addrs.forEach(item=>{
-          if (item.children) {
-            (item.children).forEach(i => {
-              if (i.children) {
-                delete i.children
+      clears(){
+        this.formdata = {
+          customerClass: '劳务分包队伍',
+          pageNum: 1,
+          pageSize: 50,
+          times: [],
+          customerName: '',
+          leaderName: '',
+          areas: [],
+          customerState: [],
+          credential: [],
+          groupSpecialtys: [],
+          groupSpecialtyId: [],
+          creditLevel: [],
+          paytaxType: [],
+          taxRate: [],
+          registerProvince: [],
+          registerCity: [],
+          approveDate2Start: null,
+          approveDate2End: null
+        }
+        this.cusoomerInfolist()
+      },
+      cusoomerInfolist(){
+        this.isSkeleton = true
+        let param = this.formdata
+        if(param.times){
+          param.approveDate2Start = param.times[0]
+          param.approveDate2End = param.times[1]
+        }else{
+          param.approveDate2Start = ''
+          param.approveDate2End = ''
+        }
+        param.groupSpecialtyId = []
+        if(param.groupSpecialtys){
+          param.groupSpecialtys.forEach(item=>{
+            param.groupSpecialtyId.push(item[item.length-1])
+          })
+        }
+        if(param.areas){
+          let province = []
+          let city = []
+          param.areas.forEach(item=>{
+            if(item.length == 3){//到市
+              if(item[1].indexOf('重庆')>-1||item[1].indexOf('北京')>-1||item[1].indexOf('天津')>-1||item[1].indexOf('上海')>-1){
+                province.push(item[1])
+              }else{
+                city.push(item[2])
               }
-            })
-          }
+            }
+          })
+          param.registerProvince = province
+          param.registerCity = city
+        }else{
+          param.registerProvince = []
+          param.registerCity = []
+        }
+        custmerInfolist(queryConditionFiltering(this.formdata)).then(res=>{
+          this.isSkeleton = false
+          this.tableData = res.rows
+          this.total = res.total
         })
-        this.addressList = addrs;
       },
-      handleCurrentChange(){
-
+      handleCurrentChange(val){
+        this.formdata.pageNum = val
+        this.cusoomerInfolist()
       },
       setHeaderRow() {
         return "owner-table-list-header";
@@ -599,7 +449,7 @@
       },
       //点击准入
       goAccess(row){
-        this.$tab.openPage('测试一下-准入情况', '/supplier/supplierlist/access')
+        this.$tab.openPage(row.customerName+'-准入情况', '/supplier/supplierlist/access',{customerKey:row.customerKey})
       },
       //点击考评
       goAssessment(row){
@@ -612,5 +462,3 @@
 <style scoped lang="scss">
 </style>
 
-
-

dsk-operate-ui/src/views/supplier/supplierlist/ledger.vue

@@ -75,7 +75,7 @@
           <span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span>
         </p>
       </div>
-      <div class="table-item-jf table-item-jf1 empty-table" v-if="!tableData.length && !isSkeleton">
+      <div class="table-item-jf table-item-jf1 empty-table" v-if="total == 0 && !isSkeleton">
         <img class="item-jf-img" src="@/assets/images/kong.png" alt="">
         <div class="item-jf-titel">暂无相关数据</div>
         <div class="item-jf-text">抱歉，暂无数据，试试更换搜索条件吧</div>

dsk-operate-ui/src/views/supplier/supplierlist/professionalSubcontracting.vue

@@ -32,7 +32,7 @@
             </el-form-item>
             <el-form-item label="专业类别">
               <el-cascader clearable
-                v-model="formdata.groupSpecialty"
+                v-model="formdata.groupSpecialtys"
                 :options="groupSpecialty" :collapse-tags="true"
                 :props="groupprops"></el-cascader>
             </el-form-item>
@@ -76,6 +76,11 @@
       <div class="total-title">
         <div class="totals">共{{total}}条</div>
       </div>
+      <div class="table-item-jf table-item-jf1 empty-table" v-if="total == 0 && !isSkeleton">
+        <img class="item-jf-img" src="@/assets/images/kong.png" alt="">
+        <div class="item-jf-titel">暂无相关数据</div>
+        <div class="item-jf-text">抱歉，暂无数据，试试更换搜索条件吧</div>
+      </div>
       <skeleton v-if="isSkeleton"></skeleton>
 
       <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
@@ -294,7 +299,7 @@
           areas:[],
           customerState:[],
           credential:[],
-          groupSpecialty:[],
+          groupSpecialtys:[],
           groupSpecialtyId:[],
           creditLevel:[],
           paytaxType:[],
@@ -359,7 +364,7 @@
           areas: [],
           customerState: [],
           credential: [],
-          groupSpecialty: [],
+          groupSpecialtys: [],
           groupSpecialtyId: [],
           creditLevel: [],
           paytaxType: [],
@@ -381,12 +386,11 @@
           param.approveDate2Start = ''
           param.approveDate2End = ''
         }
-        if(param.groupSpecialty){
-          param.groupSpecialty.forEach(item=>{
+        param.groupSpecialtyId = []
+        if(param.groupSpecialtys){
+          param.groupSpecialtys.forEach(item=>{
             param.groupSpecialtyId.push(item[item.length-1])
           })
-        }else{
-          param.groupSpecialtyId = []
         }
         if(param.areas){
           let province = []
@@ -406,8 +410,6 @@
           param.registerProvince = []
           param.registerCity = []
         }
-        console.log(queryConditionFiltering(this.formdata))
-        return false
         custmerInfolist(queryConditionFiltering(this.formdata)).then(res=>{
           this.isSkeleton = false
           this.tableData = res.rows

dsk-operate-ui/src/views/supplier/supplierlist/rentalServices.vue

-
 <template>
   <div class="supplier">
     <div class="search-supplier">
@@ -11,59 +10,52 @@
         <el-form :model="formdata" label-width="82px" label-position="right"  :inline="true" >
           <el-row>
             <el-form-item label="供应商名称">
-              <el-input v-model="formdata.user" placeholder="请输入分供方名称"></el-input>
-            </el-form-item>
-            <el-form-item label="注册地区">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
-                <el-option v-for="(item,index) in arealist" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
-              </el-select>
+              <el-input v-model="formdata.customerName" placeholder="请输入供应商名称"></el-input>
             </el-form-item>
             <el-form-item label="注册城市">
               <el-cascader
-                v-model="formdata.user"
-                :options="addressList" :collapse-tags="true"
+                v-model="formdata.areas"
+                :options="addressList" :collapse-tags="true" :show-all-levels="false" clearable
                 :props="provienceprops"></el-cascader>
             </el-form-item>
-          </el-row>
-          <el-row>
             <el-form-item label="供应商状态">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.customerState" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in customstate" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+          </el-row>
+          <el-row>
             <el-form-item label="资质等级">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.credential" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in credential" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="物资类别">
-              <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
-              </el-select>
+              <el-cascader clearable
+                           v-model="formdata.groupSpecialtys"
+                           :options="groupSpecialty" :collapse-tags="true"
+                           :props="groupprops"></el-cascader>
             </el-form-item>
-          </el-row>
-          <el-row>
             <el-form-item label="评价等级">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.creditLevel" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in creditlevel" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+          </el-row>
+          <el-row>
             <el-form-item label="纳税人身份">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.paytaxType" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in paytaxtype" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="纳税人税率">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.taxRate" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in taxrate" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
-          </el-row>
-          <el-row>
             <el-form-item label="准入时间">
               <el-date-picker
-                v-model="formdata.time"
+                v-model="formdata.times"
                 type="daterange"
                 value-format="yyyy-MM-dd"
                 range-separator="至"
@@ -74,8 +66,8 @@
           </el-row>
           <el-divider></el-divider>
           <el-form-item label="  ">
-            <el-button type="primary" size="small">查询</el-button>
-            <el-button size="small">重置</el-button>
+            <el-button type="primary" size="small" @click="handleCurrentChange(1)">查询</el-button>
+            <el-button size="small" @click="clears">重置</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -84,6 +76,11 @@
       <div class="total-title">
         <div class="totals">共{{total}}条</div>
       </div>
+      <div class="table-item-jf table-item-jf1 empty-table" v-if="total == 0 && !isSkeleton">
+        <img class="item-jf-img" src="@/assets/images/kong.png" alt="">
+        <div class="item-jf-titel">暂无相关数据</div>
+        <div class="item-jf-text">抱歉，暂无数据，试试更换搜索条件吧</div>
+      </div>
       <skeleton v-if="isSkeleton"></skeleton>
 
       <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
@@ -94,18 +91,18 @@
 
           <el-table-column type="index" label="序号" :fixed="tableColumnFixed" width="60" :resizable="false">
             <template slot-scope="scope">
-              <span>{{(pageNum - 1) *pageSize + scope.$index + 1}}</span>
+              <span>{{(formdata.pageNum - 1) *formdata.pageSize + scope.$index + 1}}</span>
             </template>
           </el-table-column>
-          <el-table-column label="供应商编号" :fixed="tableColumnFixed" width="120" :resizable="false">
+          <el-table-column label="供应商编号" prop="customerCode" :fixed="tableColumnFixed" width="120" :resizable="false">
           </el-table-column>
 
           <el-table-column label="供应商名称" :fixed="tableColumnFixed" width="380" :resizable="false">
             <template slot-scope="scope">
               <div class="renling">
                 <div style="display:flex;align-items:center">
-                  <router-link :to="`/enterprise/${encodeStr(scope.row.id)}`" tag="a"
-                               class="wordprimary" v-html="scope.row.name"></router-link>
+                  <router-link :to="`/enterprise/${encodeStr(scope.row.companyId)}`" tag="a"
+                               class="wordprimary" v-html="scope.row.customerName"></router-link>
                 </div>
               </div>
 
@@ -115,82 +112,82 @@
 
           <el-table-column label="推荐单位" min-width="280">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.recommendOrg||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司注册区域" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.registerRegion||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司注册省" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.registerProvince||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司注册城市" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.registerCity||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="专业类别" min-width="85" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.groupSpecialty||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="法人代表" min-width="85" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.representative||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="纳税人身份" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.paytaxType||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="纳税人税率" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.taxRate||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="资质等级" min-width="85" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.credential||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="注册资本(万元)" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.registerCapital||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司联系人" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.contactPerson||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="联系人电话" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.contactPhone||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="准入时间" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.approveDate2||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司合作数量" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.enterpriseCooperationCount||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="合作项目数量" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              <span>{{scope.row.legalPerson||"--"}}</span>
+              <span>{{scope.row.projectCooperationCount||"--"}}</span>
             </template>
           </el-table-column>
           <el-table-column label="分包商等级" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              <span class="wordprimary" @click="getFBS(scope.row)">{{scope.row.legalPerson||"--"}}</span>
+              <span class="wordprimary" @click="getFBS(scope.row)">{{scope.row.creditLevel||"--"}}</span>
             </template>
           </el-table-column>
           <el-table-column label="链接" min-width="160" :resizable="false">
@@ -201,14 +198,14 @@
           </el-table-column>
           <el-table-column label="资源平台分类" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              --
             </template>
           </el-table-column>
 
         </el-table>
       </div>
       <div class="pagination clearfix" v-show="total>0">
-        <el-pagination background :page-size="pageSize" :current-page.sync="pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
+        <el-pagination background :page-size="formdata.pageSize" :current-page.sync="formdata.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
                        :total="total">
         </el-pagination>
       </div>
@@ -256,13 +253,13 @@
 </template>
 
 <script>
-  import { encodeStr } from "@/assets/js/common.js";
-  import "@/assets/styles/public.scss";
-  import "@/assets/styles/supplierlist.scss";
-  import skeleton from '@/views/project/projectList/component/skeleton';
-  import api from '@/api/enterpriseData/enterpriseData.js';
-  import dataRegion from '@/assets/json/provinceTree'
-  import { getDicts } from "@/api/system/dict/data";
+  import { encodeStr } from '@/assets/js/common.js'
+  import '@/assets/styles/public.scss'
+  import '@/assets/styles/supplierlist.scss'
+  import skeleton from '@/views/project/projectList/component/skeleton'
+  import { areaAll, bizDictData, custmerInfolist } from '@/api/supplier/supplier'
+  import { getDicts } from '@/api/system/dict/data'
+  import {queryConditionFiltering} from '@/utils/index'
   export default {
     name: 'rentalServices',
     components:{skeleton},
@@ -276,216 +273,39 @@
         credential:[],
         paytaxtype:[],
         taxrate:[],
+        groupSpecialty:[],
         provienceprops:{
+          checkStrictly:false,
+          multiple:true,
+          label:'value',
+        },
+        groupprops:{
           checkStrictly:false,
           multiple:true,
           value:'id',
         },
-        formdata:{},
-        options: [
-          {
-            value: 'zhinan',
-            label: '指南',
-            children: [{
-              value: 'shejiyuanze',
-              label: '设计原则',
-              children: [{
-                value: 'yizhi',
-                label: '一致'
-              }, {
-                value: 'fankui',
-                label: '反馈'
-              }, {
-                value: 'xiaolv',
-                label: '效率'
-              }, {
-                value: 'kekong',
-                label: '可控'
-              }]
-            }, {
-              value: 'daohang',
-              label: '导航',
-              children: [{
-                value: 'cexiangdaohang',
-                label: '侧向导航'
-              }, {
-                value: 'dingbudaohang',
-                label: '顶部导航'
-              }]
-            }]
-          }, {
-            value: 'zujian',
-            label: '组件',
-            children: [{
-              value: 'basic',
-              label: 'Basic',
-              children: [{
-                value: 'layout',
-                label: 'Layout 布局'
-              }, {
-                value: 'color',
-                label: 'Color 色彩'
-              }, {
-                value: 'typography',
-                label: 'Typography 字体'
-              }, {
-                value: 'icon',
-                label: 'Icon 图标'
-              }, {
-                value: 'button',
-                label: 'Button 按钮'
-              }]
-            }, {
-              value: 'form',
-              label: 'Form',
-              children: [{
-                value: 'radio',
-                label: 'Radio 单选框'
-              }, {
-                value: 'checkbox',
-                label: 'Checkbox 多选框'
-              }, {
-                value: 'input',
-                label: 'Input 输入框'
-              }, {
-                value: 'input-number',
-                label: 'InputNumber 计数器'
-              }, {
-                value: 'select',
-                label: 'Select 选择器'
-              }, {
-                value: 'cascader',
-                label: 'Cascader 级联选择器'
-              }, {
-                value: 'switch',
-                label: 'Switch 开关'
-              }, {
-                value: 'slider',
-                label: 'Slider 滑块'
-              }, {
-                value: 'time-picker',
-                label: 'TimePicker 时间选择器'
-              }, {
-                value: 'date-picker',
-                label: 'DatePicker 日期选择器'
-              }, {
-                value: 'datetime-picker',
-                label: 'DateTimePicker 日期时间选择器'
-              }, {
-                value: 'upload',
-                label: 'Upload 上传'
-              }, {
-                value: 'rate',
-                label: 'Rate 评分'
-              }, {
-                value: 'form',
-                label: 'Form 表单'
-              }]
-            }, {
-              value: 'data',
-              label: 'Data',
-              children: [{
-                value: 'table',
-                label: 'Table 表格'
-              }, {
-                value: 'tag',
-                label: 'Tag 标签'
-              }, {
-                value: 'progress',
-                label: 'Progress 进度条'
-              }, {
-                value: 'tree',
-                label: 'Tree 树形控件'
-              }, {
-                value: 'pagination',
-                label: 'Pagination 分页'
-              }, {
-                value: 'badge',
-                label: 'Badge 标记'
-              }]
-            }, {
-              value: 'notice',
-              label: 'Notice',
-              children: [{
-                value: 'alert',
-                label: 'Alert 警告'
-              }, {
-                value: 'loading',
-                label: 'Loading 加载'
-              }, {
-                value: 'message',
-                label: 'Message 消息提示'
-              }, {
-                value: 'message-box',
-                label: 'MessageBox 弹框'
-              }, {
-                value: 'notification',
-                label: 'Notification 通知'
-              }]
-            }, {
-              value: 'navigation',
-              label: 'Navigation',
-              children: [{
-                value: 'menu',
-                label: 'NavMenu 导航菜单'
-              }, {
-                value: 'tabs',
-                label: 'Tabs 标签页'
-              }, {
-                value: 'breadcrumb',
-                label: 'Breadcrumb 面包屑'
-              }, {
-                value: 'dropdown',
-                label: 'Dropdown 下拉菜单'
-              }, {
-                value: 'steps',
-                label: 'Steps 步骤条'
-              }]
-            }, {
-              value: 'others',
-              label: 'Others',
-              children: [{
-                value: 'dialog',
-                label: 'Dialog 对话框'
-              }, {
-                value: 'tooltip',
-                label: 'Tooltip 文字提示'
-              }, {
-                value: 'popover',
-                label: 'Popover 弹出框'
-              }, {
-                value: 'card',
-                label: 'Card 卡片'
-              }, {
-                value: 'carousel',
-                label: 'Carousel 走马灯'
-              }, {
-                value: 'collapse',
-                label: 'Collapse 折叠面板'
-              }]
-            }]
-          }, {
-            value: 'ziyuan',
-            label: '资源',
-            children: [{
-              value: 'axure',
-              label: 'Axure Components'
-            }, {
-              value: 'sketch',
-              label: 'Sketch Templates'
-            }, {
-              value: 'jiaohu',
-              label: '组件交互文档'
-            }]
-          }
-        ],
-        tableData:[
-          {name:'测试',legalPerson:'AAAA'}
-        ],
+        formdata:{
+          customerClass:'租赁',
+          pageNum:1,
+          pageSize:50,
+          times:[],
+          customerName:"",
+          areas:[],
+          customerState:[],
+          credential:[],
+          groupSpecialtys:[],
+          groupSpecialtyId:[],
+          creditLevel:[],
+          paytaxType:[],
+          taxRate:[],
+          registerProvince:[],
+          registerCity:[],
+          approveDate2Start:null,
+          approveDate2End:null,
+        },
+        tableData:[],
         isSkeleton:false,
-        total:100,
-        pageSize:50,
-        pageNum:1,
+        total:0,
         // table列是否悬浮
         tableColumnFixed: true,
         fbsvisib:false,
@@ -494,13 +314,10 @@
     },
     created() {
       this.init()
+      this.cusoomerInfolist()
     },
     methods:{
       init(){
-        //地区
-        getDicts('arealist').then(res=>{
-          this.arealist = res.data
-        })
         //评价等级
         getDicts('credit_level').then(res=>{
           this.creditlevel = res.data
@@ -521,24 +338,81 @@
         getDicts('credential').then(res=>{
           this.credential = res.data
         })
-        this.dataRegion()
+        // this.dataRegion()
+        //专业类别
+        bizDictData().then(res=>{
+          this.groupSpecialty = res.data
+        })
+        // 地区树
+        areaAll().then(res=>{
+          this.addressList = res.data
+        })
       },
-      //地区
-      async dataRegion() {
-        let addrs = JSON.parse(JSON.stringify(dataRegion))
-        addrs.forEach(item=>{
-          if (item.children) {
-            (item.children).forEach(i => {
-              if (i.children) {
-                delete i.children
+      clears(){
+        this.formdata = {
+          customerClass: '租赁',
+          pageNum: 1,
+          pageSize: 50,
+          times: [],
+          customerName: '',
+          areas: [],
+          customerState: [],
+          credential: [],
+          groupSpecialtys: [],
+          groupSpecialtyId: [],
+          creditLevel: [],
+          paytaxType: [],
+          taxRate: [],
+          registerProvince: [],
+          registerCity: [],
+          approveDate2Start: null,
+          approveDate2End: null
+        }
+        this.cusoomerInfolist()
+      },
+      cusoomerInfolist(){
+        this.isSkeleton = true
+        let param = this.formdata
+        if(param.times){
+          param.approveDate2Start = param.times[0]
+          param.approveDate2End = param.times[1]
+        }else{
+          param.approveDate2Start = ''
+          param.approveDate2End = ''
+        }
+        param.groupSpecialtyId = []
+        if(param.groupSpecialtys){
+          param.groupSpecialtys.forEach(item=>{
+            param.groupSpecialtyId.push(item[item.length-1])
+          })
+        }
+        if(param.areas){
+          let province = []
+          let city = []
+          param.areas.forEach(item=>{
+            if(item.length == 3){//到市
+              if(item[1].indexOf('重庆')>-1||item[1].indexOf('北京')>-1||item[1].indexOf('天津')>-1||item[1].indexOf('上海')>-1){
+                province.push(item[1])
+              }else{
+                city.push(item[2])
               }
-            })
-          }
+            }
+          })
+          param.registerProvince = province
+          param.registerCity = city
+        }else{
+          param.registerProvince = []
+          param.registerCity = []
+        }
+        custmerInfolist(queryConditionFiltering(this.formdata)).then(res=>{
+          this.isSkeleton = false
+          this.tableData = res.rows
+          this.total = res.total
         })
-        this.addressList = addrs;
       },
-      handleCurrentChange(){
-
+      handleCurrentChange(val){
+        this.formdata.pageNum = val
+        this.cusoomerInfolist()
       },
       setHeaderRow() {
         return "owner-table-list-header";
@@ -558,7 +432,7 @@
       },
       //点击准入
       goAccess(row){
-        this.$tab.openPage('测试一下-准入情况', '/supplier/supplierlist/access')
+        this.$tab.openPage(row.customerName+'-准入情况', '/supplier/supplierlist/access',{customerKey:row.customerKey})
       },
       //点击考评
       goAssessment(row){
@@ -571,4 +445,3 @@
 <style scoped lang="scss">
 </style>
 
-

dsk-operate-ui/src/views/supplier/supplierlist/supplySubcontracting.vue

@@ -10,59 +10,52 @@
         <el-form :model="formdata" label-width="82px" label-position="right"  :inline="true" >
           <el-row>
             <el-form-item label="供应商名称">
-              <el-input v-model="formdata.user" placeholder="请输入分供方名称"></el-input>
-            </el-form-item>
-            <el-form-item label="注册地区">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
-                <el-option v-for="(item,index) in arealist" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
-              </el-select>
+              <el-input v-model="formdata.customerName" placeholder="请输入供应商名称"></el-input>
             </el-form-item>
             <el-form-item label="注册城市">
               <el-cascader
-                v-model="formdata.user"
-                :options="addressList" :collapse-tags="true"
+                v-model="formdata.areas"
+                :options="addressList" :collapse-tags="true" :show-all-levels="false" clearable
                 :props="provienceprops"></el-cascader>
             </el-form-item>
-          </el-row>
-          <el-row>
             <el-form-item label="供应商状态">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.customerState" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in customstate" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+          </el-row>
+          <el-row>
             <el-form-item label="资质等级">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.credential" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in credential" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="物资类别">
-              <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
-              </el-select>
+              <el-cascader clearable
+                           v-model="formdata.groupSpecialtys"
+                           :options="groupSpecialty" :collapse-tags="true"
+                           :props="groupprops"></el-cascader>
             </el-form-item>
-          </el-row>
-          <el-row>
             <el-form-item label="评价等级">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.creditLevel" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in creditlevel" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+          </el-row>
+          <el-row>
             <el-form-item label="纳税人身份">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.paytaxType" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in paytaxtype" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="纳税人税率">
-              <el-select v-model="formdata.user" multiple placeholder="请选择" :collapse-tags="true" clearable>
+              <el-select v-model="formdata.taxRate" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in taxrate" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
-          </el-row>
-          <el-row>
             <el-form-item label="准入时间">
               <el-date-picker
-                v-model="formdata.time"
+                v-model="formdata.times"
                 type="daterange"
                 value-format="yyyy-MM-dd"
                 range-separator="至"
@@ -73,8 +66,8 @@
           </el-row>
           <el-divider></el-divider>
           <el-form-item label="  ">
-            <el-button type="primary" size="small">查询</el-button>
-            <el-button size="small">重置</el-button>
+            <el-button type="primary" size="small" @click="handleCurrentChange(1)">查询</el-button>
+            <el-button size="small" @click="clears">重置</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -83,6 +76,11 @@
       <div class="total-title">
         <div class="totals">共{{total}}条</div>
       </div>
+      <div class="table-item-jf table-item-jf1 empty-table" v-if="total == 0 && !isSkeleton">
+        <img class="item-jf-img" src="@/assets/images/kong.png" alt="">
+        <div class="item-jf-titel">暂无相关数据</div>
+        <div class="item-jf-text">抱歉，暂无数据，试试更换搜索条件吧</div>
+      </div>
       <skeleton v-if="isSkeleton"></skeleton>
 
       <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
@@ -93,18 +91,18 @@
 
           <el-table-column type="index" label="序号" :fixed="tableColumnFixed" width="60" :resizable="false">
             <template slot-scope="scope">
-              <span>{{(pageNum - 1) *pageSize + scope.$index + 1}}</span>
+              <span>{{(formdata.pageNum - 1) *formdata.pageSize + scope.$index + 1}}</span>
             </template>
           </el-table-column>
-          <el-table-column label="供应商编号" :fixed="tableColumnFixed" width="120" :resizable="false">
+          <el-table-column label="供应商编号" prop="customerCode" :fixed="tableColumnFixed" width="120" :resizable="false">
           </el-table-column>
 
           <el-table-column label="供应商名称" :fixed="tableColumnFixed" width="380" :resizable="false">
             <template slot-scope="scope">
               <div class="renling">
                 <div style="display:flex;align-items:center">
-                  <router-link :to="`/enterprise/${encodeStr(scope.row.id)}`" tag="a"
-                               class="wordprimary" v-html="scope.row.name"></router-link>
+                  <router-link :to="`/enterprise/${encodeStr(scope.row.companyId)}`" tag="a"
+                               class="wordprimary" v-html="scope.row.customerName"></router-link>
                 </div>
               </div>
 
@@ -114,82 +112,82 @@
 
           <el-table-column label="推荐单位" min-width="280">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.recommendOrg||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司注册区域" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.registerRegion||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司注册省" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.registerProvince||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司注册城市" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.registerCity||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="供应类别" min-width="85" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.groupSpecialty||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="法人代表" min-width="85" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.representative||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="纳税人身份" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.paytaxType||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="纳税人税率" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.taxRate||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="资质等级" min-width="85" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.credential||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="注册资本(万元)" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.registerCapital||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司联系人" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.contactPerson||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="联系人电话" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.contactPhone||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="准入时间" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.approveDate2||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="公司合作数量" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              {{scope.row.enterpriseCooperationCount||"--"}}
             </template>
           </el-table-column>
           <el-table-column label="合作项目数量" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              <span>{{scope.row.legalPerson||"--"}}</span>
+              <span>{{scope.row.projectCooperationCount||"--"}}</span>
             </template>
           </el-table-column>
           <el-table-column label="分包商等级" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              <span class="wordprimary" @click="getFBS(scope.row)">{{scope.row.legalPerson||"--"}}</span>
+              <span class="wordprimary" @click="getFBS(scope.row)">{{scope.row.creditLevel||"--"}}</span>
             </template>
           </el-table-column>
           <el-table-column label="链接" min-width="160" :resizable="false">
@@ -200,14 +198,14 @@
           </el-table-column>
           <el-table-column label="资源平台分类" min-width="120" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.legalPerson||"--"}}
+              --
             </template>
           </el-table-column>
 
         </el-table>
       </div>
       <div class="pagination clearfix" v-show="total>0">
-        <el-pagination background :page-size="pageSize" :current-page.sync="pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
+        <el-pagination background :page-size="formdata.pageSize" :current-page.sync="formdata.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
                        :total="total">
         </el-pagination>
       </div>
@@ -255,13 +253,13 @@
 </template>
 
 <script>
-  import { encodeStr } from "@/assets/js/common.js";
-  import "@/assets/styles/public.scss";
-  import "@/assets/styles/supplierlist.scss";
-  import skeleton from '@/views/project/projectList/component/skeleton';
-  import api from '@/api/enterpriseData/enterpriseData.js';
-  import dataRegion from '@/assets/json/provinceTree'
-  import { getDicts } from "@/api/system/dict/data";
+  import { encodeStr } from '@/assets/js/common.js'
+  import '@/assets/styles/public.scss'
+  import '@/assets/styles/supplierlist.scss'
+  import skeleton from '@/views/project/projectList/component/skeleton'
+  import { areaAll, bizDictData, custmerInfolist } from '@/api/supplier/supplier'
+  import { getDicts } from '@/api/system/dict/data'
+  import {queryConditionFiltering} from '@/utils/index'
   export default {
     name: 'supplySubcontracting',
     components:{skeleton},
@@ -275,216 +273,39 @@
         credential:[],
         paytaxtype:[],
         taxrate:[],
+        groupSpecialty:[],
         provienceprops:{
+          checkStrictly:false,
+          multiple:true,
+          label:'value',
+        },
+        groupprops:{
           checkStrictly:false,
           multiple:true,
           value:'id',
         },
-        formdata:{},
-        options: [
-          {
-            value: 'zhinan',
-            label: '指南',
-            children: [{
-              value: 'shejiyuanze',
-              label: '设计原则',
-              children: [{
-                value: 'yizhi',
-                label: '一致'
-              }, {
-                value: 'fankui',
-                label: '反馈'
-              }, {
-                value: 'xiaolv',
-                label: '效率'
-              }, {
-                value: 'kekong',
-                label: '可控'
-              }]
-            }, {
-              value: 'daohang',
-              label: '导航',
-              children: [{
-                value: 'cexiangdaohang',
-                label: '侧向导航'
-              }, {
-                value: 'dingbudaohang',
-                label: '顶部导航'
-              }]
-            }]
-          }, {
-            value: 'zujian',
-            label: '组件',
-            children: [{
-              value: 'basic',
-              label: 'Basic',
-              children: [{
-                value: 'layout',
-                label: 'Layout 布局'
-              }, {
-                value: 'color',
-                label: 'Color 色彩'
-              }, {
-                value: 'typography',
-                label: 'Typography 字体'
-              }, {
-                value: 'icon',
-                label: 'Icon 图标'
-              }, {
-                value: 'button',
-                label: 'Button 按钮'
-              }]
-            }, {
-              value: 'form',
-              label: 'Form',
-              children: [{
-                value: 'radio',
-                label: 'Radio 单选框'
-              }, {
-                value: 'checkbox',
-                label: 'Checkbox 多选框'
-              }, {
-                value: 'input',
-                label: 'Input 输入框'
-              }, {
-                value: 'input-number',
-                label: 'InputNumber 计数器'
-              }, {
-                value: 'select',
-                label: 'Select 选择器'
-              }, {
-                value: 'cascader',
-                label: 'Cascader 级联选择器'
-              }, {
-                value: 'switch',
-                label: 'Switch 开关'
-              }, {
-                value: 'slider',
-                label: 'Slider 滑块'
-              }, {
-                value: 'time-picker',
-                label: 'TimePicker 时间选择器'
-              }, {
-                value: 'date-picker',
-                label: 'DatePicker 日期选择器'
-              }, {
-                value: 'datetime-picker',
-                label: 'DateTimePicker 日期时间选择器'
-              }, {
-                value: 'upload',
-                label: 'Upload 上传'
-              }, {
-                value: 'rate',
-                label: 'Rate 评分'
-              }, {
-                value: 'form',
-                label: 'Form 表单'
-              }]
-            }, {
-              value: 'data',
-              label: 'Data',
-              children: [{
-                value: 'table',
-                label: 'Table 表格'
-              }, {
-                value: 'tag',
-                label: 'Tag 标签'
-              }, {
-                value: 'progress',
-                label: 'Progress 进度条'
-              }, {
-                value: 'tree',
-                label: 'Tree 树形控件'
-              }, {
-                value: 'pagination',
-                label: 'Pagination 分页'
-              }, {
-                value: 'badge',
-                label: 'Badge 标记'
-              }]
-            }, {
-              value: 'notice',
-              label: 'Notice',
-              children: [{
-                value: 'alert',
-                label: 'Alert 警告'
-              }, {
-                value: 'loading',
-                label: 'Loading 加载'
-              }, {
-                value: 'message',
-                label: 'Message 消息提示'
-              }, {
-                value: 'message-box',
-                label: 'MessageBox 弹框'
-              }, {
-                value: 'notification',
-                label: 'Notification 通知'
-              }]
-            }, {
-              value: 'navigation',
-              label: 'Navigation',
-              children: [{
-                value: 'menu',
-                label: 'NavMenu 导航菜单'
-              }, {
-                value: 'tabs',
-                label: 'Tabs 标签页'
-              }, {
-                value: 'breadcrumb',
-                label: 'Breadcrumb 面包屑'
-              }, {
-                value: 'dropdown',
-                label: 'Dropdown 下拉菜单'
-              }, {
-                value: 'steps',
-                label: 'Steps 步骤条'
-              }]
-            }, {
-              value: 'others',
-              label: 'Others',
-              children: [{
-                value: 'dialog',
-                label: 'Dialog 对话框'
-              }, {
-                value: 'tooltip',
-                label: 'Tooltip 文字提示'
-              }, {
-                value: 'popover',
-                label: 'Popover 弹出框'
-              }, {
-                value: 'card',
-                label: 'Card 卡片'
-              }, {
-                value: 'carousel',
-                label: 'Carousel 走马灯'
-              }, {
-                value: 'collapse',
-                label: 'Collapse 折叠面板'
-              }]
-            }]
-          }, {
-            value: 'ziyuan',
-            label: '资源',
-            children: [{
-              value: 'axure',
-              label: 'Axure Components'
-            }, {
-              value: 'sketch',
-              label: 'Sketch Templates'
-            }, {
-              value: 'jiaohu',
-              label: '组件交互文档'
-            }]
-          }
-        ],
-        tableData:[
-          {name:'测试',legalPerson:'AAAA'}
-        ],
+        formdata:{
+          customerClass:'分供',
+          pageNum:1,
+          pageSize:50,
+          times:[],
+          customerName:"",
+          areas:[],
+          customerState:[],
+          credential:[],
+          groupSpecialtys:[],
+          groupSpecialtyId:[],
+          creditLevel:[],
+          paytaxType:[],
+          taxRate:[],
+          registerProvince:[],
+          registerCity:[],
+          approveDate2Start:null,
+          approveDate2End:null,
+        },
+        tableData:[],
         isSkeleton:false,
-        total:100,
-        pageSize:50,
-        pageNum:1,
+        total:0,
         // table列是否悬浮
         tableColumnFixed: true,
         fbsvisib:false,
@@ -493,13 +314,10 @@
     },
     created() {
       this.init()
+      this.cusoomerInfolist()
     },
     methods:{
       init(){
-        //地区
-        getDicts('arealist').then(res=>{
-          this.arealist = res.data
-        })
         //评价等级
         getDicts('credit_level').then(res=>{
           this.creditlevel = res.data
@@ -520,24 +338,81 @@
         getDicts('credential').then(res=>{
           this.credential = res.data
         })
-        this.dataRegion()
+        // this.dataRegion()
+        //专业类别
+        bizDictData().then(res=>{
+          this.groupSpecialty = res.data
+        })
+        // 地区树
+        areaAll().then(res=>{
+          this.addressList = res.data
+        })
       },
-      //地区
-      async dataRegion() {
-        let addrs = JSON.parse(JSON.stringify(dataRegion))
-        addrs.forEach(item=>{
-          if (item.children) {
-            (item.children).forEach(i => {
-              if (i.children) {
-                delete i.children
+      clears(){
+        this.formdata = {
+          customerClass: '分供',
+          pageNum: 1,
+          pageSize: 50,
+          times: [],
+          customerName: '',
+          areas: [],
+          customerState: [],
+          credential: [],
+          groupSpecialtys: [],
+          groupSpecialtyId: [],
+          creditLevel: [],
+          paytaxType: [],
+          taxRate: [],
+          registerProvince: [],
+          registerCity: [],
+          approveDate2Start: null,
+          approveDate2End: null
+        }
+        this.cusoomerInfolist()
+      },
+      cusoomerInfolist(){
+        this.isSkeleton = true
+        let param = this.formdata
+        if(param.times){
+          param.approveDate2Start = param.times[0]
+          param.approveDate2End = param.times[1]
+        }else{
+          param.approveDate2Start = ''
+          param.approveDate2End = ''
+        }
+        param.groupSpecialtyId = []
+        if(param.groupSpecialtys){
+          param.groupSpecialtys.forEach(item=>{
+            param.groupSpecialtyId.push(item[item.length-1])
+          })
+        }
+        if(param.areas){
+          let province = []
+          let city = []
+          param.areas.forEach(item=>{
+            if(item.length == 3){//到市
+              if(item[1].indexOf('重庆')>-1||item[1].indexOf('北京')>-1||item[1].indexOf('天津')>-1||item[1].indexOf('上海')>-1){
+                province.push(item[1])
+              }else{
+                city.push(item[2])
               }
-            })
-          }
+            }
+          })
+          param.registerProvince = province
+          param.registerCity = city
+        }else{
+          param.registerProvince = []
+          param.registerCity = []
+        }
+        custmerInfolist(queryConditionFiltering(this.formdata)).then(res=>{
+          this.isSkeleton = false
+          this.tableData = res.rows
+          this.total = res.total
         })
-        this.addressList = addrs;
       },
-      handleCurrentChange(){
-
+      handleCurrentChange(val){
+        this.formdata.pageNum = val
+        this.cusoomerInfolist()
       },
       setHeaderRow() {
         return "owner-table-list-header";
@@ -557,7 +432,7 @@
       },
       //点击准入
       goAccess(row){
-        this.$tab.openPage('测试一下-准入情况', '/supplier/supplierlist/access')
+        this.$tab.openPage(row.customerName+'-准入情况', '/supplier/supplierlist/access',{customerKey:row.customerKey})
       },
       //点击考评
       goAssessment(row){