Merge remote-tracking branch 'origin/dev' into dev

zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/nos/RegisterPopups.vue

@@ -40,7 +40,7 @@
                     <van-icon name="cross" class="close-icon" @click="localPersonPopup = false" />
                 </div>
                 <div class="search-bar">
-                    <van-search v-model="personSearchKeyword" placeholder="请输入至少1个字搜索" @search="handlePersonSearch"
+                    <van-search v-model="personSearchKeyword" autocomplete="off" placeholder="请输入至少1个字搜索" @search="handlePersonSearch"
                         @clear="clearPersonSearch" />
                     <van-button class="search-btn" type="primary" @click="handlePersonSearch">搜索</van-button>
                 </div>

zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/RegisterPopups.vue

@@ -49,7 +49,7 @@
                     <van-icon name="cross" class="close-icon" @click="localPersonPopup = false" />
                 </div>
                 <div class="search-bar">
-                    <van-search v-model="personSearchKeyword" placeholder="请输入至少1个字搜索" @search="handlePersonSearch"
+                    <van-search v-model="personSearchKeyword" autocomplete="off" placeholder="请输入至少1个字搜索" @search="handlePersonSearch"
                         @clear="clearPersonSearch" />
                     <van-button class="search-btn" type="primary" @click="handlePersonSearch">搜索</van-button>
                 </div>
@@ -73,7 +73,7 @@
                     <van-icon name="cross" class="close-icon" @click="localBasisPopup = false" />
                 </div>
                 <div class="search-bar">
-                    <van-search v-model="basisSearchKeyword" placeholder="请输入关键字搜索" @search="handleBasisSearch"
+                    <van-search v-model="basisSearchKeyword" autocomplete="off" placeholder="请输入关键字搜索" @search="handleBasisSearch"
                         @clear="clearBasisSearch" />
                     <van-button class="search-btn" type="primary" @click="handleBasisSearch">搜索</van-button>
                 </div>
@@ -96,7 +96,7 @@
                     <van-icon name="cross" class="close-icon" @click="localEntrustedAgencyPopup = false" />
                 </div>
                 <div class="search-bar">
-                    <van-search v-model="agencySearchKeyword" placeholder="请输入单位名称" @search="handleAgencySearch"
+                    <van-search v-model="agencySearchKeyword" autocomplete="off" placeholder="请输入单位名称" @search="handleAgencySearch"
                         @clear="clearAgencySearch" />
                     <van-button class="search-btn" type="primary" @click="handleAgencySearch">搜索</van-button>
                 </div>

zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/notice/cp_notice_edit.vue

@@ -218,7 +218,7 @@
                     <van-icon name="cross" @click="showPersonPicker = false" />
                 </div>
                 <div class="search-bar">
-                    <van-search v-model="personSearchKeyword" placeholder="请输入至少1个字搜索"
+                    <van-search v-model="personSearchKeyword" autocomplete="off" placeholder="请输入至少1个字搜索"
                         @search="handlePersonSearch" @clear="clearPersonSearch" />
                     <van-button class="search-btn" type="primary" @click="handlePersonSearch">搜索</van-button>
                 </div>

zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/plan/cp_plan_edit.vue

@@ -176,7 +176,7 @@
                     <van-icon name="cross" @click="showPersonPicker = false" />
                 </div>
                 <div class="search-bar">
-                    <van-search v-model="personSearchKeyword" placeholder="请输入至少1个字搜索"
+                    <van-search v-model="personSearchKeyword" autocomplete="off" placeholder="请输入至少1个字搜索"
                         @search="handlePersonSearch" @clear="clearPersonSearch" />
                     <van-button class="search-btn" type="primary" @click="handlePersonSearch">搜索</van-button>
                 </div>

zdxt-web-client/zdxt-efcode-enterprise-app/vite-env/.env.enterprise-dev-wmy

@@ -1,8 +1,8 @@
 # 企业端开发环境
 VITE_PORT = 12001
 # VITE_PROXY_TARGET = 'http://139.186.148.21:8080'
-VITE_PROXY_TARGET = 'http://172.16.21.213:8080'
-# VITE_PROXY_TARGET = 'http://172.16.21.93:8080'
+# VITE_PROXY_TARGET = 'http://172.16.21.213:8080'
+VITE_PROXY_TARGET = 'http://172.16.21.93:8080'
 VITE_BASE_URL = '/efcode20-ent-app/api'
 VITE_CONTEXT_PATH = '/efcode20-ent-app/'
 VITE_DEFAULT_LOGIN = '/enterprise/loginByPassword'