From 42690c45fee931a0b41b76f30bb21ff1041f3622 Mon Sep 17 00:00:00 2001
From: zhangfh <jyyzzfh@126.com>
Date: Wed, 8 Sep 2021 17:48:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8E=E5=8D=97=E9=94=A6=E6=B0=B4-=E5=A4=A7?=
 =?UTF-8?q?=E5=B1=8F=E4=BC=81=E4=B8=9A=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84=EF=BC=88=E5=89=8D=E7=AB=AF=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom/screencompany-add-or-update.vue    | 41 ++++++++++++---
 src/views/modules/custom/screencompany.vue    | 52 ++++++++++++++++---
 2 files changed, 78 insertions(+), 15 deletions(-)

diff --git a/src/views/modules/custom/screencompany-add-or-update.vue b/src/views/modules/custom/screencompany-add-or-update.vue
index 39d4aa0..e9fb942 100644
--- a/src/views/modules/custom/screencompany-add-or-update.vue
+++ b/src/views/modules/custom/screencompany-add-or-update.vue
@@ -1,11 +1,11 @@
 <template>
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '130px'">
-          <el-form-item label="企业名称" prop="companyName">
-          <el-input v-model="dataForm.companyName" placeholder="企业名称"></el-input>
+          <el-form-item label="名称" prop="companyName">
+          <el-input v-model="dataForm.companyName" placeholder="名称"></el-input>
       </el-form-item>
-          <el-form-item label="企业简介" prop="companyIntroduction">
-          <el-input v-model="dataForm.companyIntroduction" placeholder="企业简介"></el-input>
+          <el-form-item label="简介" prop="companyIntroduction">
+          <el-input v-model="dataForm.companyIntroduction" placeholder="简介"></el-input>
       </el-form-item>
           <el-form-item label="联系人" prop="contactPerson">
           <el-input v-model="dataForm.contactPerson" placeholder="联系人"></el-input>
@@ -13,7 +13,7 @@
           <el-form-item label="联系电话" prop="mobile">
           <el-input v-model="dataForm.mobile" placeholder="联系电话"></el-input>
       </el-form-item>
-      <el-form-item label="企业照片">
+      <el-form-item label="照片">
         <el-upload list-type="picture-card"
                    :limit=6
                    :action="uploadUrl"
@@ -23,8 +23,17 @@
           <i slot="default" class="el-icon-plus"></i>
         </el-upload>
       </el-form-item>
-          <el-form-item label="企业地址" prop="companyAddress">
-          <el-input v-model="dataForm.companyAddress" placeholder="企业地址"></el-input>
+          <el-form-item label="地址" prop="companyAddress">
+          <el-input v-model="dataForm.companyAddress" placeholder="地址"></el-input>
+      </el-form-item>
+      <el-form-item label="类型" prop="houseType">
+        <el-select v-model="dataForm.houseType" placeholder="类型" style="width:460px">
+          <el-option v-for="item in houseTypeDictList"
+                     :key="item.dictValue"
+                     :label="item.dictName"
+                     :value="item.dictValue">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="纬度" prop="latitude">
         <el-input v-model="dataForm.latitude" placeholder="纬度"></el-input>
@@ -66,6 +75,7 @@ export default {
         companyIntroduction: '',
         contactPerson: '',
         mobile: '',
+        houseType: '',
         companyAddress: '',
         uniformSocialCreditCode: '',
         registeredCapital: '',
@@ -79,7 +89,9 @@ export default {
         updatedBy: '',
         updatedTime: '',
         images: []
-      }
+      },
+      houseTypeDictList: [],
+      loading: false
     }
   },
   computed: {
@@ -100,6 +112,9 @@ export default {
         companyAddress: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
+        houseType: [
+          {required: true, message: this.$t('validate.required'), trigger: 'blur'}
+        ],
         longitude: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
@@ -120,6 +135,16 @@ export default {
           this.getInfo()
         }
       })
+      this.getHouseTypeDicList()
+    },
+    //获取房屋类型数据
+    getHouseTypeDicList () {
+      this.$http.get(`/sys/dict/listSimple/houseType`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.houseTypeDictList = res.data
+      }).catch(() => { })
     },
     // 获取信息
     getInfo () {
diff --git a/src/views/modules/custom/screencompany.vue b/src/views/modules/custom/screencompany.vue
index cf95627..a154d31 100644
--- a/src/views/modules/custom/screencompany.vue
+++ b/src/views/modules/custom/screencompany.vue
@@ -3,7 +3,16 @@
     <div class="mod-news__screencompany}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
-          <el-input v-model="dataForm.companyName" placeholder="请输入企业名称" clearable></el-input>
+          <el-input v-model="dataForm.companyName" placeholder="请输入名称" clearable></el-input>
+        </el-form-item>
+        <el-form-item label="类型" prop="houseType">
+          <el-select v-model="dataForm.houseType" placeholder="类型" clearable>
+            <el-option v-for="item in houseTypeDictList"
+                       :key="item.dictValue"
+                       :label="item.dictName"
+                       :value="item.dictValue">
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
@@ -17,11 +26,12 @@
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="companyName" label="企业名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="companyIntroduction" label="企业简介" header-align="center" align="center" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="contactPerson" label="联系人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="companyName" label="名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="companyIntroduction" label="简介" header-align="center" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="contactPerson" label="联系人" header-align="center" align="center" width="70px"></el-table-column>
         <el-table-column prop="mobile" label="联系电话" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="companyAddress" label="企业地址" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="companyAddress" label="地址" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="houseType" label="类型" header-align="center" align="center" width="50px" :formatter="showHouseType"></el-table-column>
         <el-table-column prop="latitude" label="纬度" header-align="center" align="center"></el-table-column>
         <el-table-column prop="longitude" label="经度" header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
@@ -60,12 +70,40 @@ export default {
         deleteIsBatch: true
       },
       dataForm: {
-        companyName: ''
-      }
+        companyName: '',
+        houseType: ''
+      },
+      houseTypeDictList: [],
+      loading: false,
+      uploadUrl: ''
     }
   },
   components: {
     AddOrUpdate
+  },
+  created() {
+  this.getHouseTypeDicList()
+  },
+  methods :{
+    getHouseTypeDicList () {
+      this.$http.get(`/sys/dict/listSimple/houseType`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.houseTypeDictList = res.data
+      }).catch(() => { })
+    },
+    showHouseType(row,column){
+      if(row.houseType === 'company'){
+        return '企业'
+      }else if(row.houseType === 'shops'){
+        return '商铺'
+      }else if (row.houseType === 'villageLive'){
+        return '村居'
+      }else {
+        return ''
+      }
+    }
   }
 }
 </script>