Merge branch 'master' of http://codez.tuoz.net:3000/lsq/byhl-zt

src/views/geopoliticalCustomers/geopoliticalCustomers.vue

@@ -123,16 +123,16 @@ const columns: ProColumns[] = [
   },
   {
     title: '联系方式',
-    // dataIndex: 'customNid',
+    dataIndex: 'customNid'
-    customRender: function ({ record }: any) {
+    // customRender: function ({ record }: any) {
-      if (record.enrollStatus === 2) {
+    //   if (record.enrollStatus === 2) {
-        const phoneNumber = record.customNid.toString()
+    //     const phoneNumber = record.customNid.toString()
-        const hiddenPhoneNumber = phoneNumber.replace(/^(\d{3})\d{4}(\d{4})$/, '$1****$2')
+    //     const hiddenPhoneNumber = phoneNumber.replace(/^(\d{3})\d{4}(\d{4})$/, '$1****$2')
-        return h('div', hiddenPhoneNumber)
+    //     return h('div', hiddenPhoneNumber)
-      } else {
+    //   } else {
-        return h('div', record.customNid)
+    //     return h('div', record.customNid)
-      }
+    //   }
-    }
+    // }
   },
   {
     title: '报名状态',

src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue

@@ -75,12 +75,6 @@
                 : { sm: { span: 24 }, md: { span: 19 } }
             "
           >
-            <!-- <a-input
-              v-model:value="formModel.remark"
-              placeholder="请输入备注"
-              :style="{ width: title === '详情' || title === '分发' ? '83%' : '100%' }"
-              :readonly="title === '详情' || title === '分发'"
-            /> -->
             <a-textarea
               v-model:value="formModel.remark"
               placeholder="请输入备注"
@@ -1000,8 +994,6 @@ const filter: ShowSearchType['filter'] = (inputValue, path) => {
 //输入提示插件AMap.Autocomplete
 const autoComplete = ref()
 //POI搜索插件AMap.PlaceSearch
-const placeSearch = ref()
-//POI搜索插件AMap.PlaceSearch
 // const placeSearch = ref()
 //点标记AMap.Marker
 //创建的一个 Marker 实例
@@ -1104,13 +1096,6 @@ const initMap = () => {
     //   city: '010' //城市设为北京，默认：“全国”
     // })
   })
-  // AMap.plugin('AMap.PlaceSearch', function () {
-  //   // PlaceSearch
-  //   const placeOptions = {
-  //     map: map.value
-  //   }
-  //   placeSearch.value = new AMap.PlaceSearch(placeOptions)
-  // })
   setTimeout(() => {
     autoComplete.value?.on('select', (e: any) => {
       const selectedTip = e.poi // 获取用户选择的提示结果对象