diff --git a/klp-ui/src/views/crm/components/CustomerOrder.vue b/klp-ui/src/views/crm/components/CustomerOrder.vue
index 939dc718..8e444565 100644
--- a/klp-ui/src/views/crm/components/CustomerOrder.vue
+++ b/klp-ui/src/views/crm/components/CustomerOrder.vue
@@ -108,8 +108,6 @@ export default {
rules: {
},
orderId: '',
- // customerList: [],
- currentCustomer: {},
};
},
computed: {
@@ -123,46 +121,12 @@ export default {
if (newVal !== oldVal) {
this.queryParams.customerId = newVal;
this.getList();
- this.getSummary();
}
},
immediate: true
}
},
methods: {
- /** 查询正式订单主列表 */
- getSummary() {
- Promise.all(
- [
- listOrder({
- pageNum: 1,
- pageSize: 1,
- customerId: this.customerId,
- preOrderStatus: 0, // 待审核
- }),
- listOrder({
- pageNum: 1,
- pageSize: 1,
- customerId: this.customerId,
- preOrderStatus: 1, // 已审核
- }),
- listOrder({
- pageNum: 1,
- pageSize: 1,
- customerId: this.customerId,
- preOrderStatus: 2, // 已取消
- }),
- ]
- ).then(([preOrderList, auditOrderList, canOrderList]) => {
- console.log(preOrderList, auditOrderList, canOrderList)
- this.currentCustomer = {
- waitCount: preOrderList.total,
- dealCount: auditOrderList.total,
- cancelCount: canOrderList.total,
- total: preOrderList.total + auditOrderList.total + canOrderList.total,
- }
- })
- },
getList() {
if (!this.customerId) {
this.total = 0;
diff --git a/klp-ui/src/views/crm/contract/components/ContractTabs.vue b/klp-ui/src/views/crm/contract/components/ContractTabs.vue
index 6ac435b3..6460b017 100644
--- a/klp-ui/src/views/crm/contract/components/ContractTabs.vue
+++ b/klp-ui/src/views/crm/contract/components/ContractTabs.vue
@@ -40,6 +40,7 @@
+
@@ -67,14 +68,16 @@
import OrderPage from "@/views/crm/order/index.vue";
import CoilTable from "../../components/CoilTable.vue";
import FileList from "@/components/FileList";
+import DeliveryTable from "../../components/DeliveryTable.vue";
export default {
name: "ContractTabs",
components: {
OrderPage,
CoilTable,
- FileList
- },
+ FileList,
+ DeliveryTable
+ },
props: {
contractId: {
type: [Number, String],
@@ -116,6 +119,10 @@ export default {
otherAttachment: {
type: String,
default: ''
+ },
+ wmsDeliveryWaybills: {
+ type: Array,
+ default: () => []
}
},
data() {
@@ -128,7 +135,8 @@ export default {
{ label: "财务状态", name: "third" },
{ label: "订单异议", name: "fourth" },
{ label: "发货配卷", name: "fifth" },
- { label: "合同附件", name: "sixth" }
+ { label: '发货单据', name: 'seventh' },
+ { label: "合同附件", name: "sixth" },
]
};
},
diff --git a/klp-ui/src/views/crm/contract/index.vue b/klp-ui/src/views/crm/contract/index.vue
index 3b90578e..01a7a656 100644
--- a/klp-ui/src/views/crm/contract/index.vue
+++ b/klp-ui/src/views/crm/contract/index.vue
@@ -26,6 +26,7 @@
{
this.financeList = response.data.financeList || [];
this.objectionList = response.data.oobjectionList || [];
+ this.wmsDeliveryWaybills = response.data.wmsDeliveryWaybills || [];
}).finally(() => {
this.tabLoading = false;
})
diff --git a/klp-ui/src/views/crm/customer/index.vue b/klp-ui/src/views/crm/customer/index.vue
index bd6c5368..8da69c16 100644
--- a/klp-ui/src/views/crm/customer/index.vue
+++ b/klp-ui/src/views/crm/customer/index.vue
@@ -6,17 +6,18 @@
客户列表
-
+
-
+
-
+
+
+
+
@@ -164,6 +168,7 @@ import CustomerEdit from '../components/CustomerEdit.vue'
import CustomerOrder from '../components/CustomerOrder.vue'
import ChinaAreaSelect from '@/components/ChinaAreaSelect/index.vue'
import CoilTable from '../components/CoilTable.vue'
+import DeliveryTable from '../components/DeliveryTable.vue'
import { listCustomer, addCustomer, updateCustomer, delCustomer, listCoilByCustomerId, listFinanceByCustomerId } from '@/api/crm/customer'
@@ -176,13 +181,15 @@ export default {
CustomerEdit,
CustomerOrder,
ChinaAreaSelect,
- CoilTable
+ CoilTable,
+ DeliveryTable
},
dicts: ['customer_industry', 'customer_level'],
data() {
return {
customerList: [],
financeList: [],
+ wmsDeliveryWaybills: [],
objectionList: [],
coilList: [],
showQuery: false,
@@ -235,6 +242,7 @@ export default {
listFinanceByCustomerId(this.currentCustomerId).then(response => {
this.financeList = response.data.financeList || [];
this.objectionList = response.data.oobjectionList || [];
+ this.wmsDeliveryWaybills = response.data.wmsDeliveryWaybills || [];
}).catch(() => {
this.$message.error('获取客户财务状态失败');
});
@@ -242,7 +250,7 @@ export default {
/** 查询合同配卷列表 */
getCoilList() {
- listContractPackaging(this.form.contractId).then(response => {
+ listCoilByCustomerId(this.currentCustomerId).then(response => {
this.coilList = response.data || [];
})
},
@@ -303,6 +311,8 @@ export default {
handleItemClick(item) {
this.currentCustomer = { ...item };
+ this.getFinanceList();
+ this.getCoilList();
this.activeTab = 'detail';
},