9.18王德鹏/1

frontend/pages/order/create.vue

@@ -36,8 +36,48 @@
 			<text class="value">{{ supplierLabel }}</text>
 		</view>
 
-		<!-- 已选商品与合计（销售/进货） -->
-		<view v-if="biz==='sale' || biz==='purchase'">
+        <!-- 销售/进货：收款/付款 专用页面 -->
+        <view v-if="(biz==='sale' && saleType==='collect') || (biz==='purchase' && purchaseType==='pay')">
+            <!-- 客户 / 供应商 -->
+            <view class="field" v-if="biz==='sale'" @click="chooseCustomer">
+                <text class="label">客户</text>
+                <text class="value">{{ customerLabel }}</text>
+            </view>
+            <view class="field" v-else @click="chooseSupplier">
+                <text class="label">供应商</text>
+                <text class="value">{{ supplierLabel }}</text>
+            </view>
+
+            <!-- 三种收付款方式 -->
+            <view class="field pay-row">
+                <text class="label">现金</text>
+                <input class="pay-input" type="digit" v-model.number="payments.cash" placeholder="0.00" @input="recalcPay()"/>
+            </view>
+            <view class="field pay-row">
+                <text class="label">银行存款</text>
+                <input class="pay-input" type="digit" v-model.number="payments.bank" placeholder="0.00" @input="recalcPay()"/>
+            </view>
+            <view class="field pay-row">
+                <text class="label">微信</text>
+                <input class="pay-input" type="digit" v-model.number="payments.wechat" placeholder="0.00" @input="recalcPay()"/>
+            </view>
+
+            <view class="collapse-trigger" @click="showMore = !showMore">{{ showMore ? '收起' : '' }}</view>
+
+            <!-- 备注与日期 -->
+            <view class="textarea">
+                <view class="amount-badge">总金额：{{ payTotal.toFixed(2) }}</view>
+                <textarea v-model="order.remark" maxlength="200" placeholder="备注（最多输入200个字）"></textarea>
+                <view class="date-mini">
+                    <picker mode="date" :value="order.orderTime" @change="onDateChange">
+                        <text>{{ order.orderTime }}</text>
+                    </picker>
+                </view>
+            </view>
+        </view>
+
+        <!-- 已选商品与合计（销售/进货 出入库） -->
+        <view v-else-if="biz==='sale' || biz==='purchase'">
 			<view class="summary">
 				<text>选中货品（{{ totalQuantity }}）</text>
 				<text>合计金额：¥ {{ totalAmount.toFixed(2) }}</text>
@@ -127,7 +167,10 @@
 				activeCategory: 'sale_income',
 				trxAmount: 0,
 				selectedAccountId: null,
-				selectedAccountName: ''
+					selectedAccountName: '',
+					// 收款/付款输入
+					payments: { cash: 0, bank: 0, wechat: 0 },
+					showMore: false
 			}
 		},
 		computed: {
@@ -141,11 +184,16 @@
 			supplierLabel() { return this.supplierName || '零散供应商' },
 			incomeCategories() { return INCOME_CATEGORIES },
 			expenseCategories() { return EXPENSE_CATEGORIES },
-			accountLabel() { return this.selectedAccountName || '现金' },
-			counterpartyLabel() { return this.customerName || this.supplierName || '—' }
+				accountLabel() { return this.selectedAccountName || '现金' },
+				counterpartyLabel() { return this.customerName || this.supplierName || '—' },
+				// 收款/付款合计
+				payTotal() {
+					const p = this.payments || { cash:0, bank:0, wechat:0 }
+					return Number(p.cash||0) + Number(p.bank||0) + Number(p.wechat||0)
+				}
 		},
 		methods: {
-			switchBiz(type) { this.biz = type },
+            switchBiz(type) { this.biz = type },
 			onDateChange(e) { this.order.orderTime = e.detail.value },
 			chooseCustomer() {
 				uni.navigateTo({ url: '/pages/customer/select' })
@@ -160,17 +208,24 @@
 					uni.navigateTo({ url: '/pages/customer/select' })
 				}
 			},
