Merge branch 'master' of http://git.ycjcjy.com/state_grid/invoice_fill_h5

src/pages/invoice/fill.vue

@@ -141,10 +141,10 @@
 
 <script setup>
 import { onMounted, reactive, ref } from 'vue';
-import { useRouter } from 'vue-router'
-import { Dialog,Toast } from 'vant'
+import { useRouter, useRoute } from 'vue-router'
+import { Dialog, Toast } from 'vant'
 import dayjs from 'dayjs'
-import { getInvoiceModel, setInvoiceDetail } from '@/services/invoice'
+import { getInvoiceModel, setInvoiceDetail, getInvoiceFill } from '@/services/invoice'
 import { useModel } from '@zjxpcyc/vue-tiny-store'
 
 const formData = reactive({
@@ -156,7 +156,6 @@ const formData = reactive({
   personId: undefined,
   personName: undefined,
   orgNameId: undefined,
-  endDate: undefined,
   orgId: undefined,
   invoiceOrgName: undefined,
   orgName: undefined,
@@ -178,51 +177,63 @@ const itemList = ref([])
 const showOrgPicker = ref(false)
 const showPersonPicker = ref(false)
 const router = useRouter();
+const route = useRoute();
 const { user } = useModel('user')
 
-// 校验函数返回 true 表示校验通过，false 表示不通过
-const validator = (val) => /1\d{10}/.test(val);
-
-// 校验函数可以直接返回一段错误提示
-const validatorMessage = (val) => `${val} 不合法，请重新输入`;
-
 onMounted(() => {
   //不是扫码进入
-  if (!router.currentRoute._rawValue.params.invoiceId) {
+  if (!route.query.invoiceId) {
     Dialog.alert({
       message: '请退出页面重新扫码进入'
     }).then(() => { })
     formData.isFinished = ture
     return
   }
-  //过期
-  let endDate = router.currentRoute._rawValue.params.endDate
-  if (dayjs().isAfter(dayjs(endDate))) {
-    formData.isFinished = true
-    Dialog.alert({
-      message: '该班次已截止如有问题请联系报销助理'
-    }).then(() => { })
-  }
-  formData.invoiceId = router.currentRoute._rawValue.params.invoiceId
-  formData.invoiceName = router.currentRoute._rawValue.params.invoiceName
+  getInvoiceFill(route.query.invoiceId).then(res => {
+    //过期
+    if (dayjs().isAfter(dayjs(res.endDate) || res.status == 2)) {
+      formData.isFinished = true
+      Dialog.alert({
+        message: '该班次已截止如有问题请联系报销助理'
+      })
+      formData.invoiceName = res.name
+    } else {
+
+      getInvoiceModel(route.query.invoiceId, { invoicePersonId: formData.invoicePersonId, personId: user.value.personId }).then(val => {
+        const info = {
+          ...(val.detail || val.tpl),
+          invoiceName: res.name
+        }
+        Object.assign(formData, info)
+        itemList.value = info.itemList
+      }).catch(err => {
+        console.log(err);
+      })
+    }
+  }).catch(err => {
+    console.log(err)
+  })
+
+
+
+
+
   formData.status = router.currentRoute._rawValue.params.status
-  formData.endDate = endDate
   formData.mergeRemark = '否'
-})
 
-// 校验函数可以返回 Promise，实现异步校验
-const asyncValidator = (val) =>
-  new Promise((resolve) => {
-    Toast.loading('验证中...');
-    setTimeout(() => {
-      Toast.clear();
-      resolve(val === '1234');
-    }, 1000);
-  });
+})
 
 const onFailed = (errorInfo) => {
   console.log('failed', formData);
 };
+
+//选择企业
+const changeOrg = () => {
+  if (!formData.isFinished) {
+    showOrgPicker.value = true
+  }
+}
+//确认企业
 const onOrgConfirm = (value) => {
   if (value) {
     formData.orgId = value.invoiceOrgId
@@ -232,11 +243,7 @@ const onOrgConfirm = (value) => {
   }
   showOrgPicker.value = false;
 };
-const changeOrg = () => {
-  if (!formData.isFinished) {
-    showOrgPicker.value = true
-  }
-}
+//选择报销人
 const showOrgPopup = () => {
   if (!formData.isFinished) {
     if (formData.orgId) {
@@ -248,6 +255,16 @@ const showOrgPopup = () => {
     }
   }
 }
+//确认报销人
+const onPersonConfirm = (value) => {
+  if (value) {
+    console.log(value);
+    formData.personName = value.name
+    formData.invoicePersonId = value.invoicePersonId
+    getDetail()
+  }
+  showPersonPicker.value = false;
+};
 //获取模板详情
 const getDetail = () => {
   getInvoiceModel(formData.invoiceId, { invoicePersonId: formData.invoicePersonId, personId: user.value.personId }).then(res => {
@@ -264,17 +281,8 @@ const getDetail = () => {
     console.log(err);
   })
 }
-const onPersonConfirm = (value) => {
-  if (value) {
-    console.log(value);
-    formData.personName = value.name
-    formData.invoicePersonId = value.invoicePersonId
-    getDetail()
-  }
-  showPersonPicker.value = false;
-};
+//提交表单
 const onSubmit = (val) => {
-  console.log(formData);
   if (itemList.value.length == 0) {
     Dialog.alert({
       message: '未找到报销项目请联系报销专员'
@@ -290,6 +298,7 @@ const onSubmit = (val) => {
     console.log(err);
   })
 }
+
 </script>
 <style lang="less" scoped>
 .lastLine::after {