feat(router): 添加数字钢卷路由
feat(components): 为MutiSelect组件添加collapseTags属性 feat(views): 新增酸连轧系统页面及组件 feat(views): 添加数字钢卷信息展示组件 refactor(views): 重构基础面板组件,支持数字钢卷功能
This commit is contained in:
@@ -1,16 +1,21 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
|
||||
<el-form-item label="入场钢卷号" prop="enterCoilNo">
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="60px">
|
||||
<el-form-item label="入场卷号" prop="enterCoilNo">
|
||||
<el-input v-model="queryParams.enterCoilNo" placeholder="请输入入场钢卷号" clearable
|
||||
@keyup.enter.native="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item label="当前钢卷号" prop="currentCoilNo">
|
||||
<el-form-item label="当前卷号" prop="currentCoilNo">
|
||||
<el-input v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
|
||||
@keyup.enter.native="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item label="逻辑库位" prop="warehouseId" v-if="!hideWarehouseQuery && !leftWarehouseQuery">
|
||||
<warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
|
||||
<el-form-item label="逻辑库位" prop="warehouseId" v-if="useWarehouseIds">
|
||||
<muti-select v-model="warehouseIds" placeholder="请选择逻辑库位"
|
||||
style="width: 100%; display: inline-block;" clearable :options="warehouseOptions">
|
||||
</muti-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="逻辑库位" prop="warehouseId" v-else-if="!hideWarehouseQuery && !leftWarehouseQuery">
|
||||
<warehouse-select v-model="queryParams.warehouseId" placeholder="请选择逻辑库位"
|
||||
style="width: 100%; display: inline-block;" clearable />
|
||||
</el-form-item>
|
||||
|
||||
@@ -20,6 +25,13 @@
|
||||
:clearInput="false" :showEmpty="true" />
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item v-if="showMaterialType" label="物料类型" prop="materialType">
|
||||
<el-select v-model="queryParams.materialType" placeholder="请选择物料类型" clearable>
|
||||
<el-option label="原料" value="原料"></el-option>
|
||||
<el-option label="成品" value="成品"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="产品名称" prop="itemName">
|
||||
<muti-select v-model="queryParams.itemName" :options="dict.type.coil_itemname" placeholder="请选择物料" clearable />
|
||||
</el-form-item>
|
||||
@@ -298,6 +310,9 @@
|
||||
<el-button size="mini" type="text" icon="el-icon-printer" @click="handlePrintLabel(scope.row)">
|
||||
打印标签
|
||||
</el-button>
|
||||
<el-button size="mini" type="text" icon="el-icon-view" @click="handleNumberCoilClick(scope.row)">
|
||||
数字钢卷
|
||||
</el-button>
|
||||
<el-button size="mini" v-if="showStatus" type="text" icon="el-icon-upload"
|
||||
@click="handleExportCoil(scope.row)">
|
||||
发货
|
||||
@@ -680,7 +695,7 @@ export default {
|
||||
type: Boolean,
|
||||
default: false,
|
||||
},
|
||||
hideType: {
|
||||
showMaterialType: {
|
||||
type: Boolean,
|
||||
default: false,
|
||||
},
|
||||
@@ -762,6 +777,14 @@ export default {
|
||||
type: Boolean,
|
||||
default: false,
|
||||
},
|
||||
useWarehouseIds: {
|
||||
type: Boolean,
|
||||
default: false,
|
||||
},
|
||||
warehouseOptions: {
|
||||
type: Array,
|
||||
default: () => [],
|
||||
},
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
@@ -883,6 +906,7 @@ export default {
|
||||
loading: false,
|
||||
list: [],
|
||||
},
|
||||
warehouseIds: '',
|
||||
__printOldTitle: document.title,
|
||||
floatLayerConfig: {
|
||||
columns: [
|
||||
@@ -974,12 +998,21 @@ export default {
|
||||
},
|
||||
},
|
||||
created() {
|
||||
this.getList();
|
||||
if (this.showExportTime) {
|
||||
this.getUserList();
|
||||
}
|
||||
if (this.useWarehouseIds) {
|
||||
this.warehouseIds = this.warehouseOptions.map(item => item.value).join(',');
|
||||
}
|
||||
this.getList();
|
||||
},
|
||||
methods: {
|
||||
// 进入数字钢卷页面
|
||||
handleNumberCoilClick(row) {
|
||||
this.$router.push({
|
||||
path: '/wms/coil/' + row.coilId,
|
||||
});
|
||||
},
|
||||
// 处理行点击事件
|
||||
handleRowClick(row) {
|
||||
this.currentCoilId = row.coilId;
|
||||
@@ -1186,6 +1219,9 @@ export default {
|
||||
}
|
||||
// 如果没有设置itemType,则设置为raw_material
|
||||
query.selectType = this.querys.materialType === '原料' ? 'raw_material' : 'product';
|
||||
if (this.useWarehouseIds) {
|
||||
query.warehouseIds = this.warehouseIds;
|
||||
}
|
||||
if (this.showWaybill) {
|
||||
const { shipmentTime, ...query } = {
|
||||
...this.queryParams,
|
||||
|
||||
Reference in New Issue
Block a user