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

2022-03-22 15:07:06 +08:00
parent 59d1e952d5 a6dafbff38
commit 25fddf63db
96 changed files with 97 additions and 103 deletions
--- a/project/oms/apps/AppArticles/components/Event.vue
+++ b/project/oms/apps/AppArticles/components/Event.vue
@@ -13,7 +13,7 @@
                size="small"
                clearable
                v-model="search.title"
-                @keyup.enter.native="search.current = 1, getList()"
+                v-throttle="() => {search.current = 1, getList()}"
                @clear="search.current = 1, search.title = '', getList()"
                suffix-icon="iconfont iconSearch"/>
          </template>
--- a/project/oms/apps/AppFeedback/components/List.vue
+++ b/project/oms/apps/AppFeedback/components/List.vue
@@ -10,7 +10,7 @@
            v-model="search.opinion"
            class="search-input"
            size="small"
-            @keyup.enter.native="search.current = 1, getList()"
+            v-throttle="() => {search.current = 1, getList()}"
            placeholder="内容描述/上报人"
            clearable
            @change="getList"
--- a/project/sass/apps/AppAddressBook/components/List.vue
+++ b/project/sass/apps/AppAddressBook/components/List.vue
@@ -106,7 +106,7 @@
          <el-input
              v-model="search.name"
              size="small"
-              @keyup.enter.native="search.current = 1, getList()"
+              v-throttle="() => {search.current = 1, getList()}"
              placeholder="请输入成员姓名、手机号或标签名称"
              clearable
              @clear="search.current = 1, search.name = '', getList()"
--- a/project/sass/apps/AppAskForm/components/FormList.vue
+++ b/project/sass/apps/AppAskForm/components/FormList.vue
@@ -22,7 +22,7 @@
            size="small"
            placeholder="请输入模板名称"
            clearable
-            @keyup.enter.native="search.current = 1, getList()"
+            v-throttle="() => {search.current = 1, getList()}"
            @clear="search.current = 1, search.title = '', getList()"
            suffix-icon="iconfont iconSearch">
          </el-input>
--- a/project/sass/apps/AppAskForm/components/Statistics.vue
+++ b/project/sass/apps/AppAskForm/components/Statistics.vue
@@ -68,7 +68,7 @@
                  size="small"
                  placeholder="请输入居民名称"
                  clearable
-                  @keyup.enter.native="search.current = 1, getList()"
+                  v-throttle="() => {search.current = 1, getList()}"
                  @clear="search.current = 1, search.name = '', getList()"
                  suffix-icon="iconfont iconSearch">
                </el-input>
--- a/project/sass/apps/AppAskForm/components/Template.vue
+++ b/project/sass/apps/AppAskForm/components/Template.vue
@@ -16,7 +16,7 @@
            size="small"
            placeholder="请输入模板名称"
            clearable
-            @keyup.enter.native="search.current = 1, getList()"
+            v-throttle="() => {search.current = 1, getList()}"
            @clear="search.current = 1, search.title = '', getList()"
            suffix-icon="iconfont iconSearch">
          </el-input>
--- a/project/sass/apps/AppBuildManage/components/BuildMsg.vue
+++ b/project/sass/apps/AppBuildManage/components/BuildMsg.vue
@@ -18,7 +18,7 @@

        <template #right>
          <el-input v-model="search.houseCode" size="small" placeholder="请输入户号/户主" clearable
-                    @keyup.enter.native=";(page.current = 1), getList()"
+                    v-throttle="() => {page.current = 1, getList()}"
                    @clear=";(page.current = 1), (search.houseCode = ''), getList()" suffix-icon="iconfont iconSearch"/>
        </template>
      </ai-search-bar>
--- a/project/sass/apps/AppBuildManage/components/List.vue
+++ b/project/sass/apps/AppBuildManage/components/List.vue
@@ -16,7 +16,7 @@

          <!-- 搜索 -->
          <template slot="right">
