前后端修改
This commit is contained in:
@@ -9,6 +9,15 @@ export function listActualWarehouse(query) {
|
||||
})
|
||||
}
|
||||
|
||||
// 获取完整三级目录
|
||||
export function listActualWarehouseTree(query) {
|
||||
return request({
|
||||
url: '/wms/actualWarehouse/tree',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
// 查询实际库区/库位自关联详细
|
||||
export function getActualWarehouse(actualWarehouseId) {
|
||||
return request({
|
||||
@@ -26,6 +35,25 @@ export function addActualWarehouse(data) {
|
||||
})
|
||||
}
|
||||
|
||||
// 导入实际库区/库位
|
||||
export function importActualWarehouse(data) {
|
||||
return request({
|
||||
url: '/wms/actualWarehouse/importData',
|
||||
method: 'post',
|
||||
data,
|
||||
headers: { 'Content-Type': 'multipart/form-data' }
|
||||
})
|
||||
}
|
||||
|
||||
// 批量新增三级目录
|
||||
export function createActualWarehouseHierarchy(data) {
|
||||
return request({
|
||||
url: '/wms/actualWarehouse/hierarchy',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
// 修改实际库区/库位自关联
|
||||
export function updateActualWarehouse(data) {
|
||||
return request({
|
||||
|
||||
@@ -793,6 +793,52 @@ body {
|
||||
}
|
||||
}
|
||||
|
||||
// Treeselect 样式
|
||||
.vue-treeselect {
|
||||
&__control {
|
||||
min-height: 24px;
|
||||
border-radius: 0;
|
||||
border-color: $--border-color-light;
|
||||
background: linear-gradient(180deg, #fdfdff 0%, #f4f6fa 100%);
|
||||
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.04);
|
||||
}
|
||||
|
||||
&__single-value,
|
||||
&__placeholder,
|
||||
&__input-container {
|
||||
line-height: 24px;
|
||||
font-size: 12px;
|
||||
color: $--color-text-regular;
|
||||
}
|
||||
|
||||
&__control-arrow-container {
|
||||
height: 24px;
|
||||
}
|
||||
|
||||
&__menu {
|
||||
background: $--metal-gradient-light;
|
||||
border: 1px solid $--border-color-light;
|
||||
border-radius: 6px;
|
||||
box-shadow: $--metal-shadow;
|
||||
padding: 4px 0;
|
||||
}
|
||||
|
||||
&__option {
|
||||
color: $--color-text-regular;
|
||||
padding: 6px 16px;
|
||||
font-size: 13px;
|
||||
|
||||
&--highlight {
|
||||
background-color: rgba($--color-primary, .12);
|
||||
}
|
||||
|
||||
&--selected {
|
||||
background-color: rgba($--color-primary, .20);
|
||||
color: $--color-text-primary;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 开关
|
||||
.el-switch {
|
||||
.el-switch__core {
|
||||
|
||||
@@ -1,156 +1,189 @@
|
||||
<template>
|
||||
<div style="width: 100%; max-width: 300px;">
|
||||
<treeselect
|
||||
:max-height="200"
|
||||
<div :class="['actual-warehouse-select', { 'is-block': block }]" :style="wrapperStyle">
|
||||
<el-select
|
||||
v-model="innerValue"
|
||||
:options="warehouseOptions"
|
||||
:normalizer="normalizer"
|
||||
:placeholder="placeholder"
|
||||
:clearable="clearable"
|
||||
search-nested
|
||||
:load-options="loadOptions"
|
||||
@input="onInput"
|
||||
/>
|
||||
filterable
|
||||
:filter-method="handleFilter"
|
||||
:disabled="disabled"
|
||||
size="small"
|
||||
class="actual-warehouse-select__inner"
|
||||
@change="handleChange"
|
||||
@visible-change="handleVisibleChange"
|
||||
>
|
||||
<el-option
|
||||
v-for="option in displayOptions"
|
||||
:key="option.actualWarehouseId"
|
||||
:label="option.fullLabel"
|
||||
:value="option.actualWarehouseId"
|
||||
>
|
||||
<div class="option-content">
|
||||
<span class="level-tag">{{ levelLabels[option.level] }}</span>
|
||||
<span class="option-text">{{ option.fullLabel }}</span>
|
||||
</div>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import Treeselect from '@riophae/vue-treeselect';
|
||||
import '@riophae/vue-treeselect/dist/vue-treeselect.css';
|
||||
import { listActualWarehouse } from '@/api/wms/actualWarehouse';
|
||||
import { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect';
|
||||
import { listActualWarehouseTree } from '@/api/wms/actualWarehouse';
|
||||
|
||||
const LEVEL_LABELS = {
|
||||
1: '一级',
|
||||
2: '二级',
|
||||
3: '三级'
|
||||
};
|
||||
|
||||
export default {
|
||||
name: 'ActualWarehouseSelect',
|
||||
components: { Treeselect },
|
||||
props: {
|
||||
value: {
|
||||
type: [Number, String, null], // 仅保留单选类型
|
||||
type: [Number, String, null],
|
||||
default: null
|
||||
},
|
||||
placeholder: {
|
||||
type: String,
|
||||
default: '请选择库区/仓库/库位'
|
||||
default: '请选择实际库区/库位'
|
||||
},
|
||||
clearable: {
|
||||
type: Boolean,
|
||||
default: true
|
||||
},
|
||||
showTop: {
|
||||
block: {
|
||||
type: Boolean,
|
||||
default: true // 是否显示顶级节点（actualWarehouseId=0）
|
||||
default: false
|
||||
},
|
||||
width: {
|
||||
type: [String, Number],
|
||||
default: 240
|
||||
},
|
||||
disabled: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
innerValue: this.value,
|
||||
warehouseOptions: [], // 初始选项（含未加载子节点的节点，标记 children: null）
|
||||
loadedChildren: {}, // 缓存已加载的子节点：key=父节点ID，value=子节点数组
|
||||
allLoadedNodes: [] // 存储所有已加载的节点，用于快速查找完整对象
|
||||
flatOptions: [],
|
||||
displayOptions: [],
|
||||
levelLabels: LEVEL_LABELS
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
wrapperStyle() {
|
||||
const widthValue = this.block ? '100%' : (typeof this.width === 'number' ? `${this.width}px` : this.width);
|
||||
return { width: widthValue };
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
value(val) {
|
||||
this.innerValue = val;
|
||||
},
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.initOptions();
|
||||
created() {
|
||||
this.fetchTree();
|
||||
},
|
||||
methods: {
|
||||
/** 初始化顶级选项 */
|
||||
initOptions() {
|
||||
// 重置状态
|
||||
this.loadedChildren = {};
|
||||
this.allLoadedNodes = [];
|
||||
this.warehouseOptions = [];
|
||||
|
||||
if (this.showTop) {
|
||||
// 显示顶级节点：标记 children: null 表示需要懒加载子节点
|
||||
const topNode = {
|
||||
actualWarehouseId: 0,
|
||||
actualWarehouseName: '顶级节点',
|
||||
children: null, // 关键：标记为未加载子节点
|
||||
isDisabled: false
|
||||
};
|
||||
this.warehouseOptions.push(topNode);
|
||||
this.allLoadedNodes.push(topNode);
|
||||
} else {
|
||||
// 不显示顶级节点：直接加载 parentId=0 的节点作为顶级（初始标记为未加载）
|
||||
this.warehouseOptions.push({
|
||||
actualWarehouseId: 'temp-parent-0', // 临时父节点ID（仅用于触发首次加载）
|
||||
actualWarehouseName: '加载中...',
|
||||
children: null,
|
||||
isDisabled: true
|
||||
});
|
||||
// 触发首次加载 parentId=0 的节点
|
||||
this.loadOptions({
|
||||
action: LOAD_CHILDREN_OPTIONS,
|
||||
parentNode: { id: 0 },
|
||||
callback: (children) => {
|
||||
this.warehouseOptions = children;
|
||||
}
|
||||
});
|
||||
async fetchTree() {
|
||||
try {
|
||||
const res = await listActualWarehouseTree();
|
||||
this.flatOptions = this.flattenTree(res.data || []);
|
||||
this.displayOptions = [...this.flatOptions];
|
||||
} catch (error) {
|
||||
console.error('获取实际库区树失败', error);
|
||||
}
|
||||
},
|
||||
|
||||
/** 懒加载核心方法 */
|
||||
loadOptions({ action, parentNode, callback, instanceId }) {
|
||||
// 仅处理 "加载子节点" 动作
|
||||
if (action !== LOAD_CHILDREN_OPTIONS) {
|
||||
callback();
|
||||
flattenTree(nodes, parentPath = [], level = 1) {
|
||||
const result = [];
|
||||
nodes.forEach(node => {
|
||||
const path = [...parentPath, node.actualWarehouseName];
|
||||
const current = {
|
||||
actualWarehouseId: node.actualWarehouseId,
|
||||
parentId: node.parentId || 0,
|
||||
level,
|
||||
fullLabel: path.join(' / '),
|
||||
descendantIds: [],
|
||||
children: node.children || []
|
||||
};
|
||||
result.push(current);
|
||||
if (node.children && node.children.length) {
|
||||
const children = this.flattenTree(node.children, path, level + 1);
|
||||
children.forEach(child => {
|
||||
current.descendantIds.push(child.actualWarehouseId);
|
||||
current.descendantIds.push(...child.descendantIds);
|
||||
});
|
||||
result.push(...children);
|
||||
}
|
||||
});
|
||||
return result;
|
||||
},
|
||||
|
||||
handleFilter(keyword) {
|
||||
const text = (keyword || '').trim();
|
||||
if (!text) {
|
||||
this.displayOptions = [...this.flatOptions];
|
||||
return;
|
||||
}
|
||||
console.log('加载子节点请求参数：', parentNode);
|
||||
|
||||
const parentId = parentNode.actualWarehouseId; // 当前父节点ID（对应 actualWarehouseId）
|
||||
|
||||
// 2. 调用接口加载子节点（parentId 作为查询条件）
|
||||
listActualWarehouse({ parentId }).then(response => {
|
||||
const children = response.data.map(item => ({
|
||||
...item,
|
||||
isDisabled: !item.isEnabled, // 禁用未启用的节点
|
||||
children: item.hasChildren ?? true ? null : [] // 有子节点则标记 children: null（需懒加载），否则空数组
|
||||
}));
|
||||
|
||||
// 如果没有子节点了，则不添加children属性
|
||||
if (children.length === 0) {
|
||||
delete parentNode.children;
|
||||
callback()
|
||||
return;
|
||||
const matchedIds = new Set();
|
||||
this.flatOptions.forEach(option => {
|
||||
if (option.fullLabel.includes(text)) {
|
||||
matchedIds.add(option.actualWarehouseId);
|
||||
option.descendantIds.forEach(id => matchedIds.add(id));
|
||||
}
|
||||
|
||||
// 5. 给父节点赋值子节点（treeselect 自动渲染）
|
||||
parentNode.children = children;
|
||||
|
||||
// 6. 回调通知加载成功
|
||||
callback();
|
||||
}).catch((error) => {
|
||||
console.error('加载子节点失败：', error);
|
||||
callback(new Error('加载失败，请重试'));
|
||||
});
|
||||
this.displayOptions = this.flatOptions.filter(option => matchedIds.has(option.actualWarehouseId));
|
||||
},
|
||||
|
||||
/** 节点格式标准化 */
|
||||
normalizer(node) {
|
||||
return {
|
||||
id: node.actualWarehouseId, // 节点唯一ID
|
||||
label: node.actualWarehouseName, // 显示文本
|
||||
children: node.children, // 子节点（null=未加载，[]=无节点）
|
||||
isDisabled: node.isDisabled, // 是否禁用
|
||||
raw: node // 保留原始节点数据，方便后续查找
|
||||
};
|
||||
handleVisibleChange(visible) {
|
||||
if (!visible) {
|
||||
this.displayOptions = [...this.flatOptions];
|
||||
}
|
||||
},
|
||||
|
||||
/** 选中值变化时触发（仅单选） */
|
||||
onInput(val) {
|
||||
handleChange(val) {
|
||||
this.$emit('input', val);
|
||||
const node = this.flatOptions.find(option => option.actualWarehouseId === val);
|
||||
this.$emit('select', node);
|
||||
},
|
||||
|
||||
/** 外部刷新方法（如需重新加载数据可调用） */
|
||||
refresh() {
|
||||
this.initOptions();
|
||||
this.fetchTree();
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.actual-warehouse-select {
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.actual-warehouse-select.is-block {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.actual-warehouse-select__inner {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.option-content {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
.level-tag {
|
||||
font-size: 12px;
|
||||
color: #909399;
|
||||
width: 34px;
|
||||
}
|
||||
|
||||
.option-text {
|
||||
font-size: 13px;
|
||||
color: #606266;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -114,9 +114,9 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column label="扫码时间" align="center" prop="scanTime" width="155" :show-overflow-tooltip="true">
|
||||
<el-table-column label="新增时间" align="center" prop="createTime" width="155" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ parseTime(scope.row.scanTime, '{y}-{m}-{d} {h}:{i}') }}</span>
|
||||
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
|
||||
@@ -11,7 +11,11 @@
|
||||
|
||||
<!-- 真实库区 -->
|
||||
<el-form-item label="真实库区">
|
||||
<ActualWarehouseSelect v-model="queryParams.actualWarehouseId" @change="handleActualWarehouseChange" />
|
||||
<ActualWarehouseSelect
|
||||
v-model="queryParams.actualWarehouseId"
|
||||
@change="handleActualWarehouseChange"
|
||||
:width="220"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
|
||||
@@ -1,25 +1,212 @@
|
||||
<template>
|
||||
<BasePage :qrcode="qrcode" :querys="querys" :labelType="labelType" :hideType="hideType" />
|
||||
<div
|
||||
:class="['actual-warehouse-select', { 'is-block': block }]"
|
||||
:style="wrapperStyle"
|
||||
>
|
||||
<el-cascader
|
||||
ref="cascader"
|
||||
v-model="innerPath"
|
||||
:props="cascaderProps"
|
||||
:placeholder="placeholder"
|
||||
:clearable="clearable"
|
||||
:show-all-levels="true"
|
||||
:emit-path="true"
|
||||
style="width: 100%;"
|
||||
@change="handleChange"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import BasePage from './panels/base.vue';
|
||||
import { listActualWarehouse } from '@/api/wms/actualWarehouse';
|
||||
|
||||
export default {
|
||||
components: {
|
||||
BasePage
|
||||
name: 'ActualWarehouseSelect',
|
||||
props: {
|
||||
// 对外仍然是「单个 ID」，即第三级 actualWarehouseId
|
||||
value: {
|
||||
type: [Number, String, null],
|
||||
default: null
|
||||
},
|
||||
placeholder: {
|
||||
type: String,
|
||||
default: '请选择实际库位'
|
||||
},
|
||||
clearable: {
|
||||
type: Boolean,
|
||||
default: true
|
||||
},
|
||||
// 已经不再显示“最高级”
|
||||
showTop: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
block: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
width: {
|
||||
type: [String, Number],
|
||||
default: 240
|
||||
},
|
||||
size: {
|
||||
type: String,
|
||||
default: 'small'
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
qrcode: true,
|
||||
querys: {
|
||||
dataType: 1,
|
||||
// itemType: 'raw_material'
|
||||
materialType: '原料'
|
||||
},
|
||||
labelType: '2',
|
||||
hideType: true
|
||||
// 级联组件内部使用的「路径值」，例如 [一级ID, 二级ID, 三级ID]
|
||||
innerPath: [],
|
||||
// 记录所有已加载节点（如果后面要根据 ID 反查路径，可复用）
|
||||
allLoadedNodes: []
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
wrapperStyle() {
|
||||
const widthValue = this.block
|
||||
? '100%'
|
||||
: (typeof this.width === 'number' ? `${this.width}px` : this.width);
|
||||
return { width: widthValue };
|
||||
},
|
||||
// el-cascader 的 props 配置
|
||||
cascaderProps() {
|
||||
return {
|
||||
lazy: true,
|
||||
lazyLoad: this.loadNode, // 懒加载方法
|
||||
checkStrictly: false, // 只允许选叶子节点
|
||||
value: 'value',
|
||||
label: 'label',
|
||||
children: 'children'
|
||||
};
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
// 外部把 value 置空时，同步清空面板
|
||||
value(val) {
|
||||
if (val == null || val === '') {
|
||||
this.innerPath = [];
|
||||
}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
/**
|
||||
* 级联懒加载
|
||||
* node.level:
|
||||
* 0：根（还没选任何东西，parentId = 0 -> 加载一级）
|
||||
* 1：一级节点，加载二级
|
||||
* 2：二级节点，加载三级（三级设为叶子，不再展开）
|
||||
*/
|
||||
loadNode(node, resolve) {
|
||||
const { level, value } = node;
|
||||
|
||||
// 超过第三级就不再加载
|
||||
if (level >= 3) {
|
||||
resolve([]);
|
||||
return;
|
||||
}
|
||||
|
||||
const parentId = level === 0 ? 0 : value;
|
||||
|
||||
listActualWarehouse({ parentId }).then(res => {
|
||||
const list = (res.data || []).map(item => {
|
||||
const nextLevel = level + 1;
|
||||
const isLeafLevel = nextLevel >= 3; // 第三级为叶子，不能再展开
|
||||
|
||||
const nodeData = {
|
||||
value: item.actualWarehouseId,
|
||||
label: item.actualWarehouseName,
|
||||
leaf: isLeafLevel,
|
||||
// 只有第三级可选；一、二级全部 disabled
|
||||
disabled: nextLevel < 3 || item.isEnabled === false,
|
||||
// 保留原始数据和层级
|
||||
raw: item,
|
||||
level: nextLevel
|
||||
};
|
||||
|
||||
this.registerNode(nodeData);
|
||||
return nodeData;
|
||||
});
|
||||
|
||||
resolve(list);
|
||||
}).catch(err => {
|
||||
console.error('加载仓库树失败：', err);
|
||||
resolve([]);
|
||||
});
|
||||
},
|
||||
|
||||
/** 把节点放进缓存数组里，后面如需扩展可用 */
|
||||
registerNode(node) {
|
||||
const id = node.value;
|
||||
const idx = this.allLoadedNodes.findIndex(
|
||||
n => String(n.value) === String(id)
|
||||
);
|
||||
if (idx === -1) {
|
||||
this.allLoadedNodes.push(node);
|
||||
} else {
|
||||
this.$set(this.allLoadedNodes, idx, {
|
||||
...this.allLoadedNodes[idx],
|
||||
...node
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* 选中变化：
|
||||
* value 是路径数组，如 [一级ID, 二级ID, 三级ID]
|
||||
* 我们对外只抛最后一个（第三级）ID
|
||||
*/
|
||||
handleChange(value) {
|
||||
if (!Array.isArray(value) || value.length === 0) {
|
||||
this.$emit('input', null);
|
||||
this.$emit('select', null);
|
||||
return;
|
||||
}
|
||||
|
||||
const leafId = value[value.length - 1];
|
||||
|
||||
// 拿到当前选中节点，获取完整路径信息
|
||||
const nodes = this.$refs.cascader.getCheckedNodes();
|
||||
let payload = null;
|
||||
if (nodes && nodes.length > 0) {
|
||||
const node = nodes[0];
|
||||
const pathNodes = node.path || [];
|
||||
|
||||
payload = {
|
||||
id: leafId,
|
||||
pathIds: pathNodes.map(n => n.value),
|
||||
pathLabels: pathNodes.map(n => n.label),
|
||||
// 原始 data（如果需要后台做别的处理可以用）
|
||||
rawPath: pathNodes.map(n => n.data || n.raw || {})
|
||||
};
|
||||
}
|
||||
|
||||
this.$emit('input', leafId);
|
||||
this.$emit('select', payload);
|
||||
},
|
||||
|
||||
/** 外部刷新：如果以后需要强制重载，可以扩展这里（目前不需要缓存） */
|
||||
refresh() {
|
||||
this.innerPath = [];
|
||||
this.allLoadedNodes = [];
|
||||
// el-cascader 的懒加载不需要预载，这里清空即可
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.actual-warehouse-select {
|
||||
display: inline-block;
|
||||
width: 100%;
|
||||
}
|
||||
</script>
|
||||
|
||||
.actual-warehouse-select.is-block {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
/* 让级联宽度占满容器，其他高度、边框等跟 el-select 共用全局 .el-input__inner 样式 */
|
||||
.actual-warehouse-select .el-cascader {
|
||||
width: 100%;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
<el-option :value="1" label="当前数据">当前数据</el-option>
|
||||
</el-select>
|
||||
</el-form-item> -->
|
||||
<el-form-item label="所在库位" prop="warehouseId" v-if="!hideWarehouseQuery">
|
||||
<el-form-item label="逻辑库位" prop="warehouseId" v-if="!hideWarehouseQuery">
|
||||
<warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
|
||||
style="width: 100%; display: inline-block;" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item label="实际库区" prop="actualWarehouseId" v-if="!hideWarehouseQuery">
|
||||
<actual-warehouse-select v-model="queryParams.actualWarehouseId" placeholder="请选择实际库位"
|
||||
style="width: 100%; display: inline-block;" clearable />
|
||||
style="display: inline-block;" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item label="厂家卷号" prop="supplierCoilNo">
|
||||
<el-input v-model="queryParams.supplierCoilNo" placeholder="请输入厂家原料卷号" clearable
|
||||
@@ -69,7 +69,7 @@
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<el-table v-loading="loading" :data="materialCoilList" @selection-change="handleSelectionChange" height="450px">
|
||||
<el-table v-loading="loading" :data="materialCoilList" @selection-change="handleSelectionChange" >
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column label="入场钢卷号" align="center" prop="enterCoilNo" />
|
||||
<el-table-column label="当前钢卷号" align="center" prop="currentCoilNo" />
|
||||
|
||||
@@ -19,7 +19,7 @@ export default {
|
||||
},
|
||||
labelType: '3',
|
||||
showStatus: true,
|
||||
hideType: true,
|
||||
hideType: false,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -171,8 +171,12 @@
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="真实库区" required>
|
||||
<ActualWarehouseSelect v-model="item.actualWarehouseId" placeholder="请选择真实库区" style="width: 100%"
|
||||
filterable :disabled="readonly" />
|
||||
<ActualWarehouseSelect
|
||||
v-model="item.actualWarehouseId"
|
||||
placeholder="请选择真实库区"
|
||||
block
|
||||
:disabled="readonly"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
|
||||
@@ -167,8 +167,12 @@
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="真实库区" prop="warehouseId">
|
||||
<ActualWarehouseSelect v-model="updateForm.actualWarehouseId" placeholder="请选择真实库区" style="width: 100%"
|
||||
filterable :disabled="readonly" />
|
||||
<ActualWarehouseSelect
|
||||
v-model="updateForm.actualWarehouseId"
|
||||
placeholder="请选择真实库区"
|
||||
block
|
||||
:disabled="readonly"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="备注" prop="remark">
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user