From 4b73b5f28cb7860420d0a82328090a38c7a55040 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Mon, 29 Apr 2024 00:24:04 +0800
Subject: [PATCH] uu

---
 common/api/url.js                             |  2 +-
 .../buns-goodinfo-sheet.vue                   | 47 +++++++++++++++----
 components/tpx-select/tpx-select.vue          |  1 +
 3 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/common/api/url.js b/common/api/url.js
index 4bfafdd..c339bcd 100644
--- a/common/api/url.js
+++ b/common/api/url.js
@@ -23,7 +23,7 @@ export default {
   submitOrder: `/emis/emisWaybill/realSubmitOrder`, // 提交订单
   getCustomerUserList: `/emis/emisCustomerUser/listSimple`, // 获取网点客户列表
   getPickStaffList: `/emis/emisStaff/getStaffList`, // 获取操作、收派 员用户列表
-  getGoodsList: `/emis/emisGoods/listSimple`, // 获取货物列表
+  getGoodsList: `/emis/emisGoods/listSimple`, // 获取历史--货物列表
   getMonthpayAccountList: `/emis/emisMonthpayAccount/listSimple`, // 月结账号列表
   getDestPositionList: `/emis/emisDestination/listSimple`, // 目的地 列表
   getCaculteDestSite: `/emis/emisDestination/getDestSite`, // 自动计算目的地
diff --git a/components/buns-goodinfo-sheet/buns-goodinfo-sheet.vue b/components/buns-goodinfo-sheet/buns-goodinfo-sheet.vue
index 53edd3f..fb6f16f 100644
--- a/components/buns-goodinfo-sheet/buns-goodinfo-sheet.vue
+++ b/components/buns-goodinfo-sheet/buns-goodinfo-sheet.vue
@@ -3,23 +3,36 @@
 		<view style="position: relative;height: calc(70vh);">
 			<tpx-layout>
 				<template v-slot:body>
+					
 					<view class="dt-block">
+						<view class="dt-tle">
+							<view class="com-section">热门物品</view>
+						</view>
+						<view class="dt-cont">
+							<view class="dt-block mt-10">
+								<tpx-tags v-model:value="checkedGoodId" type="single" :list="hotGoods"></tpx-tags>
+							</view>
+						</view>
+					</view>
+					
+					<view class="dt-block" style="margin-top: 50rpx;">
 						<view class="dt-tle">
 							<view class="com-section">物品信息</view>
 							<view>
-								<u-button custom-style="font-size: 28rpx;height: 56rpx;border-radius: 16rpx;" plain="true" type="primary">选择历史</u-button>
+								<!-- <u-button custom-style="font-size: 28rpx;height: 56rpx;border-radius: 16rpx;" plain="true" type="primary">选择历史</u-button> -->
 							</view>
 						</view>
 						<view class="dt-cont">
 							<view class="edm-input-item">
-								<tpx-text-item label="物品名称">
-									<template v-slot:right>
-										<u-input placeholder="请填写" v-model="modelInfo.goodsName" inputAlign="right" font-size="26"
-											custom-style="border:0;border-radius: 10rpx;padding: 14rpx 20rpx;" 
-											placeholder-style="color: #999; " 
-										></u-input>
-									</template>
-								</tpx-text-item>
+								<tpx-select v-model:value="checkedGoodId" v-model:resObject="goodsRes" :getListFun="getGoodsList" :transKeyVal="{valKey: 'goodsCode',titleKey: 'goodsName'}" 
+									:customInput="true" mode="drop" 
+									:searchParam="goodsSearchParam" @onChange="handleWayChange" 
+								>
+									<u-input placeholder="物品名称" v-model="modelInfo.goodsName" font-size="26"
+										custom-style="border-radius: 30rpx;padding: 10rpx 20rpx;" 
+										placeholder-style="color: #999; " 
+									></u-input>
+								</tpx-select>
 							</view>
 							
 							<view class="edm-input-item">
@@ -151,10 +164,14 @@
 </template>
 
 <script>
+	import * as apiService from "@/common/api"
 	export default {
 		computed: {
 			dicData() {
 			  return this.$store.getters.dicData
+			},
+			goodsSearchParam() {
+				return { goodsName: this.modelInfo.goodsName }
 			}
 		},
 		watch: {
@@ -162,6 +179,7 @@
 				handler: function(cval, oval) {
 					if(cval) {
 						this.modelInfo = JSON.parse(JSON.stringify(this.value || {}))
+						this.checkedGoodId = ''
 					}
 				}
 			}
@@ -180,7 +198,13 @@
 		},
 		data() {
 			return {
-				modelInfo: {}
+				modelInfo: {},
+				goodsRes: { list: [] },
+				checkedGoodId: '',
+				hotGoods: [
+					{ title: '热门1', val: 1 },
+					{ title: '热门2', val: 2 },
+				]
 			}
 		},
 		created() {
@@ -192,6 +216,8 @@
 		unmounted() {},
 
 		methods: {
+			getGoodsList: apiService.getGoodsList,
+			
 			handleCloseModal() {
 				this.$emit('update:show', false)
 			},
@@ -213,6 +239,7 @@
 		position: relative;
 	}
 	.dt-tle {
+		padding-bottom: 10rpx;
 		display: flex;
 		flex-direction: row;
 		justify-content: space-between;
diff --git a/components/tpx-select/tpx-select.vue b/components/tpx-select/tpx-select.vue
index 978903c..d6e1a10 100644
--- a/components/tpx-select/tpx-select.vue
+++ b/components/tpx-select/tpx-select.vue
@@ -175,6 +175,7 @@
 		left: 0;
 		right: 0;
 		max-height: 600rpx;
+		overflow: auto;
 		z-index: 10;
 		padding: 20rpx;
 		box-sizing: border-box;