-            <el-input v-model="search.managerName" size="small" placeholder="楼栋号/楼长/联系方式" clearable @keyup.enter.native=";(page.current = 1), getList()" @clear=";(page.current = 1), (search.managerName = ''), getList()" suffix-icon="iconfont iconSearch" />
+            <el-input v-model="search.managerName" size="small" placeholder="楼栋号/楼长/联系方式" clearable v-throttle="() => {page.current = 1, getList()}" @clear=";(page.current = 1), (search.managerName = ''), getList()" suffix-icon="iconfont iconSearch" />
          </template>
        </ai-search-bar>

--- a/project/sass/apps/AppCarousel/AppCarousel.vue
+++ b/project/sass/apps/AppCarousel/AppCarousel.vue
@@ -11,7 +11,7 @@
          </template>
          <template slot="right">
            <el-input v-model="search.title" size="small" placeholder="搜索标题" clearable
-                      @keyup.enter.native=";(page.current = 1), getList()"
+                      v-throttle="() => {page.current = 1, getList()}"
                      @clear=";(page.current = 1), (search.title = ''), getList()" suffix-icon="iconfont iconSearch"/>
          </template>
        </ai-search-bar>
--- a/project/sass/apps/AppConvenienceAddressBook/components/List.vue
+++ b/project/sass/apps/AppConvenienceAddressBook/components/List.vue
@@ -19,7 +19,7 @@
            v-model="search.name"
            class="search-input"
            size="small"
-            @keyup.enter.native="search.current = 1, getList()"
+            v-throttle="() => {search.current = 1, getList()}"
            placeholder="请输入名称/电话"
            clearable
            @change="getList"
--- a/project/sass/apps/AppGridMember/components/Family.vue
+++ b/project/sass/apps/AppGridMember/components/Family.vue
@@ -23,7 +23,7 @@
            v-model="search.name"
            class="search-input"
            size="small"
-            @keyup.enter.native="search.current = 1, getList()"
+            v-throttle="() => {search.current = 1, getList()}"
            placeholder="姓名/身份证/联系方式"
            clearable
            @clear="search.current = 1, search.name = '', getList()"
--- a/project/sass/apps/AppHealthReport/components/List.vue
+++ b/project/sass/apps/AppHealthReport/components/List.vue
@@ -10,7 +10,7 @@
              size="small"
              placeholder="请输入姓名"
              clearable
-              @keyup.enter.native="search.current = 1, getList()"
+              v-throttle="() => {search.current = 1, getList()}"
              @clear="search.current = 1, search.name = '', getList()"
              suffix-icon="iconfont iconSearch">
            </el-input>
--- a/project/sass/apps/AppHomesteadManagement/components/List.vue
+++ b/project/sass/apps/AppHomesteadManagement/components/List.vue
@@ -12,7 +12,7 @@

          <!-- 搜索 -->
          <template slot="right">
-            <el-input v-model="search.name" size="small" placeholder="户主/联系电话" clearable @keyup.enter.native=";(page.current = 1), getList()" @clear=";(page.current = 1), (search.name = ''), getList()" suffix-icon="iconfont iconSearch" />
+            <el-input v-model="search.name" size="small" placeholder="户主/联系电话" clearable v-throttle="() => {page.current = 1, getList()}" @clear=";(page.current = 1), (search.name = ''), getList()" suffix-icon="iconfont iconSearch" />
          </template>
        </ai-search-bar>

--- a/project/sass/apps/AppInterview/AppInterview.vue
+++ b/project/sass/apps/AppInterview/AppInterview.vue
@@ -28,7 +28,7 @@
                v-model="search.title"
                placeholder="标题"
                clearable
-                @keyup.enter.native="page.current = 1, getTableData()"
+                v-throttle="() => {page.current = 1, getTableData()}"
                @clear="page.current = 1, search.title = '', getTableData()"
                size="small"/>
          </template>