-			recalc() { this.$forceUpdate() },
+            recalc() { this.$forceUpdate() },
+            recalcPay() { this.$forceUpdate() },
 			async submit() {
-				const isSaleOrPurchase = (this.biz==='sale' || this.biz==='purchase')
-				const payload = isSaleOrPurchase ? {
-					type: this.biz === 'sale' ? (this.saleType) : ('purchase.' + this.purchaseType),
-					orderTime: this.order.orderTime,
-					customerId: this.order.customerId,
-					supplierId: this.order.supplierId,
-					items: this.items.map(it => ({ productId: it.productId, quantity: Number(it.quantity||0), unitPrice: Number(it.unitPrice||0) })),
-					amount: this.totalAmount
-				} : {
+                const isSaleOrPurchase = (this.biz==='sale' || this.biz==='purchase')
+                const isCollectOrPay = (this.biz==='sale' && this.saleType==='collect') || (this.biz==='purchase' && this.purchaseType==='pay')
+                const saleTypeValue = this.biz==='sale' ? ('sale.' + this.saleType) : ('purchase.' + this.purchaseType)
+                const payload = isSaleOrPurchase ? (isCollectOrPay ? [
+                        { method: 'cash', amount: Number(this.payments.cash||0) },
+                        { method: 'bank', amount: Number(this.payments.bank||0) },
+                        { method: 'wechat', amount: Number(this.payments.wechat||0) }
+                    ].filter(p => p.amount>0) : {
+                    type: saleTypeValue,
+                    orderTime: this.order.orderTime,
+                    customerId: this.order.customerId,
+                    supplierId: this.order.supplierId,
+                    items: this.items.map(it => ({ productId: it.productId, quantity: Number(it.quantity||0), unitPrice: Number(it.unitPrice||0) })),
+                    amount: this.totalAmount
+                }) : {
 					type: this.biz,
 					category: this.activeCategory,
 					counterpartyId: this.order.customerId || null,
@@ -179,8 +234,8 @@
 					txTime: this.order.orderTime,
 					remark: this.order.remark
 				}
-				try {
-					const url = isSaleOrPurchase ? '/api/orders' : '/api/other-transactions'
+                try {
+                    const url = isSaleOrPurchase ? (isCollectOrPay ? (`/api/payments/${this.biz}`) : '/api/orders') : '/api/other-transactions'
 					await post(url, payload)
 					uni.showToast({ title: '已保存', icon: 'success' })
 					setTimeout(() => { uni.navigateBack() }, 600)
@@ -188,10 +243,11 @@
 					uni.showToast({ title: e && e.message || '保存失败', icon: 'none' })
 				}
 			},
-			saveAndReset() {
+            saveAndReset() {
 				this.items = []
 				this.trxAmount = 0
 				this.order.remark = ''
+                this.payments = { cash: 0, bank: 0, wechat: 0 }
 			}
 		}
 	}
@@ -219,6 +275,11 @@
 	.col.amount { text-align:right; padding-right: 12rpx; color:#333; }
 	.bottom { position: fixed; left:0; right:0; bottom:0; background:#fff; padding: 16rpx 24rpx calc(env(safe-area-inset-bottom) + 16rpx); box-shadow: 0 -4rpx 12rpx rgba(0,0,0,0.06); }
 	.primary { width: 100%; background: linear-gradient(135deg, #FFE69A 0%, #F4CF62 45%, #D7A72E 100%); color:#493c1b; border-radius: 999rpx; padding: 20rpx 0; font-weight:800; }
+    /* 收款/付款页样式 */
+    .pay-row .pay-input { text-align: right; color:#333; }
+    .textarea { position: relative; padding: 16rpx 24rpx; background:#fff; border-top: 1rpx solid #eee; }
+    .amount-badge { position: absolute; right: 24rpx; top: -36rpx; background: #d1f0ff; color:#107e9b; padding: 8rpx 16rpx; border-radius: 12rpx; font-size: 24rpx; }
+    .date-mini { position: absolute; right: 24rpx; bottom: 20rpx; color:#666; font-size: 24rpx; }
 </style>