From 4b7417e3fac921f8f82490971209d67462c7b3f9 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 25 八月 2025 16:43:26 +0800
Subject: [PATCH] 1.付款流水开发联调

---
 src/pages/index.vue                                             |    2 
 src/pages/procurementManagement/receiptPaymentHistory/index.vue |  381 +++++++++++++++++++++++++++++++
 src/pages.json                                                  |   14 +
 src/pages/procurementManagement/paymentEntry/index.vue          |    5 
 src/pages/procurementManagement/paymentEntry/add.vue            |    1 
 src/pages/procurementManagement/paymentEntry/edit.vue           |  280 +++++++++++++++++++++++
 6 files changed, 679 insertions(+), 4 deletions(-)

diff --git a/src/pages.json b/src/pages.json
index 77a9f89..08b1cde 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -212,6 +212,20 @@
       }
     },
     {
+      "path": "pages/procurementManagement/paymentEntry/edit",
+      "style": {
+        "navigationBarTitleText": "淇敼浠樻鐧昏",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/procurementManagement/receiptPaymentHistory/index",
+      "style": {
+        "navigationBarTitleText": "浠樻娴佹按",
+        "navigationStyle": "custom"
+      }
+    },
+    {
       "path": "pages/common/webview/index",
       "style": {
         "navigationBarTitleText": "娴忚缃戦〉"
diff --git a/src/pages/index.vue b/src/pages/index.vue
index 9bd5608..d64c6b5 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -342,7 +342,7 @@
 			break;
 		case '浠樻娴佹按':
 			uni.navigateTo({
-				url: '/pages/procurementManagement/paymentEntry/index'
+				url: '/pages/procurementManagement/receiptPaymentHistory/index'
 			});
 			break;
 		case '鍗忓悓瀹℃壒':
diff --git a/src/pages/procurementManagement/paymentEntry/add.vue b/src/pages/procurementManagement/paymentEntry/add.vue
index 13e08a4..4c83048 100644
--- a/src/pages/procurementManagement/paymentEntry/add.vue
+++ b/src/pages/procurementManagement/paymentEntry/add.vue
@@ -109,7 +109,6 @@
 
 <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'
diff --git a/src/pages/procurementManagement/paymentEntry/edit.vue b/src/pages/procurementManagement/paymentEntry/edit.vue
new file mode 100644
index 0000000..d4e1856
--- /dev/null
+++ b/src/pages/procurementManagement/paymentEntry/edit.vue
@@ -0,0 +1,280 @@
+<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>
+
+    <!-- 浠樻鏂瑰紡閫夋嫨鍣� -->
+    <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'
+import {paymentRegistrationAdd, paymentRegistrationEdit} from "@/api/procurementManagement/paymentEntry";
+
+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({
+	purchaseContractNumber: '',
+  salesContractNo: '',
+  supplierName: '',
+  invoiceNumber: '',
+  invoiceAmount: '',
+  taxRate: '',
+  currentPaymentAmount: '',
+  receiptPaymentType: '',
+	paymentMethod: '',
+  registrant: '',
+	paymentDate: '',
+	registrationtDate: '',
+  ticketRegistrationId: ''
+})
+const currentNoReceiptAmount = ref(0)
+const operationType = ref('')
+
+// 鑾峰彇瀛楀吀鏁版嵁
+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.currentPaymentAmount > currentNoReceiptAmount.value) {
+		form.value.currentPaymentAmount = currentNoReceiptAmount.value
+		showToast('涓嶅彲澶т簬寰呬粯娆鹃噾棰�')
+	}
+}
+
+// 纭浠樻鏂瑰紡閫夋嫨
+const onPaymentTypeConfirm = ({ selectedValues, selectedOptions }) => {
+  form.value.receiptPaymentType = selectedOptions[0].value
+  form.value.paymentMethod = selectedOptions[0].text
+	pickerValue.value = selectedValues;
+  showPaymentType.value = false
+}
+
+// 鏄剧ず鏃ユ湡閫夋嫨鍣�
+const showDatePicker = () => {
+  showDate.value = true
+}
+
+// 纭鏃ユ湡閫夋嫨
+const onDateConfirm = ({ selectedValues }) => {
+  form.value.paymentDate = selectedValues.join('-')
+	currentDate.value = selectedValues
+  showDate.value = false
+}
+
+// 鎻愪氦琛ㄥ崟
+const onSubmit = () => {
+  // 琛ㄥ崟楠岃瘉
+  if (!form.value.currentPaymentAmount) {
+    showNotify({ type: 'warning', message: '璇疯緭鍏ヤ粯娆鹃噾棰�' })
+    return
+  }
+  if (!form.value.receiptPaymentType) {
+    showNotify({ type: 'warning', message: '璇烽�夋嫨浠樻褰㈠紡' })
+    return
+  }
+  if (!form.value.paymentDate) {
+    showNotify({ type: 'warning', message: '璇烽�夋嫨浠樻鏃ユ湡' })
+    return
+  }
+  loading.value = true
+	paymentRegistrationEdit(form.value)
+		.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.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();
+	}
+}
+// 鑾峰彇褰撳墠鏃ユ湡骞舵牸寮忓寲涓� YYYY-MM-DD
+function getCurrentDate() {
+	const today = new Date();
+	const year = today.getFullYear();
+	const month = String(today.getMonth() + 1).padStart(2, "0"); // 鏈堜唤浠�0寮�濮�
+	const day = String(today.getDate()).padStart(2, "0");
+	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; }
+</style>
diff --git a/src/pages/procurementManagement/paymentEntry/index.vue b/src/pages/procurementManagement/paymentEntry/index.vue
index 20b66e2..6083918 100644
--- a/src/pages/procurementManagement/paymentEntry/index.vue
+++ b/src/pages/procurementManagement/paymentEntry/index.vue
@@ -75,7 +75,7 @@
 							size="small"
 							class="action-btn"
 							:disabled="item.unPaymentAmountTotal == 0"
