feat:仓库列表更多信息、商品描述、筛选图标更换

pages/wareHouse/components/edit.vue

@@ -37,9 +37,7 @@
                         </view>
                     </u-form-item>
                     <u-form-item label="商品描述（详细的描述让用户更好的了解您的产品）" required prop="desc" borderBottom>
-                        <u--textarea v-model="formData.desc" clearable placeholder="95新 WHZ19219H CHANEL香奈儿链条单肩包
-21开 牛皮 尺寸25 4 15
-配件中溯卡" count autoHeight maxlength="250" :height="150" confirmType="done"></u--textarea>
+                        <u--textarea v-model="formData.desc" clearable count autoHeight maxlength="250" :height="150" confirmType="done"></u--textarea>
                     </u-form-item>
                     <u-form-item label="来源" prop="origin" borderBottom>
                         <u--textarea v-model="formData.origin" clearable placeholder="请输入来源" count autoHeight maxlength="250" height="100" confirmType="done"></u--textarea>
@@ -444,10 +442,11 @@ export default {
 实价：${res.data.actualPrice || ''}
 型号：${res.data.model || ''}
 编码：${res.data.indentifyCode || ''}
-日期：${res.data.cardYear || ''}
+日期：${res.data.cardYear || res.data.cardDate || ''}
 备注：${res.data.productDesc || ''}
 付款方式：${this.paymentTabList.find(item => item.value == res.data.payType)?.name || ''}
 `
+                this.formData.desc = `99新，${[res.data.dictLabel, res.data.model, res.data.cardYear || res.data.cardDate, res.data.productDesc].filter(item => item).join('-')}`
             }
         })
     },

pages/wareHouse/index.vue

@@ -14,8 +14,7 @@
 				<view class="btn-group">
 					<u-button type="success" shape="circle" plain size="mini" @click="openOrderList">开单记录</u-button>
 					<order-list ref="orderListRef"></order-list>
-					<u-button type="primary" shape="circle" plain size="mini"
-						@click="navigateToFakeRegistration">假货登记</u-button>
+					<u-button type="primary" shape="circle" plain size="mini" @click="navigateToFakeRegistration">假货登记</u-button>
 				</view>
 			</view>
 			<view class="data-cards">
@@ -39,9 +38,8 @@
 			</view>
 
 			<view class="category-tabs-wrap">
-				<u-tabs :list="tabList" :is-scroll="true" active-color="#007aff" inactive-color="#666666"
-					font-size="28rpx" keyName="dictLabel" border-bottom="none" @change="switchTab"
-					class="u-tabs-custom"></u-tabs>
+				<u-tabs :list="tabList" :is-scroll="true" active-color="#007aff" inactive-color="#666666" font-size="28rpx"
+					keyName="dictLabel" border-bottom="none" @change="switchTab" class="u-tabs-custom"></u-tabs>
 			</view>
 
 			<view class="filter-bar">
@@ -53,37 +51,37 @@
 				</view>
 				<view class="price-layout-btn">
 					<view class="price-btn" type="text" @click="priceVisibleChange">
-						<u-icon :name="priceVisible ? 'eye' : 'eye-off'" size="18" color="#1890ff"
-							class="price-icon"></u-icon>
+						<u-icon :name="priceVisible ? 'eye' : 'eye-off'" size="18" color="#1890ff" class="price-icon"></u-icon>
 						<text class="price-text">价格可见</text>
 					</view>
 					<view class="dept-btn" @click="recycleDeptClick">
 						<image src="/static/icons/dept.png" mode="aspectFill"></image>
 					</view>
-					<ba-tree-picker :selectParent="true" ref="recycleDeptRef" :multiple='false'
-							@select-change="deptSeletchang" border title="机构部门" :localdata="deptList" valueKey="deptId"
-							textKey="deptName" childrenKey="children" :selectedValues="deptId"
-							:personNames="deptName" />
+					<ba-tree-picker :selectParent="true" ref="recycleDeptRef" :multiple='false' @select-change="deptSeletchang"
+						border title="机构部门" :localdata="deptList" valueKey="deptId" textKey="deptName" childrenKey="children"
+						:selectedValues="deptId" :personNames="deptName" />
 					<view class="layout-btn" type="text" size="mini" @click="openSearchFilter">
-						<u-icon name="grid" size="20" color="#666666"></u-icon>
+						<image class="filter-icon" src="/static/icons/select.png" mode="aspectFill"></image>
+						筛选
+						<!-- <u-icon name="grid" size="20" color="#666666"></u-icon> -->
 						<!-- 筛选列 品牌、价格范围、位置、回收时间、回收人员、鉴定人员、商品属性 -->
 					</view>
 					<searchFilter ref="searchFilter" @confirm="handleSearch"></searchFilter>
 				</view>
 			</view>
 
-			<scroll-view ref="scrollView" class="goods-list" scroll-y @scrolltolower="handleLoadMore" @scroll="handleScroll" enable-back-to-top>
+			<scroll-view ref="scrollView" class="goods-list" scroll-y @scrolltolower="handleLoadMore" @scroll="handleScroll"
+				enable-back-to-top>
 				<view @click.stop="clickItem(goods)" class="goods-item" v-for="(goods, goodsIndex) in goodsList"
 					:key="`goods-${goodsIndex}`">
 					<u-swipe-action ref="swipeRef">
 						<u-swipe-action-item :options="swipeOptions" @click="(e) => handleSwipeClick(e, goods, goodsIndex)">
 							<view class="goods-info">
 								<view class="goods-img-container">
-									<image class="goods-img" :src="goods.imgUrl ? goods.imgUrl : '/static/no-img.png'"
-										mode="aspectFill" lazy-load></image>
+									<image class="goods-img" :src="goods.imgUrl ? goods.imgUrl : '/static/no-img.png'" mode="aspectFill"
+										lazy-load></image>
 									<!-- <image class="goods-img" src="/static/no-img.png" mode="aspectFill" lazy-load></image> -->
-									<view
-										:class="['stock-indicator', goods.downStatus == '1' ? 'up-indicator' : 'down-indicator']">
+									<view :class="['stock-indicator', goods.downStatus == '1' ? 'up-indicator' : 'down-indicator']">
 									</view>
 								</view>
 								<view class="info-content">
@@ -103,27 +101,27 @@
 										<view class="price-item" v-if="isWareHouseRole">
 											<text class="price-type">成本价</text>
 											<text class="price">¥{{ priceVisible ? goods.costPrice || '-' : '****'
-												}}</text>
+											}}</text>
 										</view>
 										<view class="price-item" v-if="isWareHouseRole">
 											<text class="price-type">销售价</text>
 											<text class="price sales">¥{{ priceVisible ? goods.salePrice || '-' : '****'
-												}}</text>
+											}}</text>
 										</view>
 										<view class="price-item" v-if="isWareHouseRole">
 											<text class="price-type">同行价</text>
 											<text class="price">¥{{ priceVisible ? goods.peerPrice || '-' : '****'
-												}}</text>
+											}}</text>
 										</view>
 										<view class="price-item">
 											<text class="price-type">代理价</text>
 											<text class="price">¥{{ priceVisible ? goods.agentPrice || '-' : '****'
-												}}</text>
+											}}</text>
 										</view>
 										<view class="price-item" v-if="isWareHouseRole">
 											<text class="price-type">实价</text>
 											<text class="price">¥{{ priceVisible ? goods.actualPrice || '-' : '****'
-												}}</text>
+											}}</text>
 										</view>
 										<view class="price-item" v-if="isWareHouseRole">
 											<text class="price-type">指导价</text>
@@ -132,6 +130,8 @@
 
 									</view>
 
+
+
 									<!-- <view class="others">
 									<view class="other-item stock" >得</view>
 									<view class="other-item">得</view>
@@ -144,6 +144,46 @@
 									</view>
 									<text class="goods-stock">数量:{{ goods.stock || 0 }}</text>
 								</view>
+
+							</view>
+							<!-- 更多信息区域 -->
+							<view class="more-info-container">
+								<view class="more-info-header" @click.stop="toggleMoreInfo(goods)">
+									<text class="more-info-title">更多信息</text>
+									<u-icon :name="goods.showMoreInfo ? 'arrow-up' : 'arrow-down'" size="14" color="#666666"></u-icon>
+								</view>
+								<transition name="more-info">
+									<view class="more-info-content" v-if="goods.showMoreInfo">
+										<view class="info-row">
+											<text class="info-label">回收时间：</text>
+											<text class="info-value">{{ formatterTime(goods.recycleTime) }}</text>
+										</view>
+										<view class="info-row">
+											<text class="info-label">入库时间：</text>
+											<text class="info-value">{{ formatterTime(goods.warehouseDate) }}</text>
+										</view>
+										<view class="info-row">
+											<text class="info-label">商品位置：</text>
+											<text class="info-value">{{ goods.productPosition || '-' }}</text>
+										</view>
+										<view class="info-row">
+											<text class="info-label">鉴定人员：</text>
+											<text class="info-value">{{ goods.identifyingPerson || '-' }}</text>
+										</view>
+										<view class="info-row">
+											<text class="info-label">回收人员：</text>
+											<text class="info-value">{{ goods.recyclePerson || '-' }}</text>
+										</view>
+										<view class="info-row">
+											<text class="info-label">是否入库：</text>
+											<text class="info-value">{{ goods.stockStatus == '1' ? '已入库' : '未入库' }}</text>
+										</view>
+										<view class="info-row">
+											<text class="info-label">付款方式：</text>
+											<text class="info-value">{{ payFormatter(goods.payType) }}</text>
+										</view>
+									</view>
+								</transition>
 							</view>
 						</u-swipe-action-item>
 					</u-swipe-action>
@@ -162,6 +202,7 @@ import searchFilter from './components/searchFilter.vue'
 import moreInfo from './components/moreInfo.vue'
 import { permissionCheck } from '../../utils/util.js'
 import orderList from './components/orderList/index.vue'
+import { paymentTabList } from './js/public.js'
 import jtimePickerPopup from '@/uni_modules/jtime-picker-popup/components/JTimePicker/JTimePicker.vue';
 export default {
 	components: {
@@ -171,120 +212,133 @@ export default {
 		jtimePickerPopup
 	},
 	data() {
-			return {
-				searchString: '',//搜索编号、名称、品牌...
-				type: '',
-				searchInfo: {},
-				pageNum: 1,
-				pageSize: 10,
-				curSortType: {
-					id: 4,
+		return {
+			searchString: '',//搜索编号、名称、品牌...
+			type: '',
+			searchInfo: {},
+			pageNum: 1,
+			pageSize: 10,
+			curSortType: {
+				id: 4,
+				label: '按入库最新',
+			},
+			wareHouseCard: {
+				totalCost: '-',
+				uploadCostToday: '-',
+				outStockToday: '-',
+				totalNum: '-'
+			},
+			tabList: [],
+			goodsList: [
+				// {
+				// 	id:'123456754',//商品库存id
+				// 	name:'Rolex',//商品名称
+				// 	model:'Submariner Date 126610LN',//型号
+				// 	costPrice:'12345',//成本价格
+				// 	salesPrice:'12345',//销售价格
+				// 	peerPrice:'12345',//同行价格
+				// 	agentPrice:'12345',//代理价格
+				// 	stock:'12345',//库存数量
+				// 	imgUrl:'https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg',//商品图片
+				// 	platform:[]//同步平台，此功能暂时不做，先定义一个字段
+				// }
+			],
+			sortPickerShow: false,
+			sortColumns: [[
+				{
+					label: '按最久未下载',
+					id: 1
+				},
+				{
+					label: '按最近更新',
+					id: 2
+				},
+				{
+					label: '按最久更新',
+					id: 3
+				},
+				{
 					label: '按入库最新',
+					id: 4
+				},
+				{
+					label: '按入库最久',
+					id: 5
+				},
+				{
+					label: '按价格最高',
+					id: 6
+				},
+				{
+					label: '按价格最低',
+					id: 7
 				},
-				wareHouseCard: {
-					totalCost: '-',
-					uploadCostToday: '-',
-					outStockToday: '-',
-					totalNum: '-'
+			]],
+			priceVisible: true,
+			searchPopShow: false,
+			total: 0,
+			moreOptions: {},
+			moreOptionsShow: false,
+			isWareHouseRole: permissionCheck('WAREHOUSER', false),
+			swipeOptions: [
+				{
+					text: '删除',
+					style: {
+						backgroundColor: '#f56c6c'
+					}
 				},
-				tabList: [],
-				goodsList: [
-					// {
-					// 	id:'123456754',//商品库存id
-					// 	name:'Rolex',//商品名称
-					// 	model:'Submariner Date 126610LN',//型号
-					// 	costPrice:'12345',//成本价格
-					// 	salesPrice:'12345',//销售价格
-					// 	peerPrice:'12345',//同行价格
-					// 	agentPrice:'12345',//代理价格
-					// 	stock:'12345',//库存数量
-					// 	imgUrl:'https://xiaohulu-crm.oss-cn-shanghai.aliyuncs.com/crm/2026/01/06/1767677335839-1767677330379.jpg',//商品图片
-					// 	platform:[]//同步平台，此功能暂时不做，先定义一个字段
-					// }
-				],
-				sortPickerShow: false,
-				sortColumns: [[
-					{
-						label: '按最久未下载',
-						id: 1
-					},
-					{
-						label: '按最近更新',
-						id: 2
-					},
-					{
-						label: '按最久更新',
-						id: 3
-					},
-					{
-						label: '按入库最新',
-						id: 4
-					},
-					{
-						label: '按入库最久',
-						id: 5
-					},
-					{
-						label: '按价格最高',
-						id: 6
-					},
-					{
-						label: '按价格最低',
-						id: 7
-					},
-				]],
-				priceVisible: true,
-				searchPopShow: false,
+			],
+			isSwipeClick: false,
+			deptList: [],
+			deptId: '',
+			deptName: '',
+			// 保存页面状态
+			pageState: {
+				pageNum: 1,
+				goodsList: [],
 				total: 0,
-				moreOptions: {},
-				moreOptionsShow: false,
-				isWareHouseRole: permissionCheck('WAREHOUSER', false),
-				swipeOptions: [
-					{
-						text: '删除',
-						style: {
-							backgroundColor: '#f56c6c'
-						}
-					},
-				],
-				isSwipeClick: false,
-				deptList: [],
-				deptId: '',
-				deptName: '',
-				// 保存页面状态
-				pageState: {
-					pageNum: 1,
-					goodsList: [],
-					total: 0,
-					scrollTop: 0
-				}
-			};
-		},
+				scrollTop: 0
+			},
+			paymentTabList: paymentTabList
+		};
+	},
 	onLoad() {
 		this.getTypeList();
 	},
 	methods: {
+		toggleMoreInfo(goods) {
+			this.$set(goods, 'showMoreInfo', !goods.showMoreInfo);
+		},
+		formatterTime(time) {
+			if (!time) {
+				return '-'
+			}
+			return this.$dayjs(time).format('YYYY-MM-DD')
+		},
+		payFormatter(payType) {
+			return paymentTabList.find(item => item.value == payType)?.name || '-'
+		},
 		getDeptListAll() {
-            const params = {
-                isDept:2
-            }
-            uni.$u.api.getDeptListAll(params).then(res => {
-                if(res.data.length > 0){
-                    this.deptList = res.data;
-                }else{
-                    uni.$u.toast('暂无机构部门');
-                }
-            })
-        },
+			const params = {
+				isDept: 2
+			}
+			uni.$u.api.getDeptListAll(params).then(res => {
+				if (res.data.length > 0) {
+					this.deptList = res.data;
+				} else {
+					uni.$u.toast('暂无机构部门');
+				}
+			})
+		},
 		deptSeletchang(ids, names) {
-            this.deptId = ids[0] || '';
+			this.deptId = ids[0] || '';
 			this.deptName = names[0] || '';
 			this.handleSearch();
-        },
+		},
 		recycleDeptClick() {
 			this.getDeptListAll();
-            this.$refs.recycleDeptRef._show();
-        },
+			this.$refs.recycleDeptRef._show();
+		},
 		showMoreOptions(goods) {
 			this.moreOptions = goods;
 			this.$refs.moreInfoRef.showMoreInfo();
@@ -351,10 +405,10 @@ export default {
 				this.handleToDetail(item);
 			}
 		},
-		handleSwipeClick(e, item,goodsIndex) {
+		handleSwipeClick(e, item, goodsIndex) {
 			if (e.index == 0) {//删除
 				this.isSwipeClick = true;
-				if(!permissionCheck('WAREHOUSER')) return false 
+				if (!permissionCheck('WAREHOUSER')) return false
 				uni.$u.api.wareHouseDelete({
 					id: item.id
 				}).then(() => {
@@ -407,54 +461,54 @@ export default {
 			});
 		},
 		openOrderList() {
-				this.$refs.orderListRef.openList();
-			},
-			handleScroll(e) {
-				this.pageState.scrollTop = e.detail.scrollTop;
-			},
-			// 保存当前页面状态
-			savePageState() {
-				this.pageState.pageNum = this.pageNum;
-				this.pageState.goodsList = [...this.goodsList];
-				this.pageState.total = this.total;
-			},
-			// 恢复页面状态
-				restorePageState() {
-					if (this.pageState.goodsList.length > 0) {
-						this.pageNum = this.pageState.pageNum;
-						this.goodsList = [...this.pageState.goodsList];
-						this.total = this.pageState.total;
-						this.$nextTick(() => {
-							if (this.pageState.scrollTop > 0) {
-								if (this.$refs.scrollView) {
-									setTimeout(() => {
-										try {
-											this.$refs.scrollView.$el.scrollTop = this.pageState.scrollTop;
-										} catch (e) {
-											console.log('设置滚动位置失败:', e);
-										}
-									}, 100);
+			this.$refs.orderListRef.openList();
+		},
+		handleScroll(e) {
+			this.pageState.scrollTop = e.detail.scrollTop;
+		},
+		// 保存当前页面状态
+		savePageState() {
+			this.pageState.pageNum = this.pageNum;
+			this.pageState.goodsList = [...this.goodsList];
+			this.pageState.total = this.total;
+		},
+		// 恢复页面状态
+		restorePageState() {
+			if (this.pageState.goodsList.length > 0) {
+				this.pageNum = this.pageState.pageNum;
+				this.goodsList = [...this.pageState.goodsList];
+				this.total = this.pageState.total;
+				this.$nextTick(() => {
+					if (this.pageState.scrollTop > 0) {
+						if (this.$refs.scrollView) {
+							setTimeout(() => {
+								try {
+									this.$refs.scrollView.$el.scrollTop = this.pageState.scrollTop;
+								} catch (e) {
+									console.log('设置滚动位置失败:', e);
 								}
-							}
-						});
-						return true;
+							}, 100);
+						}
 					}
-					return false;
-				},
-		},
-		onShow() {
-			// 尝试恢复页面状态
-			if (!this.restorePageState()) {
-				// 如果没有保存的状态，重新加载第一页
-				this.pageNum = 1;
-				this.getList();
+				});
+				return true;
 			}
-			this.getCard();
-		},
-		onHide() {
-			// 页面隐藏时保存状态
-			this.savePageState();
+			return false;
 		},
+	},
+	onShow() {
+		// 尝试恢复页面状态
+		if (!this.restorePageState()) {
+			// 如果没有保存的状态，重新加载第一页
+			this.pageNum = 1;
+			this.getList();
+		}
+		this.getCard();
+	},
+	onHide() {
+		// 页面隐藏时保存状态
+		this.savePageState();
+	},
 	onPullDownRefresh() {
 		this.pageNum = 1;
 		this.getList();

pages/wareHouse/styles/index.scss

@@ -108,7 +108,6 @@
       margin-right: 0;
     }
   }
-
 }
 
 /* 搜索框区域 */
@@ -212,7 +211,6 @@
     display: flex;
     justify-content: space-between;
     align-items: center;
-
     .price-btn {
       background: transparent;
       padding: 0;
@@ -236,16 +234,21 @@
       background: transparent;
       font-size: 22rpx;
       color: #333;
-      width: 60rpx;
       height: 60rpx;
       display: flex;
       align-items: center;
+      gap: 6rpx;
       justify-content: center;
       flex-shrink: 0;
+      margin-left: 10rpx;
+      .filter-icon {
+        width: 35rpx;
+        height: 35rpx;
+      }
     }
-    .dept-btn{
-      margin-left:18rpx;
-      image{
+    .dept-btn {
+      margin-left: 18rpx;
+      image {
         width: 30rpx;
         height: 30rpx;
       }
@@ -357,24 +360,24 @@
         .price-group {
           display: grid;
           grid-template-columns: repeat(2, 1fr);
-            .price-item {
-              display: flex;
-              flex-direction: column;
-              justify-content: flex-start;
-
-              .price-type {
-                color: #d1d5db;
-                font-size: 24rpx;
-              }
-
-              .price {
-                font-weight: 700;
-              }
-
-              .sales {
-                color: red;
-              }
+          .price-item {
+            display: flex;
+            flex-direction: column;
+            justify-content: flex-start;
+
+            .price-type {
+              color: #d1d5db;
+              font-size: 24rpx;
+            }
+
+            .price {
+              font-weight: 700;
+            }
+
+            .sales {
+              color: red;
             }
+          }
         }
 
         .others {
@@ -419,8 +422,67 @@
         }
       }
     }
+    /* 更多信息区域 */
+    .more-info-container {
+      margin-top: 20rpx;
+      border-top: 1px solid #f0f0f0;
+      padding-top: 20rpx;
+
+      .more-info-header {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        cursor: pointer;
+
+        .more-info-title {
+          font-size: 28rpx;
+          color: #666666;
+          margin-right: 10rpx;
+        }
+      }
+
+      .more-info-content {
+        padding: 10rpx 0;
+        display: grid;
+        grid-template-columns: repeat(2, 1fr);
+        gap: 20rpx;
+
+        .info-row {
+          display: flex;
+          align-items: center;
+          margin-bottom: 10rpx;
+
+          .info-label {
+            font-size: 26rpx;
+            color: #999999;
+            min-width: 140rpx;
+          }
+
+          .info-value {
+            font-size: 26rpx;
+            color: #333333;
+            flex: 1;
+          }
+        }
+      }
+    }
   }
+}
+
+/* 更多信息展开收起动画 */
+.more-info-enter-active,
+.more-info-leave-active {
+  transition: all 0.3s ease;
+  max-height: 500rpx;
+  opacity: 1;
+  overflow: hidden;
+}
 
+.more-info-enter,
+.more-info-leave-to {
+  max-height: 0;
+  opacity: 0;
+  padding: 0;
 }
 
 /* 添加按钮 */
@@ -443,4 +505,4 @@
   &:active {
     transform: scale(0.95);
   }
-}
+}