root/niuDiXiYa3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

初次提交

Browse Source
This commit is contained in:
张江玮
2022-11-04 13:56:06 +08:00
parent b0cdad9bfe
commit eb9f7c7a71
84 changed files with 1398 additions and 5721 deletions
Download Patch File Download Diff File Expand all files Collapse all files

122
lms/nladmin-ui/src/views/wms/basedata/material/index.vue
View File

@@ -2,8 +2,30 @@
<div v-loading.fullscreen.lock="fullscreenLoading" class="app-container">
<!--工具栏-->
<div class="head-container">
<el-row>
<el-col :span="8">
<div v-if="crud.props.searchToggle">
<el-form
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="80px"
label-suffix=":"
>
<el-form-item label="模糊搜索">
<el-input
v-model="query.search"
clearable
style="width: 200px"
size="mini"
placeholder="物料号或名称"
prefix-icon="el-icon-search"
class="filter-item"
/>
</el-form-item>
<rrOperation/>
</el-form>
</div>
<el-row v-if="false">
<el-col v-if="false" :span="8">
<el-row>
<el-col :span="7">
<span style="line-height:36px;text-align: center">物料类别：</span>
@@ -20,13 +42,12 @@
</el-row>
</el-col>
<el-col :span="8">
模糊查询：
<el-input
v-model="query.search"
clearable
style="width: 200px"
size="mini"
placeholder="输入物料编码或名称"
placeholder="输入物料号或名称"
prefix-icon="el-icon-search"
class="filter-item"
/>
@@ -38,6 +59,7 @@
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission">
<el-button
v-if="false"
slot="right"
class="filter-item"
type="success"
@@ -54,29 +76,52 @@
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
width="1200px"
width="600px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="110px">
<el-row>
<el-col :span="8">
<el-form-item label="物料编码" prop="material_code">
<el-input v-model="form.material_code" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="物料名称" prop="material_name">
<el-input v-model="form.material_name" style="width: 200px;" />
<el-form-item label="物料号" prop="material_code">
<el-input v-model="form.material_code" style="width: 300px;" type="number" :disabled="crud.status.edit > 0" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="规格" prop="material_spec">
<el-form-item v-if="false" label="规格" prop="material_spec">
<label slot="label">规&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;格</label>
<el-input v-model="form.material_spec" style="width: 200px;" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="名称" prop="material_name">
<el-input v-model="form.material_name" style="width: 300px;" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="单位" prop="base_unit">
<el-input v-model="form.base_unit" style="width: 300px;" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="每包数量" prop="pack_qty">
<el-input-number v-model="form.pack_qty" :precision="2" :step="0.01" style="width: 300px;" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="单个重量" prop="weight">
<el-input v-model="form.weight" style="width: 300px;" />
</el-form-item>
</el-col>
</el-row>
<el-row v-if="false">
<el-col :span="8">
<el-form-item label="型号" prop="material_model">
<label slot="label">型&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</label>
@@ -101,7 +146,7 @@
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-col v-if="false" :span="8">
<el-form-item label="产品系列">
<treeselect
v-model="form.product_series"
@@ -113,12 +158,12 @@
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col v-if="false" :span="8">
<el-form-item label="静置时间" prop="standing_time">
<el-input-number v-model="form.standing_time" :controls="false" :min="0" label="分钟" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="8" v-if="false">
<el-form-item label="是否启用" prop="is_used">
<el-radio v-model="form.is_used" label="0">否</el-radio>
<el-radio v-model="form.is_used" label="1">是</el-radio>
@@ -127,8 +172,8 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
<el-button type="info" @click="crud.cancelCU">取消</el-button>
</div>
</el-dialog>
<!--表格渲染-->
@@ -140,14 +185,17 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column prop="material_code" label="物料编码" width="160" />
<el-table-column prop="material_name" label="物料名称" width="180" show-overflow-tooltip />
<el-table-column prop="material_spec" label="物料规格" width="140" />
<el-table-column prop="material_model" label="物料型号" />
<el-table-column prop="class_name" label="物料分类" width="140" />
<el-table-column prop="unit_name" label="计量单位" />
<el-table-column prop="standing_time" label="静置时间（分钟）" width="130px" />
<el-table-column prop="product_series_name" label="系列" />
<el-table-column type="selection" width="55" />
<el-table-column prop="material_code" label="物料号" width="160" />
<el-table-column prop="material_name" label="名称" min-width="300" show-overflow-tooltip />
<el-table-column v-if="false" prop="material_spec" label="物料规格" width="140" />
<el-table-column v-if="false" prop="material_model" label="物料型号" />
<el-table-column v-if="false" prop="class_name" label="物料分类" width="140" />
<el-table-column prop="base_unit" label="单位" />
<el-table-column prop="pack_qty" label="每包数量" />
<el-table-column prop="weight" label="单个重量" />
<el-table-column v-if="false" prop="standing_time" label="静置时间（分钟）" width="130px" />
<el-table-column v-if="false" prop="product_series_name" label="系列" />
<el-table-column label="启用" align="center" prop="is_used">
<template slot-scope="scope">
<el-switch
@@ -223,11 +271,14 @@ const defaultForm = {
update_optname: null,
update_time: null,
is_used_time: null,
is_used: null,
is_used: '1',
is_delete: null,
ext_id: null,
material_height_type: null,
product_series: null
product_series: null,
base_unit: null,
pack_qty: null,
weight: null
}
export default {
name: 'Materialbase',
@@ -238,7 +289,7 @@ export default {
cruds() {
return CRUD({
title: '物料',
optShow: { add: true, reset: true },
optShow: { add: true, reset: true, del: true },
url: 'api/Materialbase',
idField: 'material_id',
sort: 'material_id,desc',
@@ -256,16 +307,13 @@ export default {
permission: {},
rules: {
material_id: [
{ required: true, message: '不能为空', trigger: 'blur' }
{ required: true, message: '物料号不能为空', trigger: 'blur' }
],
material_code: [
{ required: true, message: '物料编码不能为空', trigger: 'blur' }
{ required: true, message: '物料号不能为空', trigger: 'blur' }
],
material_name: [
{ required: true, message: '物料名称不能为空', trigger: 'blur' }
],
material_type_id: [
{ required: true, message: '物料分类不能为空', trigger: 'blur' }
{ required: true, message: '名称不能为空', trigger: 'blur' }
],
create_id: [
{ required: true, message: '不能为空', trigger: 'blur' }
@@ -278,6 +326,12 @@ export default {
],
material_height_type: [
{ required: true, message: '不能为空', trigger: 'blur' }
],
base_unit: [
{ required: true, message: '单位不能为空', trigger: 'blur' }
],
pack_qty: [
{ required: true, message: '每包数量不能为空', trigger: 'blur' }
]
}
}

120
lms/nladmin-ui/src/views/wms/basedata/vehicle/index.vue
View File

@@ -11,7 +11,7 @@
label-width="80px"
label-suffix=":"
>
<el-form-item label="载具类型">
<el-form-item v-if="false" label="载具类型">
<el-select
v-model="query.vehicle_type"
clearable
@@ -29,23 +29,42 @@
</el-select>
</el-form-item>
<el-form-item label="载具号">
<el-form-item label="载具编码">
<el-input
v-model="query.vehicle_code"
clearable
size="mini"
placeholder="载具号"
placeholder="载具编码"
style="width: 180px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="载具状态">
<el-select
v-model="query.vehicle_status"
clearable
size="mini"
placeholder="载具状态"
class="filter-item"
style="width: 180px;"
@change="hand"
>
<el-option
v-for="item in dict.vehicle_status"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<rrOperation/>
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission">
<el-button
v-if="false"
slot="right"
class="filter-item"
type="success"
@@ -58,12 +77,29 @@
</el-button>
</crudOperation>
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
<el-dialog
:close-on-click-modal="false"
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
width="500px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-form-item label="载具编码" prop="vehicle_code">
<el-input v-model="form.vehicle_code" :disabled="true" style="width: 370px;" />
<el-input v-model="form.vehicle_code" style="width: 370px;" :disabled="crud.status.edit > 0" />
</el-form-item>
<el-form-item label="载具类型">
<el-form-item label="载具状态" prop="vehicle_status">
<el-select v-model="form.vehicle_status" placeholder="请选择">
<el-option
v-for="item in dict.vehicle_status"
:key="item.id"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item v-if="false" label="载具类型">
<el-select
v-model="form.vehicle_type"
clearable
@@ -80,39 +116,52 @@
/>
</el-select>
</el-form-item>
<el-form-item label="载具数量" prop="num">
<el-input-number :precision="0" :min="1" :max="99" v-model="form.num" style="width: 200px;" />
<el-form-item v-if="false" label="载具数量" prop="num">
<el-input-number :precision="0" :min="1" :max="99" v-model="form.num" style="width: 200px;"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
<el-button type="info" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">生成</el-button>
<el-button type="primary" @click="addAndprint">生成并打印</el-button>
<el-button v-if="false" :loading="crud.cu === 2" type="primary" @click="crud.submitCU">生成</el-button>
<el-button v-if="false" type="primary" @click="addAndprint">生成并打印</el-button>
</div>
</el-dialog>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table
ref="table"
v-loading="crud.loading"
:data="crud.data"
size="mini"
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55" />
<el-table-column prop="vehicle_code" label="载具编码" />
<el-table-column prop="vehicle_type" label="载具类型" >
<el-table-column prop="vehicle_status" label="载具状态">
<template slot-scope="scope">
{{ dict.label.vehicle_status[scope.row.vehicle_status] }}
</template>
</el-table-column>
<el-table-column v-if="false" prop="vehicle_type" label="载具类型">
<template slot-scope="scope">
{{ dict.label.vehicle_type[scope.row.vehicle_type] }}
</template>
</el-table-column>
<el-table-column prop="create_name" label="创建人" />
<el-table-column prop="create_time" label="创建时间" />
<el-table-column prop="create_name" label="创建人"/>
<el-table-column prop="create_time" label="创建时间"/>
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
:data="scope.row"
:permission="permission"
:is-visiable-edit="false"
:is-visiable-edit="true"
/>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<pagination />
<pagination/>
</div>
</div>
</template>
@@ -126,15 +175,37 @@ import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import { getLodop } from '@/assets/js/lodop/LodopFuncs'
const defaultForm = { num: 1, vehicle_id: null, vehicle_code: null, vehicle_name: null, one_code: null, two_code: null, rfid_code: null, vehicle_type: null, vehicle_width: null, vehicle_long: null, vehicle_height: null, overstruct_type: null, occupystruct_qty: null, ext_id: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null }
const defaultForm = {
num: 1,
vehicle_id: null,
vehicle_code: null,
vehicle_name: null,
one_code: null,
two_code: null,
rfid_code: null,
vehicle_type: null,
vehicle_width: null,
vehicle_long: null,
vehicle_height: null,
overstruct_type: null,
occupystruct_qty: null,
ext_id: null,
create_id: null,
create_name: null,
create_time: null,
update_optid: null,
update_optname: null,
update_time: null,
vehicle_status: '1'
}
export default {
name: 'Vehicle',
dicts:['vehicle_type'],
dicts: ['vehicle_type', 'vehicle_status'],
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
title: '载具维护',
title: '载具',
url: 'api/vehicle',
idField: 'vehicle_id',
sort: 'vehicle_id,desc',
@@ -142,7 +213,7 @@ export default {
optShow: {
add: true,
edit: false,
del: false,
del: true,
download: false,
reset: true
}
@@ -150,8 +221,7 @@ export default {
},
data() {
return {
permission: {
},
permission: {},
rules: {
vehicle_code: [
{ required: true, message: '载具编码不能为空', trigger: 'blur' }
@@ -164,8 +234,12 @@ export default {
],
occupystruct_qty: [
{ required: true, message: '占仓位数不能为空', trigger: 'blur' }
],
vehicle_status: [
{ required: true, message: '托盘状态不能为空', trigger: 'blur' }
]
}}
}
}
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据

111
lms/nladmin-ui/src/views/wms/sch/point/index.vue
View File

@@ -15,7 +15,7 @@
v-model="query.name"
clearable
size="mini"
placeholder="编码名称"
placeholder="点位编码或名称"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
@@ -69,7 +69,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="块" v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624')">
<el-form-item label="块" v-if="false">
<el-input
v-model="query.block_num"
clearable
@@ -78,7 +78,7 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="排" v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624' || query.region_id=='1557538851726168064')">
<el-form-item label="排" v-if="false">
<el-input
v-model="query.row_num"
clearable
@@ -87,7 +87,7 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="列" v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624' || query.region_id=='1557538851726168064')">
<el-form-item label="列" v-if="false">
<el-input
v-model="query.col_num"
clearable
@@ -96,7 +96,7 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="层" v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624' || query.region_id=='1557538851726168064')">
<el-form-item label="层" v-if="false">
<el-input
v-model="query.layer_num"
clearable
@@ -105,6 +105,7 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<br>
<el-form-item label="锁定类型">
<el-switch
v-model="query.lock_type"
@@ -126,7 +127,7 @@
@change="hand"
/>
</el-form-item>
<rrOperation />
<rrOperation/>
</el-form>
</div>
@@ -191,7 +192,13 @@
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item v-if="false" label="点位标识" prop="point_id">
<el-input v-model="form.point_id" style="width: 370px;" />
<el-input v-model="form.point_id" style="width: 370px;"/>
</el-form-item>
<el-form-item label="点位编码" prop="point_code">
<el-input v-model="form.point_code" style="width: 370px;" :disabled="this.form.point_type==='01'"/>
</el-form-item>
<el-form-item label="点位名称" prop="point_name">
<el-input v-model="form.point_name" style="width: 370px;" :disabled="this.form.point_type==='01'"/>
</el-form-item>
<el-form-item label="所属区域" prop="region_id">
<el-select
@@ -207,11 +214,20 @@
/>
</el-select>
</el-form-item>
<el-form-item label="点位编码" prop="point_code">
<el-input v-model="form.point_code" style="width: 370px;" :disabled="this.form.point_type==='01'" />
</el-form-item>
<el-form-item label="点位名称" prop="point_name">
<el-input v-model="form.point_name" style="width: 370px;" :disabled="this.form.point_type==='01'" />
<el-form-item label="点位类型" prop="device_point_type">
<el-select
v-model="form.point_type"
size="mini"
placeholder="点位类型"
class="filter-item"
style="width: 370px;"
>
<el-option
v-for="item in pointTypesList"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="点位状态" prop="point_status">
<el-select
@@ -244,32 +260,17 @@
/>
</el-select>
</el-form-item>
<el-form-item label="点位类型" prop="device_point_type">
<el-select
v-model="form.point_type"
size="mini"
placeholder="设备点位类型"
class="filter-item"
style="width: 370px;"
>
<el-option
v-for="item in pointTypesList"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="载具编码" prop="vehicle_code">
<el-input v-model="form.vehicle_code" clearable style="width: 370px;" />
<el-input v-model="form.vehicle_code" clearable style="width: 370px;"/>
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" style="width: 370px;" rows="2" type="textarea" />
<el-input v-model="form.remark" style="width: 370px;" rows="2" type="textarea"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
<el-button type="info" @click="crud.cancelCU">取消</el-button>
</div>
</el-dialog>
<!--表格渲染-->
@@ -281,28 +282,28 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55" />
<el-table-column prop="point_code" label="点位编码" sortable width="100" />
<el-table-column prop="point_name" label="点位名称" width="120" sortable show-overflow-tooltip />
<el-table-column prop="region_name" label="区域名称" min-width="120" show-overflow-tooltip />
<el-table-column prop="point_type_name" label="点位类型" />
<el-table-column prop="point_status_name" label="点位状态" />
<el-table-column prop="lock_type_name" label="锁定类型" />
<el-table-column prop="vehicle_type" label="载具类型" min-width="120">
<el-table-column type="selection" width="55"/>
<el-table-column prop="point_code" label="点位编码" sortable width="100"/>
<el-table-column prop="point_name" label="点位名称" width="120" sortable show-overflow-tooltip/>
<el-table-column prop="region_name" label="区域名称" min-width="120" show-overflow-tooltip/>
<el-table-column prop="point_type_name" label="点位类型"/>
<el-table-column prop="point_status_name" label="点位状态"/>
<el-table-column prop="lock_type_name" label="锁定类型"/>
<el-table-column v-if="false" prop="vehicle_type" label="载具类型" min-width="120">
<template slot-scope="scope">
{{ dict.label.vehicle_type[scope.row.vehicle_type] }}
</template>
</el-table-column>
<el-table-column prop="vehicle_code" label="载具编码" />
<el-table-column prop="vehicle_qty" label="载具数量" />
<el-table-column prop="vehicle_code" label="载具编码"/>
<el-table-column v-if="false" prop="vehicle_qty" label="载具数量"/>
<el-table-column prop="remark" label="备注" min-width="100" show-overflow-tooltip/>
<el-table-column prop="is_used" label="是否启用">
<template slot-scope="scope">
{{ scope.row.is_used=='1' ? '是' : '否' }}
{{ scope.row.is_used == '1' ? '是' : '否' }}
</template>
</el-table-column>
<el-table-column prop="update_optname" label="修改人" />
<el-table-column prop="update_time" label="修改时间" width="150" />
<el-table-column v-if="false" prop="update_optname" label="修改人"/>
<el-table-column v-if="false" prop="update_time" label="修改时间" width="150"/>
<el-table-column
v-permission="[]"
label="操作"
@@ -319,7 +320,7 @@
</el-table-column>
</el-table>
<!--分页组件-->
<pagination />
<pagination/>
</div>
</div>
</template>
@@ -333,7 +334,25 @@ import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
const defaultForm = { point_id: null, point_code: null, point_name: null, point_type: null, point_status: null, lock_type: '1', vehicle_code: null, source_id: null, remark: null, is_used: null, is_delete: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null }
const defaultForm = {
point_id: null,
point_code: null,
point_name: null,
point_type: null,
point_status: null,
lock_type: '1',
vehicle_code: null,
source_id: null,
remark: null,
is_used: null,
is_delete: null,
create_id: null,
create_name: null,
create_time: null,
update_optid: null,
update_optname: null,
update_time: null
}
export default {
name: 'Point',
dicts: ['vehicle_type', 'd_lock_type', 'SCH_TASK_TYPE_DTL', 'vehicle_type'],
@@ -346,7 +365,7 @@ export default {
idField: 'point_id',
optShow: {
add: true,
edit: true,
edit: false,
del: true,
download: false,
reset: true

18
lms/nladmin-ui/src/views/wms/sch/region/index.vue
View File

@@ -43,8 +43,8 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
<el-button type="info" @click="crud.cancelCU">取消</el-button>
</div>
</el-dialog>
<!--表格渲染-->
@@ -58,13 +58,13 @@
>
<el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="region_id" label="区域标识" />
<el-table-column prop="region_code" label="区域编码" :width="flexWidth('region_code',crud.data,'区域编码')"/>
<el-table-column prop="region_name" label="区域名称" :width="flexWidth('region_name',crud.data,'区域名称')" />
<el-table-column prop="point_type_explain" label="点位类型说明" :width="flexWidth('point_type_explain',crud.data,'点位类型说明')" />
<el-table-column prop="point_status_explain" label="点位状态说明" :width="flexWidth('point_status_explain',crud.data,'点位状态说明')" />
<el-table-column prop="remark" label="备注" :width="flexWidth('remark',crud.data,'备注')"/>
<el-table-column prop="create_name" label="创建人" :width="flexWidth('create_name',crud.data,'创建人')"/>
<el-table-column prop="create_time" label="创建时间" :width="flexWidth('create_time',crud.data,'创建时间')" />
<el-table-column prop="region_code" label="区域编码" :min-width="flexWidth('region_code',crud.data,'区域编码')"/>
<el-table-column prop="region_name" label="区域名称" :min-width="flexWidth('region_name',crud.data,'区域名称')" />
<el-table-column prop="point_type_explain" label="点位类型说明" :min-width="flexWidth('point_type_explain',crud.data,'点位类型说明')" />
<el-table-column prop="point_status_explain" label="点位状态说明" :min-width="flexWidth('point_status_explain',crud.data,'点位状态说明')" />
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')"/>
<el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')"/>
<el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
@@ -81,7 +81,7 @@
</template>
<script>
import crudRegion, { changeActive } from '@/api/wms/sch/region'
import crudRegion from '@/api/wms/sch/region'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'

20
lms/nladmin-ui/src/views/wms/sch/task/index.vue
View File

@@ -113,20 +113,20 @@
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="50" />
<el-table-column v-if="true" prop="task_id" label="任务标识" min-width="150" show-overflow-tooltip />
<el-table-column v-if="true" prop="material_id" label="物料标识" min-width="150" show-overflow-tooltip />
<el-table-column v-if="false" prop="task_id" label="任务标识" min-width="150" show-overflow-tooltip />
<el-table-column v-if="false" prop="material_id" label="物料标识" min-width="150" show-overflow-tooltip />
<el-table-column prop="task_code" label="任务编码" min-width="100" show-overflow-tooltip />
<el-table-column v-if="false" prop="task_type" label="任务类型" />
<el-table-column prop="acs_task_type" label="acs任务类型" min-width="120" show-overflow-tooltip >
<el-table-column prop="task_type" label="任务类型" />
<el-table-column v-if="false" prop="acs_task_type" label="acs任务类型" min-width="120" show-overflow-tooltip >
<template slot-scope="scope">
{{ dict.label.acs_task_type[scope.row.acs_task_type] }}
</template>
</el-table-column>
<el-table-column prop="task_name" label="任务描述" min-width="120" show-overflow-tooltip />
<el-table-column v-if="false" prop="task_name" label="任务描述" min-width="120" show-overflow-tooltip />
<el-table-column v-if="false" prop="task_type_name" label="任务类型" min-width="120" show-overflow-tooltip />
<el-table-column v-if="false" prop="task_status" label="任务状态" />
<el-table-column prop="task_status_name" label="任务状态" width="95px" :formatter="formatTaskStatusName" />
<el-table-column prop="vehicle_type" label="载具类型" min-width="100" show-overflow-tooltip >
<el-table-column v-if="false" prop="vehicle_type" label="载具类型" min-width="100" show-overflow-tooltip >
<template slot-scope="scope">
{{ dict.label.vehicle_type[scope.row.vehicle_type] }}
</template>
@@ -136,10 +136,10 @@
<el-table-column prop="point1_region_name" label="区域1" width="100" />
<el-table-column prop="point_code2" label="点位2" min-width="100" show-overflow-tooltip />
<el-table-column prop="point2_region_name" label="区域2" min-width="120" show-overflow-tooltip />
<!--<el-table-column prop="point_code3" label="点位3" min-width="100" show-overflow-tooltip />
<el-table-column prop="point3_region_name" label="区域3" min-width="120" show-overflow-tooltip />-->
<!--<el-table-column prop="point_code3" label="点位3" width="85" />
<el-table-column prop="point_code4" label="点位4" width="85" />-->
<el-table-column v-if="false" prop="point_code3" label="点位3" min-width="100" show-overflow-tooltip />
<el-table-column v-if="false" prop="point3_region_name" label="区域3" min-width="120" show-overflow-tooltip />-->
<el-table-column v-if="false" prop="point_code3" label="点位3" width="85" />
<el-table-column v-if="false" prop="point_code4" label="点位4" width="85" />-->
<el-table-column prop="remark" label="备注" width="120" show-overflow-tooltip />
<el-table-column prop="create_time" label="创建时间" width="135" />
<el-table-column prop="update_time" label="修改时间" width="135" />

162
lms/nladmin-ui/src/views/wms/st/vm/index.vue Normal file
View File

@@ -0,0 +1,162 @@
<template>
<div class="app-container">
<!--工具栏-->
<div class="head-container">
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<div v-if="crud.props.searchToggle">
<el-form
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="80px"
label-suffix=":"
>
<el-form-item label="载具编码">
<el-input
v-model="query.vehicle_code"
clearable
style="width: 200px"
size="mini"
placeholder="载具编码"
prefix-icon="el-icon-search"
class="filter-item"
/>
</el-form-item>
<rrOperation/>
</el-form>
</div>
<crudOperation :permission="permission"/>
<!--表单组件-->
<el-dialog
:close-on-click-modal="false"
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
width="500px"
>
<el-form
ref="form"
:model="form"
:rules="rules"
size="mini"
label-width="80px"
>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
<el-button type="info" @click="crud.cancelCU">取消</el-button>
</div>
</el-dialog>
<!--表格渲染-->
<el-table
ref="table"
v-loading="crud.loading"
:data="crud.data"
size="mini"
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55"/>
<el-table-column
prop="vehicle_code"
label="载具编码"
:min-width="flexWidth('material_qty', crud.data, '载具编码')"
/>
<el-table-column
prop="qty"
label="物料数量"
:min-width="flexWidth('material_qty', crud.data, '物料数量')"
/>
<el-table-column
prop="create_name"
label="创建人"
:min-width="flexWidth('material_qty', crud.data, '创建人')"
/>
<el-table-column
prop="create_time"
label="创建时间"
:min-width="flexWidth('material_qty', crud.data, '创建时间')"
/>
<el-table-column v-permission="[]" label="操作" width="200px" align="center" fixed="right">
<template slot-scope="scope">
<el-button type="text" icon="el-icon-more" @click="showDetail(scope.row.vehicle_id)">详情</el-button>
<el-divider direction="vertical"/>
<udOperation
:data="scope.row"
:permission="permission"
style="display: inline"
:is-visiable-edit="false"
/>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<pagination/>
<el-dialog title="组盘详情" :visible.sync="showDetailDialog" width="1000px">
<el-table :data="detail">
<el-table-column property="material_code" label="物料号" min-width="120"/>
<el-table-column property="material_name" label="物料名称" min-width="300"/>
<el-table-column property="base_unit" label="单位" min-width="100"/>
<el-table-column property="material_qty" label="数量" min-width="120"/>
<el-table-column property="material_batch" label="批号" min-width="120"/>
</el-table>
</el-dialog>
</div>
</div>
</template>
<script>
import crudVM from './vm'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
const defaultForm = {
vm_id: null,
vehicle_id: null,
material_id: null,
material_qty: null,
material_batch: null
}
export default {
name: 'VM',
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
title: '组盘',
optShow: { reset: true, del: true },
url: 'api/vm',
idField: 'vm_id',
sort: 'vm_id,desc',
crudMethod: { ...crudVM }
})
},
data() {
return {
permission: {},
rules: {},
showDetailDialog: false,
detail: []
}
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
},
showDetail(id) {
crudVM.queryDetail({ vehicle_id: id }).then(res => {
this.detail = res
this.showDetailDialog = true
})
}
}
}
</script>
<style scoped>
</style>

35
lms/nladmin-ui/src/views/wms/st/vm/vm.js Normal file
View File

@@ -0,0 +1,35 @@
import request from '@/utils/request'
export function add(data) {
return request({
url: 'api/vm',
method: 'post',
data
})
}
export function del(ids) {
return request({
url: 'api/vm/',
method: 'delete',
data: ids
})
}
export function edit(data) {
return request({
url: 'api/vm',
method: 'put',
data
})
}
export function queryDetail(data) {
return request({
url: 'api/vm/queryDetail',
method: 'post',
data: data
})
}
export default { add, edit, del, queryDetail }

2
lms/nladmin-ui/src/views/wms/st/ysa/index.vue
View File

@@ -5,7 +5,7 @@
<span slot="label"><i class="el-icon-date"></i> 库存查询</span>
<Inventory/>
</el-tab-pane>
<el-tab-pane label="修改记录">
<el-tab-pane v-if="false" label="修改记录">
</el-tab-pane>
<el-tab-pane label="入库管理">
<ysq-in-region/>

106
lms/nladmin-ui/src/views/wms/st/ysa/inventory.vue
View File

@@ -2,7 +2,7 @@
<div>
<!--工具栏-->
<div class="head-container">
<div v-if="crud.props.searchToggle">
<div>
<el-form
:inline="true"
class="demo-form-inline"
@@ -10,17 +10,48 @@
label-width="90px"
label-suffix=":"
>
<el-form-item label="点位编码">
<el-form-item label="区域名称">
<el-input
v-model="query.point_code"
v-model="query.region_name"
clearable
size="mini"
style="width: 185px;"
placeholder="点位编码"
placeholder="区域名称"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="物料编码">
<el-form-item label="点位名称">
<el-input
v-model="query.point_name"
clearable
size="mini"
style="width: 185px;"
placeholder="点位名称"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="载具编码">
<el-input
v-model="query.vehicle_code"
clearable
size="mini"
style="width: 185px;"
placeholder="点位名称"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="入库时间">
<el-date-picker
v-model="query.createTime"
type="daterange"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
@change="crud.toQuery"
/>
</el-form-item>
<el-form-item v-if="false" label="物料编码">
<el-input
v-model="query.material_code"
clearable
@@ -30,7 +61,7 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="点位状态">
<el-form-item v-if="false" label="点位状态">
<el-select
v-model="query.point_status"
clearable
@@ -47,7 +78,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="载具类型">
<el-form-item v-if="false" label="载具类型">
<el-select
v-model="query.vehicle_type"
clearable
@@ -64,7 +95,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="块">
<el-form-item v-if="false" label="块">
<el-input
v-model="query.block_num"
clearable
@@ -74,7 +105,7 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="排">
<el-form-item v-if="false" label="排">
<el-input
v-model="query.row_num"
clearable
@@ -84,7 +115,7 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="列">
<el-form-item v-if="false" label="列">
<el-input
v-model="query.col_num"
clearable
@@ -94,7 +125,7 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="锁定类型">
<el-form-item v-if="false" label="锁定类型">
<el-select
v-model="query.lock_type"
clearable
@@ -111,18 +142,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="入库时间">
<el-date-picker
v-model="query.createTime"
type="daterange"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
@change="crud.toQuery"
/>
</el-form-item>
<el-form-item label="是否启用">
<el-form-item v-if="false" label="是否启用">
<el-switch
v-model="query.is_used"
active-value="0"
@@ -138,7 +158,7 @@
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission">
<el-button
v-if="showTab"
v-if="false"
slot="right"
class="filter-item"
type="primary"
@@ -148,7 +168,7 @@
编辑
</el-button>
<el-button
v-if="!showTab"
v-if="false"
slot="right"
class="filter-item"
type="primary"
@@ -224,25 +244,28 @@
</el-dialog>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" />
<el-table-column prop="point_code" label="点位编码" min-width="100" show-overflow-tooltip />
<el-table-column v-if="false" type="selection" width="55" />
<el-table-column v-if="false" prop="point_code" label="点位编码" min-width="100" show-overflow-tooltip />
<el-table-column prop="region_name" label="区域名称" min-width="120" show-overflow-tooltip />
<el-table-column prop="pcsn" label="批次" />
<el-table-column prop="ivt_qty" label="库存数" :formatter="crud.formatNum3" width="100">
<el-table-column prop="point_name" label="点位名称" min-width="100" show-overflow-tooltip />
<el-table-column prop="vehicle_code" label="载具编码" min-width="100" show-overflow-tooltip />
<el-table-column prop="qty" label="库存数量" min-width="100" />
<el-table-column prop="instorage_time" label="入库时间" min-width="150" show-overflow-tooltip />
<el-table-column v-if="false" prop="pcsn" label="批次" />
<el-table-column v-if="false" prop="ivt_qty" label="库存数" :formatter="crud.formatNum3" width="100">
<template slot-scope="scope">
<el-input type="text" v-model="scope.row.ivt_qty" v-show="!showTab" />
<span v-show="showTab">{{scope.row.ivt_qty}}</span>
</template>
</el-table-column>
<el-table-column prop="material_code" label="物料编码" >
<el-table-column v-if="false" prop="material_code" label="物料编码" >
<template slot-scope="scope">
<el-input type="text" v-model="scope.row.material_code" v-show="!showTab" />
<span v-show="showTab">{{scope.row.material_code}}</span>
</template>
</el-table-column>
<el-table-column prop="material_name" label="物料名称" />
<el-table-column prop="instorage_time" label="入库时间" min-width="150" show-overflow-tooltip/>
<el-table-column prop="point_status" label="点位状态" width="120">
<el-table-column v-if="false" prop="material_name" label="物料名称" />
<el-table-column v-if="false" prop="point_status" label="点位状态" width="120">
<template slot-scope="scope">
<el-select
v-show="!showTab"
@@ -260,7 +283,7 @@
<span v-show="showTab">{{scope.row.point_status_name}}</span>
</template>
</el-table-column>
<el-table-column prop="lock_type" label="锁定类型" width="120">
<el-table-column v-if="false" prop="lock_type" label="锁定类型" width="120">
<template slot-scope="scope">
<el-select
v-model="scope.row.lock_type"
@@ -278,7 +301,7 @@
<span v-show="showTab">{{ dict.label.d_lock_type[scope.row.lock_type] }}</span>
</template>
</el-table-column>
<el-table-column prop="is_used" label="是否启用">
<el-table-column v-if="false" prop="is_used" label="是否启用">
<template slot-scope="scope">
<el-switch
v-show="!showTab"
@@ -291,7 +314,7 @@
<span v-show="showTab">{{ scope.row.is_used=='1' ? '是' : '否' }}</span>
</template>
</el-table-column>
<el-table-column prop="vehicle_type" label="托盘类型" min-width="150">
<el-table-column v-if="false" prop="vehicle_type" label="托盘类型" min-width="150">
<template slot-scope="scope">
<el-select
v-show="!showTab"
@@ -309,8 +332,8 @@
<span v-show="showTab">{{ dict.label.vehicle_type[scope.row.vehicle_type] }}</span>
</template>
</el-table-column>
<el-table-column prop="vehicle_code" label="托盘号" />
<el-table-column prop="standing_time" label="静置时间(min)" min-width="120" />
<el-table-column v-if="false" prop="vehicle_code" label="托盘号" />
<el-table-column v-if="false" prop="standing_time" label="静置时间(min)" min-width="120" />
</el-table>
<!--分页组件-->
<pagination />
@@ -323,25 +346,24 @@ import crudStructivt from '../structivt'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import crudRegion from '@/api/wms/sch/region'
const defaultForm = { point_id: null, point_code: null, pcsn: null, material_id: null, ivt_qty: null, qty_unit_id: null, instorage_time: null, ext_code: null, point_status: null, vehicle_type: null, standing_time: null, block_num: null, row_num: null, col_num: null, layer_num: null, remark: null, is_used: null, is_lock: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null }
export default {
name: 'Inventory',
components: { pagination, crudOperation, rrOperation, udOperation },
components: { pagination, crudOperation, rrOperation },
dicts: ['vehicle_type', 'is_used', 'd_lock_type'],
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
title: '养生A区',
title: '库存',
url: 'api/structivt',
idField: 'point_id',
sort: 'point_id,desc',
optShow: {
add: false,
edit: true,
edit: false,
del: false,
download: false,
reset: true