--- a/project/sass/apps/AppNotification/components/noticeManage.vue
+++ b/project/sass/apps/AppNotification/components/noticeManage.vue
@@ -21,7 +21,7 @@
            <el-input
              v-model="search.title"
              size="small"
-              @keyup.enter.native="search.current = 1, getList()"
+              v-throttle="() => {search.current = 1, getList()}"
              placeholder="标题"
              clearable
              @clear="search.current = 1, search.title = '', getList()"
--- a/project/sass/apps/AppReportAiWill/components/List.vue
+++ b/project/sass/apps/AppReportAiWill/components/List.vue
@@ -19,7 +19,7 @@
            v-model="search.content"
            class="search-input"
            size="small"
-            @keyup.enter.native="search.current = 1, getList()"
+            v-throttle="() => {search.current = 1, getList()}"
            placeholder="请输入内容描述"
            clearable
            @change="getList"
--- a/project/sass/apps/AppReturnHomeRegister/components/List.vue
+++ b/project/sass/apps/AppReturnHomeRegister/components/List.vue
@@ -55,7 +55,7 @@
              size="small"
              placeholder="请输入姓名"
              clearable
-              @keyup.enter.native="search.current = 1, getList()"
+              v-throttle="() => {search.current = 1, getList()}"
              @clear="search.current = 1, search.name = '', getList()"
              suffix-icon="iconfont iconSearch">
            </el-input>
--- a/project/sass/apps/AppRiskArea/components/List.vue
+++ b/project/sass/apps/AppRiskArea/components/List.vue
@@ -20,7 +20,7 @@
            v-model="search.province"
            class="search-input"
            size="small"
-            @keyup.enter.native="search.current = 1, getList()"
+            v-throttle="() => {search.current = 1, getList()}"
            placeholder="省级名称/市级名称/区级名称"
            clearable
            @clear="search.current = 1, search.province = '', getList()"
--- a/project/sass/apps/AppSpecialAdjustment/components/List.vue
+++ b/project/sass/apps/AppSpecialAdjustment/components/List.vue
@@ -14,7 +14,7 @@
              size="small"
              placeholder="请输入姓名"
              clearable
-              @keyup.enter.native="search.current = 1, getList()"
+              v-throttle="() => {search.current = 1, getList()}"
              @clear="search.current = 1, search.name = '', getList()"
              suffix-icon="iconfont iconSearch">
            </el-input>
--- a/project/sass/apps/AppSpecialDisabled/components/List.vue
+++ b/project/sass/apps/AppSpecialDisabled/components/List.vue
@@ -14,7 +14,7 @@
              size="small"
              placeholder="请输入姓名"
              clearable
-              @keyup.enter.native="search.current = 1, getList()"
+              v-throttle="() => {search.current = 1, getList()}"
              @clear="search.current = 1, search.name = '', getList()"
              suffix-icon="iconfont iconSearch">
            </el-input>
--- a/project/sass/apps/AppSpecialDrug/components/List.vue
+++ b/project/sass/apps/AppSpecialDrug/components/List.vue
@@ -14,7 +14,7 @@
              size="small"
              placeholder="请输入姓名"
              clearable
-              @keyup.enter.native="search.current = 1, getList()"
+              v-throttle="() => {search.current = 1, getList()}"
              @clear="search.current = 1, search.name = '', getList()"
              suffix-icon="iconfont iconSearch">
            </el-input>
--- a/project/sass/apps/AppSpecialMental/components/List.vue
+++ b/project/sass/apps/AppSpecialMental/components/List.vue
@@ -14,7 +14,7 @@
              size="small"
              placeholder="请输入姓名"
              clearable
-              @keyup.enter.native="search.current = 1, getList()"
+              v-throttle="() => {search.current = 1, getList()}"
              @clear="search.current = 1, search.name = '', getList()"
              suffix-icon="iconfont iconSearch">
            </el-input>
