发票

src/views/operation/invoiceApply/detail/index.vue

@@ -464,7 +464,7 @@ const bottomForm = [
         colProps: { span: 4 },
     },
     {
-        field: 'applyDate',
+        field: 'createTime',
         label: '申请日期',
         component: 'DatePicker',
         colProps: { span: 4 },
@@ -637,7 +637,7 @@ const bottomFormEdit = [
         colProps: { span: 4 },
     },
     {
-        field: 'applyDate',
+        field: 'createTime',
         label: '申请日期',
         component: 'DEdit',
         colProps: { span: 4 },

src/views/operation/invoiceIssue/detail/applyInvoice.vue

@@ -258,7 +258,6 @@ const [registerTable, { getForm, setSelectedRowKeys, getSelectRows, setProps, ge
     },
     useSearchForm: true,
     showIndexColumn: false,
-    maxHeight: '600',
     pagination: true,
     rowKey: 'cindex',
     id: '11',
@@ -276,7 +275,6 @@ const [registerTable1, { getSelectRows: getSelectRowsFee, setProps: setPropsFee,
     columns: applyColumsDetail,
     useSearchForm: false,
     showIndexColumn: false,
-    maxHeight: '600',
     pagination: false,
     dataSource: dataSource.value,
     striped: true,
@@ -316,7 +314,6 @@ const [registerTableFree, { getForm: getFormFree, setSelectedRowKeys: setSelecte
     },
     useSearchForm: true,
     showIndexColumn: false,
-    maxHeight: '600',
     rowKey: 'cindex',
     id: '33',
     showTableSetting: true,
@@ -336,7 +333,6 @@ const [registerTableFreeDetail, { getSelectRows: getSelectRowsFeeDetail, setProp
     columns: columnsFreeDetail,
     useSearchForm: false,
     showIndexColumn: false,
-    maxHeight: '600',
     pagination: false,
     dataSource: freeDetailList.value,
     striped: true,
@@ -654,6 +650,7 @@ function handleClickFree(record, index) {
         loading.value = false
     })
 }
+const customerIdPName = ref('')
 function init(data) {
     if (route.query.type == 'apply') {
         open.value = true
@@ -665,12 +662,16 @@ function init(data) {
         if (customerIdP.value) {
             if (route.query.type == 'free') {
                 getFormFree().setFieldsValue({
-                    customerId: customerIdP.value
+                    customerId: customerIdP.value,
+                    customerName: customerIdPName.value
                 })
             } else {
+                console.log(customerIdP.value, customerIdPName.value)
                 getForm().setFieldsValue({
-                    customerId: customerIdP.value
+                    customerId: customerIdP.value,
+                    customerName: customerIdPName.value
                 })
+
             }
         }
         watch(
@@ -752,18 +753,20 @@ function addDetailed(type) {
                         amountUSD: item.amountUSD,
                         applicationId: item.id,
                         currency: ite,
-                        exchangeRate: 0
+                        exchangeRate: 1
                     })
                 })
             }
             if (type == 'rmb') {
                 arr.forEach(ite => {
-                    applications.value.push({
+                    if (ite == 'RMB') {
-                        amountRMB: item.amountRMB,
+                        applications.value.push({
-                        applicationId: item.id,
+                            amountRMB: item.amountRMB,
-                        currency: ite,
+                            applicationId: item.id,
-                        exchangeRate: 0
+                            currency: ite,
-                    })
+                            exchangeRate: 1
+                        })
+                    }
                 })
             }
             if (type == 'usd') {
@@ -772,61 +775,68 @@ function addDetailed(type) {
                         amountUSD: item.amountUSD,
                         applicationId: item.id,
                         currency: ite,
-                        exchangeRate: 0
+                        exchangeRate: 1
                     })
                 })
             }
 
         }
     })
