.

src/pages/invoice/components/DetailInfo.vue

@@ -0,0 +1,7 @@
+<template>
+<div></div>
+</template>
+<script>
+</script>
+<style>
+</style>

src/pages/invoice/components/PersonInfo.vue

@@ -0,0 +1,109 @@
+<template>
+  <van-cell-group title="报销人信息">
+    <van-field
+      label="所属公司"
+      v-model="data.invoiceOrgName"
+      name="invoiceOrgName"
+      readonly
+      @click="changeOrg"
+      placeholder="请输入所属公司"
+      :rules="[{ required: true, message: '请输入所属公司' }]"
+    />
+    <van-popup
+      v-model:show="showOrgPicker"
+      position="left"
+      :style="{ height: '100%', width: '80%' }"
+    >
+      <org-picker
+        v-model="data.invoiceOrgId"
+        :invoiceId="invoiceId"
+        @change="onOrgConfirm"
+      />
+    </van-popup>
+    <van-field
+      label="报销人"
+      v-model="data.personName"
+      name="personName"
+      readonly
+      @click="showOrgPopup"
+      placeholder="请输入报销人"
+      :rules="[{ required: true, message: '请输入报销人' }]"
+    />
+    <van-popup
+      v-model:show="showPersonPicker"
+      position="left"
+      :style="{ height: '100%', width: '80%' }"
+    >
+      <person-picker
+        v-model="data.personId"
+        :invoiceId="invoiceId"
+        :orgId="formData.invoiceOrgId"
+        @change="onPersonConfirm"
+      />
+    </van-popup>
+  </van-cell-group>
+</template>
+<script setup>
+import { computed, onMounted, reactive, ref } from 'vue';
+const data=reactive({})
+const props = defineProps({
+  isFinished: String,
+  invoiceId:String,
+})
+const showOrgPicker = ref(false)
+const showPersonPicker = ref(false)
+//选择企业
+const changeOrg = () => {
+  if (!isFinished) {
+    showOrgPicker.value = true
+  }
+}
+//确认企业
+const onOrgConfirm = (value) => {
+  if (value) {
+    data.invoiceOrgId = value.invoiceOrgId
+    data.invoiceOrgName = value.name
+    data.personName = ''
+    data.invoicePersonId = ''
+  }
+  showOrgPicker.value = false;
+};
+//选择报销人
+const showOrgPopup = () => {
+  if (!isFinished) {
+    if (data.invoiceOrgId) {
+      showPersonPicker.value = true
+    } else {
+      Dialog.alert({
+        message: '请先选择所属公司'
+      }).then(() => { })
+    }
+  }
+}
+//确认报销人
+const onPersonConfirm = (value) => {
+  if (value) {
+    let data = {
+      invoiceOrgId: data.invoiceOrgId,
+      invoiceOrgName: data.invoiceOrgName
+    }
+    //为了把当前选中报销人员放在请求里
+    data.invoicePersonId = value.invoicePersonId
+    getDetail()
+    //获取详情
+    // emit('change', orgSelected.value)
+    setTimeout(() => {
+      //因为如果客户填错报销人和所属单位 接口返回会默认上次选中的报销人所以需要把当前报销人重新赋值给formData
+      data.invoicePersonId = value.invoicePersonId
+      data.personName = value.name
+      data.invoiceOrgId = data.invoiceOrgId
+      data.invoiceOrgName = data.invoiceOrgName
+    }, 100)
+  }
+  //
+  showPersonPicker.value = false;
+  console.log(data);
+};
+</script>
+<style>
+</style>

src/pages/invoice/fill.vue

@@ -1,9 +1,5 @@
 <template>
-  <van-form
-    @failed="onFailed"
-    @submit="onSubmit"
-    :readonly="formData.isFinished"
-  >
+  <van-form @failed="onFailed" @submit="onSubmit" :readonly="isFinished">
     <h2 :style="{ textAlign: 'center' }">{{ formData.invoiceName }}</h2>
     <van-cell-group title="报销人信息">
       <van-field
@@ -21,8 +17,8 @@
         :style="{ height: '100%', width: '80%' }"
       >
         <org-picker
-          v-model="formData.orgId"
-          :invoiceId="formData.invoiceId"
+          v-model="formData.invoiceOrgId"
+          :invoiceId="fillData.invoiceId"
           @change="onOrgConfirm"
         />
       </van-popup>
@@ -42,8 +38,8 @@
       >
         <person-picker
           v-model="formData.personId"
-          :invoiceId="formData.invoiceId"
-          :orgId="formData.orgId"
+          :invoiceId="fillData.invoiceId"
+          :orgId="formData.invoiceOrgId"
           @change="onPersonConfirm"
         />
       </van-popup>
@@ -101,7 +97,7 @@
           <van-radio-group
             v-model="formData.mergeRemark"
             direction="horizontal"
-            :disabled="formData.isFinished"
+            :disabled="isFinished"
           >
             <van-radio name="是">是</van-radio>
             <van-radio name="否">否</van-radio>
@@ -127,7 +123,7 @@
     </van-cell-group>
     <div style="margin: 16px">
       <van-button
-        v-show="!formData.isFinished"
+        v-show="!isFinished"
         round
         block
         type="primary"
