Merge branch 'dev'

src/components/OrgPicker.vue

@@ -1,25 +1,11 @@
 <template>
   <div class="org-picker">
     <div class="picker-search">
-      <Search
-        v-model="searchValue"
-        placeholder="请输入公司名称"
-        @search="onSearch"
-      />
+      <Search v-model="searchValue" placeholder="请输入公司名称" @search="onSearch" />
     </div>
     <div class="picker-list">
-      <List
-        v-model:loading="loading"
-        :finished="finished"
-        finished-text="我们是有底线的"
-        @load="onLoad"
-      >
-        <Cell
-          v-for="org in orgList"
-          :key="org.orgId"
-          :title="org.orgName"
-          @click="onClick(org)"
-        >
+      <List v-model:loading="loading" :finished="finished" finished-text="我们是有底线的" @load="onLoad">
+        <Cell v-for="org in orgList" :key="org.orgId" :title="org.orgName" @click="onClick(org)">
           <template #right-icon v-if="org.orgId === orgSelected.orgId">
             <Icon name="success" />
           </template>
@@ -33,65 +19,66 @@
 </template>
 
 <script setup>
-import { computed, watch, ref, onMounted } from 'vue';
-import { Button, Search, List, Cell, Col, Row, Icon } from 'vant';
+import { computed, watch, ref, onMounted } from 'vue'
+import { Button, Search, List, Cell, Col, Row, Icon } from 'vant'
 import { getOrgList } from '@/services/org'
 
-const searchValue = ref('');
-const orgSelected = ref({});
+const searchValue = ref('')
+const orgSelected = ref({})
 const orgResult = ref({})
-const loading = ref(false);
-const finished = ref(false);
-const pageSize = 20;
+const loading = ref(false)
+const finished = ref(false)
+const pageSize = 20
 
 const props = defineProps({
-  modelValue: String,
+  modelValue: String
 })
 const emit = defineEmits(['update:modelValue', 'change'])
 
-const orgList = computed(() => (orgResult.value.records || []))
+const orgList = computed(() => orgResult.value.records || [])
 watch(props.modelValue, (val) => {
-  orgSelected.value = { orgId: val };
+  orgSelected.value = { orgId: val }
 })
 
 const queryData = (params) => {
-  getOrgList(params, true).then(res => {
-    const first = res.current === 1;
-    if (first) {
-      orgResult.value = res;
-    } else {
-      orgResult.value = {
-        ...res,
-        records: orgResult.value.records.concat(res.records),
-      };
-    }
-
-
-    loading.value = false;
-    finished.value = res.current >= res.pages;
-  }).catch(() => {
-    loading.value = false;
-    finished.value = true;
-  });
+  getOrgList(params, true)
+    .then((res) => {
+      const first = res.current === 1
+      if (first) {
+        orgResult.value = res
+      } else {
+        orgResult.value = {
+          ...res,
+          records: orgResult.value.records.concat(res.records)
+        }
+      }
+
+      loading.value = false
+      finished.value = res.current >= res.pages
+    })
+    .catch(() => {
+      loading.value = false
+      finished.value = true
+    })
 }
 
 const onSearch = (val) => {
-  queryData({ pageNum: 1, pageSize, orgName: val });
+  queryData({ pageNum: 1, pageSize, orgName: val })
 }
 
 const onCancel = () => {
-  queryData({ pageNum: 1, pageSize });
+  queryData({ pageNum: 1, pageSize })
 }
 
 // 组件加载, onLoad 就会执行一次
 // 所以 onMounted 里面不需要初始化执行了
 const onLoad = () => {
-  const pageNum = orgResult.value.current ? orgResult.value.current + 1 : 1;
-  queryData({ pageNum, pageSize, orgName: searchValue.value });
-};
+  const pageNum = orgResult.value.current ? orgResult.value.current + 1 : 1
+  queryData({ pageNum, pageSize, orgName: searchValue.value })
+}
 
 const onClick = (org) => {
-  orgSelected.value = org;
+  orgSelected.value = org
 }
 
 const onSubmit = () => {
@@ -107,7 +94,6 @@ onMounted(() => {
   // onLoad 执行了一次查询
   // queryData({ pageNum: 1, pageSize });
 })
-
 </script>
 
 <style lang="less" scoped>
@@ -130,5 +116,4 @@ onMounted(() => {
     padding: 4px 8px;
   }
 }
-
 </style>