-    const currencySet = new Set();
+    if (type != 'rmb') {
-    const arr = [] as any
+        const currencySet = new Set();
-    applications.value.forEach(item => {
+        const arr = [] as any
-        if (item.currency != 'RMB') {
+        applications.value.forEach(item => {
-            arr.push(item)
+            if (item.currency != 'RMB') {
-        }
+                arr.push(item)
-    })
-    if (arr.length > 0) {
-        const uniqueData = arr.filter(item => {
-            if (!currencySet.has(item.currency)) {
-                currencySet.add(item.currency);
-                return true;
             }
-            return false;
+        })
-        });
+        if (arr.length > 0) {
-        const promises = uniqueData.map(item => {
+            const uniqueData = arr.filter(item => {
-            return new Promise((resolve) => {
+                if (!currencySet.has(item.currency)) {
-                const data = {
+                    currencySet.add(item.currency);
-                    currencyFrom: 'RMB',
+                    return true;
-                    currencyTo: item.currency,
-                    feeType: 1
                 }
-                GetExchangeRate(data).then(res => {
+                return false;
-                    exchangarr.value.push(res.data)
-                    resolve(true);
-                })
             });
-        });
+            const promises = uniqueData.map(item => {
-        return Promise.all(promises).then(() => {
+                return new Promise((resolve) => {
-            applications.value.forEach(item => {
+                    const data = {
-                exchangarr.value.forEach(ite => {
+                        currencyFrom: 'RMB',
-                    if (item.currency == ite.currencyTo) {
+                        currencyTo: item.currency,
-                        item.exchangeRate = ite.reverseRate
+                        feeType: 1
                     }
+                    GetExchangeRate(data).then(res => {
+                        exchangarr.value.push(res.data)
+                        resolve(true);
+                    })
+                });
+            });
+            return Promise.all(promises).then(() => {
+                applications.value.forEach(item => {
+                    exchangarr.value.forEach(ite => {
+                        if (item.currency == ite.currencyTo) {
+                            item.exchangeRate = ite.reverseRate
+                        }
+                    })
                 })
-            })
+                exchangeFlag.value = true
-            exchangeFlag.value = true
+            });
-        });
+        } else {
+            emits('updateList', applications.value)
+            open.value = false
+            exchangeFlag.value = false
+        }
     } else {
         emits('updateList', applications.value)
         open.value = false
         exchangeFlag.value = false
     }
+
 }
 
 const customerIdP = ref('')
 
-defineExpose({ init, customerIdP })
+defineExpose({ init, customerIdP, customerIdPName })
 </script>
 <style lang="less" scoped>
 .total {

src/views/operation/invoiceIssue/detail/index.vue

@@ -734,8 +734,9 @@ onMounted(() => {
     }
 })
 function handleInto() {
-    applyInvoiceRef.value.init()
     applyInvoiceRef.value.customerIdP = form.value.customerId
+    applyInvoiceRef.value.customerIdPName = form.value.customerName
+    applyInvoiceRef.value.init()
 }
 function handleSave() {
     const data = {
@@ -858,8 +859,9 @@ function updateListFreeLeft(val,arrQuery) {
             if (!route.query.id) {
                 const { fullPath } = route //获取当前路径
                 tabStore.closeTabByKey(fullPath, router)
+                let type = route.query.type
                 setTimeout(() => {
-                    go(`/invoiceIssueDetail?id=${res.data.id}&type=${route.query.type}`)
+                    go(`/invoiceIssueDetail?id=${res.data.id}&type=${type}`)
                 }, 50)
             } else {
                 getDetail()
@@ -905,8 +907,9 @@ function handleUpdate(val) {
             if (!route.query.id) {
                 const { fullPath } = route //获取当前路径
                 tabStore.closeTabByKey(fullPath, router)
+                let type = route.query.type
                 setTimeout(() => {
-                    go(`/invoiceIssueDetail?id=${res.data.id}&type=${route.query.type}`)
+                    go(`/invoiceIssueDetail?id=${res.data.id}&type=${type}`)
                 }, 50)
             } else {
                 getDetail()
@@ -940,8 +943,9 @@ function updateListFree(val) {
             if (!route.query.id) {
                 const { fullPath } = route //获取当前路径
                 tabStore.closeTabByKey(fullPath, router)
+                let type = route.query.type
                 setTimeout(() => {
-                    go(`/invoiceIssueDetail?id=${res.data.id}&type=${route.query.type}`)
+                    go(`/invoiceIssueDetail?id=${res.data.id}&type=${type}`)
                 }, 50)
             } else {
                 getDetail()
@@ -1178,7 +1182,7 @@ const columns = [
             const res = feeDict.value.length ? feeDict.value : (await GetInvoiceCodeList())?.data
             if (!feeDict.value.length) feeDict.value = res
             const dict = res.map((res) => {
-                return res.displayName
+                return res.name
             })
             process(dict)
         },