.

src/components/OrgPicker/index.vue

@@ -1,12 +1,29 @@
 <template>
   <div class="org-picker">
     <div class="picker-search">
-      <van-search v-model="searchValue" placeholder="请输入公司名称" @search="onSearch" />
+      <van-search
+        v-model="searchValue"
+        placeholder="请输入公司名称"
+        @search="onSearch"
+      />
     </div>
     <div class="picker-list">
-      <van-list v-model:loading="loading" :finished="finished" finished-text="我们是有底线的" @load="onLoad">
-        <van-cell v-for="org in orgList" :key="org.invoiceOrgId" :title="org.name" @click="onClick(org)">
-          <template #right-icon v-if="org.invoiceOrgId === orgSelected.invoiceOrgId">
+      <van-list
+        v-model:loading="loading"
+        :finished="finished"
+        finished-text="我们是有底线的"
+        @load="onLoad"
+      >
+        <van-cell
+          v-for="org in orgList"
+          :key="org.invoiceOrgId"
+          :title="org.name"
+          @click="onClick(org)"
+        >
+          <template
+            #right-icon
+            v-if="org.invoiceOrgId === orgSelected.invoiceOrgId"
+          >
             <van-icon name="success" />
           </template>
         </van-cell>
@@ -32,7 +49,7 @@ const pageSize = 20
 
 const props = defineProps({
   modelValue: String,
-  invoiceId:String
+  invoiceId: String
 })
 const emit = defineEmits(['update:modelValue', 'change'])
 
@@ -41,7 +58,7 @@ watch(props.modelValue, (val) => {
   orgSelected.value = { invoiceOrgId: val }
 })
 
-const queryData = (params) => {  
+const queryData = (params) => {
   getOrgList({ ...params })
     .then((res) => {
       //是否为第一页
@@ -65,7 +82,7 @@ const queryData = (params) => {
 }
 
 const onSearch = (val) => {
-  queryData({ pageNum: 1, pageSize, name: val,invoiceId:props.invoiceId })
+  queryData({ pageNum: 1, pageSize, name: val, invoiceId: props.invoiceId })
 }
 
 const onCancel = () => {
@@ -76,7 +93,7 @@ const onCancel = () => {
 // 所以 onMounted 里面不需要初始化执行了
 const onLoad = () => {
   const pageNum = orgResult.value.current ? orgResult.value.current + 1 : 1
-  queryData({ pageNum, pageSize, name: searchValue.value,invoiceId:props.invoiceId })
+  queryData({ pageNum, pageSize, name: searchValue.value, invoiceId: props.invoiceId })
 }
 
 const onClick = (org) => {

src/components/PersonPicker/index.vue

@@ -3,7 +3,7 @@
     <div class="picker-search">
       <van-search
         v-model="searchValue"
-        placeholder="请输入公司名称"
+        placeholder="请输入报销人姓名"
         @search="onSearch"
       />
     </div>
@@ -15,12 +15,12 @@
         @load="onLoad"
       >
         <van-cell
-          v-for="org in orgList"
-          :key="org.invoiceOrgId"
-          :title="org.name"
-          @click="onClick(org)"
+          v-for="item in personList"
+          :key="item.invoicePersonId"
+          :title="item.name"
+          @click="onClick(item)"
         >
-          <template #right-icon v-if="org.invoiceOrgId === orgSelected.invoiceOrgId">
+          <template #right-icon v-if="item.invoicePersonId === personSelected.invoicePersonId">
             <van-icon name="success" />
           </template>
         </van-cell>
@@ -38,8 +38,8 @@ import { getPersonList } from '@/services/person'
 
 
 const searchValue = ref('')
-const orgSelected = ref({})
-const orgResult = ref({})
+const personSelected = ref({})
+const personResult = ref({})
 const loading = ref(false)
 const finished = ref(false)
 const pageSize = 20
@@ -51,9 +51,9 @@ const props = defineProps({
 })
 const emit = defineEmits(['update:modelValue', 'change'])
 
-const orgList = computed(() => orgResult.value.records || [])
+const personList = computed(() => personResult.value.records || [])
 watch(props.modelValue, (val) => {
-  orgSelected.value = { invoiceOrgId: val }
+  personSelected.value = { invoicePersonId: val }
 })
 watch(()=>props.orgId,(val)=>{
   const pageNum = 1
@@ -65,11 +65,11 @@ const queryData = (params) => {
     .then((res) => {
       const first = res.current === 1
       if (first) {
-        orgResult.value = res
+        personResult.value = res
       } else {
-        orgResult.value = {
+        personResult.value = {
           ...res,
-          records: orgResult.value.records.concat(res.records)
+          records: personResult.value.records.concat(res.records)
         }
       }
       loading.value = false
@@ -92,18 +92,18 @@ const onCancel = () => {
 // 组件加载, onLoad 就会执行一次
 // 所以 onMounted 里面不需要初始化执行了
 const onLoad = () => {
-  const pageNum = orgResult.value.current ? orgResult.value.current + 1 : 1
+  const pageNum = personResult.value.current ? personResult.value.current + 1 : 1
   queryData({ pageNum, pageSize, name: searchValue.value, invoiceId: props.invoiceId, invoiceOrgId: props.orgId })
 }
 
 const onClick = (org) => {
-  orgSelected.value = org
+  personSelected.value = org
 }
 
 const onSubmit = () => {
-  emit('update:modelValue', orgSelected.value.invoicePersonId)
-  if (orgSelected.value.invoicePersonId && orgSelected.value.name) {
-    emit('change', orgSelected.value)
+  emit('update:modelValue', personSelected.value.invoicePersonId)
+  if (personSelected.value.invoicePersonId && personSelected.value.name) {
+    emit('change', personSelected.value)
   } else {
     emit('change')
   }

src/pages/invoice/history.vue

@@ -42,7 +42,6 @@ const pagenavi = reactive({ pageNum: 1, pageSize: 10, total: 0 })
 const finished = computed(() => pagenavi.pageNum * pagenavi.pageSize > pagenavi.total)
 
 const queryData = (params = {}) => {
-  console.log('-------------', user.personId)
   getList(invoiceId, { ...params, personId: user.personId }).then(res => {
     const { records, ...pageInfo } = res;
     if (pageInfo.current === 1) {