暂存

src/views/manage/company/companyList.vue

@@ -24,6 +24,18 @@
       <template slot="cityIdForm" slot-scope="{ disabled }">
         <jl-city-cascader :disabled="disabled" v-model="form.cityId"></jl-city-cascader>
       </template>
+      <template slot="companyAddressForm" slot-scope="{ disabled }">
+        <select-map
+          ref="selectMap"
+          @addAddress="addAddress"
+          @addressDel = "addressDel"
+          :isCanEdit="!disabled"
+          :lng="obj.lon"
+          :lat="obj.lat"
+          :address="form.companyAddress"
+          :type="type"
+        ></select-map>
+      </template>
       <template slot="authUrlIdImgForm">
         <el-image style="width: 100px; height: 100px" :src="form.authUrlId" :preview-src-list="[form.authUrlId]">
         </el-image>
@@ -90,6 +102,8 @@
         </el-select>
       </template> -->
 
+
+
       <!--保证金状态搜索栏trialOn-->
       <template slot="trialOnSearch">
         <el-select v-model="query.trialOn" placeholder="保证金" @change="selectTrailTyepChange">
@@ -124,7 +138,7 @@ import { check18IdCardNo } from "@/util/validate";
 import { moneyFormat } from "@/util/money";
 import companyRecord from "./companyRecord";
 import { companyStatus } from "@/const/company";
-
+import SelectMap from "@/components/map/selectLocation";
 const accept = [
   "image/png",
   "image/jpeg",
@@ -139,7 +153,7 @@ function getPath(path) {
 }
 
 export default {
-  components: { addAccount, companyConfig, companyCheck, companyRecord },
+  components: { addAccount, companyConfig, companyCheck, companyRecord, SelectMap },
   name: "manage_compan_companyList",
   data() {
     const validateTradeId = (rule, value, callback) => {
@@ -185,6 +199,7 @@ export default {
         currentPage: 1,
         total: 0,
       },
+      obj: {},
       option: {
         height: "auto",
         tip: false,
@@ -198,7 +213,7 @@ export default {
         addBtn: true,
         editBtn: true,
         addBtnText: "社区街道登记",
-        addTitle: "新增企业",
+        addTitle: "新增社区街道名称",
         delBtn: false,
         menuWidth: 300,
         labelWidth: 151,
@@ -478,7 +493,7 @@ export default {
               // },
               {
                 type: "input",
-                label: "企业名称",
+                label: "社区街道名称",
                 span: 20,
                 display: true,
                 size: "small",
@@ -487,7 +502,7 @@ export default {
                   {
                     required: true,
                     whitespace: true,
-                    message: "请输入企业名称",
+                    message: "请输入社区街道名称",
                   },
                 ],
               },
@@ -551,6 +566,7 @@ export default {
                 display: true,
                 size: "small",
                 prop: "companyAddress",
+                formslot: true,
                 rules: [
                   {
                     required: true,
@@ -808,6 +824,15 @@ export default {
     },
   },
   methods: {
+    /*地图*/
+    addAddress(form) {
+      this.obj.address = form.address + (form.title || "");
+      this.obj.lat = form.lat;
+      this.obj.lon = form.lng;
+    },
+    addressDel(){
+      this.obj.address = "";
+    },
     // uploadBefore(file, done, loading) {
     //   const isLt2M = file.size / 1024 / 1024 < 2;
     //   if (!isLt2M) {
@@ -841,7 +866,7 @@ export default {
       });
       if (!flags) {
         this.$message.closeAll(); //只显示一个提示
-        this.$message.error("该企业信息已经审核，不用重复操作");
+        this.$message.error("该社区街道名称已经审核，不用重复操作");
         return;
       }
       this.$refs.check.open(this.ids[0]);
@@ -894,7 +919,11 @@ export default {
       row.authUrlId = getPath(row.authUrlId);
       row.identityUrl4Id = getPath(row.identityUrl4Id);
       row.identityUrl5Id = getPath(row.identityUrl5Id);
-      update(row).then(
+      const copyRow = {...row}
+      if(this.obj.address) {
+        copyRow.companyAddress = this.obj.address
+      }
+      update(copyRow).then(
         () => {
           this.onLoad(this.page);
           this.$message({
@@ -913,7 +942,7 @@ export default {
     rowStop(id) {
       let h = this.$createElement;
       this.$confirm(
-        h("p", { style: "color: #F56C6C" }, "一旦终止合作企业将无法操作系统"),
+        h("p", { style: "color: #F56C6C" }, "一旦终止合作社区街道将无法操作系统"),
         "您确定要终止与此公司的合作吗？",
         {
           confirmButtonText: "确定",
@@ -941,7 +970,7 @@ export default {
     rowStart(id) {
       let h = this.$createElement;
       this.$confirm(
-        h("p", { style: "color: #F56C6C" }, "一旦恢复合作企业所有账号均可使用"),
+        h("p", { style: "color: #F56C6C" }, "一旦恢复合作社区街道所有账号均可使用"),
         "您确定要恢复与此公司的合作吗？",
         {
           confirmButtonText: "确定",

src/views/tenant/mission/index.vue

@@ -26,7 +26,7 @@
           <el-input v-model="search.missionNo" placeholder="任务编号" clearable></el-input>
         </el-form-item> -->
 
-        
+
 
         <el-form-item label="">
           <el-select v-model="search.state" placeholder="请选择搜索时间类型" style="width: 100%" @change="date">