--- a/project/sass/apps/AppSpecialPrison/components/List.vue
+++ b/project/sass/apps/AppSpecialPrison/components/List.vue
@@ -14,7 +14,7 @@
              size="small"
              placeholder="请输入姓名"
              clearable
-              @keyup.enter.native="search.current = 1, getList()"
+              v-throttle="() => {search.current = 1, getList()}"
              @clear="search.current = 1, search.name = '', getList()"
              suffix-icon="iconfont iconSearch">
            </el-input>
--- a/project/shandong10086/apps/shandong/AppIntegralAudit/components/List.vue
+++ b/project/shandong10086/apps/shandong/AppIntegralAudit/components/List.vue
@@ -52,7 +52,7 @@
              size="small"
              placeholder="请输入姓名"
              clearable
-              @keyup.enter.native="search.current = 1, getList()"
+              v-throttle="() => {search.current = 1, getList()}"
              @clear="search.current = 1, search.residentName = '', getList()"
              suffix-icon="iconfont iconSearch">
            </el-input>
--- a/project/shandong10086/apps/shandong/AppVillagersCircle/components/CommentsList.vue
+++ b/project/shandong10086/apps/shandong/AppVillagersCircle/components/CommentsList.vue
@@ -23,7 +23,7 @@
            v-model="search.title"
            class="search-input"
            size="small"
-            @keyup.enter.native="search.current = 1, search.title, getList()"
+            v-throttle="() => {search.current=1,getList()}"
            placeholder="请输入发布人姓名"
            clearable
            @clear="search.current = 1, search.title = '', getList()"
--- a/project/shandong10086/apps/shandong/monitor/AppMonitorManage/AppMonitorManage.vue
+++ b/project/shandong10086/apps/shandong/monitor/AppMonitorManage/AppMonitorManage.vue
@@ -26,7 +26,7 @@
      </el-form>
    </ai-dialog>
    <locate-dialog v-model="locate" :ins="instance" :latlng="latlng" @confirm="v=>handleLocate(selected,v)"/>
-    <ai-area custom-clicker :input-clicker="false" v-model="selected.areaId" :hideLevel="disabledLevel" :instance="instance" ref="BindArea"
+    <ai-area custom-clicker :input-clicker="false" v-model="selected.areaId" :instance="instance" ref="BindArea"
             @change="handleSubmit(selected)"/>
  </section>
 </template>
