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

100
src/views/asrs/goodSpecification/add-or-updata.vue
View File

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: zwq
* @LastEditTime: 2023-10-08 10:45:09
* @LastEditTime: 2023-10-09 16:01:44
* @Description:
-->
<template>
@@ -12,48 +12,62 @@
ref="dataForm"
@keyup.enter.native="dataFormSubmit()"
label-width="120px">
<el-form-item label="产品编码" prop="goodSpecificationCode">
<el-input
v-model="dataForm.goodSpecificationCode"
clearable
placeholder="请输入产品编码" />
</el-form-item>
<el-form-item label="产品名称" prop="goodSpecificationName">
<el-input
v-model="dataForm.goodSpecificationName"
clearable
placeholder="请输入产品名称" />
</el-form-item>
<el-form-item label="产品规格" prop="specification">
<el-select
v-model="dataForm.specification"
clearable
placeholder="请选择产品规格">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="需要熟化时间" prop="cureTime">
<el-input-number
v-model="dataForm.cureTime"
controls-position="right"
:min="0"></el-input-number>
</el-form-item>
<el-form-item label="是否需要熟化" prop="cure">
<el-switch
v-model="dataForm.cure"
:active-value="1"
:inactive-value="0"></el-switch>
</el-form-item>
<el-form-item label="是否启用" prop="deactivate">
<el-switch
v-model="dataForm.deactivate"
:active-value="1"
:inactive-value="0"></el-switch>
</el-form-item>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="产品编码" prop="goodSpecificationCode">
<el-input
v-model="dataForm.goodSpecificationCode"
clearable
placeholder="请输入产品编码" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="产品名称" prop="goodSpecificationName">
<el-input
v-model="dataForm.goodSpecificationName"
clearable
placeholder="请输入产品名称" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="产品规格" prop="specification">
<el-select
v-model="dataForm.specification"
clearable
placeholder="请选择产品规格">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="需要熟化时间" prop="cureTime">
<el-input-number
v-model="dataForm.cureTime"
controls-position="right"
:min="0"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否需要熟化" prop="cure">
<el-switch
v-model="dataForm.cure"
:active-value="1"
:inactive-value="0"></el-switch>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否启用" prop="deactivate">
<el-switch
v-model="dataForm.deactivate"
:active-value="1"
:inactive-value="0"></el-switch>
</el-form-item>
</el-col>
</el-row>
</el-form>
</template>

4
src/views/asrs/goodSpecification/index.vue
View File

@@ -13,7 +13,7 @@
<method-btn
v-if="tableBtn.length"
slot="handleBtn"
:width="120"
:width="100"
label="操作"
:method-list="tableBtn"
@clickBtn="handleClick" />
@@ -29,7 +29,7 @@
@cancel="handleCancel"
@confirm="handleConfirm"
:before-close="handleCancel"
width="70%">
width="50%">
<add-or-update
ref="addOrUpdate"
@refreshDataList="successSubmit"></add-or-update>

4
src/views/asrs/goodSpecification/indexb.vue
View File

@@ -13,7 +13,7 @@
<method-btn
v-if="tableBtn.length"
slot="handleBtn"
:width="120"
:width="100"
label="操作"
:method-list="tableBtn"
@clickBtn="handleClick" />
@@ -29,7 +29,7 @@
@cancel="handleCancel"
@confirm="handleConfirm"
:before-close="handleCancel"
width="70%">
width="50%">
<add-or-update
ref="addOrUpdate"
@refreshDataList="successSubmit"></add-or-update>