@@ -150,30 +146,24 @@ import { useModel } from '@zjxpcyc/vue-tiny-store'
 const formData = reactive({
   //班级名称
   invoiceName: '',
-  detailId: undefined,
   invoiceId: undefined,
   invoicePersonId: undefined,
-  personId: undefined,
   personName: undefined,
-  orgNameId: undefined,
-  orgId: undefined,
+  invoiceOrgId: undefined,
   invoiceOrgName: undefined,
   orgName: undefined,
   taxNo: undefined,
   address: undefined,
   phone: undefined,
-  bankId: undefined,
   bankName: undefined,
   cardNo: undefined,
-  invoiceItemTplId: undefined,
-  itemName: undefined,
-  charge: undefined,
-  //是否结束
-  isFinished: false,
   mergeRemark: '否',
   status: undefined
 })
 const itemList = ref([])
+const fillData = ref([])
+//是否结束
+const isFinished = ref(false)
 const showOrgPicker = ref(false)
 const showPersonPicker = ref(false)
 const router = useRouter();
@@ -188,20 +178,23 @@ onMounted(() => {
     Dialog.alert({
       message: '请退出页面重新扫码进入'
     }).then(() => { })
-    formData.isFinished = ture
+    isFinished.value = true
     return
   }
+  if (route.query.isFinished) {
+    isFinished.value = true
+  }
   getInvoiceFill(route.query.invoiceId).then(res => {
+    fillData.value = res
     //过期
     if (dayjs().isAfter(dayjs(res.endDate) || res.status == 2)) {
-      formData.isFinished = true
+      isFinished.value = true
       Dialog.alert({
         message: '该班次已截止如有问题请联系报销助理'
       })
-      formData.invoiceName = res.name
-    } else {
-      getDetail({ invoiceName: res.name })
     }
+    getDetail()
+    formData.invoiceName = res.name
   }).catch(err => {
     console.log(err)
   })
@@ -213,14 +206,14 @@ const onFailed = (errorInfo) => {
 
 //选择企业
 const changeOrg = () => {
-  if (!formData.isFinished) {
+  if (!isFinished.value) {
     showOrgPicker.value = true
   }
 }
 //确认企业
 const onOrgConfirm = (value) => {
   if (value) {
-    formData.orgId = value.invoiceOrgId
+    formData.invoiceOrgId = value.invoiceOrgId
     formData.invoiceOrgName = value.name
     formData.personName = ''
     formData.invoicePersonId = ''
@@ -229,8 +222,8 @@ const onOrgConfirm = (value) => {
 };
 //选择报销人
 const showOrgPopup = () => {
-  if (!formData.isFinished) {
-    if (formData.orgId) {
+  if (!isFinished.value) {
+    if (formData.invoiceOrgId) {
       showPersonPicker.value = true
     } else {
       Dialog.alert({
@@ -242,28 +235,35 @@ const showOrgPopup = () => {
 //确认报销人
 const onPersonConfirm = (value) => {
   if (value) {
-    console.log(value);
-    formData.personName = value.name
-    formData.invoicePersonId = value.invoicePersonId
-    getDetail({
-      invoiceName: formData.name,
-      invoicePersonId: formData.invoicePersonId,
-      personName: formData.personName,
-      orgId: formData.orgId,
+    let data = {
+      invoiceOrgId: formData.invoiceOrgId,
       invoiceOrgName: formData.invoiceOrgName
-    })
+    }
+    //为了把当前选中报销人员放在请求里
+    formData.invoicePersonId = value.invoicePersonId
+    getDetail()
+    setTimeout(() => {
+      //因为如果客户填错报销人和所属单位 接口返回会默认上次选中的报销人所以需要把当前报销人重新赋值给formData
+      formData.invoicePersonId = value.invoicePersonId
+      formData.personName = value.name
+      formData.invoiceOrgId = data.invoiceOrgId
+      formData.invoiceOrgName = data.invoiceOrgName
+    }, 100)
   }
   showPersonPicker.value = false;
+  console.log(formData);
 };
 //获取模板详情
-const getDetail = (data) => {
-  getInvoiceModel(route.query.invoiceId, { invoicePersonId: formData.invoicePersonId, personId: personId }).then(res => {
-    const info = {
+const getDetail = () => {
+  getInvoiceModel(route.query.invoiceId, { invoicePersonId: formData.invoicePersonId, personId: personId.value }).then(res => {
+    let info = {
       ...(res.detail || res.tpl),
-      ...data
+      invoiceName: fillData.value.name,
     }
+    info.mergeRemark = info.mergeRemark || formData.mergeRemark
     Object.assign(formData, info)
     itemList.value = info.itemList
+    console.log(info);
   }).catch(err => {
     console.log(err);
   })
@@ -276,7 +276,7 @@ const onSubmit = (val) => {
     }).then(() => { })
     return;
   }
-  setInvoiceDetail(formData.invoiceId, formData).then(() => {
+  setInvoiceDetail(fillData.value.invoiceId, formData).then(() => {
     Toast.success('提交成功');
     setTimeout(() => {
       router.back()

src/pages/publicity/list.vue

@@ -12,9 +12,9 @@
         class="item"
         v-for="item in list"
         :key="item.detailId"
-        :title="item.orgName"
+        :title="item.invoiceOrgName"
         is-link
-        :to="{ name: 'invoice.fill', query: { invoiceId, personId: item.personId } }"
+        :to="{ name: 'invoice.fill', query: { invoiceId, personId: item.personId,isFinished:true } }"
       >
         <template #value>
           <span class="pname">{{ item.personName }}</span>