处理商品订单

pages/index/orderEdit.vue

@@ -151,14 +151,22 @@
 						<nut-input v-model="form.discount_amount" placeholder="请输入金额" type="number" />
 					</template>
 				</nut-form-item>
+				<nut-form-item label="备注">
+					<nut-textarea v-model="form.remarks" :rows="3" :adjust-keyboard-to="bottom"
+						placeholder="请输入备注"></nut-textarea>
+				</nut-form-item>
 			</nut-form>
 
 
-
+			<view style="align-items: center;text-align: center; padding: 20rpx 60rpx;">
+				<nut-button type="success" block @click="submitForm">
+					仅保存账单
+				</nut-button>
+			</view>
 
 			<view style="align-items: center;text-align: center; padding: 20rpx 60rpx;">
-				<nut-button type="primary" block @click="submitForm">
-					开台
+				<nut-button type="danger" block @click="submitForm">
+					保存账单并结束该房间
 				</nut-button>
 			</view>
 		</view>
@@ -253,36 +261,10 @@
 			form.over_pay_status = res.over_pay_status.value
 			form.over_pay_status_txt = res.over_pay_status.text
 
-			// is_show_edit.value = true;
-			// console.log("====>", res);
-			// form.goods_id = res.goods_id
-			// form.goods_name = res.goods_name
-			// form.goods_no = res.goods_no
-			// form.goods_price = res.goods_price
-			// // form.goods_stock = res.goods_stock
-			// form.content = res.content
-			// form.details_content = res.details_content
-			// form.status = res.status.value.toString()
+			form.discount_amount = res.discount_amount
+			form.remarks = res.remarks
 
-			// form.degree_id = res.degree?.degree_id ?? 0
-			// form.degree_name = res.degree?.degree_name ?? '未选择'
-			// form.type_id = res.type?.type_id ?? 0
-			// form.type_name = res.type?.name ?? '未选择'
-			// form.brand_id = res.brand?.brand_id ?? 0
-			// form.brand_name = res.brand?.name ?? '未选择'
-			// form.product_id = res.product?.product_id ?? 0
-			// form.product_name = res.product?.name ?? '未选择'
-			// popup_degree_val.value = [res.degree?.degree_id ?? 0]
-			// cascader_product_val.value = [res.type?.type_id ?? 0, res.brand?.brand_id ?? 0, res.product
-			// 	?.product_id ?? 0
-			// ]
-			// form.images = []
-			// res.image?.forEach(item => {
-			// 	form.images.push({
-			// 		id: item.image_id,
-			// 		file_path: item.file_path,
-			// 	})
-			// })
+			orderGoods.value = res.goods
 		})
 	}
 
@@ -291,33 +273,6 @@
 
 
 
-	// // 选择房间弹窗
-	// const visibleRoomsPopup = ref(false);
-	// // 选中的房间
-	// const popupRoomsVal = ref([])
-	// // 房间列表
-	// const rooms = [{
-	// 		value: 1,
-	// 		label: '房间 101'
-	// 	},
-	// 	{
-	// 		value: 2,
-	// 		label: '房间 102'
-	// 	},
-	// 	{
-	// 		value: 3,
-	// 		label: '房间 103'
-	// 	}
-	// ];
-	// // 选择房间
-	// const onConfirmRoom = (selectedValue) => {
-	// 	console.log(selectedValue);
-	// 	form.room_name = selectedValue.selectedOptions[0].label
-	// 	form.room_id = selectedValue.selectedOptions[0].value
-	// 	console.log(form);
-	// 	visibleRoomsPopup.value = false
-	// }
-
 	// 选择房间弹窗
 	const visibleFeeTypePopup = ref(false);
 	// 台费结算类型
@@ -405,8 +360,8 @@
 		console.log(type);
 	}
 
+	// 选择支付状态
 	const onConfirmPaymentStatus = (selectedValue) => {
-
 		if (popupPaymentTypeVal.value == 'fee') {
 			form.fee_pay_status_txt = selectedValue.selectedOptions[0].label
 			form.fee_pay_status = selectedValue.selectedOptions[0].value
@@ -414,7 +369,8 @@
 		if (popupPaymentTypeVal.value == 'over') {
 			form.over_pay_status_txt = selectedValue.selectedOptions[0].label
 			form.over_pay_status = selectedValue.selectedOptions[0].value
-		}
+		}
+		// 商品
 		if (popupPaymentTypeVal.value == 'goods' && goodsPayIndex.value >= 0) {
 			console.log("处理商品支付状态", goodsPayIndex.value);
 			orderGoods.value[goodsPayIndex.value].goods_pay_status_txt = selectedValue.selectedOptions[0].label