@@ -103,6 +103,25 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/CostEntry/feeStatistic.vue b/src/components/CostEntry/feeStatistic.vue
index 3b0dc2e2..98bf0354 100644
--- a/src/components/CostEntry/feeStatistic.vue
+++ b/src/components/CostEntry/feeStatistic.vue
@@ -11,27 +11,27 @@
利润合计:
RMB应收:
- {{ data.receivableCNY }}
+ {{ statisticData.receivableCNY }}
RMB应付:
- {{ data.payableCNY }}
+ {{ statisticData.payableCNY }}
RMB利润:
- {{ data.profitCNY }}
+ {{ statisticData.profitCNY }}
USD应收:
- {{ data.receivableUSD }}
+ {{ statisticData.receivableUSD }}
USD应付:
- {{ data.payableUSD }}
+ {{ statisticData.payableUSD }}
USD利润:
- {{ data.profitUSD }}
+ {{ statisticData.profitUSD }}
合计应收:
- {{ data.receivableTotal }}
+ {{ statisticData.receivableTotal }}
合计应付:
- {{ data.payableTotal }}
+ {{ statisticData.payableTotal }}
合计利润:
- {{ data.profitTotal }}
+ {{ statisticData.profitTotal }}
利润率:
- {{ data.profitUSD }}%
+ {{ statisticData.profitUSD }}%
@@ -54,7 +54,8 @@
diff --git a/src/views/baseinfo/orderContact/index.vue b/src/views/baseinfo/orderContact/index.vue
new file mode 100644
index 00000000..ec9dc1b5
--- /dev/null
+++ b/src/views/baseinfo/orderContact/index.vue
@@ -0,0 +1,6 @@
+
+
+
+
+
diff --git a/src/views/baseinfo/sendReciveTem/index.vue b/src/views/baseinfo/sendReciveTem/index.vue
new file mode 100644
index 00000000..77fb6706
--- /dev/null
+++ b/src/views/baseinfo/sendReciveTem/index.vue
@@ -0,0 +1,7 @@
+
+
+ 1
+
+
+
diff --git a/src/views/baseinfo/userEmail/index.vue b/src/views/baseinfo/userEmail/index.vue
new file mode 100644
index 00000000..ec9dc1b5
--- /dev/null
+++ b/src/views/baseinfo/userEmail/index.vue
@@ -0,0 +1,6 @@
+
+
+
+
+
diff --git a/src/views/fee/template/components/feeField.vue b/src/views/fee/template/components/feeField.vue
index e41f9bd0..efdb6d6e 100644
--- a/src/views/fee/template/components/feeField.vue
+++ b/src/views/fee/template/components/feeField.vue
@@ -66,6 +66,8 @@
const list = ref([])
// 费用名称字典
const feeDict = ref([])
+ // 结算对象下拉数据
+ const companyDict = ref([])
// tableDom
const hotTb = ref(null)
// 校验成功返回数据
@@ -126,6 +128,32 @@
})
process(dict)
}
+ }, {
+ title: '结算对象',
+ width: 130,
+ data: 'customerName',
+ type: 'dropdown',
+ source: async (query, process) => {
+ // 获取当前选中行
+ const rowIndex = hotTb.value.hotInstance.countRows()
+ const code = list.value[rowIndex - 1].customerType
+ if (code) {
+ GetClientListByCode({ code }).then(res => {
+ const { data } = res
+ data.forEach(item => {
+ item['label'] = item.shortName
+ item['value'] = item.codeName
+ })
+ companyDict.value = data
+ const dict = data.map((item) => {
+ return item.shortName
+ })
+ process(dict)
+ })
+ } else {
+ process([])
+ }
+ },
}, {
title: '客户类别',
width: 130,
diff --git a/src/views/operation/seaexport/detail/modules/goodsTable.vue b/src/views/operation/seaexport/detail/modules/goodsTable.vue
index 3c9897b2..18104ff1 100644
--- a/src/views/operation/seaexport/detail/modules/goodsTable.vue
+++ b/src/views/operation/seaexport/detail/modules/goodsTable.vue
@@ -253,7 +253,7 @@
import { GetPackageSelectList } from '/@/views/operation/seaexport/api/BookingLedger'
registerAllModules()
import * as XLSX from 'xlsx'
- import printJS from 'print-js'
+ // import printJS from 'print-js'
const route = useRoute()
const props = defineProps({
details: { type: Object, default: {} },
@@ -1211,12 +1211,12 @@
// 打印
async function PrintExcel() {
- printJS({
- printable: 'printableTable',
- type: 'html',
- header: null,
- targetStyles: ['*'],
- })
+ // printJS({
+ // printable: 'printableTable',
+ // type: 'html',
+ // header: null,
+ // targetStyles: ['*'],
+ // })
}
// -------------------------------
const loadingTable = ref(false)