From 35b0b44824aaeb6be31595f1d0a17380c90c1b89 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 25 八月 2025 17:31:09 +0800
Subject: [PATCH] 1.回款流水开发联调
---
src/pages/procurementManagement/receiptPaymentHistory/index.vue | 3
src/pages.json | 7 +
src/pages/procurementManagement/paymentEntry/edit.vue | 4
src/pages/sales/receiptPayment/edit.vue | 285 +++++++++++++++++++++++++++++++++++++++++++++++
src/pages/sales/receiptPaymentHistory/index.vue | 33 +++++
5 files changed, 327 insertions(+), 5 deletions(-)
diff --git a/src/pages.json b/src/pages.json
index fcbdd4f..9e29df3 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -121,6 +121,13 @@
}
},
{
+ "path": "pages/sales/receiptPayment/edit",
+ "style": {
+ "navigationBarTitleText": "淇敼鍥炴鐧昏",
+ "navigationStyle": "custom"
+ }
+ },
+ {
"path": "pages/sales/receiptPaymentHistory/index",
"style": {
"navigationBarTitleText": "鍥炴娴佹按",
diff --git a/src/pages/procurementManagement/paymentEntry/edit.vue b/src/pages/procurementManagement/paymentEntry/edit.vue
index d4e1856..082c945 100644
--- a/src/pages/procurementManagement/paymentEntry/edit.vue
+++ b/src/pages/procurementManagement/paymentEntry/edit.vue
@@ -186,10 +186,6 @@
showNotify({ type: 'warning', message: '璇烽�夋嫨浠樻褰㈠紡' })
return
}
- if (!form.value.paymentDate) {
- showNotify({ type: 'warning', message: '璇烽�夋嫨浠樻鏃ユ湡' })
- return
- }
loading.value = true
paymentRegistrationEdit(form.value)
.then(() => {
diff --git a/src/pages/procurementManagement/receiptPaymentHistory/index.vue b/src/pages/procurementManagement/receiptPaymentHistory/index.vue
index 158d5e7..42aaef6 100644
--- a/src/pages/procurementManagement/receiptPaymentHistory/index.vue
+++ b/src/pages/procurementManagement/receiptPaymentHistory/index.vue
@@ -76,6 +76,7 @@
type="primary"
size="small"
class="action-btn"
+ :disabled="item.registrant !== userStore.nickName"
@click="openForm(item)"
>
缂栬緫浠樻
@@ -95,6 +96,8 @@
import { ref, computed } from 'vue';
import { onShow } from '@dcloudio/uni-app';
import {paymentHistoryListPage} from "@/api/procurementManagement/paymentEntry";
+import useUserStore from "@/store/modules/user";
+const userStore = useUserStore()
// 鎼滅储琛ㄥ崟
const searchForm = ref({
diff --git a/src/pages/sales/receiptPayment/edit.vue b/src/pages/sales/receiptPayment/edit.vue
new file mode 100644
index 0000000..92cfeeb
--- /dev/null
+++ b/src/pages/sales/receiptPayment/edit.vue
@@ -0,0 +1,285 @@
+<template>
+ <view class="account-detail">
+ <!-- 浣跨敤閫氱敤椤甸潰澶撮儴缁勪欢 -->
+ <PageHeader title="鏂板鍥炴" @back="onClickLeft" />
+
+ <!-- 琛ㄥ崟鍐呭 -->
+ <van-form @submit="onSubmit" ref="formRef" label-width="110px" input-align="right" error-message-align="right" scroll-to-error scroll-to-error-position="center">
+ <!-- 鍩烘湰淇℃伅 -->
+ <van-cell-group title="鍩烘湰淇℃伅" inset>
+ <van-field
+ v-model="form.salesContractNo"
+ label="閿�鍞悎鍚屽彿"
+ placeholder="鑷姩濉厖"
+ readonly
+ />
+ <van-field
+ v-model="form.customerName"
+ label="瀹㈡埛鍚嶇О"
+ placeholder="鑷姩濉厖"
+ readonly
+ />
+<!-- <van-field-->
+<!-- v-model="form.invoiceNo"-->
+<!-- label="鍙戠エ鍙�"-->
+<!-- placeholder="鑷姩濉厖"-->
+<!-- readonly-->
+<!-- />-->
+<!-- <van-field-->
+<!-- v-model="form.invoiceTotal"-->
+<!-- label="鍙戠エ閲戦(鍏�)"-->
+<!-- placeholder="鑷姩濉厖"-->
+<!-- readonly-->
+<!-- />-->
+<!-- <van-field-->
+<!-- v-model="form.taxRate"-->
+<!-- label="绋庣巼"-->
+<!-- placeholder="鑷姩濉厖"-->
+<!-- readonly-->
+<!-- />-->
+ <view class="tip-text">寰呭洖娆鹃噾棰濓細{{ currentNoReceiptAmount }} 鍏�</view>
+ <van-field
+ v-model="form.receiptPaymentAmount"
+ label="鏈鍥炴閲戦"
+ type="number"
+ placeholder="璇疯緭鍏�"
+ @blur="changeNum"
+ :rules="[{ required: true, message: '璇疯緭鍏ュ洖娆鹃噾棰�' }]"
+ clearable
+ />
+ <van-field
+ v-model="form.receiptPaymentTypeName"
+ label="鍥炴褰㈠紡"
+ placeholder="璇烽�夋嫨"
+ readonly
+ @click="showPaymentTypePicker"
+ :rules="[{ required: true, message: '璇烽�夋嫨鍥炴褰㈠紡' }]"
+ />
+ <van-field
+ v-model="form.receiptPaymentDate"
+ label="鏉ユ鏃ユ湡"
+ placeholder="璇烽�夋嫨"
+ readonly
+ :rules="[{ required: true, message: '璇烽�夋嫨鏉ユ鏃ユ湡' }]"
+ />
+ <van-field
+ v-model="form.registrant"
+ label="鐧昏浜�"
+ placeholder="鑷姩濉厖"
+ readonly
+ />
+ </van-cell-group>
+
+ <!-- 鎻愪氦鎸夐挳 -->
+ <view class="footer-btns">
+ <van-button class="cancel-btn" @click="onClickLeft">鍙栨秷</van-button>
+ <van-button class="save-btn" native-type="submit" form-type="submit" :loading="loading">淇濆瓨</van-button>
+ </view>
+ </van-form>
+
+ <!-- 鍥炴鏂瑰紡閫夋嫨鍣� -->
+ <van-popup v-model:show="showPaymentType" position="bottom">
+ <van-picker
+ :model-value="pickerValue"
+ :columns="receipt_payment_type"
+ @confirm="onPaymentTypeConfirm"
+ @cancel="showPaymentType = false"
+ />
+ </van-popup>
+
+ <!-- 鏃ユ湡閫夋嫨鍣� -->
+ <van-popup v-model:show="showDate" position="bottom">
+ <van-date-picker
+ v-model="currentDate"
+ title="閫夋嫨鏃ユ湡"
+ @confirm="onDateConfirm"
+ @cancel="showDate = false"
+ />
+ </van-popup>
+ </view>
+</template>
+
+<script setup>
+import { ref, onMounted, computed } from 'vue'
+import { receiptPaymentSaveOrUpdate, invoiceInfo } from '@/api/salesManagement/receiptPayment'
+import useUserStore from '@/store/modules/user'
+import { showToast, showNotify } from 'vant'
+import { useDict } from '@/utils/dict'
+
+const userStore = useUserStore()
+
+// 琛ㄥ崟寮曠敤
+const formRef = ref()
+
+// 鍝嶅簲寮忔暟鎹�
+const loading = ref(false)
+const showPaymentType = ref(false)
+const pickerValue = ref([])
+const showDate = ref(false)
+const currentDate = ref([new Date().getFullYear(), new Date().getMonth() + 1, new Date().getDate()])
+
+// 琛ㄥ崟鏁版嵁
+const form = ref({
+ salesContractNo: '',
+ customerName: '',
+ invoiceNo: '',
+ invoiceTotal: '',
+ taxRate: '',
+ receiptPaymentAmount: '',
+ receiptPaymentType: '',
+ receiptPaymentTypeName: '',
+ registrant: '',
+ receiptPaymentDate: '',
+ invoiceLedgerId: ''
+})
+const currentNoReceiptAmount = ref(0)
+
+// 鑾峰彇瀛楀吀鏁版嵁
+const { receipt_payment_type: dictReceiptPaymentType } = useDict('receipt_payment_type')
+
+// 杞崲瀛楀吀鏁版嵁鏍煎紡涓洪�夋嫨鍣ㄩ渶瑕佺殑鏍煎紡
+const receipt_payment_type = computed(() => {
+ return dictReceiptPaymentType.value.map(item => ({
+ text: item.label,
+ value: item.value
+ }))
+})
+
+// 杩斿洖涓婁竴椤�
+const onClickLeft = () => {
+ uni.removeStorageSync('invoiceLedgerEditRow');
+ uni.navigateBack()
+}
+
+// 鏄剧ず鍥炴鏂瑰紡閫夋嫨鍣�
+const showPaymentTypePicker = () => {
+ showPaymentType.value = true
+}
+const changeNum = () => {
+ if (form.value.receiptPaymentAmount > currentNoReceiptAmount.value) {
+ form.value.receiptPaymentAmount = currentNoReceiptAmount.value
+ showToast('涓嶅彲澶т簬寰呭洖娆鹃噾棰�')
+ }
+}
+
+// 纭鍥炴鏂瑰紡閫夋嫨
+const onPaymentTypeConfirm = ({ selectedValues, selectedOptions }) => {
+ form.value.receiptPaymentType = selectedOptions[0].value
+ form.value.receiptPaymentTypeName = selectedOptions[0].text
+ pickerValue.value = selectedValues;
+ showPaymentType.value = false
+}
+
+// 鏄剧ず鏃ユ湡閫夋嫨鍣�
+const showDatePicker = () => {
+ showDate.value = true
+}
+
+// 纭鏃ユ湡閫夋嫨
+const onDateConfirm = ({ selectedValues }) => {
+ form.value.receiptPaymentDate = selectedValues.join('-')
+ currentDate.value = selectedValues
+ showDate.value = false
+}
+
+// 鎻愪氦琛ㄥ崟
+const onSubmit = () => {
+ // 琛ㄥ崟楠岃瘉
+ if (!form.value.receiptPaymentAmount) {
+ showNotify({ type: 'warning', message: '璇疯緭鍏ュ洖娆鹃噾棰�' })
+ return
+ }
+
+ if (!form.value.receiptPaymentType) {
+ showNotify({ type: 'warning', message: '璇烽�夋嫨鍥炴褰㈠紡' })
+ return
+ }
+ loading.value = true
+ let updateData = {
+ id: form.value.id,
+ receiptPaymentType: form.value.receiptPaymentType,
+ receiptPaymentAmount: form.value.receiptPaymentAmount,
+ };
+ receiptPaymentSaveOrUpdate(updateData)
+ .then(() => {
+ showToast('鎻愪氦鎴愬姛')
+ onClickLeft()
+ })
+ .catch((error) => {
+ loading.value = false
+ })
+}
+
+// 鍒濆鍖栨暟鎹�
+const initData = () => {
+ const rowStr = uni.getStorageSync('invoiceLedgerEditRow')
+ const row = JSON.parse(rowStr)
+ form.value = { ...row}
+ form.value.receiptPaymentTypeName = formatReceiptType(row.receiptPaymentType);
+ form.value.id = "";
+ currentNoReceiptAmount.value = row.noReceiptAmount
+}
+const formatReceiptType = (type) => {
+ if (type == 0) {
+ return "鐢垫眹";
+ } else if (type == 1) {
+ return "鎵垮厬";
+ } else {
+ return "鏈煡";
+ }
+};
+
+onMounted(() => {
+ initData()
+})
+</script>
+
+<style scoped lang="scss">
+.account-detail {
+ min-height: 100vh;
+ background: #f8f9fa;
+ padding-bottom: 5rem;
+}
+
+.footer-btns {
+ position: fixed;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ background: #fff;
+ display: flex;
+ justify-content: space-around;
+ align-items: center;
+ padding: 0.75rem 0;
+ box-shadow: 0 -0.125rem 0.5rem rgba(0,0,0,0.05);
+ z-index: 1000;
+}
+
+.cancel-btn {
+ font-weight: 400;
+ font-size: 1rem;
+ color: #FFFFFF;
+ width: 6.375rem;
+ background: #C7C9CC;
+ box-shadow: 0 0.25rem 0.625rem 0 rgba(3,88,185,0.2);
+ border-radius: 2.5rem 2.5rem 2.5rem 2.5rem;
+}
+
+.save-btn {
+ font-weight: 400;
+ font-size: 1rem;
+ color: #FFFFFF;
+ width: 14rem;
+ background: linear-gradient( 140deg, #00BAFF 0%, #006CFB 100%);
+ box-shadow: 0 0.25rem 0.625rem 0 rgba(3,88,185,0.2);
+ border-radius: 2.5rem 2.5rem 2.5rem 2.5rem;
+}
+
+// 鍝嶅簲寮忚皟鏁�
+@media (max-width: 768px) {
+ .submit-section {
+ padding: 12px;
+ }
+}
+.tip-text { padding: 4px 16px 0 16px; font-size: 12px; color: #888; }
+</style>
diff --git a/src/pages/sales/receiptPaymentHistory/index.vue b/src/pages/sales/receiptPaymentHistory/index.vue
index de4620d..747ec95 100644
--- a/src/pages/sales/receiptPaymentHistory/index.vue
+++ b/src/pages/sales/receiptPaymentHistory/index.vue
@@ -78,6 +78,18 @@
<text class="detail-value">{{ item.createTime }}</text>
</view>
</view>
+ <!-- 鎿嶄綔鎸夐挳 -->
+ <view class="action-buttons">
+ <van-button
+ type="primary"
+ size="small"
+ class="action-btn"
+ :disabled="item.registrant !== userStore.nickName"
+ @click="openForm(item)"
+ >
+ 缂栬緫鍥炴
+ </van-button>
+ </view>
</view>
</view>
</view>
@@ -92,6 +104,8 @@
import { ref, computed } from 'vue';
import { onShow } from '@dcloudio/uni-app';
import { receiptPaymentHistoryListPage } from "@/api/salesManagement/receiptPayment.js";
+import useUserStore from "@/store/modules/user";
+const userStore = useUserStore()
// 鎼滅储琛ㄥ崟
const searchForm = ref({
@@ -160,6 +174,11 @@
const formatAmount = (amount) => {
return amount ? parseFloat(amount).toFixed(2) : '0.00';
};
+// 鎵撳紑缂栬緫琛ㄥ崟
+const openForm = (item) => {
+ uni.setStorageSync('invoiceLedgerEditRow', JSON.stringify(item))
+ uni.navigateTo({ url: '/pages/sales/receiptPayment/edit' })
+}
onShow(() => {
// 椤甸潰鏄剧ず鏃跺埛鏂板垪琛�
getList();
@@ -247,7 +266,19 @@
align-items: center;
gap: 8px;
}
-
+.action-buttons {
+ display: flex;
+ gap: 12px;
+ padding: 12px 0 0 0;
+ justify-content: space-between;
+}
+.action-btn {
+ flex: 1;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ gap: 8px;
+}
.document-icon {
width: 24px;
height: 24px;
--
Gitblit v1.9.3