mt-fe-group/wms-njlm
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

更新

Browse Source
This commit is contained in:
朱文强
2023-10-10 16:06:53 +08:00
parent 51f101ea4e
commit 78796203f6
38 changed files with 487 additions and 438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
src/views/asrs/warehouseStorehouseStorage/add-or-updata.vue
View File

@@ -2,7 +2,7 @@
<el-drawer
:visible.sync="visible"
:show-close="false"
:destroy-on-close="true"
:destroy-on-close="true"
:wrapper-closable="false"
class="drawer"
size="60%">
@@ -18,29 +18,28 @@
label-position="top"
@keyup.enter.native="dataFormSubmit">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="仓库编码" prop="code">
<el-col :span="8">
<el-form-item label="库位编码" prop="warehouseStorehouseCode">
<el-input
v-model="dataForm.code"
v-model="dataForm.warehouseStorehouseCode"
readonly
placeholder="请输入仓库编码" />
placeholder="请输入库位编码" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="仓库名" prop="name">
<el-col :span="8">
<el-form-item label="库位名" prop="warehouseStorehouseName">
<el-input
v-model="dataForm.name"
v-model="dataForm.warehouseStorehouseName"
readonly
placeholder="请输入仓库名" />
placeholder="请输入库位名" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="工序" prop="processId">
<el-col :span="8">
<el-form-item label="工序" prop="process">
<el-select
v-model="dataForm.processId"
v-model="dataForm.process"
style="width: 100%"
@change="$forceUpdate()"
placeholder="请选择工序">
<el-option
v-for="item in processArr"
@@ -50,6 +49,31 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="托盘编码" prop="trayCode">
<el-input
v-model="dataForm.trayCode"
@input="$forceUpdate()"
placeholder="请输入托盘编码" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item
label="选择入库位置"
prop="inWarehouseStorehouseName">
<el-select
v-model="dataForm.inWarehouseStorehouseName"
style="width: 100%"
@change="$forceUpdate()"
placeholder="请选择入库位置">
<el-option
v-for="item in potArr"
:key="item.id"
:label="item.warehouseStorehouseName"
:value="item.id" />
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
@@ -57,24 +81,25 @@
style="margin: 16px 0; padding-left: 8px"
:no-padding="true">
产品信息
<el-alert title="产品信息新增和修改后，需点击最下方保存按钮确定修改" type="warning" show-icon></el-alert>
<el-alert
title="产品信息新增和修改后，需点击最下方保存按钮确定修改"
type="warning"
show-icon></el-alert>
</small-title>
<div class="attr-list">
<base-table
:table-props="
tableProps
"
:table-props="tableProps"
:page="listQuery.pageNo"
:limit="listQuery.pageSize"
:add-button-show="addButtonShow"
@emitButtonClick="addNew"
@emitFun="inputChange"
:height="400"
:height="400"
:table-data="productAttributeList">
<method-btn
slot="handleBtn"
:width="120"
:width="70"
label="操作"
:method-list="tableBtn"
@clickBtn="handleClick" />
@@ -99,14 +124,13 @@
</template>
<script>
import {
updateProduct,
} from '@/api/core/base/product';
import { updateProduct } from '@/api/core/base/product';
import {
getWarehouseStorehouseGoodsSpecificationPage,
deleteWarehouseStorehouseGoodsSpecification,
deleteWarehouseStorehouseGoodsSpecification,
} from '@/api/asrs/warehouseStorehouseGoodsSpecification';
import { getWarehouseStorehouseList } from '@/api/asrs/warehouseStorehouse';
import productAttrAdd from './attr-add';
import inputArea from '../mixins/inputArea';
import selectQuality from '../mixins/selectQuality';
@@ -133,21 +157,25 @@ const tableProps = [
prop: 'specification',
label: '产品规格',
filter: codeFilter('specification'),
width: 90,
},
{
prop: 'number',
label: '数量',
subcomponent: inputArea,
width: 100,
},
{
prop: 'quality',
label: '品质',
filter: codeFilter('quality'),
subcomponent: selectQuality,
width: 110,
},
{
prop: 'cureTime',
label: '需要熟化时间(小时)',
width: 150,
},
];
@@ -184,11 +212,13 @@ export default {
productAttributeList: [],
addButtonShow: '新增',
processArr,
potArr: [],
dataForm: {
id: null,
name: '',
code: '',
processId: '',
warehouseStorehouseName: '',
warehouseStorehouseCode: '',
process: '',
inWarehouseStorehouseName: '',
},
listQuery: {
pageSize: 10,
@@ -214,7 +244,9 @@ export default {
this.dataForm = val;
this.initData();
this.visible = true;
getWarehouseStorehouseList().then((response) => {
this.potArr = response.data;
});
this.$nextTick(() => {
this.$refs['dataForm'].resetFields();
@@ -281,7 +313,7 @@ export default {
dataFormSubmit() {
this.productAttributeList.forEach((item) => {
item.id = '';
item.warehouseStorehouseId = this.dataForm.id
item.warehouseStorehouseId = this.dataForm.id;
item.warehouseId = '';
});
this.$refs['dataForm'].validate((valid) => {
@@ -326,12 +358,14 @@ export default {
.drawer >>> .el-form-item__label {
padding: 0;
}
.drawer >>> .el-form-item {
margin: 0;
}
.drawer >>> .el-drawer__header {
margin: 0;
padding: 32px 32px 24px;
border-bottom: 1px solid #dcdfe6;
margin-bottom: 30px;
margin-bottom: 10px;
}
.drawer >>> .content {

8
src/views/asrs/warehouseStorehouseStorage/index.vue
View File

@@ -29,7 +29,7 @@
prop="warehouseStorehouseCode"
label="库位编码"></el-table-column>
<el-table-column prop="trayCode" label="托盘编码"></el-table-column>
<el-table-column prop="process" label="工序">
<el-table-column prop="process" label="工序" width="110">
<template slot-scope="scope">
<span>
{{
@@ -38,12 +38,12 @@
</span>
</template>
</el-table-column>
<el-table-column prop="cacheLocation" label="缓存库位">
<el-table-column prop="cacheLocation" label="缓存库位" width="100">
<template slot-scope="scope">
<span>{{ scope.row.cacheLocation === 0 ? '否' : '是' }}</span>
</template>
</el-table-column>
<el-table-column prop="warehouseStorehouseState" label="仓库状态">
<el-table-column prop="warehouseStorehouseState" label="库位状态" width="100">
<template slot-scope="scope">
<span>
{{
@@ -55,7 +55,7 @@
</span>
</template>
</el-table-column>
<el-table-column label="操作">
<el-table-column label="操作" width="100">
<template v-slot="scope">
<el-button
size="mini"

8
src/views/asrs/warehouseStorehouseStorage/indexb.vue
View File

@@ -29,7 +29,7 @@
prop="warehouseStorehouseCode"
label="库位编码"></el-table-column>
<el-table-column prop="trayCode" label="托盘编码"></el-table-column>
<el-table-column prop="process" label="工序">
<el-table-column prop="process" label="工序" width="110">
<template slot-scope="scope">
<span>
{{
@@ -38,12 +38,12 @@
</span>
</template>
</el-table-column>
<el-table-column prop="cacheLocation" label="缓存库位">
<el-table-column prop="cacheLocation" label="缓存库位" width="100">
<template slot-scope="scope">
<span>{{ scope.row.cacheLocation === 0 ? '否' : '是' }}</span>
</template>
</el-table-column>
<el-table-column prop="warehouseStorehouseState" label="仓库状态">
<el-table-column prop="warehouseStorehouseState" label="库位状态" width="100">
<template slot-scope="scope">
<span>
{{
@@ -55,7 +55,7 @@
</span>
</template>
</el-table-column>
<el-table-column label="操作">
<el-table-column label="操作" width="100">
<template v-slot="scope">
<el-button
size="mini"

14
src/views/asrs/warehouseStorehouseStorage/out-or-move.vue
View File

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: zwq
* @LastEditTime: 2023-09-04 15:47:46
* @LastEditTime: 2023-10-09 15:49:08
* @Description:
-->
<template>
@@ -20,7 +20,7 @@
<el-option
v-for="item in potArr"
:key="item.id"
:label="item.warehouseName"
:label="item.warehouseStorehouseName"
:value="item.id" />
</el-select>
</el-form-item>
@@ -29,7 +29,7 @@
<script>
import basicAdd from '../mixins/basic-add';
import { getWarehouseStorehousePage,moveStorehouse } from "@/api/asrs/warehouseStorehouse";
import { getWarehouseStorehouseList,moveStorehouse } from "@/api/asrs/warehouseStorehouse";
export default {
mixins: [basicAdd],
@@ -55,12 +55,8 @@ export default {
this.visible = true;
this.$nextTick(() => {
this.$refs["dataForm"].resetFields();
const params = {
pageSize: 100,
pageNo: 1,
};
getWarehouseStorehousePage(params).then((response) => {
this.potArr = response.data.list;
getWarehouseStorehouseList().then((response) => {
this.potArr = response.data;
});
});
},