.

src/pages/invoice/fill.vue

@@ -200,29 +200,11 @@ onMounted(() => {
       })
       formData.invoiceName = res.name
     } else {
-
-      getInvoiceModel(route.query.invoiceId, { invoicePersonId: formData.invoicePersonId, 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);
-      })
+      getDetail({invoiceName: res.name})      
     }
   }).catch(err => {
     console.log(err)
   })
-
-
-
-
-
-  formData.status = router.currentRoute._rawValue.params.status
-  formData.mergeRemark = '否'
-
 })
 
 const onFailed = (errorInfo) => {
@@ -263,19 +245,22 @@ const onPersonConfirm = (value) => {
     console.log(value);
     formData.personName = value.name
     formData.invoicePersonId = value.invoicePersonId
-    getDetail()
+    getDetail({
+      invoiceName:formData.name,
+      invoicePersonId: formData.invoicePersonId,
+      personName: formData.personName,
+      orgId: formData.orgId,
+      invoiceOrgName: formData.invoiceOrgName
+    })
   }
   showPersonPicker.value = false;
 };
 //获取模板详情
-const getDetail = () => {
+const getDetail = (data) => {
   getInvoiceModel(formData.invoiceId, { invoicePersonId: formData.invoicePersonId, personId: user.value.personId }).then(res => {
     const info = {
       ...(res.detail || res.tpl),
-      invoicePersonId: formData.invoicePersonId,
-      personName: formData.personName,
-      orgId: formData.orgId,
-      invoiceOrgName: formData.invoiceOrgName
+      ...data
     }
     Object.assign(formData, info)
     itemList.value = info.itemList