From 3f88a4f81bbfc424caa1391f4b3969c26fbf8485 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 05 九月 2025 17:57:41 +0800
Subject: [PATCH] 销售管理真机测试，bug修改
---
src/pages/procurementManagement/paymentEntry/edit.vue | 261 +++++++++++++++++++++------------------------------
1 files changed, 107 insertions(+), 154 deletions(-)
diff --git a/src/pages/procurementManagement/paymentEntry/edit.vue b/src/pages/procurementManagement/paymentEntry/edit.vue
index 082c945..606cb4f 100644
--- a/src/pages/procurementManagement/paymentEntry/edit.vue
+++ b/src/pages/procurementManagement/paymentEntry/edit.vue
@@ -1,100 +1,108 @@
<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.purchaseContractNumber"
- label="閲囪喘鍚堝悓鍙�"
- placeholder="鑷姩濉厖"
- readonly
- />
- <van-field
- v-model="form.supplierName"
- label="渚涘簲鍟嗗悕绉�"
- placeholder="鑷姩濉厖"
- readonly
- />
- <van-field
- v-model="form.invoiceNumber"
- label="鍙戠エ鍙�"
- placeholder="鑷姩濉厖"
- readonly
- />
- <van-field
- v-model="form.invoiceAmount"
- label="鍙戠エ閲戦(鍏�)"
- placeholder="鑷姩濉厖"
- readonly
- />
- <view class="tip-text">寰呬粯娆鹃噾棰濓細{{ currentNoReceiptAmount }} 鍏�</view>
- <van-field
- v-model="form.currentPaymentAmount"
- label="鏈浠樻閲戦"
- type="number"
- placeholder="璇疯緭鍏�"
- @blur="changeNum"
- :rules="[{ required: true, message: '璇疯緭鍏ヤ粯娆鹃噾棰�' }]"
- clearable
- />
- <van-field
- v-model="form.paymentMethod"
- label="浠樻褰㈠紡"
- placeholder="璇烽�夋嫨"
- readonly
- @click="showPaymentTypePicker"
- :rules="[{ required: true, message: '璇烽�夋嫨浠樻褰㈠紡' }]"
- />
- <van-field
- v-model="form.paymentDate"
- label="浠樻鏃ユ湡"
- placeholder="璇烽�夋嫨"
- readonly
- @click="showDatePicker"
- :rules="[{ required: true, message: '璇烽�夋嫨鏉ユ鏃ユ湡' }]"
- />
- </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>
+ <view class="payment-edit">
+ <!-- 浣跨敤閫氱敤椤甸潰澶撮儴缁勪欢 -->
+ <PageHeader title="缂栬緫浠樻" @back="onClickLeft" />
+
+ <!-- 琛ㄥ崟鍐呭 -->
+ <u-form @submit="onSubmit" ref="formRef" label-width="110" input-align="right" error-message-align="right">
+ <!-- 鍩烘湰淇℃伅 -->
+ <u-cell-group title="鍩烘湰淇℃伅" class="form-section">
+ <u-form-item label="閲囪喘鍚堝悓鍙�" class="form-item">
+ <u-input v-model="form.purchaseContractNumber" placeholder="鑷姩濉厖" readonly />
+ </u-form-item>
+ <u-form-item label="閿�鍞悎鍚屽彿" class="form-item">
+ <u-input v-model="form.salesContractNo" placeholder="鑷姩濉厖" readonly />
+ </u-form-item>
+ <u-form-item label="渚涘簲鍟嗗悕绉�" class="form-item">
+ <u-input v-model="form.supplierName" placeholder="鑷姩濉厖" readonly />
+ </u-form-item>
+ <u-form-item label="鍙戠エ鍙�" class="form-item">
+ <u-input v-model="form.invoiceNumber" placeholder="鑷姩濉厖" readonly />
+ </u-form-item>
+ <u-form-item label="鍙戠エ閲戦(鍏�)" class="form-item">
+ <u-input v-model="form.invoiceAmount" placeholder="鑷姩濉厖" readonly />
+ </u-form-item>
+ <view class="tip-text">寰呬粯娆鹃噾棰濓細{{ currentNoReceiptAmount }} 鍏�</view>
+ <u-form-item label="鏈浠樻閲戦" prop="currentPaymentAmount" required class="form-item">
+ <u-input v-model="form.currentPaymentAmount" type="number" placeholder="璇疯緭鍏�" @blur="changeNum" clearable />
+ </u-form-item>
+ <u-form-item label="浠樻褰㈠紡" prop="paymentMethod" required class="form-item">
+ <u-input v-model="form.paymentMethod" placeholder="璇烽�夋嫨" readonly @click="showPaymentTypePicker" />
+ <template #right>
+ <up-icon
+ name="arrow-right"
+ @click="showPaymentTypePicker"
+ ></up-icon>
+ </template>
+ </u-form-item>
+ <u-form-item label="浠樻鏃ユ湡" prop="paymentDate" required class="form-item">
+ <u-input v-model="form.paymentDate" placeholder="璇烽�夋嫨" readonly @click="showDatePicker" />
+ <template #right>
+ <up-icon
+ name="arrow-right"
+ @click="showDatePicker"
+ ></up-icon>
+ </template>
+ </u-form-item>
+ <u-form-item label="鐧昏浜�" class="form-item">
+ <u-input v-model="form.registrant" placeholder="鑷姩濉厖" readonly />
+ </u-form-item>
+ <u-form-item label="鐧昏鏃ユ湡" prop="registrationtDate" required class="form-item">
+ <u-input v-model="form.registrationtDate" placeholder="璇烽�夋嫨" readonly />
+ </u-form-item>
+ </u-cell-group>
+
+ <!-- 鎻愪氦鎸夐挳 -->
+ <FooterButtons
+ :loading="loading"
+ @cancel="onClickLeft"
+ @confirm="onSubmit"
+ />
+ </u-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>
+ <!-- 浠樻鏂瑰紡閫夋嫨鍣� -->
+ <up-action-sheet
+ :show="showPaymentType"
+ title="閫夋嫨浠樻鏂瑰紡"
+ :actions="receipt_payment_type"
+ @select="onPaymentTypeConfirm"
+ @close="showPaymentType = false"
+ />
- <!-- 鏃ユ湡閫夋嫨鍣� -->
- <van-popup v-model:show="showDate" position="bottom">
- <van-date-picker
- v-model="currentDate"
- title="閫夋嫨鏃ユ湡"
- @confirm="onDateConfirm"
- @cancel="showDate = false"
- />
- </van-popup>
- </view>
+ <!-- 鏃ユ湡閫夋嫨鍣� -->
+ <up-datetime-picker
+ :show="showDate"
+ v-model="form.paymentDate"
+ @confirm="onDateConfirm"
+ @cancel="showDate = false"
+ mode="date"
+ />
+ </view>
</template>
<script setup>
+
+// 鏇挎崲 toast 鍜� notify 鏂规硶
+const showToast = (message) => {
+ uni.showToast({
+ title: message,
+ icon: 'none'
+ })
+}
+
+const showNotify = ({ type, message }) => {
+ uni.showToast({
+ title: message,
+ icon: type === 'warning' ? 'none' : 'success'
+ })
+}
+
import { ref, onMounted, computed } from 'vue'
-import { receiptPaymentSaveOrUpdate, invoiceInfo } from '@/api/salesManagement/receiptPayment'
+import FooterButtons from '@/components/FooterButtons.vue'
import useUserStore from '@/store/modules/user'
-import { showToast, showNotify } from 'vant'
import { useDict } from '@/utils/dict'
import {paymentRegistrationAdd, paymentRegistrationEdit} from "@/api/procurementManagement/paymentEntry";
+import { formatDateToYMD } from '@/utils/ruoyi'
const userStore = useUserStore()
@@ -104,9 +112,7 @@
// 鍝嶅簲寮忔暟鎹�
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({
@@ -125,7 +131,6 @@
ticketRegistrationId: ''
})
const currentNoReceiptAmount = ref(0)
-const operationType = ref('')
// 鑾峰彇瀛楀吀鏁版嵁
const { receipt_payment_type: dictReceiptPaymentType } = useDict('receipt_payment_type')
@@ -133,7 +138,7 @@
// 杞崲瀛楀吀鏁版嵁鏍煎紡涓洪�夋嫨鍣ㄩ渶瑕佺殑鏍煎紡
const receipt_payment_type = computed(() => {
return dictReceiptPaymentType.value.map(item => ({
- text: item.label,
+ name: item.label,
value: item.value
}))
})
@@ -156,10 +161,9 @@
}
// 纭浠樻鏂瑰紡閫夋嫨
-const onPaymentTypeConfirm = ({ selectedValues, selectedOptions }) => {
- form.value.receiptPaymentType = selectedOptions[0].value
- form.value.paymentMethod = selectedOptions[0].text
- pickerValue.value = selectedValues;
+const onPaymentTypeConfirm = (item) => {
+ form.value.receiptPaymentType = item.value
+ form.value.paymentMethod = item.name
showPaymentType.value = false
}
@@ -169,9 +173,8 @@
}
// 纭鏃ユ湡閫夋嫨
-const onDateConfirm = ({ selectedValues }) => {
- form.value.paymentDate = selectedValues.join('-')
- currentDate.value = selectedValues
+const onDateConfirm = (e) => {
+ form.value.paymentDate = formatDateToYMD(e.value)
showDate.value = false
}
@@ -184,6 +187,10 @@
}
if (!form.value.receiptPaymentType) {
showNotify({ type: 'warning', message: '璇烽�夋嫨浠樻褰㈠紡' })
+ return
+ }
+ if (!form.value.paymentDate) {
+ showNotify({ type: 'warning', message: '璇烽�夋嫨浠樻鏃ユ湡' })
return
}
loading.value = true
@@ -202,14 +209,7 @@
const rowStr = uni.getStorageSync('invoiceLedgerEditRow')
const row = JSON.parse(rowStr)
form.value = { ...row };
- form.value.ticketRegistrationId = row.id;
- form.value.id = "";
- if (operationType.value === 'add') {
- currentNoReceiptAmount.value = row.unPaymentAmountTotal
- form.value.registrant = userStore.nickName
- form.value.registrationtDate = getCurrentDate();
- form.value.paymentDate = getCurrentDate();
- }
+ currentNoReceiptAmount.value = row.unPaymentAmountTotal || 0;
}
// 鑾峰彇褰撳墠鏃ユ湡骞舵牸寮忓寲涓� YYYY-MM-DD
function getCurrentDate() {
@@ -220,57 +220,10 @@
return `${year}-${month}-${day}`;
}
onMounted(() => {
- operationType.value = uni.getStorageSync('operationType') || '';
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; }
+@import '@/static/scss/form-common.scss';
</style>
--
Gitblit v1.9.3