@@ -81,7 +81,6 @@

    created () {
      this.selected.areaId = this.user.info.areaId
-      this.disabledLevel = this.user.info.areaList.length
    },

    methods: {
@@ -151,6 +150,7 @@
      },
      handleSliderOption(command, data) {
        this.selected = JSON.parse(JSON.stringify({...data, command}))
+        this.selected.areaId = data.areaId || this.user.info.areaId
        if (command == "edit") {//修改名称
          this.dialog = true
        } else if (command == "area") {//绑定areaId
--- a/project/shandong10086/apps/shandong/scoreManage/pointsAppeal.vue
+++ b/project/shandong10086/apps/shandong/scoreManage/pointsAppeal.vue
@@ -39,7 +39,7 @@
              size="mini"
              placeholder="申诉人/申诉对象/..."
              clearable
-              @keyup.enter.native="page.current = 1, getList()"
+              v-throttle="() => {page.current = 1, getList()}"
              @clear="page.current = 1, getList()"
              suffix-icon="iconfont iconSearch" />
          </template>
--- a/project/shandong10086/apps/shandong/scoreManage/pointsDeclaration.vue
+++ b/project/shandong10086/apps/shandong/scoreManage/pointsDeclaration.vue
@@ -39,7 +39,7 @@
              size="mini"
              placeholder="申诉人/申诉对象/..."
              clearable
-              @keyup.enter.native="page.current = 1, getList()"
+              v-throttle="() => {page.current = 1, getList()}"
              @clear="page.current = 1, getList()"
              suffix-icon="iconfont iconSearch" />
          </template>
--- a/project/shandong10086/apps/shandong/scoreManage/pointsDetails.vue
+++ b/project/shandong10086/apps/shandong/scoreManage/pointsDetails.vue
@@ -14,7 +14,7 @@
              size="small"
              placeholder="对象、户主、事件类型"
              clearable
-              @keyup.enter.native="search.current = 1, getList()"
+              v-throttle="() => {search.current = 1, getList()}"
              @clear="search.current = 1, getList()"
              suffix-icon="iconfont iconSearch" />
          </template>
--- a/project/xiushan/apps/creditScore/scoreFamily/AppScoreFamily.vue
+++ b/project/xiushan/apps/creditScore/scoreFamily/AppScoreFamily.vue
@@ -21,7 +21,7 @@
              v-model="searchObj.con"
              size="small"
              placeholder="户主姓名"
-              @keyup.enter.native="page.current = 1, getList()"
+              v-throttle="() => {page.current = 1, getList()}"
              @clear="search.current = 1, search.con = '', getList()"
              clearable
              suffix-icon="iconfont iconSearch" />
--- a/project/xiushan/apps/creditScore/scoreManage/pointsAppeal.vue
+++ b/project/xiushan/apps/creditScore/scoreManage/pointsAppeal.vue
@@ -43,7 +43,7 @@
                size="mini"
                placeholder="申诉人/申诉对象/..."
                clearable
-                @keyup.enter.native="page.current = 1, getList()"
+                v-throttle="() => {page.current = 1, getList()}"
                @clear="page.current = 1, getList()"
                suffix-icon="iconfont iconSearch"/>
          </template>
--- a/project/xiushan/apps/creditScore/scoreManage/pointsDeclaration.vue
+++ b/project/xiushan/apps/creditScore/scoreManage/pointsDeclaration.vue
@@ -43,7 +43,7 @@
                size="mini"
                placeholder="申诉人/申诉对象/..."
                clearable
-                @keyup.enter.native="page.current = 1, getList()"
+                v-throttle="() => {page.current = 1, getList()}"
                @clear="page.current = 1, getList()"
                suffix-icon="iconfont iconSearch"/>
          </template>
--- a/project/xiushan/apps/creditScore/scoreManage/pointsDetails.vue
+++ b/project/xiushan/apps/creditScore/scoreManage/pointsDetails.vue
@@ -14,7 +14,7 @@
              size="small"
              placeholder="对象、户主、事件类型"
              clearable
-              @keyup.enter.native="search.current = 1, getList()"
+              v-throttle="() => {search.current = 1, getList()}"
              @clear="search.current = 1, getList()"
              suffix-icon="iconfont iconSearch" />
          </template>
--- a/project/xiushan/apps/creditScore/scorePersonal/AppScorePersonal.vue
+++ b/project/xiushan/apps/creditScore/scorePersonal/AppScorePersonal.vue
@@ -29,7 +29,7 @@
              v-model="searchObj.con"
              size="small"
              placeholder="个人姓名"
-              @keyup.enter.native="page.current = 1, getList()"
+              v-throttle="() => {page.current = 1, getList()}"
              @clear="page.current = 1, searchObj.con = '', getList()"
              clearable
              suffix-icon="iconfont iconSearch" />
--- a/project/xiushan/apps/creditScore/scoreSupermarket/orderManagement.vue
+++ b/project/xiushan/apps/creditScore/scoreSupermarket/orderManagement.vue
@@ -56,7 +56,7 @@
              v-model="searchObj.name"
              size="small"
              placeholder="订单号/商品名/兑换家庭"
-              @keyup.enter.native="page.current = 1, getList()"
+              v-throttle="() => {page.current = 1, getList()}"
              @clear="page.current = 1, searchObj.name = '', getList()"
              clearable
              suffix-icon="iconfont iconSearch"