启信宝查询功能优化

src/api/basicdata/checkCompany.js

@@ -1,19 +1,38 @@
 import request from '@/utils/request'
 
 // 查询库区列表
-export function advSearch(query) {
+export function advSearch(keyword) {
   return request({
     url: '/warehouse/information/advSearch',
     method: 'get',
-    params: query
+    params: {
+      keyword: keyword
+    }
   })
 }
 
-// 查询库区详细
-export function getBasicInfo(query) {
+export function getBasicInfo(keyword) {
   return request({
     url: '/warehouse/information/getBasicInfo',
     method: 'get',
+    params: {
+      keyword: keyword
+    }
+  })
+}
+
+
+export function companyList(query) {
+  return request({
+    url: '/warehouse/information/list',
+    method: 'get',
     params: query
   })
-}
+}
+
+export function getInfo(id) {
+  return request({
+    url: '/warehouse/information/' + id,
+    method: 'get'
+  })
+}

src/views/basicdata/checkCompany/AddOrUpdate.vue

@@ -15,40 +15,40 @@
           <el-button slot="append" icon="el-icon-search" type="primary">检索</el-button>
         </el-autocomplete> -->
         <el-autocomplete v-model="state" :fetch-suggestions="querySearchAsync" @select="handleSelect"
-          :trigger-on-focus="false" placeholder="请输入搜索内容">
-          <!-- 2.x版本自定义模板 -->
-          <template slot-scope="{ item }">
-            <div v-if="item.isLoading" class="loading-tip">
-              <i class="el-icon-loading"></i> 搜索中...
-            </div>
-            <div v-else-if="item.isEmpty" class="empty-tip">
-              <i class="el-icon-warning"></i> 无匹配结果
-            </div>
-            <div v-else class="result-item">
-              {{ item.value }}
-            </div>
-          </template>
+                         :trigger-on-focus="false" placeholder="请输入搜索内容"
+        >
+          <!--          <template slot-scope="{ item }">
+                      <div v-if="item.isLoading" class="loading-tip">
+                        <i class="el-icon-loading"></i> 搜索中...
+                      </div>
+                      <div v-else-if="item.isEmpty" class="empty-tip">
+                        <i class="el-icon-warning"></i> 无匹配结果
+                      </div>
+                      <div v-else class="result-item">
+                        {{ item.value }}
+                      </div>
+                    </template>-->
           <el-button slot="append" icon="el-icon-search" type="primary" @click="search">检索</el-button>
         </el-autocomplete>
       </div>
       <div style="width: 254px;">
       </div>
     </div>
-    <br />
+    <br/>
     <div>
       <el-card class="box-card">
         <div style="display: flex;">
           <div>
             <el-row>
-              <span style="font-size: 24px;">青岛途宝软件开发有限公司</span>
-            </el-row>
-            <el-row>
-              <span>
-                <el-tag size="small" v-for="tag in tags" :key="tag.name">
-                  {{ tag.name }}
-                </el-tag>
-              </span>
+              <span style="font-size: 24px;">{{ fromData.name ? fromData.name : '' }}</span>
             </el-row>
+            <!--            <el-row>
+                          <span>
+                            <el-tag size="small" v-for="tag in tags" :key="tag.name">
+                              {{ tag.name }}
+                            </el-tag>
+                          </span>
+                        </el-row>-->
           </div>
         </div>
         <div style="background-color: #f6faff;padding: 16px 0px;line-height: 22px;font-size: 14px;margin:10px 0;">
@@ -57,19 +57,19 @@
               <el-row style="margin:4px 0px;">
                 <div>
                   <span style="color: #666;">法定代表人：</span>
-                  <span style="color: #333;">刘梦</span>
+                  <span style="color: #333;">{{ fromData.operName ? fromData.operName : '' }}</span>
                 </div>
               </el-row>
               <el-row style="margin:4px 0px;">
                 <div>
                   <span style="color: #666;">注册资本：</span>
-                  <span style="color: #333;">300 万人民币</span>
+                  <span style="color: #333;">{{ fromData.registCapi ? fromData.registCapi : '' }}</span>
                 </div>
               </el-row>
               <el-row style="margin:4px 0px;">
                 <div>
                   <span style="color: #666;">成立日期：</span>
-                  <span style="color: #333;">2020-01-17</span>
+                  <span style="color: #333;">{{ fromData.startDate ? fromData.startDate : '' }}</span>
                 </div>
               </el-row>
             </el-col>
@@ -77,19 +77,19 @@
               <el-row style="margin:4px 0px;">
                 <div>
                   <span style="color: #666;">统一社会信用代码：</span>
-                  <span style="color: #333;">91370213MA3RE74912</span>
+                  <span style="color: #333;">{{ fromData.creditNo ? fromData.creditNo : '' }}</span>
                 </div>
               </el-row>
               <el-row style="margin:4px 0px;">
                 <div>
                   <span style="color: #666;">邮箱：</span>
-                  <span style="color: #333;">15065420766@163.com</span>
+                  <span style="color: #333;">{{ fromData.contact ? fromData.contact.email : '' }}</span>
                 </div>
               </el-row>
               <el-row style="margin:4px 0px;">
                 <div>
                   <span style="color: #666;">电话：</span>
-                  <span style="color: #333;">150********</span>
+                  <span style="color: #333;">{{ fromData.contact ? fromData.contact.telephone : '' }}</span>
                 </div>
               </el-row>
             </el-col>
@@ -97,19 +97,19 @@
               <el-row style="margin:4px 0px;">
                 <div>
                   <span style="color: #666;">所属行业：</span>
-                  <span style="color: #333;">其他未列明零售业（F5299）</span>
+                  <span style="color: #333;">{{ fromData.domains }}</span>
                 </div>
               </el-row>
               <el-row style="margin:4px 0px;">
                 <div>
                   <span style="color: #666;">企业规模：</span>
-                  <span style="color: #333;">小微</span>
+                  <span style="color: #333;">{{ fromData.scale }}</span>
                 </div>
               </el-row>
               <el-row style="margin:4px 0px;">
                 <div>
                   <span style="color: #666;">企业员工：</span>
-                  <span style="color: #333;">7人</span>
+                  <span style="color: #333;">{{ fromData.colleguesNum }}</span>
                 </div>
               </el-row>
             </el-col>
@@ -117,8 +117,9 @@
           <el-row style="padding: 16px 16px 0 16px;">
             <div>
               <span style="color: #666;">简介：</span>
-              <span style="color: #333;">青岛途宝软件开发有限公司成立于2020-01-17，法定代表人为刘梦，注册资本为300
-                万人民币，统一社会信用代码为91370213MA3RE74912，当前处于存续状态。企业注册地址位于山东省青岛市崂山区海尔路182-6号财富大厦1703，所属行业为其他未列明零售业，经营范围包括：软件开发；系统集成；技术研发、技术咨询、技术推广、技术转让、技术服务；批发：计算机设备及配件、电子产品、数码产品。（依法须经批准的项目，经相关部门批准后方可开展经营活动）</span>
+              <span style="color: #333;">
+                {{ fromData.introduction }}
+              </span>
             </div>
           </el-row>
         </div>
@@ -127,136 +128,128 @@
           <table border="1">
             <tr>
               <td style="background-color: #f6faff;width: 150px;">统一社会信用代码</td>
-              <td>91370213MA3RE74912</td>
+              <td>{{ fromData.creditNo }}</td>
               <td style="background-color: #f6faff;width: 150px;">企业名称</td>
-              <td colspan="4">青岛途宝软件开发有限公司</td>
+              <td colspan="4">{{ fromData.name }}</td>
             </tr>
             <tr>
               <td style="background-color: #f6faff;width: 150px;" rowspan="2">法定代表人</td>
-              <td style="width:20%;" rowspan="2">刘梦</td>
+              <td style="width:20%;" rowspan="2">{{ fromData.operName }}</td>
               <td style="background-color: #f6faff;width: 150px;">经营状态</td>
-              <td style="width:20%;">存续</td>
+              <td style="width:20%;">{{ fromData.newStatus }}</td>
               <td style="background-color: #f6faff;width: 150px;">成立日期</td>
-              <td style="width:20%;">2020-01-17</td>
+              <td style="width:20%;">{{ fromData.startDate }}</td>
             </tr>
             <tr>
               <td style="background-color: #f6faff;width: 150px;">注册资本</td>
-              <td>300 万人民币</td>
+              <td>{{ fromData.registCapi }}</td>
               <td style="background-color: #f6faff;width: 150px;">实缴资本</td>
-              <td>-</td>
+              <td>{{ fromData.actualCapi }}</td>
             </tr>
             <tr>
               <td style="background-color: #f6faff;width: 150px;">组织机构代码</td>
-              <td>MA3RE7491</td>
+              <td>{{ fromData.orgNo }}</td>
               <td style="background-color: #f6faff;width: 150px;">工商注册号</td>
-              <td>370213230529508</td>
-              <td style="background-color: #f6faff;width: 150px;">实缴资本</td>
-              <td>-</td>
-            </tr>
-            <tr>
-              <td style="background-color: #f6faff;width: 150px;">进出口企业代码</td>
-              <td>-</td>
-              <td style="background-color: #f6faff;width: 150px;">海关注册编码</td>
-              <td>-</td>
-              <td style="background-color: #f6faff;width: 150px;">实缴资本</td>
-              <td>-</td>
-            </tr>
-            <tr>
-              <td style="background-color: #f6faff;width: 150px;">所属行业</td>
-              <td>批发和零售业 > 零售业 > 货摊、无店铺及其他零售业 > 其他未列明零售业（F5299）</td>
-              <td style="background-color: #f6faff;width: 150px;">所属地区</td>
-              <td>山东省青岛市崂山区</td>
+              <td>{{ fromData.regNo }}</td>
               <td style="background-color: #f6faff;width: 150px;">登记机关</td>
-              <td>青岛市崂山区市场监督管理局</td>
+              <td>{{ fromData.belongOrg }}</td>
+              <!--              <td style="background-color: #f6faff;width: 150px;">实缴资本</td>
+                            <td>{{fromData.actualCapi}}</td>-->
             </tr>
+            <!--            <tr>
+                          <td style="background-color: #f6faff;width: 150px;">进出口企业代码</td>
+                          <td>-</td>
+                          <td style="background-color: #f6faff;width: 150px;">海关注册编码</td>
+                          <td>-</td>
+                          <td style="background-color: #f6faff;width: 150px;">实缴资本</td>
+                          <td>-</td>
+                        </tr>-->
+            <!--            <tr>
+                          <td style="background-color: #f6faff;width: 150px;">所属行业</td>
+                          <td>{{fromData.domains}}</td>
+                          <td style="background-color: #f6faff;width: 150px;">所属地区</td>
+                          <td>{{fromData.districtCode}}</td>
+
+                        </tr>-->
             <tr>
               <td style="background-color: #f6faff;width: 150px;">企业规模</td>
-              <td>小微</td>
+              <td>{{ fromData.scale }}</td>
               <td style="background-color: #f6faff;width: 150px;">员工数量</td>
-              <td>7人</td>
+              <td>{{ fromData.colleguesNum }}</td>
               <td style="background-color: #f6faff;width: 150px;">社保人数</td>
-              <td>7</td>
+              <td>{{ fromData.colleguesNum }}</td>
             </tr>
             <tr>
               <td style="background-color: #f6faff;width: 150px;">营业期限</td>
-              <td>2020-01-17 至 无固定期限</td>
+              <td>{{ fromData.startDate }} 至 {{ fromData.termEnd }}</td>
               <td style="background-color: #f6faff;width: 150px;">企业类型</td>
-              <td colspan="3">有限责任公司（自然人投资或控股）</td>
+              <td colspan="3">{{ fromData.econKind }}</td>
             </tr>
             <tr>
               <td style="background-color: #f6faff;width: 150px;">核准日期</td>
-              <td>2021-08-26</td>
-              <td style="background-color: #f6faff;width: 150px;">英文名</td>
-              <td colspan="3">-</td>
+              <td>{{ fromData.checkDate }}</td>
+              <!--              <td style="background-color: #f6faff;width: 150px;">英文名</td>
+                            <td colspan="3">-</td>-->
             </tr>
             <tr>
               <td style="background-color: #f6faff;width: 150px;">注册地址</td>
-              <td colspan="5">批发和零售业 > 零售业 > 货摊、无店铺及其他零售业 > 其他未列明零售业（F5299）</td>
+              <td colspan="5">{{ fromData.address }}</td>
             </tr>
             <tr>
               <td style="background-color: #f6faff;width: 150px;">经营范围</td>
-              <td colspan="5">软件开发；系统集成；技术研发、技术咨询、技术推广、技术转让、技术服务；批发：计算机设备及配件、电子产品、数码产品。（依法须经批准的项目，经相关部门批准后方可开展经营活动）</td>
+              <td colspan="5">{{ fromData.scope }}</td>
             </tr>
           </table>
           <div style="margin: 10px 0;color: #666;">
             <span style="margin-right: 10px;">
-              更新时间：2024-12-31
-            </span>
-            <span>
-              来源：国家信用信息公示系统
+              创建时间：{{ fromData.createTime }}
             </span>
+            <!--            <span>
+                          来源：启信宝
+                        </span>-->
           </div>
         </div>
         <div>
           <div style="font-size: 18px;font-weight: 600;padding:10px 10px 6px 0;">股东信息</div>
-          <el-table :data="tableData" border style="width: 100%;"
-            :header-cell-style="{ background: '#f6faff', color: '#333', 'font-family': 'Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif', 'font-weight': '400', 'font-size': '15px' }"
-            :cell-style="{ color: '#333', 'font-family': 'Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif', 'font-weight': '400' }">
-            <el-table-column type="index" width="60" label="序号" align="center"></el-table-column>
-            <el-table-column prop="name1" label="股东名称" header-align="center">
-            </el-table-column>
-            <el-table-column prop="name2" label="认缴出资额" header-align="center">
-            </el-table-column>
-            <el-table-column prop="name3" label="直接持股比例" header-align="center">
-            </el-table-column>
-            <el-table-column prop="name4" label="认缴出资日期" header-align="center">
-            </el-table-column>
-            <el-table-column prop="name5" label="实缴出资额" header-align="center">
-            </el-table-column>
-            <el-table-column prop="name6" label="综合持股比例" header-align="center">
+          <el-table :data="fromData.partners" border style="width: 100%;"
+                    :header-cell-style="{ background: '#f6faff', color: '#333', 'font-family': 'Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif', 'font-weight': '400', 'font-size': '15px' }"
+                    :cell-style="{ color: '#333', 'font-family': 'Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif', 'font-weight': '400' }"
+          >
+            <el-table-column type="index" width="60" label="序号" align="center"/>
+            <el-table-column prop="name" label="股东名称" header-align="center"/>
+            <el-table-column prop="stock_type" label="股东类型" header-align="center"/>
+            <el-table-column prop="total_should_capi" label="认缴出资额" header-align="center"/>
+            <el-table-column prop="stock_percent" label="直接持股比例" header-align="center">
+              <template slot-scope="scope">
+                {{ Number(scope.row.stock_percent) * 100 }}%
+              </template>
             </el-table-column>
+            <el-table-column prop="total_real_capi" label="实缴出资额" header-align="center"/>
           </el-table>
         </div>
         <div>
           <div style="font-size: 18px;font-weight: 600;padding:10px 10px 6px 0;">主要人员</div>
-          <el-table :data="tableData" border style="width: 100%;"
-            :header-cell-style="{ background: '#f6faff', color: '#333', 'font-family': 'Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif', 'font-weight': '400', 'font-size': '15px' }"
-            :cell-style="{ color: '#333', 'font-family': 'Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif', 'font-weight': '400' }">
-            <el-table-column type="index" width="60" label="序号" align="center"></el-table-column>
-            <el-table-column prop="name1" label="姓名" header-align="center">
-            </el-table-column>
-            <el-table-column prop="name2" label="职务" header-align="center">
-            </el-table-column>
-            <el-table-column prop="name3" label="直接持股比例" header-align="center">
-            </el-table-column>
-            <el-table-column prop="name4" label="综合持股比例" header-align="center">
-            </el-table-column>
+          <el-table :data="fromData.employees" border style="width: 100%;"
+                    :header-cell-style="{ background: '#f6faff', color: '#333', 'font-family': 'Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif', 'font-weight': '400', 'font-size': '15px' }"
+                    :cell-style="{ color: '#333', 'font-family': 'Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif', 'font-weight': '400' }"
+          >
+            <el-table-column type="index" width="60" label="序号" align="center"/>
+            <el-table-column prop="name" label="姓名" header-align="center"/>
+            <el-table-column prop="job_title" label="职务" header-align="center"/>
           </el-table>
         </div>
         <div>
           <div style="font-size: 18px;font-weight: 600;padding:10px 10px 6px 0;">变更记录</div>
-          <el-table :data="tableData" border style="width: 100%;"
-            :header-cell-style="{ background: '#f6faff', color: '#333', 'font-family': 'Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif', 'font-weight': '400', 'font-size': '15px' }"
-            :cell-style="{ color: '#333', 'font-family': 'Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif', 'font-weight': '400' }">
-            <el-table-column type="index" width="60" label="序号" align="center"></el-table-column>
-            <el-table-column prop="name1" label="变更日期" header-align="center">
-            </el-table-column>
-            <el-table-column prop="name2" label="变更事项" header-align="center">
-            </el-table-column>
-            <el-table-column prop="name3" label="变更前" header-align="center">
-            </el-table-column>
-            <el-table-column prop="name4" label="变更后" header-align="center">
-            </el-table-column>
+          <el-table :data="fromData.changerecords" border style="width: 100%;"
+                    :header-cell-style="{ background: '#f6faff', color: '#333', 'font-family': 'Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif', 'font-weight': '400', 'font-size': '15px' }"
+                    :cell-style="{ color: '#333', 'font-family': 'Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif', 'font-weight': '400' }"
+          >
+            <el-table-column type="index" width="60" label="序号" align="center"/>
+            <el-table-column prop="change_item" label="变更项目" header-align="center"/>
+            <el-table-column prop="change_date" label="变更日期" header-align="center"/>
+            <el-table-column prop="before_content" label="变更前" header-align="center"/>
+            <el-table-column prop="after_content" label="变更后" header-align="center"/>
+            <el-table-column prop="tag" label="历史信息标签" header-align="center"/>
           </el-table>
         </div>
       </el-card>
@@ -265,8 +258,8 @@
 </template>
 
 <script>
-import { advSearch, getBasicInfo } from '@/api/basicdata/checkCompany'
-import { debounce } from 'lodash';
+import { advSearch, getBasicInfo, getInfo } from '@/api/basicdata/checkCompany'
+
 export default {
   name: 'inStock',
   props: {
@@ -275,121 +268,71 @@ export default {
       required: null
     }
   },
+
   data() {
     return {
-      tags: [
-        { name: '标签一' },
-        { name: '标签二' },
-        { name: '标签三' },
-        { name: '标签四' },
-        { name: '标签五' }
-      ],
-      src: 'https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg',
-      restaurants: [],
-      //检索名称
       state: '',
       loading: false,
       timeout: null,
-      tableData: [{
-        name1: '名字'
-      }]
+      fromData: {}
     }
   },
-  async created() {
-    this.querySearchAsync = debounce((queryString, cb) => {
-      this.handleSearch(queryString).then(data => cb(data));
-    }, 500);
-  },
-  mounted() {
-  },
 
   methods: {
-    goBack() {
-      this.$emit('changeShow', 'true')
+    querySearchAsync(queryString, cb) {
+      if (!queryString) {
+        return
+      }
+      this.loading = true
+      advSearch(this.state).then(data => {
+        this.loading = false
+        var companyData = data.length > 0 ? data.map(d => ({ value: d.name, ...d })) : [{ isEmpty: true }]
+        cb(companyData)
+      }).catch(err => {
+        this.loading = false
+      })
+      // this.handleSearch(queryString).then(data => cb(data))
     },
-    search(){
-      console.log(this.state)
+
+    getBasicInfo() {
+      getInfo(this.chiId).then(res => {
+        this.convertData(res.data)
+      })
     },
-    // async querySearchAsync(queryString, cb) {
-    //   console.log(queryString, cb, 'querySearchAsync')
-    //   _.debounce(batchLog, 250, { 'maxWait': 1000 });
-    //   if (queryString) {
-    //     var results = await this.loadAll()
-    //     cb(results)
-    //   } else {
-    //     cb([])
-    //   }
-    // },
-    async handleSearch(query) {
-      if (query) {
-        this.loading = true;
-        const res = await this.loadAll()
-        this.loading = false;
-        return res.length > 0
-          ? res.map(d => ({ value: d.name, ...d }))
-          : [{ isEmpty: true }];
+
+    convertData(data) {
+      this.fromData = data
+      this.fromData.contact = this.fromData.contact ? JSON.parse(this.fromData.contact) : {}
+      this.fromData.domains = this.fromData.domains ? JSON.parse(this.fromData.domains).join(';') : ''
+      this.fromData.partners = this.fromData.partners ? JSON.parse(this.fromData.partners) : []
+      this.fromData.changerecords = this.fromData.changerecords ? JSON.parse(this.fromData.changerecords) : []
+      this.fromData.employees = this.fromData.employees ? JSON.parse(this.fromData.employees) : []
+      if (!data) {
+        return
+      }
+      if (this.fromData.colleguesNum === '-') {
+        this.fromData.scale = '微型'
       } else {
-        return [{ isEmpty: true }];
+        let workersNum = Number(this.fromData.colleguesNum)
+        this.fromData.scale = workersNum < 50 ? '微型' : workersNum < 200 ? '小型' : workersNum < 500 ? '中型' : '大型'
       }
+      this.fromData.introduction = this.fromData.name + '成立于' + this.fromData.startDate + '，法定代表人为' + this.fromData.operName + '，注册资本为' + this.fromData.registCapi
+        + '，统一社会信用代码为' + this.fromData.creditNo + '，当前处于' + this.fromData.newStatus + '状态。企业注册地址位于' + this.fromData.address + '，所属行业为' + this.fromData.domains
+        + '，经营范围包括：' + this.fromData.scope
+    },
 
+    goBack() {
+      this.$emit('changeShow', 'true')
     },
-    loadAll() {
-      return [
-        { "value": "三全鲜食（北新泾店）", "address": "长宁区新渔路144号" },
-        { "value": "Hot honey 首尔炸鸡（仙霞路）", "address": "上海市长宁区淞虹路661号" },
-        { "value": "新旺角茶餐厅", "address": "上海市普陀区真北路988号创邑金沙谷6号楼113" },
-        { "value": "泷千家(天山西路店)", "address": "天山西路438号" },
-        { "value": "胖仙女纸杯蛋糕（上海凌空店）", "address": "上海市长宁区金钟路968号1幢18号楼一层商铺18-101" },
-        { "value": "贡茶", "address": "上海市长宁区金钟路633号" },
-        { "value": "豪大大香鸡排超级奶爸", "address": "上海市嘉定区曹安公路曹安路1685号" },
-        { "value": "茶芝兰（奶茶，手抓饼）", "address": "上海市普陀区同普路1435号" },
-        { "value": "十二泷町", "address": "上海市北翟路1444弄81号B幢-107" },
-        { "value": "星移浓缩咖啡", "address": "上海市嘉定区新郁路817号" },
-        { "value": "阿姨奶茶/豪大大", "address": "嘉定区曹安路1611号" },
-        { "value": "新麦甜四季甜品炸鸡", "address": "嘉定区曹安公路2383弄55号" },
-        { "value": "Monica摩托主题咖啡店", "address": "嘉定区江桥镇曹安公路2409号1F，2383弄62号1F" },
-        { "value": "浮生若茶（凌空soho店）", "address": "上海长宁区金钟路968号9号楼地下一层" },
-        { "value": "NONO JUICE  鲜榨果汁", "address": "上海市长宁区天山西路119号" },
-        { "value": "CoCo都可(北新泾店）", "address": "上海市长宁区仙霞西路" },
-        { "value": "快乐柠檬（神州智慧店）", "address": "上海市长宁区天山西路567号1层R117号店铺" },
-        { "value": "Merci Paul cafe", "address": "上海市普陀区光复西路丹巴路28弄6号楼819" },
-        { "value": "猫山王（西郊百联店）", "address": "上海市长宁区仙霞西路88号第一层G05-F01-1-306" },
-        { "value": "枪会山", "address": "上海市普陀区棕榈路" },
-        { "value": "纵食", "address": "元丰天山花园(东门) 双流路267号" },
-        { "value": "钱记", "address": "上海市长宁区天山西路" },
-        { "value": "壹杯加", "address": "上海市长宁区通协路" },
-        { "value": "唦哇嘀咖", "address": "上海市长宁区新泾镇金钟路999号2幢（B幢）第01层第1-02A单元" },
-        { "value": "爱茜茜里(西郊百联)", "address": "长宁区仙霞西路88号1305室" },
-        { "value": "爱茜茜里(近铁广场)", "address": "上海市普陀区真北路818号近铁城市广场北区地下二楼N-B2-O2-C商铺" },
-        { "value": "鲜果榨汁（金沙江路和美广店）", "address": "普陀区金沙江路2239号金沙和美广场B1-10-6" },
-        { "value": "开心丽果（缤谷店）", "address": "上海市长宁区威宁路天山路341号" },
-        { "value": "超级鸡车（丰庄路店）", "address": "上海市嘉定区丰庄路240号" },
-        { "value": "妙生活果园（北新泾店）", "address": "长宁区新渔路144号" },
-        { "value": "香宜度麻辣香锅", "address": "长宁区淞虹路148号" },
-        { "value": "凡仔汉堡（老真北路店）", "address": "上海市普陀区老真北路160号" },
-        { "value": "港式小铺", "address": "上海市长宁区金钟路968号15楼15-105室" },
-        { "value": "蜀香源麻辣香锅（剑河路店）", "address": "剑河路443-1" },
-        { "value": "北京饺子馆", "address": "长宁区北新泾街道天山西路490-1号" },
-        { "value": "饭典*新简餐（凌空SOHO店）", "address": "上海市长宁区金钟路968号9号楼地下一层9-83室" },
-        { "value": "焦耳·川式快餐（金钟路店）", "address": "上海市金钟路633号地下一层甲部" },
-        { "value": "动力鸡车", "address": "长宁区仙霞西路299弄3号101B" },
-        { "value": "浏阳蒸菜", "address": "天山西路430号" },
-        { "value": "四海游龙（天山西路店）", "address": "上海市长宁区天山西路" },
-        { "value": "樱花食堂（凌空店）", "address": "上海市长宁区金钟路968号15楼15-105室" },
-        { "value": "壹分米客家传统调制米粉(天山店)", "address": "天山西路428号" },
-        { "value": "福荣祥烧腊（平溪路店）", "address": "上海市长宁区协和路福泉路255弄57-73号" },
-        { "value": "速记黄焖鸡米饭", "address": "上海市长宁区北新泾街道金钟路180号1层01号摊位" },
-        { "value": "红辣椒麻辣烫", "address": "上海市长宁区天山西路492号" },
-        { "value": "(小杨生煎)西郊百联餐厅", "address": "长宁区仙霞西路88号百联2楼" },
-        { "value": "阳阳麻辣烫", "address": "天山西路389号" },
-        { "value": "南拳妈妈龙虾盖浇饭", "address": "普陀区金沙江路1699号鑫乐惠美食广场A13" }
-      ];
+    search() {
+      getBasicInfo(this.state).then(res => {
+        this.convertData(res.data)
+      })
+      console.log(this.state)
     },
     handleSelect(item) {
-      item.value
-      console.log(item, 'handleSelect');
+      console.log(item, 'handleSelect')
     }
-
   }
 }
 </script>

src/views/basicdata/checkCompany/index.vue

@@ -6,7 +6,8 @@
           <el-col :span="6">
             <el-form-item label="企业名称" prop="fMblno">
               <el-input v-model="queryParams.fMblno" placeholder="请输入企业名称" clearable style="width: 200px"
-                @keyup.enter.native="handleQuery" />
+                        @keyup.enter.native="handleQuery"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -14,7 +15,8 @@
       <el-row :gutter="10" class="mb8">
         <el-col :span="1.5">
           <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
-            v-hasPermi="['warehouseBusiness:inStock:add']">新增
+                     v-hasPermi="['warehouseBusiness:inStock:add']"
+          >新增
           </el-button>
         </el-col>
         <div class="tabSetting">
@@ -29,7 +31,9 @@
         </div>
       </el-row>
 
-      <el-dialog title="自定义列显示" :visible.sync="showSetting" width="700px" v-dialogDrag :close-on-click-modal="false">
+      <el-dialog title="自定义列显示" :visible.sync="showSetting" width="700px" v-dialogDrag
+                 :close-on-click-modal="false"
+      >
         <template slot="title">
           <div class="avue-crud__dialog__header">
             <span class="el-dialog__title">
@@ -40,7 +44,8 @@
                   margin-right: 5px;
                   float: left;
                   margin-top: 2px;
-                "></span>
+                "
+              ></span>
             </span>
           </div>
         </template>
@@ -50,12 +55,14 @@
         </div>
         <div style="padding: 4px; display: flex; justify-content: center">
           <draggable v-model="setRowList" group="site" animation="300" @start="onStart" @end="onEnd"
-            handle=".indraggable">
+                     handle=".indraggable"
+          >
             <transition-group>
               <div v-for="item in setRowList" :key="item.surface" class="listStyle">
                 <div style="width: 500px" class="indraggable">
                   <div class="progress" :style="{ width: item.width + 'px' }">
-                    <el-checkbox :label="item.name" v-model="item.checked" :true-label="0" :false-label="1">{{ item.name
+                    <el-checkbox :label="item.name" v-model="item.checked" :true-label="0" :false-label="1">{{
+                        item.name
                       }}
                     </el-checkbox>
                   </div>
@@ -72,72 +79,72 @@
           <el-button type="primary" @click="save()">确 定</el-button>
         </span>
       </el-dialog>
-      <el-table ref="table" style="width: 100%;" v-loading="loading" :data="warehousebillsList" :height="tableHeight" border>
+      <el-table ref="table" style="width: 100%;" v-loading="loading" :data="companyList" :height="tableHeight" border>
         <el-table-column v-for="(item, index) in getRowList" :key="index" :label="item.name" :width="item.width"
-          :prop="item.label" align="center" :fixed="item.fixed" :show-overflow-tooltip="true" sortable >
+                         :prop="item.label" align="center" :fixed="item.fixed" :show-overflow-tooltip="true" sortable
+        >
           <template slot-scope="scope">
             <span>{{ scope.row[item.label] }}</span>
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="20" fixed="right">
           <template slot-scope="scope">
-            <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row, true)"
-              v-hasPermi="['warehouseBusiness:inStock:edit']">查看
+            <el-button size="mini" type="text" @click="handleUpdate(scope.row, true)" v-hasPermi="['warehouseBusiness:inStock:edit']">查看
             </el-button>
           </template>
         </el-table-column>
       </el-table>
       <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-        @pagination="getList" />
+                  @pagination="getList"
+      />
     </div>
     <add-or-update v-show="pageShow2" @changeShow="showAddOrUpdate" ref="addOrUpdateRef" :chiId="formId"
-      :key="timer"></add-or-update>
+                   :key="timer"
+    ></add-or-update>
   </div>
 </template>
 
 <script>
-import AddOrUpdate from "./AddOrUpdate.vue";
-import {
-  listWarehousebills
-} from "@/api/warehouseBusiness/warehouseInStock";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import Cookies from "js-cookie";
-import { addSet, select, resetModule } from "@/api/system/set";
-import draggable from "vuedraggable";
+import AddOrUpdate from './AddOrUpdate.vue'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import Cookies from 'js-cookie'
+import { addSet, select, resetModule } from '@/api/system/set'
+import draggable from 'vuedraggable'
+import { companyList } from '@/api/basicdata/checkCompany'
 
 export default {
-  name: "plans",
+  name: 'plans',
   data() {
     return {
       tableHeight: '600',
-      timer: "",
+      timer: '',
       pageShow: true,
       pageShow2: false,
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 10
       },
       // 显示搜索条件
       showSearch: true,
       drag: false,
       tableDate: [
         {
-          surface: "1",
-          label: "fMblno",
-          name: "企业名称",
-          checked: 0,
+          surface: '1',
+          label: 'name',
+          name: '企业名称',
+          checked: 0
         },
         {
-          surface: "2",
-          label: "created",
-          name: "使用人",
-          checked: 0,
+          surface: '2',
+          label: 'operName',
+          name: '企业法定代表人',
+          checked: 0
         },
         {
-          surface: "3",
-          label: "date",
-          name: "使用日期",
-          checked: 0,
+          surface: '3',
+          label: 'startDate',
+          name: '成立日期',
+          checked: 0
         }
       ],
       setRowList: [],
@@ -145,18 +152,18 @@ export default {
       allCheck: false,
       showSetting: false,
       total: 0,
-      warehousebillsList: [],
+      companyList: [],
       loading: true,
-      formId: null,
-    };
+      formId: null
+    }
   },
   // 使用子组件
   components: { draggable, AddOrUpdate },
   created() {
-    this.setRowList = this.tableDate;
-    this.getRowList = this.tableDate;
-    this.getRow();
-    this.getList();
+    this.setRowList = this.tableDate
+    this.getRowList = this.tableDate
+    // this.getRow();
+    this.getList()
   },
   mounted() {
     this.$nextTick(() => {
@@ -170,25 +177,25 @@ export default {
     allChecked() {
       if (this.allCheck == true) {
         this.setRowList.map((e) => {
-          return (e.checked = 0);
-        });
+          return (e.checked = 0)
+        })
       } else {
         this.setRowList.map((e) => {
-          return (e.checked = 1);
-        });
+          return (e.checked = 1)
+        })
       }
     },
     //查询列数据
     getRow() {
-      let that = this;
+      let that = this
       this.data = {
-        tableName: "入库",
-        userId: Cookies.get("userName"),
-      };
+        tableName: '入库',
+        userId: Cookies.get('userName')
+      }
       select(this.data).then((res) => {
         if (res.data.length != 0) {
-          this.getRowList = res.data.filter((e) => e.checked == 0);
-          this.setRowList = res.data;
+          this.getRowList = res.data.filter((e) => e.checked == 0)
+          this.setRowList = res.data
           this.setRowList = this.setRowList.reduce((res, item) => {
             res.push({
               surface: item.surface,
@@ -196,100 +203,100 @@ export default {
               name: item.name,
               checked: item.checked,
               width: item.width,
-              fixed: item.fixed,
-            });
-            return res;
-          }, []);
+              fixed: item.fixed
+            })
+            return res
+          }, [])
         }
-      });
+      })
     },
     //重置列表
     delRow() {
       this.data = {
-        tableName: "入库",
-        userId: Cookies.get("userName"),
-      };
+        tableName: '入库',
+        userId: Cookies.get('userName')
+      }
       resetModule(this.data).then((res) => {
         if (res.code == 200) {
-          this.showSetting = false;
-          this.setRowList = this.$options.data().tableDate;
-          this.getRowList = this.$options.data().tableDate;
+          this.showSetting = false
+          this.setRowList = this.$options.data().tableDate
+          this.getRowList = this.$options.data().tableDate
         }
-      });
+      })
     },
     //保存列设置
     save() {
-      this.showSetting = false;
+      this.showSetting = false
       this.data = {
-        tableName: "入库",
-        userId: Cookies.get("userName"),
-        sysTableSetList: this.setRowList,
-      };
+        tableName: '入库',
+        userId: Cookies.get('userName'),
+        sysTableSetList: this.setRowList
+      }
       addSet(this.data).then((res) => {
         if (res.code == 200) {
-          this.showSetting = false;
-          this.getRowList = this.setRowList.filter((e) => e.checked == 0);
+          this.showSetting = false
+          this.getRowList = this.setRowList.filter((e) => e.checked == 0)
         }
-      });
+      })
     },
     //开始拖拽事件
     onStart() {
-      this.drag = true;
+      this.drag = true
     },
     //拖拽结束事件
     onEnd() {
-      this.drag = false;
+      this.drag = false
     },
     getList() {
-      //获取仓库
-      listWarehousebills(this.queryParams).then((response) => {
-        this.warehousebillsList = response.rows;
-        this.total = response.total;
-        this.loading = false;
+      companyList(this.queryParams).then(res => {
+        this.companyList = res.rows
+        this.total = res.total
+        this.loading = false
         // 根据浏览器高度设置初始高度
         setTimeout(() => {
           this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 70
         }, 300)
-      });
+      })
     },
     handleAdd() {
-      this.timer = new Date().getTime();
-      this.pageShow = false;
-      this.pageShow2 = true;
+      this.timer = new Date().getTime()
+      this.pageShow = false
+      this.pageShow2 = true
+      this.$refs.addOrUpdateRef.convertData({})
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.formId = row.fId;
+      this.formId = row.id
       this.$nextTick(() => {
-        this.$refs.addOrUpdateRef.init();
-      });
+        this.$refs.addOrUpdateRef.getBasicInfo()
+      })
       setTimeout(() => {
-        this.pageShow = false;
-        this.pageShow2 = true;
-      }, 200);
+        this.pageShow = false
+        this.pageShow2 = true
+      }, 200)
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
+      this.queryParams.pageNum = 1
+      this.getList()
     },
     /** 重置按钮操作 */
     resetQuery() {
       this.queryParams = {
         pageNum: 1,
-        pageSize: 10,
-      };
-      this.handleQuery();
+        pageSize: 10
+      }
+      this.handleQuery()
     },
     showAddOrUpdate(data) {
       if (data) {
-        this.getList();
-        this.pageShow = true;
-        this.pageShow2 = false;
+        this.getList()
+        this.pageShow = true
+        this.pageShow2 = false
       }
     }
-  },
-};
+  }
+}
 </script>
 
 <style scoped>