8
src/views/asrs/mixins/basic-page.js
View File

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2022-08-24 11:19:43
* @LastEditors: zwq
* @LastEditTime: 2023-09-26 14:00:22
* @LastEditTime: 2023-10-10 15:29:31
* @Description:
*/
export default {
@@ -155,16 +155,16 @@ export default {
this.getDataList()
},
/** 导出按钮操作 */
handleExport() {
handleExport(id) {
// 处理查询参数
let params = { ...this.queryParams };
let params = { warehouseId:id };
params.pageNo = undefined;
params.pageSize = undefined;
this.$modal.confirm('是否确认导出所有数据项?').then(() => {
this.exportLoading = true;
return this.urlOptions.exportURL(params);
}).then(response => {
this.$download.excel(response, '工厂.xls');
this.$download.excel(response, '导出.xls');
this.exportLoading = false;
}).catch(() => { });
}

5
src/views/asrs/product-mini.vue
View File

@@ -2,11 +2,12 @@
* @Author: zwq
* @Date: 2023-08-24 14:47:58
* @LastEditors: zwq
* @LastEditTime: 2023-10-07 14:33:42
* @LastEditTime: 2023-10-09 16:20:11
* @Description:
-->
<template>
<div class="app-container">
<div>
<!-- <div class="app-container"> -->
<base-table
v-loading="dataListLoading"
:table-props="propType==='1'?

4
src/views/asrs/warehouse/index.vue
View File

@@ -13,7 +13,7 @@
<method-btn
v-if="tableBtn.length"
slot="handleBtn"
:width="120"
:width="100"
label="操作"
:method-list="tableBtn"
@clickBtn="handleClick" />
@@ -29,7 +29,7 @@
@cancel="handleCancel"
@confirm="handleConfirm"
:before-close="handleCancel"
width="70%">
width="50%">
<add-or-update
ref="addOrUpdate"
@refreshDataList="successSubmit"></add-or-update>

71
src/views/asrs/warehouseLocationMonitoring/index.vue
View File

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2023-08-21 14:26:23
* @LastEditors: zwq
* @LastEditTime: 2023-10-07 16:45:47
* @LastEditTime: 2023-10-10 16:05:52
* @Description:
-->
<template>
@@ -12,9 +12,9 @@
ref="searchBarForm"
@headBtnClick="buttonClick" />
<div class="tips">
<el-tag effect="dark">满</el-tag>
<el-tag type="success" effect="dark">空</el-tag>
<el-tag type="warning" effect="dark">锁</el-tag>
<el-tag effect="dark" color="#7362F3" style="border:none">满</el-tag>
<el-tag effect="dark" color="#16DC09" style="border:none">空</el-tag>
<el-tag effect="dark" color="#FFA08F" style="border:none">锁</el-tag>
</div>
<div class="mainbody">
<div v-for="a in listQuery.total" :key="a">
@@ -25,11 +25,11 @@
class="dashboard-layout-item"
v-for="a in wareData.one"
:key="a.id+a.warehouseStorehouseCode"
:style="{background: bgColor[a.warehouseStorehouseState], float: 'left'}">
<!-- <div
style="background: #FFF8E8; float: left">
<div
class="dashboard-layout-item-cricle"
style="background: #16dc09" /> -->
{{ a.warehouseStorehouseCode }}
:style="{background: bgColor[a.warehouseStorehouseState]}" />
{{ a.warehouseStorehouseName }}
</div>
</el-row>
<el-row>
@@ -37,11 +37,11 @@
class="dashboard-layout-item"
v-for="b in wareData.two"
:key="b.id+b.warehouseStorehouseCode"
:style="{background: bgColor[b.warehouseStorehouseState], float: 'left'}">
<!-- <div
style="background: #FFF8E8; float: left">
<div
class="dashboard-layout-item-cricle"
style="background: #16dc09" /> -->
{{ b.warehouseStorehouseCode }}
:style="{background: bgColor[b.warehouseStorehouseState]}" />
{{ b.warehouseStorehouseName }}
</div>
</el-row>
</el-col>
@@ -54,11 +54,11 @@
class="dashboard-layout-item"
v-for="c in wareData.there"
:key="c.id+c.warehouseStorehouseCode"
:style="{background: bgColor[c.warehouseStorehouseState], float: 'left'}">
<!-- <div
style="background: #FFF8E8; float: left">
<div
class="dashboard-layout-item-cricle"
style="background: #16dc09" /> -->
{{ c.warehouseStorehouseCode }}
:style="{background: bgColor[c.warehouseStorehouseState]}" />
{{ c.warehouseStorehouseName }}
</div>
</el-row>
<el-row>
@@ -66,11 +66,11 @@
class="dashboard-layout-item"
v-for="d in wareData.four"
:key="d.id+d.warehouseStorehouseCode"
:style="{background: bgColor[d.warehouseStorehouseState], float: 'left'}">
<!-- <div
style="background: #FFF8E8; float: left">
<div
class="dashboard-layout-item-cricle"
style="background: #16dc09" /> -->
{{ d.warehouseStorehouseCode }}
:style="{background: bgColor[d.warehouseStorehouseState]}" />
{{ d.warehouseStorehouseName }}
</div>
</el-row>
</el-col>
@@ -82,7 +82,7 @@
<script>
import basicPage from '../mixins/basic-page';
import { getWarehouseStorehouseList } from '@/api/asrs/warehouseStorehouse';
import { getWarehouseStorehouseList,exportWarehouseStorehouseExcel } from '@/api/asrs/warehouseStorehouse';
export default {
mixins: [basicPage],
@@ -90,6 +90,7 @@ export default {
return {
urlOptions: {
getDataListURL: getWarehouseStorehouseList,
exportURL: exportWarehouseStorehouseExcel,
},
listQuery: {
wareLayer: 1,
@@ -101,7 +102,7 @@ export default {
there: [],
four: [],
},
bgColor:['#37d97f','#ffbd02','#0b58ff'],
bgColor:['#16DC09','#FFA08F','#7362F3'],
formConfig: [
{
type: 'select',
@@ -123,6 +124,13 @@ export default {
name: 'search',
color: 'primary',
},
{
type: 'button',
btnName: '下载',
name: 'export',
plain: true,
color: 'primary',
},
],
};
},
@@ -161,6 +169,9 @@ export default {
this.listQuery.wareLayer = val.value;
this.getDataList();
break;
case 'export':
this.handleExport(this.aId);
break;
default:
console.log(val);
}
@@ -176,13 +187,12 @@ export default {
flex-direction: column;
}
.dashboard-layout-item {
color: white;
width: 3.3%;
width: 80px;
text-align: center;
height: 40px;
height: 32px;
box-shadow: 0px 3px 6px 0px rgba(166, 174, 190, 0.8);
border-radius: 2px 4px 4px 2px;
margin-bottom: 4px;
margin-bottom: 8px;
display: flex;
align-items: center;
justify-content: center;
@@ -194,11 +204,12 @@ export default {
margin-right: 6px;
}
&:hover {
background-color: rgba(85, 136, 253, 0.8) !important;
color: #ffffff;
cursor: pointer;
transform: scaleY(1.3) translateZ(0);
transform: scale(1.3) translateZ(0);
}
&:nth-child(2n) {
margin-right: 24px;
}
}
.el-divider--horizontal {
margin: 10px 0;
@@ -209,6 +220,6 @@ export default {
.tips {
position: absolute;
top: 22px;
left: 370px;
right: 120px;
}
</style>

38
src/views/asrs/warehouseLocationMonitoring/indexb.vue
View File

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2023-08-21 14:26:23
* @LastEditors: zwq
* @LastEditTime: 2023-10-07 16:45:37
* @LastEditTime: 2023-10-10 15:41:01
* @Description:
-->
<template>
@@ -12,9 +12,9 @@
ref="searchBarForm"
@headBtnClick="buttonClick" />
<div class="tips">
<el-tag effect="dark">满</el-tag>
<el-tag type="success" effect="dark">空</el-tag>
<el-tag type="warning" effect="dark">锁</el-tag>
<el-tag type="info" color="#D8E5FF">满</el-tag>
<el-tag type="info" color="#FFF8E8">空</el-tag>
<el-tag type="info" color="#F6F6F6">锁</el-tag>
</div>
<div class="mainbody">
<div v-for="a in listQuery.total" :key="a">
@@ -29,7 +29,7 @@
<!-- <div
class="dashboard-layout-item-cricle"
style="background: #16dc09" /> -->
{{ a.warehouseStorehouseCode }}
{{ a.warehouseStorehouseName }}
</div>
</el-row>
<el-row>
@@ -41,7 +41,7 @@
<!-- <div
class="dashboard-layout-item-cricle"
style="background: #16dc09" /> -->
{{ b.warehouseStorehouseCode }}
{{ b.warehouseStorehouseName }}
</div>
</el-row>
</el-col>
@@ -58,7 +58,7 @@
<!-- <div
class="dashboard-layout-item-cricle"
style="background: #16dc09" /> -->
{{ c.warehouseStorehouseCode }}
{{ c.warehouseStorehouseName }}
</div>
</el-row>
<el-row>
@@ -70,7 +70,7 @@
<!-- <div
class="dashboard-layout-item-cricle"
style="background: #16dc09" /> -->
{{ d.warehouseStorehouseCode }}
{{ d.warehouseStorehouseName }}
</div>
</el-row>
</el-col>
@@ -82,7 +82,7 @@
<script>
import basicPage from '../mixins/basic-page';
import { getWarehouseStorehouseList } from '@/api/asrs/warehouseStorehouse';
import { getWarehouseStorehouseList,exportWarehouseStorehouseExcel } from '@/api/asrs/warehouseStorehouse';
export default {
mixins: [basicPage],
@@ -90,6 +90,7 @@ export default {
return {
urlOptions: {
getDataListURL: getWarehouseStorehouseList,
exportURL: exportWarehouseStorehouseExcel,
},
listQuery: {
wareLayer: 1,
@@ -101,7 +102,7 @@ export default {
there: [],
four: [],
},
bgColor:['#37d97f','#ffbd02','#0b58ff'],
bgColor:['#FFF8E8','#F6F6F6','#D8E5FF'],
formConfig: [
{
type: 'select',
@@ -123,6 +124,13 @@ export default {
name: 'search',
color: 'primary',
},
{
type: 'button',
btnName: '下载',
name: 'export',
plain: true,
color: 'primary',
},
],
};
},
@@ -162,6 +170,9 @@ export default {
this.listQuery.wareLayer = val.value;
this.getDataList();
break;
case 'export':
this.handleExport(this.bId);
break;
default:
console.log(val);
}
@@ -177,7 +188,6 @@ export default {
flex-direction: column;
}
.dashboard-layout-item {
color: white;
width: 3.3%;
text-align: center;
height: 40px;
@@ -195,10 +205,8 @@ export default {
margin-right: 6px;
}
&:hover {
background-color: rgba(85, 136, 253, 0.8) !important;
color: #ffffff;
cursor: pointer;
transform: scaleY(1.3) translateZ(0);
transform: scale(1.3) translateZ(0);
}
}
.el-divider--horizontal {
@@ -210,6 +218,6 @@ export default {
.tips {
position: absolute;
top: 22px;
left: 370px;
right: 120px;
}
</style>

9
src/views/asrs/warehouseStorehouse/index.vue
View File

@@ -13,7 +13,7 @@
<method-btn
v-if="tableBtn.length"
slot="handleBtn"
:width="120"
:width="100"
label="操作"
:method-list="tableBtn"
@clickBtn="handleClick" />
@@ -29,7 +29,7 @@
@cancel="handleCancel"
@confirm="handleConfirm"
:before-close="handleCancel"
width="70%">
width="50%">
<add-or-update
ref="addOrUpdate"
@refreshDataList="successSubmit"></add-or-update>
@@ -63,24 +63,29 @@ const tableProps = [
{
prop: 'wareRow',
label: '排',
width: 70,
},
{
prop: 'wareColumn',
label: '列',
width: 70,
},
{
prop: 'wareLayer',
label: '层',
width: 70,
},
{
prop: 'cacheLocation',
label: '缓存库位',
filter: codeFilter('isOrno'),
width: 100,
},
{
prop: 'deactivate',
label: '是否停用',
filter: codeFilter('deactivate'),
width: 100,
},
{
prop: 'notes',

9
src/views/asrs/warehouseStorehouse/indexb.vue
View File

@@ -13,7 +13,7 @@
<method-btn
v-if="tableBtn.length"
slot="handleBtn"
:width="120"
:width="100"
label="操作"
:method-list="tableBtn"
@clickBtn="handleClick" />
@@ -29,7 +29,7 @@
@cancel="handleCancel"
@confirm="handleConfirm"
:before-close="handleCancel"
width="70%">
width="50%">
<add-or-update
ref="addOrUpdate"
@refreshDataList="successSubmit"></add-or-update>
@@ -63,24 +63,29 @@ const tableProps = [
{
prop: 'wareRow',
label: '排',
width: 70,
},
{
prop: 'wareColumn',
label: '列',
width: 70,
},
{
prop: 'wareLayer',
label: '层',
width: 70,
},
{
prop: 'cacheLocation',
label: '缓存库位',
filter: codeFilter('isOrno'),
width: 100,
},
{
prop: 'deactivate',
label: '是否停用',
filter: codeFilter('deactivate'),
width: 100,
},
{
prop: 'notes',

40
src/views/asrs/warehouseStorehouseGoodsSpecification/add-or-updata.vue
View File

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2023-08-22 15:01:55
* @LastEditors: zwq
* @LastEditTime: 2023-10-07 14:39:56
* @LastEditTime: 2023-10-10 10:43:39
* @Description:
-->
<template>
@@ -26,28 +26,27 @@
@keyup.enter.native="dataFormSubmit">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="仓库编码" prop="warehouseCode">
<el-form-item label="库位编码" prop="warehouseStorehouseCode">
<el-input
v-model="dataForm.warehouseCode"
v-model="dataForm.warehouseStorehouseCode"
readonly
placeholder="请输入仓库编码" />
placeholder="请输入库位编码" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="仓库名" prop="warehouseName">
<el-form-item label="库位名" prop="warehouseStorehouseName">
<el-input
v-model="dataForm.warehouseName"
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="process">
<el-select
v-model="dataForm.process"
style="width: 100%"
@change="$forceUpdate()"
placeholder="请选择工序">
<el-option
v-for="item in processArr"
@@ -57,6 +56,14 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="托盘编码" prop="trayCode">
<el-input
v-model="dataForm.trayCode"
@input="$forceUpdate()"
placeholder="请输入托盘编码" />
</el-form-item>
</el-col>
</el-row>
</el-form>
@@ -79,7 +86,7 @@
:table-data="productAttributeList">
<method-btn
slot="handleBtn"
:width="120"
:width="70"
label="操作"
:method-list="tableBtn"
@clickBtn="handleClick" />
@@ -132,21 +139,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
},
];
@@ -185,8 +196,8 @@ export default {
processArr,
dataForm: {
id: null,
warehouseName: '',
warehouseCode: '',
warehouseStorehouseName: '',
warehouseStorehouseCode: '',
process: '',
},
listQuery: {
@@ -315,12 +326,15 @@ 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/warehouseStorehouseGoodsSpecification/index.vue
View File

@@ -29,19 +29,19 @@
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>
{{ scope.row.process>=0 ? processArr[scope.row.process].name : '' }}
</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>
{{
@@ -53,7 +53,7 @@
</span>
</template>
</el-table-column>
<el-table-column label="操作">
<el-table-column label="操作" width="70">
<template v-slot="scope">
<el-button
size="mini"

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

@@ -29,19 +29,19 @@
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>
{{ scope.row.process>=0 ? processArr[scope.row.process].name : '' }}
</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>
{{
@@ -53,7 +53,7 @@
</span>
</template>
</el-table-column>
<el-table-column label="操作">
<el-table-column label="操作" width="70">
<template v-slot="scope">
<el-button
size="mini"

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;
});
});
},

4
src/views/asrs/warehouseStorehouseStorageHistory/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>
{{
@@ -45,7 +45,7 @@
</el-table-column>
<el-table-column
prop="warehouseStorehouseStorageState"
label="出入库状态">
label="出入库状态" width="100">
<template slot-scope="scope">
<span>
{{