-							@click="openForm(item)"
+							@click="openForm('add', item)"
 						>
 							鏂板浠樻
 						</van-button>
@@ -139,11 +139,12 @@
 }
 
 // 鎵撳紑鏂板琛ㄥ崟
-const openForm = (item) => {
+const openForm = (type, item) => {
 	if (item.unPaymentAmountTotal == 0) {
 		showToast('鏃犻渶鍐嶄粯娆�')
 		return
 	}
+	uni.setStorageSync('operationType', type);
 	uni.setStorageSync('invoiceLedgerEditRow', JSON.stringify(item))
 	uni.navigateTo({ url: '/pages/procurementManagement/paymentEntry/add' })
 }
diff --git a/src/pages/procurementManagement/receiptPaymentHistory/index.vue b/src/pages/procurementManagement/receiptPaymentHistory/index.vue
new file mode 100644
index 0000000..158d5e7
--- /dev/null
+++ b/src/pages/procurementManagement/receiptPaymentHistory/index.vue
@@ -0,0 +1,381 @@
+<template>
+	<view class="receipt-payment-history">
+		<!-- 浣跨敤閫氱敤椤甸潰澶撮儴缁勪欢 -->
+		<PageHeader title="浠樻娴佹按" @back="goBack" />
+		
+		<!-- 鎼滅储鍖哄煙 -->
+		<view class="search-section">
+			<view class="search-bar">
+				<view class="search-input">
+					<input
+						class="search-text"
+						placeholder="璇疯緭鍏ヤ緵搴斿晢鍚嶇О"
+						v-model="searchForm.searchText"
+						@input="getList"
+					/>
+				</view>
+				<view class="search-button" @click="getList">
+					<up-icon name="search" size="24" color="#999"></up-icon>
+				</view>
+			</view>
+		</view>
+		<!-- 缁熻淇℃伅 -->
+		<view class="summary-info" v-if="tableData.length > 0">
+			<view class="summary-item">
+				<text class="summary-label">鎬昏褰曟暟</text>
+				<text class="summary-value">{{ tableData.length }}</text>
+			</view>
+			<view class="summary-item">
+				<text class="summary-label">鎬婚噾棰�</text>
+				<text class="summary-value highlight">{{ formatAmount(totalAmount) }}</text>
+			</view>
+		</view>
+		<!-- 浠樻鍘嗗彶鍒楄〃 -->
+		<view class="history-list" v-if="tableData.length > 0">
+			<view v-for="(item, index) in tableData" :key="index">
+				<view class="history-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.purchaseContractNumber }}</text>
+						</view>
+						<view class="item-tag" :class="getTagClass(item.paymentMethod)">
+							<text class="tag-text">{{ item.paymentMethod }}</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.supplierName }}</text>
+						</view>
+						<view class="detail-row">
+							<text class="detail-label">浠樻閲戦(鍏�)</text>
+							<text class="detail-value highlight">{{ formatAmount(item.currentPaymentAmount) }}</text>
+						</view>
+						<view class="detail-row">
+							<text class="detail-label">浠樻鏃ユ湡</text>
+							<text class="detail-value">{{ item.paymentDate }}</text>
+						</view>
+						<up-divider></up-divider>
+						<view class="detail-info">
+							<view class="detail-row">
+								<text class="detail-label">鐧昏浜�</text>
+								<text class="detail-value">{{ item.registrant }}</text>
+							</view>
+							<view class="detail-row">
+								<text class="detail-label">鐧昏鏃ユ湡</text>
+								<text class="detail-value">{{ item.registrationtDate }}</text>
+							</view>
+						</view>
+						<!-- 鎿嶄綔鎸夐挳 -->
+						<view class="action-buttons">
+							<van-button
+								type="primary"
+								size="small"
+								class="action-btn"
+								@click="openForm(item)"
+							>
+								缂栬緫浠樻
+							</van-button>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view v-else class="no-data">
+			<text>鏆傛棤浠樻鍘嗗彶鏁版嵁</text>
+		</view>
+	</view>
+</template>
+
+<script setup>
+import { ref, computed } from 'vue';
+import { onShow } from '@dcloudio/uni-app';
+import {paymentHistoryListPage} from "@/api/procurementManagement/paymentEntry";
+
+// 鎼滅储琛ㄥ崟
+const searchForm = ref({
+	searchText: '',
+});
+
+// 琛ㄦ牸鏁版嵁
+const tableData = ref([]);
+
+// 鍒嗛〉鍙傛暟
+const page = ref({
+	current: -1,
+	size: -1,
+});
+
+const totalAmount = computed(() => {
+	return tableData.value.reduce((sum, item) => {
+		return sum + (parseFloat(item.receiptPaymentAmount) || 0);
+	}, 0);
+});
+
+// 杩斿洖涓婁竴椤�
+const goBack = () => {
+	uni.navigateBack();
+};
+
+// 鏌ヨ鍒楄〃
+const getList = () => {
+	const params = {
+		...searchForm.value,
+		...page.value
+	};
+	paymentHistoryListPage(params).then((res) => {
+		tableData.value = res.records;
+	}).catch(() => {
+		uni.showToast({
+			title: '鏌ヨ澶辫触',
+			icon: 'error'
+		});
+	});
+};
+
+// 鑾峰彇鏍囩鏍峰紡绫�
+const getTagClass = (type) => {
+	if (type == '鐢垫眹') {
+		return "tag-electric";
+	} else if (type == '鎵垮厬') {
+		return "tag-acceptance";
+	} else {
+		return "tag-unknown";
+	}
+};
+
+// 鏍煎紡鍖栭噾棰�
+const formatAmount = (amount) => {
+	return amount ? parseFloat(amount).toFixed(2) : '0.00';
+};
+// 鎵撳紑缂栬緫琛ㄥ崟
+const openForm = (item) => {
+	uni.setStorageSync('invoiceLedgerEditRow', JSON.stringify(item))
+	uni.navigateTo({ url: '/pages/procurementManagement/paymentEntry/edit' })
+}
+onShow(() => {
+	// 椤甸潰鏄剧ず鏃跺埛鏂板垪琛�
+	getList();
+});
+</script>
+
+<style scoped lang="scss">
+.u-divider {
+	margin: 0 !important;
+}
+
+.receipt-payment-history {
+	min-height: 100vh;
+	background: #f8f9fa;
+	position: relative;
+}
+
+
+
+.search-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;
+}
+
+.search-button {
+	width: 40px;
+	height: 40px;
+	border-radius: 8px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.history-list {
+	padding: 20px;
+}
+
+.history-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-tag {
+	border-radius: 4px;
+	padding:  2px 8px;
+}
+
+.tag-electric {
+	background: #4caf50;
+}
+
+.tag-acceptance {
+	background: #ff9800;
+}
+
+.tag-unknown {
+	background: #9e9e9e;
+}
+
+.tag-text {
+	font-size: 14px;
+	color: #ffffff;
+	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-info {
+	margin-top: 10px;
+	display: flex;
+	align-items: flex-start;
+	justify-content: space-between;
+}
+.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;
+}
+
+.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;
+}
+
+.detail-value.highlight {
+	color: #2979ff;
+	font-weight: 500;
+}
+
+.no-data {
+	padding: 40px 0;
+	text-align: center;
+	color: #999;
+}
+
+.summary-info {
+	background: #ffffff;
+	margin: 20px 20px 0 20px;
+	border-radius: 12px;
+	padding: 16px;
+	box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
+}
+
+.summary-item {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin-bottom: 8px;
+	
+	&:last-child {
+		margin-bottom: 0;
+	}
+}
+
+.summary-label {
+	font-size: 14px;
+	color: #666;
+}
+
+.summary-value {
+	font-size: 14px;
+	color: #333;
+	font-weight: 500;
+}
+
+.summary-value.highlight {
+	color: #2979ff;
+	font-weight: 600;
+}
+</style>
\ No newline at end of file

--
Gitblit v1.9.3