xinyouhe/art-design
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

终版 计划收款信息 调整成可添加修改

Browse Source
This commit is contained in:
浅念
2025-11-10 15:54:59 +08:00
parent 6e2cd44f55
commit 963a95732b
3 changed files with 72 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/crmpc/stocking/final_add.vue
+31 -18
View File
@@ -753,13 +753,12 @@
<ElRow :gutter="12">
<ElCol :sm="12" :md="12" :lg="6" :xl="6">
<ElFormItem label="汇款人" label-width="55px">
<ElInput v-model="payment.remitter_name" placeholder="请选择汇款人" disabled />
<ElInput v-model="payment.remitter_name" placeholder="请选择汇款人" />
</ElFormItem>
</ElCol>
<ElCol :sm="12" :md="12" :lg="4" :xl="4">
<ElFormItem label="汇款国" label-width="55px">
<el-select
disabled
v-model="payment.remit_country_id"
filterable
placeholder="请选择汇款国"
@@ -782,7 +781,6 @@
<ElCol :sm="12" :md="12" :lg="4" :xl="4">
<ElFormItem label="日期" label-width="55px">
<ElDatePicker
disabled
v-model="payment.remit_date"
type="date"
format="YYYY-MM-DD"
@@ -795,13 +793,13 @@
<ElCol :sm="12" :md="12" :lg="5" :xl="5">
<ElFormItem label="账户" label-width="55px">
<ElSelect
disabled
v-model="payment.account_name_snapshot"
v-model="payment.account_id"
filterable
placeholder="请选择账户"
@change="
(val) =>
(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 || '')
"
>
<ElOption
@@ -811,15 +809,14 @@
:value="item.id"
/>
</ElSelect>
<ElInput v-model="payment.account_id" type="hidden" />
<ElInput v-model="payment.account_name_snapshot" type="hidden" />
</ElFormItem>
</ElCol>
<ElCol :sm="12" :md="12" :lg="5" :xl="5">
<ElFormItem label="金额" label-width="55px">
<ElInput disabled v-model="payment.amount" placeholder="请输入金额">
<ElInput v-model="payment.amount" placeholder="请输入金额">
<template #suffix>
<ElSelect
disabled
v-model="payment.currency_code"
style="width: 64px"
@change="
@@ -842,12 +839,27 @@
</ElFormItem>
</ElCol>
</ElRow>
<!-- <ElRow :gutter="12">
<ElCol :span="24" style="text-align: right;">
<ElButton type="danger" size="small" @click="removePaymentItem(idx)" :disabled="paymentItems.length === 1">删除</ElButton>
<ElButton type="primary" size="small" @click="addPaymentItem" v-if="idx === paymentItems.length - 1">添加收款信息</ElButton>
<ElRow :gutter="12">
<ElCol :span="24" style="text-align: right">
<ElButton type="success" size="small" @click="copyPaymentItem(idx)"
>复制</ElButton
>
<ElButton
type="primary"
size="small"
@click="addPaymentItem"
v-if="idx === paymentItems.length - 1"
>添加</ElButton
>
<ElButton
type="danger"
size="small"
@click="removePaymentItem(idx)"
:disabled="paymentItems.length === 1"
>删除</ElButton
>
</ElCol>
</ElRow> -->
</ElRow>
</ElForm>
</div>
</div>
@@ -1154,9 +1166,10 @@
// copyRow,
// addRowAfter,
// removeRow,
// // 收款项方法
// addPaymentItem,
// removePaymentItem,
// 收款项方法
addPaymentItem,
removePaymentItem,
copyPaymentItem,
// 客户选择方法
openCustomerDialog,
getCustomerList,
src/views/crmpc/stocking/final_edit.vue
+28 -22
View File
@@ -893,13 +893,12 @@
<ElRow :gutter="12">
<ElCol :span="4">
<ElFormItem label="汇款人">
<ElInput v-model="payment.remitter_name" placeholder="请选择汇款人" disabled />
<ElInput v-model="payment.remitter_name" placeholder="请选择汇款人" />
</ElFormItem>
</ElCol>
<ElCol :sm="12" :md="12" :lg="6" :xl="6">
<ElFormItem label="汇款国">
<el-select
disabled
v-model="payment.remit_country_id"
filterable
placeholder="请选择汇款国"
@@ -927,7 +926,6 @@
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
placeholder="请选择日期"
disabled
style="width: 100%"
/>
</ElFormItem>
@@ -935,13 +933,13 @@
<ElCol :sm="12" :md="12" :lg="5" :xl="5">
<ElFormItem label="账户">
<ElSelect
disabled
v-model="payment.account_name_snapshot"
v-model="payment.account_id"
filterable
placeholder="请选择账户"
@change="
(val) =>
(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 || '')
"
>
<ElOption
@@ -951,17 +949,16 @@
:value="item.id"
/>
</ElSelect>
<ElInput v-model="payment.account_id" type="hidden" />
<ElInput v-model="payment.account_name_snapshot" type="hidden" />
</ElFormItem>
</ElCol>
<ElCol :sm="12" :md="12" :lg="5" :xl="5">
<ElFormItem label="金额">
<ElInput disabled v-model="payment.amount" placeholder="请输入金额">
<ElInput v-model="payment.amount" placeholder="请输入金额">
<template #suffix>
<ElSelect
v-model="payment.currency_code"
style="width: 64px"
disabled
@change="
(val) => {
const found = (currencyOptions || []).find((x: any) => x.currency_code === val)
@@ -982,12 +979,27 @@
</ElFormItem>
</ElCol>
</ElRow>
<!-- <ElRow :gutter="12">
<ElCol :span="24" style="text-align: right;">
<ElButton type="danger" size="small" @click="removePaymentItem(idx)" :disabled="paymentItems.length === 1">删除</ElButton>
<ElButton type="primary" size="small" @click="addPaymentItem" v-if="idx === paymentItems.length - 1">添加收款信息</ElButton>
<ElRow :gutter="12">
<ElCol :span="24" style="text-align: right">
<ElButton type="success" size="small" @click="copyPaymentItem(idx)"
>复制</ElButton
>
<ElButton
type="primary"
size="small"
@click="addPaymentItem"
v-if="idx === paymentItems.length - 1"
>添加</ElButton
>
<ElButton
type="danger"
size="small"
@click="removePaymentItem(idx)"
:disabled="paymentItems.length === 1"
>删除</ElButton
>
</ElCol>
</ElRow> -->
</ElRow>
</ElForm>
</div>
</div>
@@ -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,
src/views/crmpc/stocking/stocking_list.vue
+13 -10
View File
@@ -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