feat: 更新版本号至1.3.23并新增真实库区选择器组件
refactor(warehouse-picker): 重构逻辑库区选择器组件 feat(actual-warehouse-picker): 新增真实库区选择器组件 fix(easycode.vue): 调整钢卷质量状态校验逻辑 style(search.vue): 优化表单样式和字段显示
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<view>
|
||||
<!-- 选择器触发按钮 -->
|
||||
<!-- 选择器触发按钮 - 核心互斥:未选中=箭头 / 选中=清除按钮,二选一 -->
|
||||
<view
|
||||
class="picker-input"
|
||||
@click="handleOpen"
|
||||
@@ -9,15 +9,21 @@
|
||||
<text class="picker-text" :class="{ 'picker-placeholder': !selectedName }">
|
||||
{{ selectedName || placeholder }}
|
||||
</text>
|
||||
<text class="picker-arrow" v-if="!disabled">▼</text>
|
||||
<!-- ✅ 互斥核心:选中库区 → 清除按钮 | 未选中 → 下拉箭头,永不共存 -->
|
||||
<text
|
||||
class="picker-clear"
|
||||
v-if="selectedName && !disabled"
|
||||
@click.stop.prevent="handleClear"
|
||||
>✕</text>
|
||||
<text class="picker-arrow" v-else-if="!disabled">▼</text>
|
||||
</view>
|
||||
|
||||
<!-- 弹窗内容 -->
|
||||
<!-- 弹窗内容 - 固定逻辑库区标题,无任何真实库区相关内容 -->
|
||||
<uni-popup ref="popup" type="bottom" @close="handlePopupClose">
|
||||
<view class="warehouse-popup">
|
||||
<!-- 弹窗头部 -->
|
||||
<!-- 弹窗头部 - 固定标题:选择逻辑库区 -->
|
||||
<view class="popup-header">
|
||||
<text class="popup-title">{{ title || (wareType === 'virtual' ? '选择逻辑库区' : '选择真实库区') }}</text>
|
||||
<text class="popup-title">选择逻辑库区</text>
|
||||
<text class="popup-close" @click="handleClose">✕</text>
|
||||
</view>
|
||||
|
||||
@@ -42,11 +48,11 @@
|
||||
<view
|
||||
class="warehouse-item"
|
||||
v-for="item in filteredList"
|
||||
:key="getItemId(item)"
|
||||
:key="item.warehouseId"
|
||||
@click="handleSelect(item)"
|
||||
>
|
||||
<text class="warehouse-name">{{ getItemName(item) }}</text>
|
||||
<text class="warehouse-check" v-if="getItemId(item) === selectedId">✓</text>
|
||||
<text class="warehouse-name">{{ item.warehouseName }}</text>
|
||||
<text class="warehouse-check" v-if="item.warehouseId === selectedId">✓</text>
|
||||
</view>
|
||||
<view class="empty-tip" v-if="filteredList.length === 0">
|
||||
<text>未找到匹配的库区</text>
|
||||
@@ -65,13 +71,13 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
// ✅ 只保留逻辑库区接口,彻底删除真实库区接口引入
|
||||
import { listWarehouse } from '@/api/wms/warehouse.js'
|
||||
import { listActualWarehouse } from '@/api/wms/actualWarehouse.js'
|
||||
|
||||
export default {
|
||||
name: 'WarehousePicker',
|
||||
props: {
|
||||
// 已选中的库区ID(用于回显)
|
||||
// 已选中的逻辑库区ID(用于回显)
|
||||
value: {
|
||||
type: [String, Number],
|
||||
default: ''
|
||||
@@ -86,25 +92,17 @@ export default {
|
||||
type: String,
|
||||
default: '请选择库区'
|
||||
},
|
||||
// 弹窗标题
|
||||
// 弹窗标题(保留该属性,如需自定义可传,默认固定为选择逻辑库区)
|
||||
title: {
|
||||
type: String,
|
||||
default: ''
|
||||
},
|
||||
// 库区类型:virtual-逻辑库区,actual-真实库区
|
||||
wareType: {
|
||||
type: String,
|
||||
default: 'virtual',
|
||||
validator: (value) => {
|
||||
return ['virtual', 'actual'].includes(value)
|
||||
}
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
// 弹窗显示状态
|
||||
showPopup: false,
|
||||
// 所有库区列表
|
||||
// 所有逻辑库区列表
|
||||
dataList: [],
|
||||
// 过滤后的库区列表
|
||||
filteredList: [],
|
||||
@@ -137,31 +135,17 @@ export default {
|
||||
immediate: true,
|
||||
handler(val) {
|
||||
if (val && this.dataList.length) {
|
||||
const matched = this.dataList.find(item => this.getItemId(item) === val)
|
||||
this.selectedName = matched ? this.getItemName(matched) : ''
|
||||
const matched = this.dataList.find(item => item.warehouseId === val)
|
||||
this.selectedName = matched ? matched.warehouseName : ''
|
||||
}
|
||||
}
|
||||
},
|
||||
// 监听库区类型变化,重新加载数据
|
||||
wareType: {
|
||||
immediate: true,
|
||||
handler() {
|
||||
this.loadWarehouses()
|
||||
}
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.loadWarehouses()
|
||||
},
|
||||
methods: {
|
||||
// 根据类型获取项目ID
|
||||
getItemId(item) {
|
||||
return this.wareType === 'virtual' ? item.warehouseId : item.actualWarehouseId
|
||||
},
|
||||
|
||||
// 根据类型获取项目名称
|
||||
getItemName(item) {
|
||||
return this.wareType === 'virtual' ? item.warehouseName : item.actualWarehouseName
|
||||
},
|
||||
|
||||
// 加载库区列表
|
||||
// 加载逻辑库区列表 ✅ 精简后:只保留逻辑库区接口请求,无任何类型判断
|
||||
async loadWarehouses() {
|
||||
if (this.loading) return
|
||||
|
||||
@@ -170,23 +154,18 @@ export default {
|
||||
this.errorMsg = ''
|
||||
|
||||
try {
|
||||
// 根据类型选择不同的API
|
||||
const res = this.wareType === 'virtual'
|
||||
? await listWarehouse({ pageNum: 1, pageSize: 1000 })
|
||||
: await listActualWarehouse({ pageNum: 1, pageSize: 1000 })
|
||||
|
||||
const res = await listWarehouse({ pageNum: 1, pageSize: 1000 })
|
||||
if (res.code === 200) {
|
||||
this.dataList = res[this.wareType === 'virtual' ? 'data' : 'rows'] || []
|
||||
this.dataList = res.data || []
|
||||
this.filteredList = [...this.dataList]
|
||||
// 初始化选中项名称
|
||||
this.updateSelectedName()
|
||||
} else {
|
||||
throw new Error(res.msg || `${this.wareType === 'virtual' ? '逻辑' : '真实'}库区数据加载失败`)
|
||||
throw new Error(res.msg || '逻辑库区数据加载失败')
|
||||
}
|
||||
} catch (err) {
|
||||
this.error = true
|
||||
this.errorMsg = err.message
|
||||
console.error(`${this.wareType === 'virtual' ? '逻辑' : '真实'}库区加载失败:`, err)
|
||||
console.error('逻辑库区加载失败:', err)
|
||||
} finally {
|
||||
this.loading = false
|
||||
}
|
||||
@@ -196,29 +175,33 @@ export default {
|
||||
updateSelectedName() {
|
||||
if (!this.selectedId) return
|
||||
|
||||
const matched = this.dataList.find(
|
||||
item => this.getItemId(item) === this.selectedId
|
||||
)
|
||||
this.selectedName = matched ? this.getItemName(matched) : ''
|
||||
const matched = this.dataList.find(item => item.warehouseId === this.selectedId)
|
||||
this.selectedName = matched ? matched.warehouseName : ''
|
||||
},
|
||||
|
||||
// 搜索过滤
|
||||
// 搜索过滤:只匹配逻辑库区名称
|
||||
handleSearch() {
|
||||
const keyword = this.searchKeyword.trim().toLowerCase()
|
||||
if (!keyword) {
|
||||
this.filteredList = [...this.dataList]
|
||||
} else {
|
||||
this.filteredList = this.dataList.filter(item =>
|
||||
this.getItemName(item).toLowerCase().includes(keyword)
|
||||
item.warehouseName.toLowerCase().includes(keyword)
|
||||
)
|
||||
}
|
||||
},
|
||||
|
||||
// 选择库区
|
||||
// 选择逻辑库区:保留禁用库区过滤逻辑
|
||||
handleSelect(item) {
|
||||
this.selectedId = this.getItemId(item)
|
||||
this.selectedName = this.getItemName(item)
|
||||
// 通知父组件选中的完整信息
|
||||
if (item.isEnabled == 0) {
|
||||
uni.showToast({
|
||||
title: '该库区已禁用',
|
||||
icon: 'none'
|
||||
});
|
||||
return;
|
||||
}
|
||||
this.selectedId = item.warehouseId
|
||||
this.selectedName = item.warehouseName
|
||||
this.$emit('change', item)
|
||||
this.handleClose()
|
||||
},
|
||||
@@ -226,7 +209,6 @@ export default {
|
||||
// 打开弹窗
|
||||
handleOpen() {
|
||||
if (this.disabled) return
|
||||
// 每次打开前重置搜索
|
||||
this.searchKeyword = ''
|
||||
this.filteredList = [...this.dataList]
|
||||
this.showPopup = true
|
||||
@@ -242,17 +224,25 @@ export default {
|
||||
// 弹窗关闭回调
|
||||
handlePopupClose() {
|
||||
this.showPopup = false
|
||||
},
|
||||
|
||||
// ✅ 清空选中的库区数据:清空ID+名称,双向绑定同步,触发空回调
|
||||
handleClear() {
|
||||
this.selectedId = '';
|
||||
this.selectedName = '';
|
||||
this.$emit('change', {});
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
/* 保持原有样式不变 */
|
||||
/* 保持原有样式不变,样式适配互斥显示,无需任何修改 */
|
||||
.picker-input {
|
||||
width: 100%;
|
||||
height: 88rpx;
|
||||
padding: 0 24rpx;
|
||||
padding-right: 60rpx; // 预留按钮/箭头空间,防止文本遮挡
|
||||
background: #f8f9fa;
|
||||
border: 2rpx solid #e8e8e8;
|
||||
border-radius: 12rpx;
|
||||
@@ -283,11 +273,29 @@ export default {
|
||||
}
|
||||
}
|
||||
|
||||
// 下拉箭头样式
|
||||
.picker-arrow {
|
||||
font-size: 24rpx;
|
||||
color: #999;
|
||||
margin-left: 10rpx;
|
||||
}
|
||||
|
||||
// 清除按钮样式 (和箭头位置一致,样式协调)
|
||||
.picker-clear {
|
||||
font-size: 28rpx;
|
||||
color: #999;
|
||||
width: 40rpx;
|
||||
height: 40rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
margin-left: 8rpx;
|
||||
border-radius: 50%;
|
||||
&:active {
|
||||
background-color: #e8e8e8;
|
||||
color: #666;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.warehouse-popup {
|
||||
@@ -417,7 +425,7 @@ export default {
|
||||
|
||||
.empty-tip {
|
||||
text-align: center;
|
||||
padding: 60rpx 0;
|
||||
padding: 60rpx 0;
|
||||
color: #999;
|
||||
font-size: 28rpx;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user