diff --git a/src/views/crmpc/stocking/final_add.vue b/src/views/crmpc/stocking/final_add.vue
index 1295b7f..a7f1b7d 100644
--- a/src/views/crmpc/stocking/final_add.vue
+++ b/src/views/crmpc/stocking/final_add.vue
@@ -753,13 +753,12 @@
-
+
- (payment.account_id =
- (accountOptions || []).find((x: any) => x.short_desc === val)?.id || '')
+ (payment.account_name_snapshot =
+ (accountOptions || []).find((x: any) => x.id === val)?.short_desc || '')
"
>
-
+
-
+
-
+
@@ -1154,9 +1166,10 @@
// copyRow,
// addRowAfter,
// removeRow,
- // // 收款项方法
- // addPaymentItem,
- // removePaymentItem,
+ // 收款项方法
+ addPaymentItem,
+ removePaymentItem,
+ copyPaymentItem,
// 客户选择方法
openCustomerDialog,
getCustomerList,
diff --git a/src/views/crmpc/stocking/final_edit.vue b/src/views/crmpc/stocking/final_edit.vue
index 317c24a..c41dc6a 100644
--- a/src/views/crmpc/stocking/final_edit.vue
+++ b/src/views/crmpc/stocking/final_edit.vue
@@ -893,13 +893,12 @@
-
+
@@ -935,13 +933,13 @@
- (payment.account_id =
- (accountOptions || []).find((x: any) => x.short_desc === val)?.id || '')
+ (payment.account_name_snapshot =
+ (accountOptions || []).find((x: any) => x.id === val)?.short_desc || '')
"
>
-
+
-
+
{
const found = (currencyOptions || []).find((x: any) => x.currency_code === val)
@@ -982,12 +979,27 @@
-
+
@@ -1265,11 +1277,9 @@
ncolorOptions,
transportOptions,
trade_termsOptions,
-
// 上传相关
actionImageUplode,
uploadHeaders,
-
// 方法
initializeForm,
populateFromDetail,
@@ -1279,29 +1289,25 @@
wrapMoney,
calcProfit,
handleUserEdit,
-
// 合同文件方法
isImageFile,
beforeContractUpload,
handleContractUpload,
removeContractFile,
-
// 订单项方法
copyRow,
addRowAfter,
removeRow,
-
// 收款项方法
addPaymentItem,
removePaymentItem,
-
+ copyPaymentItem,
// 客户选择方法
openCustomerDialog,
getCustomerList,
handleCustomerSizeChange,
handleCustomerCurrentChange,
chooseCustomer,
-
// 车辆选择方法
openVehicleDialog,
getVehicleList,
diff --git a/src/views/crmpc/stocking/stocking_list.vue b/src/views/crmpc/stocking/stocking_list.vue
index ce59d8e..2c14eea 100644
--- a/src/views/crmpc/stocking/stocking_list.vue
+++ b/src/views/crmpc/stocking/stocking_list.vue
@@ -399,22 +399,25 @@
const handleView1 = async (row: any) => {
const res = await CrmService.checkStock({ id: row.object_id })
-
// 处理合同文件
- if (res?.contract) {
- contractFiles.value = processFiles(res.contract, '合同')
+ const file_list = res?.file_list
+ if (file_list?.contract) {
+ contractFiles.value = processFiles(file_list.contract, '合同')
+ } else {
+ contractFiles.value = []
}
-
// 处理PI文件
- if (res?.pi_doc) {
- piFiles.value = processFiles(res.pi_doc, 'PI')
+ if (file_list?.pi_doc) {
+ piFiles.value = processFiles(file_list.pi_doc, 'PI')
+ } else {
+ piFiles.value = []
}
-
// 处理水单文件
- if (res?.transaction_slip) {
- waterBillFiles.value = processFiles(res.transaction_slip, '水单')
+ if (file_list?.transaction_slip) {
+ waterBillFiles.value = processFiles(file_list.transaction_slip, '水单')
+ } else {
+ waterBillFiles.value = []
}
-
if (res) {
// 获取订单详情成功
const orderData: OrderData = res