From 89cd3efd5dc533e6c8129d7d86dc74e1adf3d84c Mon Sep 17 00:00:00 2001 From: gaoluyang <2820782392@qq.com> Date: 星期三, 20 八月 2025 14:00:25 +0800 Subject: [PATCH] 1.回款登记页面开发账联调 --- src/pages/index.vue | 5 src/pages/sales/receiptPayment/index.vue | 405 +++++++++++++++++++++++++++++++ src/pages.json | 14 + src/pages/sales/invoicingRegistration/add.vue | 2 src/pages/sales/invoiceLedger/detail.vue | 1 src/pages/sales/salesAccount/detail.vue | 2 src/pages/sales/invoiceLedger/index.vue | 3 src/pages/sales/receiptPayment/add.vue | 299 +++++++++++++++++++++++ 8 files changed, 728 insertions(+), 3 deletions(-) diff --git a/src/pages.json b/src/pages.json index bebcc42..361e6d9 100644 --- a/src/pages.json +++ b/src/pages.json @@ -106,6 +106,20 @@ } }, { + "path": "pages/sales/receiptPayment/index", + "style": { + "navigationBarTitleText": "鍥炴鐧昏", + "navigationStyle": "custom" + } + }, + { + "path": "pages/sales/receiptPayment/add", + "style": { + "navigationBarTitleText": "鏂板鍥炴", + "navigationStyle": "custom" + } + }, + { "path": "pages/common/webview/index", "style": { "navigationBarTitleText": "娴忚缃戦〉" diff --git a/src/pages/index.vue b/src/pages/index.vue index f073745..c9f1609 100644 --- a/src/pages/index.vue +++ b/src/pages/index.vue @@ -303,6 +303,11 @@ url: '/pages/sales/invoiceLedger/index' }); break; + case '鍥炴鐧昏': + uni.navigateTo({ + url: '/pages/sales/receiptPayment/index' + }); + break; case '鍗忓悓瀹℃壒': uni.navigateTo({ url: '/pages/cooperativeOffice/collaborativeApproval/index' diff --git a/src/pages/sales/invoiceLedger/detail.vue b/src/pages/sales/invoiceLedger/detail.vue index 2ddba5e..230564a 100644 --- a/src/pages/sales/invoiceLedger/detail.vue +++ b/src/pages/sales/invoiceLedger/detail.vue @@ -87,6 +87,7 @@ const currentInvoiceDate = ref([new Date().getFullYear(), new Date().getMonth() + 1, new Date().getDate()]) const goBack = () => { + uni.removeStorageSync('invoiceLedgerEditRow'); uni.navigateBack() } diff --git a/src/pages/sales/invoiceLedger/index.vue b/src/pages/sales/invoiceLedger/index.vue index 60a3533..cc7f81f 100644 --- a/src/pages/sales/invoiceLedger/index.vue +++ b/src/pages/sales/invoiceLedger/index.vue @@ -230,6 +230,7 @@ commitFile, delInvoiceLedgerByRegProductId } from '@/api/salesManagement/invoiceLedger.js' +import {onShow} from "@dcloudio/uni-app"; const userStore = useUserStore() @@ -518,7 +519,7 @@ } } -onMounted(() => { +onShow(() => { getList() }) </script> diff --git a/src/pages/sales/invoicingRegistration/add.vue b/src/pages/sales/invoicingRegistration/add.vue index ee658e0..154e2ac 100644 --- a/src/pages/sales/invoicingRegistration/add.vue +++ b/src/pages/sales/invoicingRegistration/add.vue @@ -358,7 +358,7 @@ productData.value = res.productData; form.value = { ...res }; // 璁剧疆榛樿褰曞叆浜� - form.value.createUer = userStore.name || '' + form.value.createUer = userStore.nickName || '' // 璁剧疆榛樿鏃ユ湡 const today = new Date() diff --git a/src/pages/sales/receiptPayment/add.vue b/src/pages/sales/receiptPayment/add.vue new file mode 100644 index 0000000..4317bb9 --- /dev/null +++ b/src/pages/sales/receiptPayment/add.vue @@ -0,0 +1,299 @@ +<template> + <view class="account-detail"> + <!-- 椤甸潰澶撮儴 --> + <van-nav-bar + title="鏂板鍥炴" + left-text="杩斿洖" + left-arrow + @click-left="onClickLeft" + fixed + placeholder + /> + + <!-- 琛ㄥ崟鍐呭 --> + <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 + @click="showDatePicker" + :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 + } + + if (!form.value.receiptPaymentDate) { + showNotify({ type: 'warning', message: '璇烽�夋嫨鏉ユ鏃ユ湡' }) + return + } + + loading.value = true + + receiptPaymentSaveOrUpdate(form.value) + .then(() => { + showToast('鎻愪氦鎴愬姛') + // 閫氱煡涓婁竴椤靛埛鏂版暟鎹� + const pages = getCurrentPages(); + const prevPage = pages[pages.length - 2]; + if (prevPage && prevPage.$vm && prevPage.$vm.getList) { + prevPage.$vm.getList(); + } + uni.removeStorageSync('invoiceLedgerEditRow'); + uni.navigateBack() + }) + .catch((error) => { + loading.value = false + }) +} + +// 鍒濆鍖栨暟鎹� +const initData = () => { + const rowStr = uni.getStorageSync('invoiceLedgerEditRow') + const row = JSON.parse(rowStr) + invoiceInfo({ id: row.id }).then((res) => { + const data = res.data + form.value = { ...data} + form.value.invoiceLedgerId = form.value.id; + form.value.id = ""; + currentNoReceiptAmount.value = row.noReceiptAmount + form.value.registrant = userStore.nickName + }).catch(() => { + showToast('鑾峰彇鏁版嵁澶辫触') + }) +} + +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/receiptPayment/index.vue b/src/pages/sales/receiptPayment/index.vue new file mode 100644 index 0000000..08b2f51 --- /dev/null +++ b/src/pages/sales/receiptPayment/index.vue @@ -0,0 +1,405 @@ +<template> + <view class="receipt-payment"> + <!-- 椤甸潰澶撮儴 --> + <van-nav-bar + title="鍥炴鐧昏" + left-text="杩斿洖" + left-arrow + @click-left="goBack" + fixed + placeholder + /> + + <!-- 鎼滅储鍜岀瓫閫夊尯鍩� --> + <view class="search-filter-section"> + <view class="search-bar"> + <view class="search-input"> + <input + class="search-text" + placeholder="瀹㈡埛鍚嶇О/鍚堝悓鍙�/椤圭洰鍚嶇О" + v-model="searchForm.searchText" + confirm-type="search" + /> + </view> + <view class="filter-button" @click="getList"> + <up-icon name="search" size="24" color="#999"></up-icon> + </view> + </view> + + <!-- 绛涢�夊紑鍏� --> + <view class="switch-row"> + <text class="switch-label">涓嶆樉绀哄緟鍥炴涓�0</text> + <van-switch v-model="searchForm.status" @change="getList" size="18"/> + </view> + </view> + + + + <!-- 鍒楄〃鍖哄煙 --> + <view class="ledger-list" v-if="tableData.length > 0"> + <view v-for="(item, index) in tableData" :key="index"> + <view class="ledger-item"> + <view class="item-header"> + <view class="item-left"> + <view class="document-icon"> + <up-icon name="file-text" size="16" color="#ffffff"></up-icon> + </view> + <text class="item-id">{{ item.salesContractNo }}</text> + </view> + </view> + <up-divider></up-divider> + <view class="item-details"> + <view class="detail-row"> + <text class="detail-label">瀹㈡埛鍚嶇О</text> + <text class="detail-value">{{ item.customerName }}</text> + </view> + <view class="detail-row"> + <text class="detail-label">瀹㈡埛鍚堝悓鍙�</text> + <text class="detail-value">{{ item.customerContractNo }}</text> + </view> + <view class="detail-row"> + <text class="detail-label">椤圭洰鍚嶇О</text> + <text class="detail-value">{{ item.projectName }}</text> + </view> + <view class="detail-row"> + <text class="detail-label">浜у搧澶х被</text> + <text class="detail-value">{{ item.productCategory }}</text> + </view> + <view class="detail-row"> + <text class="detail-label">鍙戠エ鍙�</text> + <text class="detail-value">{{ item.invoiceNo || '-' }}</text> + </view> + <view class="detail-row"> + <text class="detail-label">鍙戠エ閲戦(鍏�)</text> + <text class="detail-value highlight">{{ formatNumber(item.invoiceTotal) }}</text> + </view> + <view class="detail-row"> + <text class="detail-label">绋庣巼(%)</text> + <text class="detail-value">{{ item.taxRate }}</text> + </view> + <view class="detail-row"> + <text class="detail-label">鍥炴閲戦(鍏�)</text> + <text class="detail-value highlight">{{ formatNumber(item.receiptPaymentAmountTotal) }}</text> + </view> + <view class="detail-row"> + <text class="detail-label">寰呭洖娆鹃噾棰�(鍏�)</text> + <text class="detail-value danger">{{ formatNumber(item.noReceiptAmount) }}</text> + </view> + </view> + + <!-- 鎿嶄綔鎸夐挳 --> + <view class="action-buttons"> + <van-button + type="primary" + size="small" + class="action-btn" + :disabled="item.noReceiptAmount == 0" + @click="openForm(item)" + > + 鏂板鍥炴 + </van-button> + </view> + </view> + </view> + </view> + + <!-- 鏃犳暟鎹彁绀� --> + <view class="no-data" v-else> + <text>鏆傛棤鍥炴鏁版嵁</text> + </view> + + <!-- 鍥炴鏂瑰紡閫夋嫨鍣� --> + <van-popup v-model:show="showPaymentType" position="bottom"> + <van-picker + :columns="receipt_payment_type" + @confirm="onPaymentTypeConfirm" + @cancel="showPaymentType = false" + /> + </van-popup> + </view> +</template> + +<script setup> +import { ref } from 'vue' +import { + bindInvoiceNoRegPage, +} from '@/api/salesManagement/receiptPayment' +import useUserStore from '@/store/modules/user' +import { showToast } from 'vant' +import {onShow} from "@dcloudio/uni-app"; + +const userStore = useUserStore() + +// 鍝嶅簲寮忔暟鎹� +const tableData = ref([]) +const tableLoading = ref(false) +const showPaymentType = ref(false) +const currentEditRow = ref(null) + +// 鏌ヨ鍙傛暟璁剧疆涓�-1鑾峰彇鍏ㄩ儴鏁版嵁 +const page = ref({ + current: -1, + size: -1 +}) + +// 鎼滅储琛ㄥ崟 +const searchForm = ref({ + searchText: '', + status: true, + customerName: '', + customerContractNo: '', + projectName: '' +}) + +// 鍥炴鏂瑰紡閫夐」 +const receipt_payment_type = ref([ + { text: '鐜伴噾', value: '1' }, + { text: '閾惰杞处', value: '2' }, + { text: '鏀エ', value: '3' }, + { text: '鍏朵粬', value: '4' } +]) + +// 鏍煎紡鍖栨暟瀛� +const formatNumber = (value) => { + return parseFloat(value || 0).toFixed(2) +} + +// 杩斿洖涓婁竴椤� +const goBack = () => { + uni.navigateBack() +} + +// 鑾峰彇鍒楄〃鏁版嵁 +const getList = () => { + tableLoading.value = true + bindInvoiceNoRegPage({ ...searchForm.value, ...page.value }) + .then((res) => { + tableLoading.value = false + tableData.value = res.data.records || [] + }) + .catch(() => { + tableLoading.value = false + }) +} + +// 鎵撳紑鏂板琛ㄥ崟 +const openForm = (item) => { + if (item.noReceiptAmount == 0) { + showToast('鏃犻渶鍐嶅洖娆�') + return + } + uni.setStorageSync('invoiceLedgerEditRow', JSON.stringify(item)) + uni.navigateTo({ url: '/pages/sales/receiptPayment/add' }) +} + +// 纭鍥炴鏂瑰紡閫夋嫨 +const onPaymentTypeConfirm = (value) => { + if (currentEditRow.value) { + currentEditRow.value.receiptPaymentType = value.value + } + showPaymentType.value = false +} +onShow(() => { + getList() +}) +</script> + +<style scoped lang="scss"> +.u-divider { + margin: 0 !important; +} + +.receipt-payment { + min-height: 100vh; + background: #f8f9fa; + position: relative; +} + +.search-filter-section { + padding: 10px 20px; + background: #ffffff; +} + +.search-bar { + display: flex; + align-items: center; + gap: 12px; +} + +.search-input { + flex: 1; + background: #f5f5f5; + border-radius: 24px; + padding: 10px 16px; + display: flex; + align-items: center; + gap: 8px; +} + +.search-text { + flex: 1; + font-size: 14px; + color: #333; + background: transparent; + border: none; + outline: none; +} + +.search-text::placeholder { + color: #999; +} + +.filter-button { + width: 40px; + height: 40px; + border-radius: 8px; + display: flex; + align-items: center; + justify-content: center; +} + +.switch-row { + padding: 8px; + display: flex; + align-items: center; + justify-content: space-between; + margin-top: 8px; +} + +.switch-label { + font-size: 14px; + color: #333; +} + + + +.ledger-list { + padding: 20px; +} + +.ledger-item { + background: #ffffff; + border-radius: 12px; + margin-bottom: 16px; + overflow: hidden; + box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05); + padding: 0 16px; +} + +.item-header { + padding: 16px 0; + display: flex; + align-items: center; + justify-content: space-between; +} + +.item-left { + display: flex; + align-items: center; + gap: 8px; +} + +.document-icon { + width: 24px; + height: 24px; + background: #2979ff; + border-radius: 4px; + display: flex; + align-items: center; + justify-content: center; +} + +.item-id { + font-size: 14px; + color: #333; + font-weight: 500; +} + + + +.item-details { + padding: 16px 0; +} + +.detail-row { + display: flex; + align-items: flex-end; + justify-content: space-between; + margin-bottom: 8px; + + &:last-child { + margin-bottom: 0; + } +} + +.detail-label { + font-size: 12px; + color: #777777; + min-width: 60px; +} + +.detail-value { + font-size: 12px; + color: #000000; + text-align: right; + flex: 1; + margin-left: 16px; + display: flex; + align-items: center; + justify-content: flex-end; +} + +.detail-value.highlight { + color: #2979ff; + font-weight: 500; +} + +.detail-value.danger { + color: #ee0a24; + font-weight: 500; +} + +.children-list { + .children-title { + font-size: 14px; + font-weight: 500; + color: #333; + padding: 12px 0 8px 0; + border-top: 1px solid #f0f0f0; + } +} + +.child-item { + .child-details { + padding: 12px 0; + } + + .child-actions { + display: flex; + gap: 8px; + padding: 8px 0 16px 0; + justify-content: flex-end; + } +} + +.action-buttons { + display: flex; + gap: 12px; + padding: 0 0 16px 0; + justify-content: space-between; +} + +.action-btn { + flex: 1; + display: flex; + align-items: center; + justify-content: center; + gap: 8px; +} + +.no-data { + padding: 40px 0; + text-align: center; + color: #999; +} +</style> \ No newline at end of file diff --git a/src/pages/sales/salesAccount/detail.vue b/src/pages/sales/salesAccount/detail.vue index c243a88..2c2530c 100644 --- a/src/pages/sales/salesAccount/detail.vue +++ b/src/pages/sales/salesAccount/detail.vue @@ -616,7 +616,7 @@ }; const setUserInfo = () => { form.value.entryPerson = userStore.id; - form.value.entryPersonName = userStore.name; + form.value.entryPersonName = userStore.nickName; // 璁剧疆褰撳ぉ鏃ユ湡 const today = new Date() const year = today.getFullYear() -- Gitblit v1.9.3