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

rev

Browse Source
This commit is contained in:
张江玮
2023-09-05 15:00:24 +08:00
parent bae18a1394
commit 6a5c490676
100 changed files with 1161 additions and 1525 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-ui/src/views/generator/index.vue
View File

@@ -25,7 +25,7 @@
<el-table-column type="selection" width="55" />
<el-table-column show-overflow-tooltip prop="tableName" label="表名" />
<el-table-column show-overflow-tooltip prop="engine" label="数据库引擎" />
<el-table-column show-overflow-tooltip prop="coding" label="字符编码集" />
<el-table-column show-overflow-tooltip prop="coding" label="字符号集" />
<el-table-column show-overflow-tooltip prop="remark" label="备注" />
<el-table-column prop="createTime" label="创建日期">
<template slot-scope="scope">

6
lms/nladmin-ui/src/views/system/dept/index.vue
View File

@@ -38,7 +38,7 @@
width="500px"
>
<el-form ref="form" inline :model="form" :rules="rules" size="mini" label-width="80px">
<el-form-item label="部门编码" prop="code">
<el-form-item label="部门号" prop="code">
<el-input v-model="form.code" style="width: 370px;" />
</el-form-item>
<el-form-item label="部门名称" prop="name">
@@ -99,7 +99,7 @@
@selection-change="crud.selectionChangeHandler"
>
<el-table-column :selectable="checkboxT" type="selection" width="55" />
<!-- <el-table-column label="编码" prop="code" />-->
<!-- <el-table-column label="号" prop="code" />-->
<el-table-column label="名称" prop="name" />
<el-table-column label="排序" prop="deptSort" />
<el-table-column label="状态" align="center" prop="enabled">
@@ -173,7 +173,7 @@ export default {
depts: [],
rules: {
code: [
{ required: true, message: '请输入编码', trigger: 'blur' }
{ required: true, message: '请输入号', trigger: 'blur' }
],
name: [
{ required: true, message: '请输入名称', trigger: 'blur' }

8
lms/nladmin-ui/src/views/system/grid/index.vue
View File

@@ -40,7 +40,7 @@
>
<el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="id" label="id" />
<el-table-column prop="code" label="编码" />
<el-table-column prop="code" label="号" />
<el-table-column prop="name" label="名称" />
<el-table-column prop="remark" label="备注" />
<el-table-column prop="is_active" label="启用" width="75px">
@@ -70,7 +70,7 @@
width="500px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-form-item label="编码" prop="code">
<el-form-item label="号" prop="code">
<el-input v-model="form.code" style="width: 370px;" />
</el-form-item>
<el-form-item label="名字" prop="name">
@@ -111,12 +111,12 @@
border
>
<el-table-column type="index" label="序号" min-width="50" />
<el-table-column label="编码" prop="code" min-width="120">
<el-table-column label="号" prop="code" min-width="120">
<template slot-scope="scope">
<el-form-item
:prop="'gridFieldData.'+ scope.$index + '.code'"
:rules="[
{ required: true, message: '编码不能为空!', trigger: 'blur' }
{ required: true, message: '号不能为空!', trigger: 'blur' }
]"
>
<el-input v-model="scope.row.code" style="text-align: center" />

2
lms/nladmin-ui/src/views/system/logicflow/image/index.vue
View File

@@ -196,7 +196,7 @@ export default {
{ required: true, message: '创建时间不能为空', trigger: 'blur' }
],
image_code: [
{ required: true, message: '图标编码不能为空', trigger: 'blur' }
{ required: true, message: '图标号不能为空', trigger: 'blur' }
]
},
fileList: [],

6
lms/nladmin-ui/src/views/system/logicflow/index.vue
View File

@@ -16,7 +16,7 @@
<el-form-item v-if="false" label="舞台标识" prop="stage_uuid">
<el-input v-model="form.stage_uuid" style="width: 370px;" />
</el-form-item>
<el-form-item label="舞台编码" prop="stage_code">
<el-form-item label="舞台号" prop="stage_code">
<el-input v-model="form.stage_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="舞台名字" prop="stage_name">
@@ -39,7 +39,7 @@
>
<el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="stage_uuid" label="舞台标识" />
<el-table-column prop="stage_code" label="舞台编码" />
<el-table-column prop="stage_code" label="舞台号" />
<el-table-column prop="stage_name" label="舞台名字" />
<el-table-column prop="stage_data" label="舞台数据" show-overflow-tooltip />
<el-table-column prop="create_by" label="创建者" />
@@ -107,7 +107,7 @@ export default {
},
rules: {
stage_code: [
{ required: true, message: '舞台编码不能为空', trigger: 'blur' }
{ required: true, message: '舞台号不能为空', trigger: 'blur' }
],
stage_name: [
{ required: true, message: '舞台名字不能为空', trigger: 'blur' }

2
lms/nladmin-ui/src/views/system/monitor/device/XJDeviceMonitor.vue
View File

@@ -19,7 +19,7 @@
</el-row>
<el-card class="box-card" shadow="never">
<el-form ref="form" disabled :inline="true" :model="form" :rules="rules" size="mini" label-width="80px">
<el-form-item label="设备编码">
<el-form-item label="设备号">
<el-input v-model="device_code" placeholder="自动生产" style="width: 200px;" />
</el-form-item>
<el-form-item label="设备名称" prop="dtl_count">

3
lms/nladmin-ui/src/views/system/monitor/device/index.vue
View File

@@ -8,7 +8,6 @@
<script>
import crudStage from '@/api/logicflow/stage'
import paramCrud from '@/api/system/param'
import '@logicflow/core/dist/style/index.css'
import '@logicflow/extension/lib/style/index.css'
@@ -102,7 +101,7 @@ export default {
this.initStageData()
},
initStageData() {
// 获取舞台编码
// 获取舞台号
this.getValueByCode(this.stageParam).then(res => {
if (res.value !== undefined) {
crudStage.getNewStageDataByCode(res.value).then(res => {

7
lms/nladmin-ui/src/views/system/param/index.vue
View File

@@ -13,7 +13,7 @@
width="500px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-form-item label="编码" prop="code">
<el-form-item label="号" prop="code">
<el-input v-model="form.code" style="width: 370px;" />
</el-form-item>
<el-form-item label="名字" prop="name">
@@ -42,7 +42,7 @@
>
<el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="id" label="id" />
<el-table-column prop="code" label="编码" min-width="130" show-overflow-tooltip />
<el-table-column prop="code" label="号" min-width="130" show-overflow-tooltip />
<el-table-column prop="name" label="名称" min-width="120" show-overflow-tooltip />
<el-table-column prop="value" label="值" min-width="270" show-overflow-tooltip />
<el-table-column prop="remark" label="备注" />
@@ -64,7 +64,6 @@
<script>
import crudParam from '@/api/system/param'
import CRUD, { presenter, header, form, crud } 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'
@@ -83,7 +82,7 @@ const defaultForm = {
}
export default {
name: 'Param',
components: { pagination, crudOperation, rrOperation, udOperation },
components: { pagination, crudOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({ title: '系统参数', url: 'api/param', idField: 'id', sort: 'id,desc', crudMethod: { ...crudParam },

12
lms/nladmin-ui/src/views/tools/codeGen/codeDetail.vue
View File

@@ -1,7 +1,7 @@
<template>
<div>
<div v-if="query.dictName === ''">
<div class="my-code">点击编码查看详情</div>
<div class="my-code">点击号查看详情</div>
</div>
<div v-else>
<!--工具栏-->
@@ -12,7 +12,7 @@
v-model="query.label"
clearable
size="mini"
placeholder="输入编码标签查询"
placeholder="输入号标签查询"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="toQuery"
@@ -30,7 +30,7 @@
width="500px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-form-item label="编码类型" prop="type">
<el-form-item label="号类型" prop="type">
<el-select v-model="form.type" placeholder="请选择" @change="changeType">
<el-option
v-for="item in options"
@@ -88,7 +88,7 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column label="所属编码">
<el-table-column label="所属号">
{{ query.dictName }}
</el-table-column>
<el-table-column prop="type" label="类型" :formatter="typeFormate" />
@@ -138,7 +138,7 @@ export default {
cruds() {
return [
CRUD({
title: '编码详情', url: 'api/codeDetail', query: { dictName: '' }, sort: ['sort_num,asc'],
title: '号详情', url: 'api/codeDetail', query: { dictName: '' }, sort: ['sort_num,asc'],
crudMethod: { ...crudCodeDetail },
optShow: {
add: true,
@@ -172,7 +172,7 @@ export default {
dictId: null,
rules: {
type: [
{ required: true, message: '请输入编码标签', trigger: 'blur' }
{ required: true, message: '请输入号标签', trigger: 'blur' }
],
init_value: [
{ required: true, message: '请输入初始值', trigger: 'blur' }

14
lms/nladmin-ui/src/views/tools/codeGen/index.vue
View File

@@ -3,7 +3,7 @@
<!--表单组件-->
<el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible="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="name">
<el-form-item label="号" prop="name">
<el-input v-model="form.code" style="width: 370px;" />
</el-form-item>
<el-form-item label="名称">
@@ -23,7 +23,7 @@
<div class="head-container">
<div v-if="crud.props.searchToggle">
<!-- 搜索 -->
<el-input v-model="query.blurry" clearable size="mini" placeholder="输入编码或者名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
<el-input v-model="query.blurry" clearable size="mini" placeholder="输入号或者名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
<rrOperation />
</div>
<crudOperation :permission="permission" />
@@ -31,7 +31,7 @@
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" highlight-current-row style="width: 100%;" @selection-change="crud.selectionChangeHandler" @current-change="handleCurrentChange">
<el-table-column type="selection" width="55" />
<el-table-column show-overflow-tooltip prop="code" width="80" label="编码" />
<el-table-column show-overflow-tooltip prop="code" width="80" label="号" />
<el-table-column show-overflow-tooltip prop="name" width="100" label="名称" />
<el-table-column show-overflow-tooltip prop="demo" width="150" label="测试值" />
<el-table-column show-overflow-tooltip prop="remark" label="备注" />
@@ -52,7 +52,7 @@
<el-col :xs="24" :sm="24" :md="14" :lg="13" :xl="13">
<el-card class="box-card">
<div slot="header" class="clearfix">
<span>编码详情</span>
<span>号详情</span>
<el-button
v-if="checkPermission(['admin','genCode:add']) && this.$refs.codeGenDetail && this.$refs.codeGenDetail.query.dictName"
class="filter-item"
@@ -88,7 +88,7 @@ export default {
components: { crudOperation, pagination, rrOperation, udOperation, codeGenDetail },
cruds() {
return [
CRUD({ title: '编码', url: 'api/genCode', crudMethod: { ...crudDict }, sort: ['create_time,desc'],
CRUD({ title: '号', url: 'api/genCode', crudMethod: { ...crudDict }, sort: ['create_time,desc'],
optShow: {
add: true,
edit: true,
@@ -101,12 +101,12 @@ export default {
data() {
return {
queryTypeOptions: [
{ key: 'code', display_name: '编码' },
{ key: 'code', display_name: '号' },
{ key: 'name', display_name: '名称' }
],
rules: {
code: [
{ required: true, message: '请输入编码', trigger: 'blur' }
{ required: true, message: '请输入号', trigger: 'blur' }
]
},
permission: {

287
lms/nladmin-ui/src/views/wms/basedata/bom/index.vue
View File

@@ -1,287 +0,0 @@
<template>
<div v-loading.fullscreen.lock="fullscreenLoading" class="app-container">
<!--工具栏-->
<div class="head-container">
<div v-if="crud.props.searchToggle">
<el-form
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="90px"
label-suffix="："
>
<el-form-item label="物料编码">
<el-input
v-model="query.name"
clearable
placeholder="物料编码"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<rrOperation />
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<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="600px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="160px" label-suffix="：">
<el-row>
<el-col :span="12">
<el-form-item label="BOM编码" prop="material_code">
<el-input :disabled="crud.status.edit" v-model="form.material_code" clearable style="width: 300px" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="困料时间" prop="standing_time">
<el-input v-model="form.standing_time" type="number" style="width: 300px"><i slot="suffix" style="font-style:normal;margin-right: 10px;">分钟</i></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="超时时间" prop="threshold_time">
<el-input v-model="form.threshold_time" type="number" style="width: 300px"><i slot="suffix" style="font-style:normal;margin-right: 10px;">分钟</i></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="info" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</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 prop="material_code" label="BOM编码" :min-width="flexWidth('material_code',crud.data,'BOM编码')" />
<el-table-column prop="standing_time" label="困料时间" :min-width="flexWidth('standing_time',crud.data,'困料时间')" />
<el-table-column prop="threshold_time" label="超时时间" :min-width="flexWidth('threshold_time',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 prop="update_optname" label="修改人" :min-width="flexWidth('update_optname',crud.data,'修改人')" />
<el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
<el-table-column
v-permission="[]"
label="操作"
fixed="right"
width="120px"
align="center"
>
<template slot-scope="scope">
<udOperation
:is-visiable-del="false"
:data="scope.row"
:permission="permission"
/>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<pagination />
</div>
</div>
</template>
<script>
import crudMaterialbase from '@/api/wms/basedata/materialbase'
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 { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import crudClassstandard from '@/api/wms/basedata/classstandard'
import crudMdPbMeasureunit from '@/api/wms/basedata/mdPbMeasureunit'
const defaultForm = {
material_id: null,
ass_unit_id: null,
material_code: null,
material_name: null,
standing_time: null,
threshold_time: null,
a: null,
b: null,
h: null,
w: null,
product_code: null,
create_id: null,
create_name: null,
create_time: null,
update_optid: null,
update_optname: null,
update_time: null,
weight: null,
material_type: '2'
}
export default {
name: 'BOM',
// 数据字典
dicts: ['is_used'],
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
title: 'BOM',
optShow: { add: false, reset: true },
url: 'api/Materialbase',
idField: 'material_id',
sort: 'material_id,desc',
crudMethod: { ...crudMaterialbase },
query: {
material_type: '2'
}
})
},
data() {
return {
classes1: [],
classes2: [],
classes3: [],
fullscreenLoading: false,
measure_unit: [],
productSeries: [],
permission: {},
rules: {
material_code: [
{ required: true, message: '物料编码不能为空', trigger: 'blur' }
]
}
}
},
created() {
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
},
[CRUD.HOOK.beforeToCU](crud, form) {
crudMdPbMeasureunit.getUnit().then(res => {
this.measure_unit = res.content
})
// 物料标识为空，新增
if (!form.material_type_id) {
form.material_type_id = null // 必须为null，否则会出现unknown
} else { // 更新
this.getSubTypes('02', form.material_type_id)
}
// 物料系列为空，新增
if (!form.product_series) {
form.product_series = null // 必须为null，否则会出现unknown
} else { // 更新
this.getSubTypes('03', form.product_series)
}
},
getSubTypes(type, id) {
const that = this
crudClassstandard.getClassSuperior(id).then(res => {
const data = res.content
that.buildTree(data)
if (type === '02') {
that.classes2 = data
}
if (type === '03') {
that.classes3 = data
}
})
},
synchronize() {
this.fullscreenLoading = true
crudMaterialbase.synchronize(this.crud.query).then(res => {
this.fullscreenLoading = false
this.crud.notify('同步成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
}).catch(() => {
this.fullscreenLoading = false
})
},
queryClassId() {
const param = {
'class_idStr': this.class_idStr
}
crudClassstandard.queryClassById(param).then(res => {
this.classes = res.content.map(obj => {
if (obj.hasChildren) {
obj.children = null
}
return obj
})
})
},
buildTree(classes) {
classes.forEach(data => {
if (data.children) {
this.buildTree(data.children)
}
if (data.hasChildren && !data.children) {
data.children = null // 重点代码
}
})
},
// 改变状态
changeEnabled(data, val) {
this.$confirm('此操作将 "' + this.dict.label.is_used[val] + '" ' + data.material_name + ', 是否继续？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
crudMaterialbase.edit(data).then(res => {
this.crud.notify(this.dict.label.is_used[val] + '成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
}).catch(() => {
if (data.is_used === '0') {
data.is_used = '1'
return
}
if (data.is_used === '1') {
data.is_used = '0'
}
})
}).catch(() => {
if (data.is_used === '0') {
data.is_used = '1'
return
}
if (data.is_used === '1') {
data.is_used = '0'
}
})
},
// 获取子节点数据
loadChildNodes({ action, parentNode, callback }) {
if (action === LOAD_CHILDREN_OPTIONS) {
crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
parentNode.children = res.content.map(function(obj) {
if (obj.hasChildren) {
obj.children = null
}
return obj
})
setTimeout(() => {
callback()
}, 100)
})
}
}
}
}
</script>
<style scoped>
</style>

6
lms/nladmin-ui/src/views/wms/basedata/class/index.vue
View File

@@ -55,7 +55,7 @@
width="500px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-form-item label="分类编码" prop="class_code">
<el-form-item label="分类号" prop="class_code">
<el-input v-model="form.class_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="分类名称" prop="class_name">
@@ -98,7 +98,7 @@
@select-all="crud.selectAllChange"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column prop="class_code" label="分类编码" />
<el-table-column prop="class_code" label="分类号" />
<el-table-column prop="class_name" label="分类名称" />
<el-table-column prop="class_desc" label="分类简要描述" />
<el-table-column prop="update_optname" label="修改人" />
@@ -226,7 +226,7 @@ export default {
},
methods: {
getClassNames() {
crudClassstandard.getClassName().then((res) => { // 获取分类名称，查询根据分类编码查找对应分支树
crudClassstandard.getClassName().then((res) => { // 获取分类名称，查询根据分类号查找对应分支树
this.classNames = res
})
},

10
lms/nladmin-ui/src/views/wms/basedata/customer/index.vue
View File

@@ -7,7 +7,7 @@
clearable
style="width: 300px"
size="mini"
placeholder="输入客户编码或客户名称"
placeholder="输入客户号或客户名称"
prefix-icon="el-icon-search"
class="filter-item"
/>
@@ -25,7 +25,7 @@
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="110px">
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="客户编码" prop="cust_code">
<el-form-item label="客户号" prop="cust_code">
<el-input v-model="form.cust_code" style="width: 200px;" />
</el-form-item>
</el-col>
@@ -64,7 +64,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="邮政编码">
<el-form-item label="邮政号">
<el-input v-model="form.zip_code" style="width: 200px;" />
</el-form-item>
</el-col>
@@ -123,7 +123,7 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column prop="cust_code" label="客户编码" />
<el-table-column prop="cust_code" label="客户号" />
<el-table-column prop="cust_name" label="客户名称 " />
<el-table-column prop="corp_tele_no" label="公司电话" />
<el-table-column prop="corp_address" label="公司地址" />
@@ -226,7 +226,7 @@ export default {
{ required: true, message: '客户标识不能为空', trigger: 'blur' }
],
cust_code: [
{ required: true, message: '客户编码不能为空', trigger: 'blur' }
{ required: true, message: '客户号不能为空', trigger: 'blur' }
],
cust_name: [
{ required: true, message: '客户名称 不能为空', trigger: 'blur' }

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

@@ -1,207 +0,0 @@
<template>
<div class="app-container">
<!--工具栏-->
<div class="head-container">
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<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="600px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="160px" label-suffix="：">
<el-form-item label="物料编码" prop="material_code">
<el-input v-model="form.material_code" :disabled="crud.status.edit" placeholder="物料编码" style="width: 300px;" />
</el-form-item>
<el-form-item label="物料名称" prop="material_name">
<el-input v-model="form.material_name" placeholder="物料名称" style="width: 300px;" />
</el-form-item>
<el-form-item label="炉型" prop="furnace">
<el-input v-model="form.furnace" placeholder="炉型" style="width: 300px;" />
</el-form-item>
<el-form-item label="物料砖类型" prop="material_brick_type">
<el-input v-model="form.material_brick_type" placeholder="物料砖类型" style="width: 300px;" />
</el-form-item>
<el-form-item label="BOM编码" prop="bom_code">
<el-input v-model="form.bom_code" :disabled="crud.status.edit" placeholder="BOM编码" style="width: 300px;" />
</el-form-item>
<el-form-item label="订单编码" prop="order_code">
<el-input v-model="form.order_code" :disabled="crud.status.edit" placeholder="订单编码" style="width: 300px;" />
</el-form-item>
<el-form-item label="客户编码" prop="customer_code">
<el-input v-model="form.customer_code" :disabled="crud.status.edit" placeholder="客户编码" style="width: 300px;" />
</el-form-item>
<el-form-item label="牌号" prop="product_grade">
<el-input v-model="form.product_grade" placeholder="牌" style="width: 300px;" />
</el-form-item>
<el-form-item label="砖型" prop="brick_type">
<el-input v-model="form.brick_type" :disabled="crud.status.edit" placeholder="砖型" style="width: 300px;" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="info" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
</div>
</el-dialog>
<!--表格渲染-->
<el-table
ref="table"
v-loading="crud.loading"
:data="crud.data"
size="mini"
style="width: 100%;"
>
<el-table-column
prop="material_code"
label="物料编码"
:min-width="flexWidth('material_code',crud.data,'物料编码')"
/>
<el-table-column
prop="material_name"
label="物料名称"
:min-width="flexWidth('material_name',crud.data,'物料名称')"
/>
<el-table-column
prop="furnace"
label="炉型"
:min-width="flexWidth('furnace_name',crud.data,'炉型')"
/>
<el-table-column
prop="material_brick_type"
label="物料砖类型"
:min-width="flexWidth('material_brick_type_name',crud.data,'物料砖类型')"
/>
<el-table-column
prop="bom_code"
label="BOM编码"
:min-width="flexWidth('bom_code',crud.data,'BOM编码')"
/>
<el-table-column
prop="order_code"
label="订单编码"
:min-width="flexWidth('order_code',crud.data,'订单编码')"
/>
<el-table-column
prop="customer_code"
label="客户编码"
:min-width="flexWidth('customer_code',crud.data,'客户编码')"
/>
<el-table-column
prop="product_grade"
label="牌号"
:min-width="flexWidth('product_grade_name',crud.data,'牌号')"
/>
<el-table-column prop="brick_type" label="砖型" :min-width="flexWidth('brick_type',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 prop="update_optname" label="修改人" :min-width="flexWidth('update_optname',crud.data,'创建人')" />
<el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'创建人')" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
:is-visiable-del="false"
:data="scope.row"
:permission="permission"
/>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<pagination />
</div>
</div>
</template>
<script>
import crudMaterialDetail from '@/api/wms/basedata/materialDetail'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
const defaultForm = {
material_id: null,
material_code: null,
material_name: null,
furnace: null,
material_brick_type: null,
bom_code: null,
order_code: null,
customer_code: null,
product_grade: null,
brick_type: null,
create_id: null,
create_name: null,
create_time: null,
update_optid: null,
update_optname: null,
update_time: null,
is_delete: '0'
}
export default {
name: 'MaterialDetail',
dicts: ['furnace', 'material_brick_type', 'product_grade'],
components: { pagination, crudOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
title: '物料详情',
url: 'api/materialDetail',
idField: 'material_id',
sort: 'material_id,desc',
crudMethod: { ...crudMaterialDetail },
optShow: {
add: false,
edit: false,
del: false,
download: false,
reset: true
}
})
},
data() {
return {
permission: {},
rules: {
material_code: [
{ required: true, message: '物料编码不能为空', trigger: 'blur' }
],
furnace: [
{ required: true, message: '炉型不能为空', trigger: 'blur' }
],
material_brick_type: [
{ required: true, message: '物料砖类型不能为空', trigger: 'blur' }
],
bom_code: [
{ required: true, message: 'BOM编码不能为空', trigger: 'blur' }
],
order_code: [
{ required: true, message: '订单编码不能为空', trigger: 'blur' }
],
customer_code: [
{ required: true, message: '客户编码不能为空', trigger: 'blur' }
],
product_grade: [
{ required: true, message: '牌号不能为空', trigger: 'blur' }
],
brick_type: [
{ required: true, message: '砖型不能为空', trigger: 'blur' }
]
}
}
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
}
}
}
</script>
<style scoped>
</style>

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

@@ -10,27 +10,19 @@
label-width="90px"
label-suffix="："
>
<el-form-item label="物料编码">
<el-form-item label="物料号">
<el-input
v-model="query.name"
v-model="query.material_number"
clearable
placeholder="物料编码"
placeholder="物料号"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="订单编码">
<el-form-item label="物料名称">
<el-input
v-model="query.order_code"
v-model="query.material_name"
clearable
placeholder="订单编码"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="部位">
<el-input
v-model="query.product_grade"
clearable
placeholder="部位"
placeholder="物料名称"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
@@ -60,106 +52,57 @@
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="160px" label-suffix="：">
<el-row>
<el-col :span="12">
<el-form-item label="物料编码" prop="material_code">
<el-input v-model="form.material_code" :disabled="crud.status.edit" clearable style="width: 300px" />
<el-form-item label="物料号" prop="material_number">
<el-input v-model="form.material_number" :disabled="crud.status.edit" clearable style="width: 300px" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="订单编码" prop="order_code">
<el-input v-model="form.order_code" :disabled="crud.status.edit" style="width: 300px" />
<el-form-item label="物料名称" prop="material_name">
<el-input v-model="form.material_name" clearable style="width: 300px" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="部位" prop="product_grade">
<el-input v-model="form.product_grade" :disabled="crud.status.edit" style="width: 300px" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="炉型" prop="furnace">
<el-input v-model="form.furnace" :disabled="crud.status.edit" style="width: 300px" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="砖型" prop="brick_type">
<el-input v-model="form.brick_type" :disabled="crud.status.edit" style="width: 300px" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="类别" prop="material_brick_type">
<el-input v-model="form.material_brick_type" :disabled="crud.status.edit" style="width: 300px" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="订单单重" prop="weight">
<el-input v-model="form.weight" type="number" style="width: 300px"><i slot="suffix" style="font-style:normal;margin-right: 10px;">千克</i></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="订单数量" prop="aux_qty">
<el-input v-model="form.aux_qty" type="number" style="width: 300px"><i slot="suffix" style="font-style:normal;margin-right: 10px;">块</i></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="订单重量" prop="qty">
<el-input v-model="form.qty" type="number" style="width: 300px"><i slot="suffix" style="font-style:normal;margin-right: 10px;">千克</i></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="困料时间" prop="standing_time">
<el-input v-model="form.standing_time" type="number" style="width: 300px"><i slot="suffix" style="font-style:normal;margin-right: 10px;">分钟</i></el-input>
<el-form-item label="困料时间" prop="stand_time">
<el-input v-model="form.stand_time" type="number" oninput="value=value.replace(/[^0-9]/g,'')" style="width: 300px"><i slot="suffix" style="font-style:normal;margin-right: 10px;">分钟</i></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="超时时间" prop="threshold_time">
<el-input v-model="form.threshold_time" type="number" style="width: 300px"><i slot="suffix" style="font-style:normal;margin-right: 10px;">分钟</i></el-input>
<el-input v-model="form.threshold_time" type="number" oninput="value=value.replace(/[^0-9]/g,'')" style="width: 300px"><i slot="suffix" style="font-style:normal;margin-right: 10px;">分钟</i></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="产品编号" prop="product_code">
<el-input v-model="form.product_code" type="number" style="width: 300px" />
<el-input v-model="form.product_code" type="number" oninput="value=value.replace(/[^0-9]/g,'')" style="width: 300px" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="长边长度" prop="a">
<el-input v-model="form.a" type="number" style="width: 300px"><i slot="suffix" style="font-style:normal;margin-right: 10px;">毫米</i></el-input>
<el-input v-model="form.a" type="number" oninput="value=value.replace(/[^0-9]/g,'')" style="width: 300px"><i slot="suffix" style="font-style:normal;margin-right: 10px;">毫米</i></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="短边长度" prop="b">
<el-input v-model="form.b" type="number" style="width: 300px"><i slot="suffix" style="font-style:normal;margin-right: 10px;">毫米</i></el-input>
<el-input v-model="form.b" type="number" oninput="value=value.replace(/[^0-9]/g,'')" style="width: 300px"><i slot="suffix" style="font-style:normal;margin-right: 10px;">毫米</i></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="梯形高度" prop="h">
<el-input v-model="form.h" type="number" style="width: 300px"><i slot="suffix" style="font-style:normal;margin-right: 10px;">毫米</i></el-input>
<el-input v-model="form.h" type="number" oninput="value=value.replace(/[^0-9]/g,'')" style="width: 300px"><i slot="suffix" style="font-style:normal;margin-right: 10px;">毫米</i></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -185,21 +128,9 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
<el-table-column prop="order_code" label="订单编码" :min-width="flexWidth('order_code',crud.data,'订单编码')" />
<el-table-column prop="product_grade" label="部位" :min-width="flexWidth('product_grade',crud.data,'部位')" />
<el-table-column prop="furnace" label="炉型" :min-width="flexWidth('furnace',crud.data,'炉型')" />
<el-table-column prop="brick_type" label="砖型" :min-width="flexWidth('brick_type',crud.data,'砖型')" />
<el-table-column prop="material_brick_type" label="类别" :min-width="flexWidth('material_brick_type',crud.data,'类别')" />
<el-table-column prop="weight" label="订单单重" :min-width="flexWidth('weight',crud.data,'订单单重')" />
<el-table-column prop="aux_qty" label="订单数量" :min-width="flexWidth('aux_qty',crud.data,'订单数量')" />
<el-table-column prop="qty" label="订单重量" :min-width="flexWidth('qty',crud.data,'订单重量')" />
<el-table-column prop="current_aux_qty" label="完成数量" :min-width="flexWidth('current_aux_qty',crud.data,'完成数量')" />
<el-table-column prop="unqualified_qty" label="废砖数量" :min-width="flexWidth('unqualified_qty',crud.data,'废砖数量')" />
<el-table-column prop="current_qty" label="完成总重" :min-width="flexWidth('current_qty',crud.data,'完成总重')" />
<el-table-column prop="surplus_aux_qty" label="剩余数量" :min-width="flexWidth('surplus_aux_qty',crud.data,'剩余数量')" />
<el-table-column prop="surplus_qty" label="剩余重量" :min-width="flexWidth('surplus_qty',crud.data,'剩余重量')" />
<el-table-column prop="standing_time" label="困料时间" :min-width="flexWidth('standing_time',crud.data,'困料时间')" />
<el-table-column prop="material_number" label="物料号" :min-width="flexWidth('material_number',crud.data,'物料号')" />
<el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
<el-table-column prop="stand_time" label="困料时间" :min-width="flexWidth('stand_time',crud.data,'困料时间')" />
<el-table-column prop="threshold_time" label="超时时间" :min-width="flexWidth('threshold_time',crud.data,'超时时间')" />
<el-table-column prop="product_code" label="产品编号" :min-width="flexWidth('product_code',crud.data,'产品编号')" />
<el-table-column prop="a" label="长边长度" :min-width="flexWidth('a',crud.data,'长边长度')" />
@@ -245,10 +176,9 @@ import crudMdPbMeasureunit from '@/api/wms/basedata/mdPbMeasureunit'
const defaultForm = {
material_id: null,
ass_unit_id: null,
material_code: null,
material_number: null,
material_name: null,
standing_time: null,
stand_time: null,
threshold_time: null,
a: null,
b: null,
@@ -260,16 +190,7 @@ const defaultForm = {
create_time: null,
update_optid: null,
update_optname: null,
update_time: null,
weight: null,
material_type: '1',
order_code: null,
product_grade: null,
material_brick_type: null,
furnace: null,
qty: 0,
aux_qty: 0,
brick_type: null
update_time: null
}
export default {
name: 'Materialbase',
@@ -300,8 +221,8 @@ export default {
productSeries: [],
permission: {},
rules: {
material_code: [
{ required: true, message: '物料编码不能为空', trigger: 'blur' }
material_number: [
{ required: true, message: '物料号不能为空', trigger: 'blur' }
]
}
}

6
lms/nladmin-ui/src/views/wms/basedata/measure/index.vue
View File

@@ -7,7 +7,7 @@
clearable
style="width: 300px"
size="mini"
placeholder="输入单位编码或单位名称"
placeholder="输入单位号或单位名称"
prefix-icon="el-icon-search"
class="filter-item"
/>
@@ -17,7 +17,7 @@
<!--表单组件-->
<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="unit_code">
<el-form-item label="号" prop="unit_code">
<el-input v-model="form.unit_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="名称" prop="unit_name">
@@ -42,7 +42,7 @@
</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 prop="unit_code" label="编码" />
<el-table-column prop="unit_code" label="号" />
<el-table-column prop="unit_name" label="名称" />
<el-table-column prop="qty_precision" label="数据精度" />
<el-table-column prop="update_optname" label="修改者" />

8
lms/nladmin-ui/src/views/wms/basedata/supp/index.vue
View File

@@ -7,7 +7,7 @@
clearable
style="width: 300px"
size="mini"
placeholder="输入供应商编码或名称"
placeholder="输入供应商号或名称"
prefix-icon="el-icon-search"
class="filter-item"
/>
@@ -25,7 +25,7 @@
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="130px">
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="供应商编码" prop="supp_code">
<el-form-item label="供应商号" prop="supp_code">
<el-input v-model="form.supp_code" style="width: 200px;" />
</el-form-item>
</el-col>
@@ -69,7 +69,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="邮政编码">
<el-form-item label="邮政号">
<el-input v-model="form.zip_code" style="width: 200px;" />
</el-form-item>
</el-col>
@@ -133,7 +133,7 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column prop="supp_code" label="供应商编码" />
<el-table-column prop="supp_code" label="供应商号" />
<el-table-column prop="supp_name" label="供应商名称 " />
<el-table-column prop="corp_address" label="公司地址" />
<el-table-column prop="corp_tele_no" label="公司电话" />

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

@@ -10,20 +10,20 @@
label-width="90px"
label-suffix=":"
>
<el-form-item label="载具编码">
<el-form-item label="载具号">
<el-input
v-model="query.vehicle_code"
clearable
size="mini"
placeholder="请输入载具编码"
placeholder="请输入载具号"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<rrOperation/>
<rrOperation />
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission"/>
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog
:close-on-click-modal="false"
@@ -50,17 +50,17 @@
/>
</el-select>
</el-form-item>
<el-form-item label="载具编码" prop="vehicle_code">
<el-input v-model="form.vehicle_code" style="width: 370px;"/>
<el-form-item label="载具号" prop="vehicle_code">
<el-input v-model="form.vehicle_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="数量" prop="qty">
<el-input v-model="form.qty" style="width: 370px;"/>
<el-input v-model="form.qty" style="width: 370px;" />
</el-form-item>
<el-form-item label="重量" prop="weight">
<el-input v-model="form.weight" style="width: 370px;"/>
<el-input v-model="form.weight" style="width: 370px;" />
</el-form-item>
<el-form-item label="点位编码">
<el-input v-model="form.point_code" style="width: 370px;"/>
<el-form-item label="点位号">
<el-input v-model="form.point_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="是否满垛" prop="is_full">
<el-radio v-model="form.is_full" label="0">否</el-radio>
@@ -85,7 +85,7 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55"/>
<el-table-column type="selection" width="55" />
<el-table-column
prop="vehicle_type"
label="载具类型"
@@ -97,12 +97,12 @@
</el-table-column>
<el-table-column
prop="vehicle_code"
label="载具编码"
:min-width="flexWidth('vehicle_code',crud.data,'载具编码')"
label="载具号"
:min-width="flexWidth('vehicle_code',crud.data,'载具号')"
/>
<el-table-column prop="qty" label="数量" :min-width="flexWidth('qty',crud.data,'数量')"/>
<el-table-column prop="weight" label="重量" :min-width="flexWidth('weight',crud.data,'重量')"/>
<!-- <el-table-column prop="point_name" label="点位名称" :min-width="flexWidth('point_name',crud.data,'点位名称')"/>-->
<el-table-column prop="qty" label="数量" :min-width="flexWidth('qty',crud.data,'数量')" />
<el-table-column prop="weight" label="重量" :min-width="flexWidth('weight',crud.data,'重量')" />
<!-- <el-table-column prop="point_name" label="点位名称" :min-width="flexWidth('point_name',crud.data,'点位名称')"/>-->
<el-table-column prop="is_full" label="是否满垛" :min-width="flexWidth('is_full',crud.data,'是否满垛')">
<template slot-scope="scope">
{{ scope.row.is_full == '1' ? '是' : '否' }}
@@ -143,7 +143,7 @@
</el-table-column>
</el-table>
<!--分页组件-->
<pagination/>
<pagination />
</div>
</div>
</template>

20
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 label="载具号">
<el-input
v-model="query.vehicle_code"
clearable
@@ -59,11 +59,11 @@
/>
</el-select>
</el-form-item>
<rrOperation/>
<rrOperation />
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission"/>
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog
:close-on-click-modal="false"
@@ -74,7 +74,7 @@
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px" label-suffix=":">
<el-row>
<el-form-item label="载具编码" prop="vehicle_code">
<el-form-item label="载具号" prop="vehicle_code">
<el-input
v-model="form.vehicle_code"
placeholder="请输入"
@@ -143,8 +143,8 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55"/>
<el-table-column prop="vehicle_code" label="载具编码"/>
<el-table-column type="selection" width="55" />
<el-table-column prop="vehicle_code" label="载具号" />
<el-table-column prop="vehicle_type" label="载具类型">
<template slot-scope="scope">
{{ dict.label.vehicle_type[scope.row.vehicle_type] }}
@@ -155,8 +155,8 @@
{{ dict.label.vehicle_status[scope.row.vehicle_status] }}
</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
@@ -167,7 +167,7 @@
</el-table-column>
</el-table>
<!--分页组件-->
<pagination/>
<pagination />
</div>
</div>
</template>
@@ -219,7 +219,7 @@ export default {
permission: {},
rules: {
vehicle_code: [
{ required: true, message: '载具编码不能为空', trigger: 'blur' }
{ required: true, message: '载具号不能为空', trigger: 'blur' }
],
vehicle_type: [
{ required: true, message: '载具类型不能为空', trigger: 'blur' }

14
lms/nladmin-ui/src/views/wms/pdm/device/index.vue
View File

@@ -11,12 +11,12 @@
label-width="90px"
label-suffix="："
>
<el-form-item label="编码名称">
<el-form-item label="号名称">
<el-input
v-model="query.search"
clearable
size="mini"
placeholder="编码名称"
placeholder="号名称"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
@@ -34,7 +34,7 @@
width="600px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="160px" label-suffix="：">
<el-form-item label="设备编码" prop="device_code">
<el-form-item label="设备号" prop="device_code">
<el-input v-model="form.device_code" :disabled="crud.status.edit" style="width: 300px" />
</el-form-item>
<el-form-item label="设备名称" prop="device_name">
@@ -77,7 +77,7 @@
<el-radio v-model="form.is_workorder" label="1">是</el-radio>
<el-radio v-model="form.is_workorder" label="0">否</el-radio>
</el-form-item>
<el-form-item label="外部编码">
<el-form-item label="外部号">
<el-input v-model="form.extend_code" style="width: 300px" />
</el-form-item>
<el-form-item label="备注">
@@ -101,8 +101,8 @@
<el-table-column type="selection" width="55" />
<el-table-column
prop="device_code"
label="设备编码"
:min-width="flexWidth('device_code',crud.data,'设备编码')"
label="设备号"
:min-width="flexWidth('device_code',crud.data,'设备号')"
/>
<el-table-column
prop="device_name"
@@ -203,7 +203,7 @@ export default {
permission: {},
rules: {
device_code: [
{ required: true, message: '设备编码不能为空', trigger: 'blur' }
{ required: true, message: '设备号不能为空', trigger: 'blur' }
],
device_name: [
{ required: true, message: '设备名称不能为空', trigger: 'blur' }

4
lms/nladmin-ui/src/views/wms/pdm/workerorder/OutMaterDialog.vue
View File

@@ -20,7 +20,7 @@
v-model="query.search"
clearable
size="mini"
placeholder="编码、名称"
placeholder="号、名称"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
@@ -47,7 +47,7 @@
</template>
</el-table-column>
<el-table-column prop="material_code" label="物料编码" min-width="150" show-overflow-tooltip />
<el-table-column prop="material_number" label="物料号" min-width="150" show-overflow-tooltip />
<el-table-column prop="material_name" label="物料名称" min-width="100" show-overflow-tooltip />
<el-table-column prop="material_spec" label="规格" min-width="100" show-overflow-tooltip />
<el-table-column prop="net_weight" label="物料净重" min-width="100" show-overflow-tooltip />

12
lms/nladmin-ui/src/views/wms/pdm/workerorder/ViewDialog.vue
View File

@@ -9,7 +9,7 @@
>
<el-card class="box-card" shadow="never">
<el-form ref="form" disabled :inline="true" :model="form" :rules="rules" size="mini" label-width="180px">
<el-form-item label="工单编码">
<el-form-item label="工单号">
<el-input v-model="form.produceorder_code" style="width: 200px;" />
</el-form-item>
<el-form-item label="工单类型">
@@ -44,13 +44,13 @@
<el-form-item v-if="false" label="物料标识">
<el-input v-model="form.material_id" style="width: 200px;" />
</el-form-item>
<el-form-item label="物料编码">
<el-form-item label="物料号">
<el-input
v-model="form.material_code"
v-model="form.material_number"
style="width: 200px;"
clearable
@focus="materialShow=true"
@clear="form.material_id='',form.material_code='',form.material_name='',form.material_spec=''"
@clear="form.material_id='',form.material_number='',form.material_name='',form.material_spec=''"
/>
</el-form-item>
<el-form-item label="物料名称">
@@ -158,7 +158,7 @@
:highlight-current-row="true"
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
>
<el-table-column prop="device_code" label="设备编码" align="center" />
<el-table-column prop="device_code" label="设备号" align="center" />
<el-table-column prop="device_name" label="设备名称" align="center" min-width="200" show-overflow-tooltip />
<el-table-column prop="produce_qty" label="生产数量" align="center" />
<el-table-column prop="init_qty" label="期初数量" align="center" />
@@ -215,7 +215,7 @@ export default {
plan_qty: null,
real_qty: null,
material_id: null,
material_code: null,
material_number: null,
material_weight: null,
planproducestart_date: null,
planproduceend_date: null,

64
lms/nladmin-ui/src/views/wms/pdm/workerorder/fj/index.vue
View File

@@ -20,11 +20,11 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="物料编码">
<el-form-item label="物料号">
<el-input
v-model="query.material"
clearable
placeholder="物料编码"
placeholder="物料号"
style="width: 200px;"
@keyup.enter.native="crud.toQuery"
/>
@@ -114,14 +114,14 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="物料编码" prop="material_code">
<el-form-item label="物料号" prop="material_number">
<el-input
v-model="form.material_code"
v-model="form.material_number"
:disabled="crud.status.edit"
style="width: 300px"
clearable
@focus="materialShow=true"
@clear="form.material_id=''; form.material_code=''; form.material_name=''"
@clear="form.material_id=''; form.material_number=''; form.material_name=''"
/>
</el-form-item>
</el-col>
@@ -136,29 +136,6 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item
label="木托盘类型"
prop="vehicle_type"
>
<el-select
v-model="form.vehicle_type"
:disabled="crud.status.edit"
style="width: 300px"
filterable
placeholder="请选择"
>
<el-option
v-for="item in dict.wood_vehicle_type"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="计划生产日期" prop="plan_date">
@@ -199,8 +176,8 @@
<el-table-column v-if="false" prop="workorder_id" label="生产班次工单标识" />
<el-table-column
prop="workorder_code"
label="工单编码"
:min-width="flexWidth('workorder_code',crud.data,'工单编码')"
label="工单号"
:min-width="flexWidth('workorder_code',crud.data,'工单号')"
>
<!-- <template slot-scope="scope">-->
<!-- <el-link type="warning" @click="toView(scope.row)">{{ scope.row.produceorder_code }}</el-link>-->
@@ -217,19 +194,10 @@
</el-table-column>
<el-table-column prop="device_name" label="设备" :min-width="flexWidth('device_name',crud.data,'设备')" />
<el-table-column
prop="material_code"
label="物料编码"
:min-width="flexWidth('material_code',crud.data,'物料编码')"
prop="material_number"
label="物料号"
:min-width="flexWidth('material_number',crud.data,'物料号')"
/>
<el-table-column
prop="vehicle_type"
label="载具类型"
:min-width="flexWidth('vehicle_type',crud.data,'类型一木托盘')"
>
<template slot-scope="scope">
{{ dict.label.vehicle_type[scope.row.vehicle_type] }}
</template>
</el-table-column>
<el-table-column prop="plan_qty" label="计划数量" :min-width="flexWidth('plan_qty',crud.data,'计划数量')" />
<el-table-column prop="plan_date" label="计划生产日期" :min-width="flexWidth('plan_date',crud.data,'计划生产日期')" />
<el-table-column prop="is_urgent" label="是否加急" :min-width="flexWidth('is_urgent',crud.data,'是否加急')">
@@ -365,7 +333,7 @@ const defaultForm = {
plan_qty: null,
real_qty: null,
material_id: null,
material_code: null,
material_number: null,
material_weight: null,
vehicle_type: '3',
planproducestart_date: null,
@@ -394,7 +362,7 @@ const defaultForm = {
is_new: '1',
is_package: '1',
warn_time: '0',
standing_time: '0',
stand_time: '0',
is_urgent: '0',
is_pri: '0',
ext_code: null,
@@ -441,8 +409,8 @@ export default {
plan_qty: [
{ required: true, message: '计划数量不能为空', trigger: 'blur' }
],
material_code: [
{ required: true, message: '物料编码不能为空', trigger: 'change' }
material_number: [
{ required: true, message: '物料号不能为空', trigger: 'change' }
],
vehicle_type: [
{ required: true, message: '木托盘类型不能为空', trigger: 'blur' }
@@ -515,7 +483,7 @@ export default {
// 新增编辑给form表单物料相关信息赋值
setMaterValue(row) {
this.form.material_id = row.material_id
this.form.material_code = row.material_code
this.form.material_number = row.material_number
},
tableChanged(row) {
this.form.device_code = row.device_code
@@ -525,7 +493,7 @@ export default {
},
setBOMValue(row) {
this.form.material_id = row.material_id
this.form.material_code = row.material_code
this.form.material_number = row.material_number
},
// 下发
submits(row) {

29
lms/nladmin-ui/src/views/wms/pdm/workerorder/hl/index.vue
View File

@@ -20,11 +20,11 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="物料编码">
<el-form-item label="物料号">
<el-input
v-model="query.material"
clearable
placeholder="物料编码"
placeholder="物料号"
style="width: 200px;"
@keyup.enter.native="crud.toQuery"
/>
@@ -114,14 +114,14 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="物料编码" prop="material_code">
<el-form-item label="物料号" prop="material_number">
<el-input
v-model="form.material_code"
v-model="form.material_number"
:disabled="form.order_status > '1'"
style="width: 300px"
clearable
@focus="materialShow=true"
@clear="form.material_id=''; form.material_code=''; form.material_name=''"
@clear="form.material_id=''; form.material_number=''; form.material_name=''"
/>
</el-form-item>
</el-col>
@@ -179,7 +179,7 @@
>
<el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="workorder_id" label="生产班次工单标识" />
<el-table-column prop="workorder_code" label="工单编码" :min-width="flexWidth('workorder_code',crud.data,'工单编码')">
<el-table-column prop="workorder_code" label="工单号" :min-width="flexWidth('workorder_code',crud.data,'工单号')">
<!-- <template slot-scope="scope">-->
<!-- <el-link type="warning" @click="toView(scope.row)">{{ scope.row.produceorder_code }}</el-link>-->
<!-- </template>-->
@@ -190,7 +190,7 @@
</template>
</el-table-column>
<el-table-column prop="device_name" label="设备" :min-width="flexWidth('device_name',crud.data,'设备')" />
<el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
<el-table-column prop="material_number" label="物料号" :min-width="flexWidth('material_number',crud.data,'物料号')" />
<el-table-column prop="plan_qty" label="计划重量" :min-width="flexWidth('plan_qty',crud.data,'计划数量/重量')" />
<el-table-column prop="plan_date" label="计划生产日期" :min-width="flexWidth('plan_date',crud.data,'计划生产日期')" />
<el-table-column prop="is_urgent" label="是否加急" :min-width="flexWidth('is_urgent',crud.data,'是否加急')">
@@ -198,11 +198,6 @@
{{ dict.label.true_or_false[scope.row.is_urgent] }}
</template>
</el-table-column>
<el-table-column prop="is_new" label="是否正品料" :min-width="flexWidth('is_new',crud.data,'是否正品料')">
<template slot-scope="scope">
{{ dict.label.true_or_false[scope.row.is_new] }}
</template>
</el-table-column>
<el-table-column prop="realproducestart_date" label="实际开始时间" :min-width="flexWidth('realproducestart_date',crud.data,'实际开始时间')" />
<el-table-column prop="realproduceend_date" label="实际结束时间" :min-width="flexWidth('realproduceend_date',crud.data,'实际结束时间')" />
<el-table-column prop="real_qty" label="实际生产重量" :min-width="flexWidth('real_qty',crud.data,'实际生产重量')" />
@@ -274,7 +269,7 @@ const defaultForm = {
plan_qty: null,
real_qty: null,
material_id: null,
material_code: null,
material_number: null,
material_weight: null,
vehicle_type: '1',
planproducestart_date: null,
@@ -303,7 +298,7 @@ const defaultForm = {
is_new: '1',
is_package: '1',
warn_time: '0',
standing_time: '0',
stand_time: '0',
is_urgent: '0',
is_pri: '0',
ext_code: null,
@@ -350,8 +345,8 @@ export default {
plan_qty: [
{ required: true, message: '计划数量不能为空', trigger: 'blur' }
],
material_code: [
{ required: true, message: '物料编码不能为空', trigger: 'change' }
material_number: [
{ required: true, message: '物料号不能为空', trigger: 'change' }
],
vehicle_type: [
{ required: true, message: '木托盘类型不能为空', trigger: 'blur' }
@@ -430,7 +425,7 @@ export default {
},
setMaterValue(row) {
this.form.material_id = row.material_id
this.form.material_code = row.material_code
this.form.material_number = row.material_number
},
// 下发
submits(row) {

76
lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
View File

@@ -20,11 +20,11 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="物料编码">
<el-form-item label="物料号">
<el-input
v-model="query.material"
clearable
placeholder="物料编码"
placeholder="物料号"
style="width: 200px;"
@keyup.enter.native="crud.toQuery"
/>
@@ -88,16 +88,6 @@
>
强制完成
</el-button>
<el-button
slot="right"
class="filter-item"
type="danger"
icon="el-icon-download"
size="mini"
@click="downloadExcel()"
>
导出Excel
</el-button>
</crudOperation>
<!--表单组件-->
<el-dialog
@@ -124,14 +114,14 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="物料编码" prop="material_code">
<el-form-item label="物料号" prop="material_number">
<el-input
v-model="form.material_code"
v-model="form.material_number"
:disabled="crud.status.edit"
style="width: 300px"
clearable
@focus="materialShow=true"
@clear="form.material_id=''; form.material_code=''; form.material_name=''"
@clear="form.material_id=''; form.material_number=''; form.material_name=''"
/>
</el-form-item>
</el-col>
@@ -139,13 +129,23 @@
<el-row>
<el-col :span="12">
<el-form-item label="计划数量" prop="plan_qty">
<el-input v-model="form.plan_qty" :disabled="crud.status.edit" type="number" style="width: 300px"><i
<el-input v-model="form.plan_qty" oninput="value=value.replace(/[^0-9]/g,'')" :disabled="crud.status.edit" type="number" style="width: 300px"><i
slot="suffix"
style="font-style:normal;margin-right: 10px;"
>块</i></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="计划重量" prop="plan_weight">
<el-input v-model="form.plan_weight" oninput="value=value.replace(/[^0-9]/g,'')" :disabled="crud.status.edit" type="number" style="width: 300px"><i
slot="suffix"
style="font-style:normal;margin-right: 10px;"
>千克</i></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="计划生产日期" prop="plan_date">
@@ -194,8 +194,8 @@
<el-table-column v-if="false" prop="workorder_id" label="生产班次工单标识" />
<el-table-column
prop="workorder_code"
label="工单编码"
:min-width="flexWidth('workorder_code',crud.data,'工单编码')"
label="工单号"
:min-width="flexWidth('workorder_code',crud.data,'工单号')"
>
<!-- <template slot-scope="scope">-->
<!-- <el-link type="warning" @click="toView(scope.row)">{{ scope.row.produceorder_code }}</el-link>-->
@@ -210,22 +210,14 @@
{{ dict.label.pdm_workorder_status[scope.row.order_status] }}
</template>
</el-table-column>
<el-table-column prop="device_name" label="设备" :min-width="flexWidth('device_name',crud.data,'设备')" />
<el-table-column prop="device_name" label="生产设备" :min-width="flexWidth('device_name',crud.data,'生产设备')" />
<el-table-column
prop="material_code"
label="物料编码"
:min-width="flexWidth('material_code',crud.data,'物料编码')"
prop="material_number"
label="物料号"
:min-width="flexWidth('material_number',crud.data,'物料号')"
/>
<el-table-column
prop="vehicle_type"
label="载具类型"
:min-width="flexWidth('vehicle_type',crud.data,'类型一木托盘')"
>
<template slot-scope="scope">
{{ dict.label.vehicle_type[scope.row.vehicle_type] }}
</template>
</el-table-column>
<el-table-column prop="plan_qty" label="计划数量" :min-width="flexWidth('plan_qty',crud.data,'计划数量')" />
<el-table-column prop="plan_weight" label="计划重量" :min-width="flexWidth('plan_weight',crud.data,'计划重量')" />
<el-table-column prop="plan_date" label="计划生产日期" :min-width="flexWidth('plan_date',crud.data,'计划生产日期')" />
<el-table-column prop="is_urgent" label="是否加急" :min-width="flexWidth('is_urgent',crud.data,'是否加急')">
<template slot-scope="scope">
@@ -258,6 +250,8 @@
label="不合格数量"
:min-width="flexWidth('unqualified_qty',crud.data,'不合格数量')"
/>
<el-table-column prop="real_weight" label="实际生产重量" :min-width="flexWidth('real_weight',crud.data,'实际生产重量')" />
<el-table-column prop="avg_piece_weight" label="平均单重" :min-width="flexWidth('avg_piece_weight',crud.data,'平均单重')" />
<el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
<el-table-column
prop="create_time"
@@ -367,9 +361,9 @@ const defaultForm = {
plan_qty: null,
real_qty: null,
material_id: null,
material_code: null,
material_number: null,
material_weight: null,
vehicle_type: '3',
vehicle_type: '2',
planproducestart_date: null,
planproduceend_date: null,
realproducestart_date: null,
@@ -396,14 +390,15 @@ const defaultForm = {
is_new: '1',
is_package: '1',
warn_time: '0',
standing_time: '0',
stand_time: '0',
is_urgent: '0',
is_pri: '0',
ext_code: null,
qualified_qty: '0',
unqualified_qty: '0',
region_code: null,
plan_date: null
plan_date: null,
plan_weight: null
}
export default {
name: 'Produceshiftorder',
@@ -443,8 +438,8 @@ export default {
plan_qty: [
{ required: true, message: '计划数量不能为空', trigger: 'blur' }
],
material_code: [
{ required: true, message: '物料编码不能为空', trigger: 'change' }
material_number: [
{ required: true, message: '物料号不能为空', trigger: 'change' }
],
vehicle_type: [
{ required: true, message: '木托盘类型不能为空', trigger: 'blur' }
@@ -460,6 +455,9 @@ export default {
],
plan_date: [
{ required: true, message: '计划生产日期不能为空', trigger: 'blur' }
],
plan_weight: [
{ required: true, message: '计划重量不能为空', trigger: 'blur' }
]
}
}
@@ -517,7 +515,7 @@ export default {
// 新增编辑给form表单物料相关信息赋值
setMaterValue(row) {
this.form.material_id = row.material_id
this.form.material_code = row.material_code
this.form.material_number = row.material_number
},
tableChanged(row) {
this.form.device_code = row.device_code
@@ -527,7 +525,7 @@ export default {
},
setBOMValue(row) {
this.form.material_id = row.material_id
this.form.material_code = row.material_code
this.form.material_number = row.material_number
},
// 下发
submits(row) {

8
lms/nladmin-ui/src/views/wms/pub/BOMDialog.vue
View File

@@ -15,11 +15,11 @@
label-width="90px"
label-suffix="："
>
<el-form-item label="BOM编码">
<el-form-item label="BOM号">
<el-input
v-model="query.name"
clearable
placeholder="BOM编码"
placeholder="BOM号"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
@@ -45,8 +45,8 @@
<el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
</template>
</el-table-column>
<el-table-column prop="material_code" label="BOM编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
<el-table-column prop="standing_time" label="静置时间" :min-width="flexWidth('standing_time',crud.data,'静置时间')" />
<el-table-column prop="material_number" label="BOM号" :min-width="flexWidth('material_number',crud.data,'物料号')" />
<el-table-column prop="stand_time" label="静置时间" :min-width="flexWidth('stand_time',crud.data,'静置时间')" />
<el-table-column prop="threshold_time" label="阈值时间" :min-width="flexWidth('threshold_time',crud.data,'阈值时间')" />
</el-table>
<!--分页组件-->

8
lms/nladmin-ui/src/views/wms/pub/DeviceDialog.vue
View File

@@ -15,11 +15,11 @@
label-width="90px"
label-suffix="："
>
<el-form-item label="编码/名称">
<el-form-item label="号/名称">
<el-input
v-model="query.search"
clearable
placeholder="编码/名称"
placeholder="号/名称"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
@@ -45,7 +45,7 @@
</template>
</el-table-column>
<el-table-column prop="device_code" label="设备编码" :min-width="flexWidth('device_code',crud.data,'设备编码')" />
<el-table-column prop="device_code" label="设备号" :min-width="flexWidth('device_code',crud.data,'设备号')" />
<el-table-column prop="device_name" label="设备名称" :min-width="flexWidth('device_name',crud.data,'设备名称')" />
<el-table-column prop="device_model" label="设备型号" :min-width="flexWidth('device_model',crud.data,'设备型号')">
<template slot-scope="scope">
@@ -53,7 +53,7 @@
</template>
</el-table-column>
<el-table-column prop="region_name" label="所属区域" :min-width="flexWidth('region_name',crud.data,'所属区域')" />
<el-table-column prop="extend_code" label="外部编码" :min-width="flexWidth('extend_code',crud.data,'外部编码')" />
<el-table-column prop="extend_code" label="外部号" :min-width="flexWidth('extend_code',crud.data,'外部号')" />
</el-table>
<!--分页组件-->
<pagination />

27
lms/nladmin-ui/src/views/wms/pub/MaterDialog.vue
View File

@@ -15,30 +15,21 @@
label-width="90px"
label-suffix="："
>
<el-form-item label="物料编码">
<el-form-item label="物料号">
<el-input
v-model="query.name"
v-model="query.material_number"
clearable
style="width: 200px;"
placeholder="物料编码"
placeholder="物料号"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="订单编码">
<el-form-item label="物料名称">
<el-input
v-model="query.order_code"
v-model="query.material_name"
clearable
style="width: 200px;"
placeholder="订单编码"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="部位">
<el-input
v-model="query.product_grade"
clearable
style="width: 200px;"
placeholder="部位"
placeholder="物料号"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
@@ -64,10 +55,8 @@
<el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
</template>
</el-table-column>
<el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
<el-table-column prop="order_code" label="订单编码" :min-width="flexWidth('order_code',crud.data,'订单编码')" />
<el-table-column prop="product_grade" label="部位" :min-width="flexWidth('product_grade',crud.data,'部位')" />
<el-table-column prop="brick_type" label="砖型" :min-width="flexWidth('brick_type',crud.data,'砖型')" />
<el-table-column prop="material_number" label="物料号" :min-width="flexWidth('material_number',crud.data,'物料号')" />
<el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
</el-table>
<!--分页组件-->
<pagination />

4
lms/nladmin-ui/src/views/wms/pub/PointDialog.vue
View File

@@ -12,7 +12,7 @@
<el-col :span="22">
<el-form :inline="true" class="demo-form-inline">
<el-form-item :inline="true" label="模糊搜索:">
<el-input v-model="query.search" placeholder="请输入点位编码或名称" />
<el-input v-model="query.search" placeholder="请输入点位号或名称" />
</el-form-item>
<rrOperation />
</el-form>
@@ -39,7 +39,7 @@
</template>
</el-table-column>
<el-table-column prop="point_code" label="终点点位编码" show-overflow-tooltip />
<el-table-column prop="point_code" label="终点点位号" show-overflow-tooltip />
<el-table-column prop="point_name" label="终点点位名称" show-overflow-tooltip />
<el-table-column prop="region_name" label="所属区域" show-overflow-tooltip />
<el-table-column prop="point_type" label="点位类型">

4
lms/nladmin-ui/src/views/wms/sch/point/MaterialDialog.vue
View File

@@ -47,13 +47,13 @@
<el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
</template>
</el-table-column>
<el-table-column prop="material_code" label="物料编码" width="160" />
<el-table-column prop="material_number" 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="stand_time" label="静置时间（分钟）" width="130px" />
<el-table-column prop="product_series_name" label="系列" />
<el-table-column prop="update_optname" label="修改人" />
<el-table-column prop="update_time" label="修改时间" width="135" />

100
lms/nladmin-ui/src/views/wms/sch/point/ViewDialog.vue
View File

@@ -14,36 +14,36 @@
</div>
<el-form ref="form" disabled :inline="true" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item label="区域编码">
<el-input v-model="form.region_code" style="width: 200px;"/>
<el-form-item label="区域号">
<el-input v-model="form.region_code" style="width: 200px;" />
</el-form-item>
<el-form-item label="区域名称">
<el-input v-model="form.region_name" style="width: 200px;"/>
<el-input v-model="form.region_name" style="width: 200px;" />
</el-form-item>
<el-form-item label="点位编码">
<el-input v-model="form.point_code" style="width: 200px;"/>
<el-form-item label="点位号">
<el-input v-model="form.point_code" style="width: 200px;" />
</el-form-item>
<el-form-item label="点位名称">
<el-input v-model="form.point_name" style="width: 200px;"/>
<el-input v-model="form.point_name" style="width: 200px;" />
</el-form-item>
<el-form-item label="点位类型">
<el-input v-model="form.point_type_name" style="width: 200px;"/>
<el-input v-model="form.point_type_name" style="width: 200px;" />
</el-form-item>
<el-form-item label="点位状态">
<el-input v-model="form.point_status_name" style="width: 200px;"/>
<el-input v-model="form.point_status_name" style="width: 200px;" />
</el-form-item>
<el-form-item label="锁定类型">
<el-input v-model="form.lock_type_name" style="width: 200px;"/>
<el-input v-model="form.lock_type_name" style="width: 200px;" />
</el-form-item>
<el-form-item label="载具类型">
<el-input v-model="form.lock_type_name" style="width: 200px;"/>
<el-input v-model="form.lock_type_name" style="width: 200px;" />
</el-form-item>
<el-form-item label="载具编码">
<el-input v-model="form.vehicle_code" style="width: 200px;"/>
<el-form-item label="载具号">
<el-input v-model="form.vehicle_code" style="width: 200px;" />
</el-form-item>
<el-form-item label="载具数量">
<el-input v-model="form.vehicle_qty" style="width: 200px;"/>
<el-input v-model="form.vehicle_qty" style="width: 200px;" />
</el-form-item>
</el-form>
@@ -56,30 +56,30 @@
</div>
<el-form ref="form" disabled :inline="true" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item label="物料编码">
<el-input v-model="form.region_code" style="width: 200px;"/>
<el-form-item label="物料号">
<el-input v-model="form.region_code" style="width: 200px;" />
</el-form-item>
<el-form-item label="物料名称">
<el-input v-model="form.region_name" style="width: 200px;"/>
<el-input v-model="form.region_name" style="width: 200px;" />
</el-form-item>
<el-form-item label="物料规格">
<el-input v-model="form.point_code" style="width: 200px;"/>
<el-input v-model="form.point_code" style="width: 200px;" />
</el-form-item>
<el-form-item label="物料批次">
<el-input v-model="form.point_name" style="width: 200px;"/>
<el-input v-model="form.point_name" style="width: 200px;" />
</el-form-item>
<el-form-item label="库存量">
<el-input v-model="form.point_type_name" style="width: 200px;"/>
<el-input v-model="form.point_type_name" style="width: 200px;" />
</el-form-item>
<el-form-item label="计量单位">
<el-input v-model="form.point_status_name" style="width: 200px;"/>
<el-input v-model="form.point_status_name" style="width: 200px;" />
</el-form-item>
<el-form-item label="入库时间">
<el-input v-model="form.lock_type_name" style="width: 200px;"/>
<el-input v-model="form.lock_type_name" style="width: 200px;" />
</el-form-item>
<el-form-item label="静置时间(分)">
<el-input v-model="form.lock_type_name" style="width: 200px;"/>
<el-input v-model="form.lock_type_name" style="width: 200px;" />
</el-form-item>
</el-form>
</el-card>
@@ -91,30 +91,30 @@
</div>
<el-form ref="form" disabled :inline="true" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item label="物料编码">
<el-input v-model="form.region_code" style="width: 200px;"/>
<el-form-item label="物料号">
<el-input v-model="form.region_code" style="width: 200px;" />
</el-form-item>
<el-form-item label="物料名称">
<el-input v-model="form.region_name" style="width: 200px;"/>
<el-input v-model="form.region_name" style="width: 200px;" />
</el-form-item>
<el-form-item label="物料规格">
<el-input v-model="form.point_code" style="width: 200px;"/>
<el-input v-model="form.point_code" style="width: 200px;" />
</el-form-item>
<el-form-item label="物料批次">
<el-input v-model="form.point_name" style="width: 200px;"/>
<el-input v-model="form.point_name" style="width: 200px;" />
</el-form-item>
<el-form-item label="库存量">
<el-input v-model="form.point_type_name" style="width: 200px;"/>
<el-input v-model="form.point_type_name" style="width: 200px;" />
</el-form-item>
<el-form-item label="计量单位">
<el-input v-model="form.point_status_name" style="width: 200px;"/>
<el-input v-model="form.point_status_name" style="width: 200px;" />
</el-form-item>
<el-form-item label="入库时间">
<el-input v-model="form.lock_type_name" style="width: 200px;"/>
<el-input v-model="form.lock_type_name" style="width: 200px;" />
</el-form-item>
<el-form-item label="静置时间(分)">
<el-input v-model="form.lock_type_name" style="width: 200px;"/>
<el-input v-model="form.lock_type_name" style="width: 200px;" />
</el-form-item>
</el-form>
</el-card>
@@ -126,30 +126,30 @@
</div>
<el-form ref="form" disabled :inline="true" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item label="物料编码">
<el-input v-model="form.region_code" style="width: 200px;"/>
<el-form-item label="物料号">
<el-input v-model="form.region_code" style="width: 200px;" />
</el-form-item>
<el-form-item label="物料名称">
<el-input v-model="form.region_name" style="width: 200px;"/>
<el-input v-model="form.region_name" style="width: 200px;" />
</el-form-item>
<el-form-item label="物料规格">
<el-input v-model="form.point_code" style="width: 200px;"/>
<el-input v-model="form.point_code" style="width: 200px;" />
</el-form-item>
<el-form-item label="物料批次">
<el-input v-model="form.point_name" style="width: 200px;"/>
<el-input v-model="form.point_name" style="width: 200px;" />
</el-form-item>
<el-form-item label="库存量">
<el-input v-model="form.point_type_name" style="width: 200px;"/>
<el-input v-model="form.point_type_name" style="width: 200px;" />
</el-form-item>
<el-form-item label="计量单位">
<el-input v-model="form.point_status_name" style="width: 200px;"/>
<el-input v-model="form.point_status_name" style="width: 200px;" />
</el-form-item>
<el-form-item label="入库时间">
<el-input v-model="form.lock_type_name" style="width: 200px;"/>
<el-input v-model="form.lock_type_name" style="width: 200px;" />
</el-form-item>
<el-form-item label="静置时间(分)">
<el-input v-model="form.lock_type_name" style="width: 200px;"/>
<el-input v-model="form.lock_type_name" style="width: 200px;" />
</el-form-item>
</el-form>
</el-card>
@@ -169,15 +169,15 @@
:highlight-current-row="true"
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
>
<el-table-column prop="device_code" label="设备编码" align="center"/>
<el-table-column prop="device_name" label="设备名称" align="center" min-width="200" show-overflow-tooltip/>
<el-table-column prop="produce_qty" label="生产数量" align="center"/>
<el-table-column prop="init_qty" label="期初数量" align="center"/>
<el-table-column prop="finish_qty" label="期末数量" align="center"/>
<el-table-column prop="finishproduct_qty" label="完成数量" align="center"/>
<el-table-column prop="operatetime_start" label="开始时间" align="center" min-width="130" show-overflow-tooltip/>
<el-table-column prop="operatetime_end" label="结束时间" align="center" min-width="130" show-overflow-tooltip/>
<el-table-column prop="nick_name" label="操作人" align="center"/>
<el-table-column prop="device_code" label="设备号" align="center" />
<el-table-column prop="device_name" label="设备名称" align="center" min-width="200" show-overflow-tooltip />
<el-table-column prop="produce_qty" label="生产数量" align="center" />
<el-table-column prop="init_qty" label="期初数量" align="center" />
<el-table-column prop="finish_qty" label="期末数量" align="center" />
<el-table-column prop="finishproduct_qty" label="完成数量" align="center" />
<el-table-column prop="operatetime_start" label="开始时间" align="center" min-width="130" show-overflow-tooltip />
<el-table-column prop="operatetime_end" label="结束时间" align="center" min-width="130" show-overflow-tooltip />
<el-table-column prop="nick_name" label="操作人" align="center" />
</el-table>
</el-card>
<!--<span slot="footer" class="dialog-footer">
@@ -217,7 +217,7 @@ export default {
plan_qty: null,
real_qty: null,
material_id: null,
material_code: null,
material_number: null,
material_weight: null,
planproducestart_date: null,
planproduceend_date: null,

4
lms/nladmin-ui/src/views/wms/sch/point/WorkOrderDialog.vue
View File

@@ -47,10 +47,10 @@
<el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
</template>
</el-table-column>
<el-table-column prop="workorder_code" label="工单编号" width="120px"/>
<el-table-column prop="workorder_code" label="工单编号" width="120px" />
<el-table-column v-if="false" prop="material_id" label="物料标识" />
<el-table-column prop="device_name" label="设备" width="100" show-overflow-tooltip />
<el-table-column prop="material_code" label="物料编码" width="100" show-overflow-tooltip />
<el-table-column prop="material_number" label="物料号" width="100" show-overflow-tooltip />
<el-table-column prop="material_name" label="物料名称" width="100" show-overflow-tooltip />
<el-table-column prop="material_spec" label="物料规格" width="100" show-overflow-tooltip />
<el-table-column prop="vehicle_type" label="载具类型" min-width="120" show-overflow-tooltip>

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

@@ -10,11 +10,11 @@
label-width="90px"
label-suffix="："
>
<el-form-item label="编码/名称">
<el-form-item label="号/名称">
<el-input
v-model="query.name"
clearable
placeholder="编码/名称"
placeholder="号/名称"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
@@ -134,7 +134,7 @@
width="600px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="160px" label-suffix="：">
<el-form-item label="点位编码" prop="point_code">
<el-form-item label="点位号" prop="point_code">
<el-input v-model="form.point_code" :disabled="crud.status.edit" style="width: 300px" />
</el-form-item>
<el-form-item label="点位名称" prop="point_name">
@@ -218,8 +218,8 @@
/>
</el-select>
</el-form-item>
<el-form-item v-show="crud.status.edit" label="载具编码" prop="vehicle_code">
<el-input v-model="form.vehicle_code" placeholder="载具编码" clearable style="width: 300px" />
<el-form-item v-show="crud.status.edit" label="载具号" prop="vehicle_code">
<el-input v-model="form.vehicle_code" placeholder="载具号" clearable style="width: 300px" />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" style="width: 300px" rows="2" type="textarea" />
@@ -240,7 +240,7 @@
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55" />
<el-table-column prop="point_code" label="点位编码" :min-width="flexWidth('point_code',crud.data,'点位编码')" />
<el-table-column prop="point_code" label="点位号" :min-width="flexWidth('point_code',crud.data,'点位号')" />
<el-table-column prop="point_name" label="点位名称" :min-width="flexWidth('point_name',crud.data,'点位名称')" />
<el-table-column prop="region_name" label="所属区域" :min-width="flexWidth('region_name',crud.data,'所属区域')" />
<el-table-column prop="point_type_name" label="点位类型" :min-width="flexWidth('point_type_name',crud.data,'点位类型')" />
@@ -264,8 +264,8 @@
{{ dict.label.vehicle_type[scope.row.vehicle_type] }}
</template>
</el-table-column>
<el-table-column prop="vehicle_code" label="载具编码" :min-width="flexWidth('vehicle_code',crud.data,'载具编码')" />
<el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
<el-table-column prop="vehicle_code" label="载具号" :min-width="flexWidth('vehicle_code',crud.data,'载具号')" />
<el-table-column prop="material_number" label="物料号" :min-width="flexWidth('material_number',crud.data,'物料号')" />
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" show-overflow-tooltip />
<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,'创建时间')" />
@@ -310,7 +310,7 @@ const defaultForm = {
point_code: null,
point_name: null,
point_type: null,
point_status: '0',
point_status: '1',
lock_type: '1',
vehicle_code: null,
source_id: null,
@@ -365,7 +365,7 @@ export default {
deviceList: [],
rules: {
point_code: [
{ required: true, message: '点位编码不能为空', trigger: 'blur' }
{ required: true, message: '点位号不能为空', trigger: 'blur' }
],
point_name: [
{ required: true, message: '点位名称不能为空', trigger: 'blur' }

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

@@ -11,11 +11,11 @@
label-width="90px"
label-suffix="："
>
<el-form-item label="编码/名称">
<el-form-item label="号/名称">
<el-input
v-model="query.region_code"
clearable
placeholder="编码/名称"
placeholder="号/名称"
style="width: 180px;"
@keyup.enter.native="crud.toQuery"
/>
@@ -34,7 +34,7 @@
width="500px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="120px" label-suffix=":">
<el-form-item label="区域编码" prop="region_code">
<el-form-item label="区域号" prop="region_code">
<el-input v-model="form.region_code" clearable style="width: 300px;" />
</el-form-item>
<el-form-item label="区域名称" prop="region_name">
@@ -62,7 +62,7 @@
@selection-change="crud.selectionChangeHandler"
>
<el-table-column v-if="false" prop="region_id" label="区域标识" />
<el-table-column prop="region_code" label="区域编码" :min-width="flexWidth('region_code',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="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" show-overflow-tooltip />
@@ -129,7 +129,7 @@ export default {
permission: {},
rules: {
region_code: [
{ required: true, message: '区域编码不能为空', trigger: 'blur' }
{ required: true, message: '区域号不能为空', trigger: 'blur' }
],
region_name: [
{ required: true, message: '区域名称不能为空', trigger: 'blur' }

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

@@ -10,19 +10,19 @@
label-width="90px"
label-suffix="："
>
<el-form-item label="任务编码">
<el-form-item label="任务号">
<el-input
v-model="query.task_code"
clearable
placeholder="任务编码"
placeholder="任务号"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="载具编码">
<el-form-item label="载具号">
<el-input
v-model="query.vehicle_code"
clearable
placeholder="载具编码"
placeholder="载具号"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
@@ -81,9 +81,9 @@
<el-table-column type="selection" width="50" />
<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="flexWidth('task_code',crud.data,'任务编码')" />
<el-table-column prop="task_code" label="任务号" :min-width="flexWidth('task_code',crud.data,'任务号')" />
<el-table-column v-if="false" prop="task_type" label="任务类型" />
<el-table-column v-if="false" prop="acs_task_type" label="acs任务类型" min-width="120" show-overflow-tooltip >
<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>
@@ -101,8 +101,8 @@
{{ dict.label.vehicle_type[scope.row.vehicle_type] }}
</template>
</el-table-column>
<el-table-column prop="vehicle_code" label="载具编码" :min-width="flexWidth('vehicle_code',crud.data,'载具编码')" />
<el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
<el-table-column prop="vehicle_code" label="载具号" :min-width="flexWidth('vehicle_code',crud.data,'载具号')" />
<el-table-column prop="material_number" label="物料号" :min-width="flexWidth('material_number',crud.data,'物料号')" />
<!--<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" />

9
lms/nladmin-ui/src/views/wms/st/cppoint/cppInRegion.vue
View File

@@ -32,6 +32,7 @@
>
<el-option
v-for="item in dict.st_bill_status"
:key="item.value"
:label="item.label"
:value="item.value"
/>
@@ -65,7 +66,7 @@
<el-form-item label="批次">
<el-input v-model="form.pcsn" style="width: 370px;" />
</el-form-item>
<el-form-item label="载具编码">
<el-form-item label="载具号">
<el-input v-model="form.vehicle_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="数量">
@@ -74,10 +75,10 @@
<el-form-item label="单据状态" prop="bill_status">
<el-input v-model="form.bill_status" style="width: 370px;" />
</el-form-item>
<el-form-item label="起始点位编码">
<el-form-item label="起始点位号">
<el-input v-model="form.start_point_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="终点点位编码">
<el-form-item label="终点点位号">
<el-input v-model="form.end_point_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="起始区域">
@@ -102,7 +103,7 @@
</template>
</el-table-column>
<el-table-column prop="pcsn" label="批次" />
<el-table-column prop="vehicle_code" label="载具编码" show-overflow-tooltip />
<el-table-column prop="vehicle_code" label="载具号" show-overflow-tooltip />
<el-table-column prop="qty" label="数量" :formatter="crud.formatNum3" />
<el-table-column prop="bill_status" label="单据状态">
<template slot-scope="scope">

53
lms/nladmin-ui/src/views/wms/st/cppoint/cppInventory.vue
View File

@@ -10,23 +10,23 @@
label-width="90px"
label-suffix=":"
>
<el-form-item label="点位编码">
<el-form-item label="点位号">
<el-input
v-model="query.point_code"
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.material_code"
v-model="query.material_number"
clearable
size="mini"
style="width: 185px;"
placeholder="物料编码"
placeholder="物料号"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
@@ -42,6 +42,7 @@
>
<el-option
v-for="item in pointStatusList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
@@ -59,6 +60,7 @@
>
<el-option
v-for="item in dict.vehicle_type"
:key="item.value"
:label="item.label"
:value="item.value"
/>
@@ -106,6 +108,7 @@
>
<el-option
v-for="item in dict.d_lock_type"
:key="item.value"
:label="item.label"
:value="item.value"
/>
@@ -137,7 +140,7 @@
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" >
<crudOperation :permission="permission">
<el-button
slot="right"
class="filter-item"
@@ -156,7 +159,8 @@
type="primary"
icon="el-icon-s-promotion"
size="mini"
@click="changeShowTab">
@click="changeShowTab"
>
编辑
</el-button>
<el-button
@@ -167,15 +171,16 @@
icon="el-icon-s-promotion"
size="mini"
:disabled="crud.selections.length === 0"
@click="doEdit(crud.data)">
@click="doEdit(crud.data)"
>
保存
</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="550px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="120px">
<el-form-item label="点位编码" prop="standing_time">
<el-input v-model="form.point_code" style="width: 370px;" :disabled="true"/>
<el-form-item label="点位号" prop="stand_time">
<el-input v-model="form.point_code" style="width: 370px;" :disabled="true" />
</el-form-item>
<el-form-item label="托盘类型">
<el-select
@@ -188,6 +193,7 @@
>
<el-option
v-for="item in dict.vehicle_type"
:key="item.value"
:label="item.label"
:value="item.value"
/>
@@ -204,6 +210,7 @@
>
<el-option
v-for="item in dict.d_lock_type"
:key="item.value"
:label="item.label"
:value="item.value"
/>
@@ -218,23 +225,23 @@
<!--表格渲染-->
<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 prop="region_name" label="区域名称" min-width="120" show-overflow-tooltip/>
<el-table-column 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">
<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>
<el-input v-show="!showTab" v-model="scope.row.ivt_qty" type="text" />
<span v-show="showTab">{{ scope.row.ivt_qty }}</span>
</template>
</el-table-column>
<el-table-column prop="material_code" label="物料编码" >
<el-table-column prop="material_number" 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>
<el-input v-show="!showTab" v-model="scope.row.material_number" type="text" />
<span v-show="showTab">{{ scope.row.material_number }}</span>
</template>
</el-table-column>
<el-table-column prop="material_name" label="物料名称" min-width="120"/>
<el-table-column prop="instorage_time" label="入库时间" min-width="150" show-overflow-tooltip/>
<el-table-column prop="material_name" label="物料名称" min-width="120" />
<el-table-column prop="instorage_time" label="入库时间" min-width="150" show-overflow-tooltip />
<el-table-column prop="point_status_name" label="点位状态" width="120">
<template slot-scope="scope">
<el-select
@@ -246,11 +253,12 @@
>
<el-option
v-for="item in pointStatusList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
<span v-show="showTab">{{scope.row.point_status_name}}</span>
<span v-show="showTab">{{ scope.row.point_status_name }}</span>
</template>
</el-table-column>
<el-table-column prop="vehicle_type" label="托盘类型" min-width="100">
@@ -259,7 +267,7 @@
</template>
</el-table-column>
<el-table-column prop="remark" label="备注" />
<el-table-column prop="is_used" label="是否启用" >
<el-table-column prop="is_used" label="是否启用">
<template slot-scope="scope">
<el-switch
v-show="!showTab"
@@ -275,14 +283,15 @@
<el-table-column prop="lock_type" label="锁定类型" width="120">
<template slot-scope="scope">
<el-select
v-model="scope.row.lock_type"
v-show="!showTab"
v-model="scope.row.lock_type"
clearable
filterable
size="mini"
>
<el-option
v-for="item in dict.d_lock_type"
:key="item.value"
:label="item.label"
:value="item.value"
/>

11
lms/nladmin-ui/src/views/wms/st/cppoint/cppOutRegion.vue
View File

@@ -32,6 +32,7 @@
>
<el-option
v-for="item in dict.st_bill_status"
:key="item.value"
:label="item.label"
:value="item.value"
/>
@@ -52,7 +53,7 @@
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" >
<crudOperation :permission="permission">
<el-button
slot="right"
class="filter-item"
@@ -77,7 +78,7 @@
<el-form-item label="批次">
<el-input v-model="form.pcsn" style="width: 370px;" />
</el-form-item>
<el-form-item label="载具编码">
<el-form-item label="载具号">
<el-input v-model="form.vehicle_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="数量">
@@ -86,10 +87,10 @@
<el-form-item label="单据状态" prop="bill_status">
<el-input v-model="form.bill_status" style="width: 370px;" />
</el-form-item>
<el-form-item label="起始点位编码">
<el-form-item label="起始点位号">
<el-input v-model="form.start_point_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="终点点位编码">
<el-form-item label="终点点位号">
<el-input v-model="form.end_point_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="起始区域">
@@ -114,7 +115,7 @@
</template>
</el-table-column>
<el-table-column prop="pcsn" label="批次" />
<el-table-column prop="vehicle_code" label="载具编码" show-overflow-tooltip />
<el-table-column prop="vehicle_code" label="载具号" show-overflow-tooltip />
<el-table-column prop="qty" label="数量" :formatter="crud.formatNum3" />
<el-table-column prop="bill_status" label="单据状态">
<template slot-scope="scope">

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

@@ -10,23 +10,23 @@
label-width="90px"
label-suffix=":"
>
<el-form-item label="点位编码">
<el-form-item label="点位号">
<el-input
v-model="query.point_code"
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.material_code"
v-model="query.material_number"
clearable
size="mini"
style="width: 185px;"
placeholder="物料编码"
placeholder="物料号"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
@@ -42,6 +42,7 @@
>
<el-option
v-for="item in pointStatusList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
@@ -59,6 +60,7 @@
>
<el-option
v-for="item in dict.vehicle_type"
:key="item.value"
:label="item.label"
:value="item.value"
/>
@@ -106,6 +108,7 @@
>
<el-option
v-for="item in dict.d_lock_type"
:key="item.value"
:label="item.label"
:value="item.value"
/>
@@ -144,7 +147,8 @@
type="primary"
icon="el-icon-s-promotion"
size="mini"
@click="changeShowTab">
@click="changeShowTab"
>
编辑
</el-button>
<el-button
@@ -155,14 +159,15 @@
icon="el-icon-s-promotion"
size="mini"
:disabled="crud.selections.length === 0"
@click="doEdit(crud.data)">
@click="doEdit(crud.data)"
>
保存
</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="550px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="120px">
<el-form-item label="点位编码" prop="standing_time">
<el-form-item label="点位号" prop="stand_time">
<el-input v-model="form.point_code" style="width: 370px;" :disabled="true" />
</el-form-item>
<el-form-item label="点位状态">
@@ -176,6 +181,7 @@
>
<el-option
v-for="item in pointStatusList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
@@ -192,13 +198,14 @@
>
<el-option
v-for="item in dict.vehicle_type"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="静置时间(min)" prop="standing_time">
<el-input v-model="form.standing_time" style="width: 370px;" />
<el-form-item label="静置时间(min)" prop="stand_time">
<el-input v-model="form.stand_time" style="width: 370px;" />
</el-form-item>
<el-form-item label="锁定类型">
<el-select
@@ -211,6 +218,7 @@
>
<el-option
v-for="item in dict.d_lock_type"
:key="item.value"
:label="item.label"
:value="item.value"
/>
@@ -225,23 +233,23 @@
<!--表格渲染-->
<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 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">
<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>
<el-input v-show="!showTab" v-model="scope.row.ivt_qty" type="text" />
<span v-show="showTab">{{ scope.row.ivt_qty }}</span>
</template>
</el-table-column>
<el-table-column prop="material_code" label="物料编码" >
<el-table-column prop="material_number" 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>
<el-input v-show="!showTab" v-model="scope.row.material_number" type="text" />
<span v-show="showTab">{{ scope.row.material_number }}</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="instorage_time" label="入库时间" min-width="150" show-overflow-tooltip />
<el-table-column prop="point_status" label="点位状态" width="120">
<template slot-scope="scope">
<el-select
@@ -253,24 +261,26 @@
>
<el-option
v-for="item in pointStatusList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
<span v-show="showTab">{{scope.row.point_status_name}}</span>
<span v-show="showTab">{{ scope.row.point_status_name }}</span>
</template>
</el-table-column>
<el-table-column prop="lock_type" label="锁定类型" width="120">
<template slot-scope="scope">
<el-select
v-model="scope.row.lock_type"
v-show="!showTab"
v-model="scope.row.lock_type"
clearable
filterable
size="mini"
>
<el-option
v-for="item in dict.d_lock_type"
:key="item.value"
:label="item.label"
:value="item.value"
/>
@@ -302,6 +312,7 @@
>
<el-option
v-for="item in dict.vehicle_type"
:key="item.value"
:label="item.label"
:value="item.value"
/>
@@ -310,7 +321,7 @@
</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 prop="stand_time" label="静置时间(min)" min-width="120" />
</el-table>
<!--分页组件-->
<pagination />
@@ -323,14 +334,13 @@ 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 }
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, stand_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() {

9
lms/nladmin-ui/src/views/wms/st/ysa/ysqInRegion.vue
View File

@@ -32,6 +32,7 @@
>
<el-option
v-for="item in dict.st_bill_status"
:key="item.value"
:label="item.label"
:value="item.value"
/>
@@ -65,7 +66,7 @@
<el-form-item label="批次">
<el-input v-model="form.pcsn" style="width: 370px;" />
</el-form-item>
<el-form-item label="载具编码">
<el-form-item label="载具号">
<el-input v-model="form.vehicle_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="数量">
@@ -74,10 +75,10 @@
<el-form-item label="单据状态" prop="bill_status">
<el-input v-model="form.bill_status" style="width: 370px;" />
</el-form-item>
<el-form-item label="起始点位编码">
<el-form-item label="起始点位号">
<el-input v-model="form.start_point_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="终点点位编码">
<el-form-item label="终点点位号">
<el-input v-model="form.end_point_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="起始区域">
@@ -102,7 +103,7 @@
</template>
</el-table-column>
<el-table-column prop="pcsn" label="批次" />
<el-table-column prop="vehicle_code" label="载具编码" show-overflow-tooltip />
<el-table-column prop="vehicle_code" label="载具号" show-overflow-tooltip />
<el-table-column prop="qty" label="数量" :formatter="crud.formatNum3" />
<el-table-column prop="bill_status" label="单据状态">
<template slot-scope="scope">

37
lms/nladmin-ui/src/views/wms/st/ysa/ysqOutRegion.vue
View File

@@ -32,6 +32,7 @@
>
<el-option
v-for="item in dict.st_bill_status"
:key="item.value"
:label="item.label"
:value="item.value"
/>
@@ -65,7 +66,7 @@
<el-form-item label="批次">
<el-input v-model="form.pcsn" style="width: 370px;" />
</el-form-item>
<el-form-item label="载具编码">
<el-form-item label="载具号">
<el-input v-model="form.vehicle_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="数量">
@@ -74,10 +75,10 @@
<el-form-item label="单据状态" prop="bill_status">
<el-input v-model="form.bill_status" style="width: 370px;" />
</el-form-item>
<el-form-item label="起始点位编码">
<el-form-item label="起始点位号">
<el-input v-model="form.start_point_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="终点点位编码">
<el-form-item label="终点点位号">
<el-input v-model="form.end_point_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="起始区域">
@@ -95,29 +96,29 @@
<!--表格渲染-->
<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="bill_code" label="单据编号" min-width="150"/>
<el-table-column prop="io_type" label="出入类型" >
<el-table-column prop="bill_code" label="单据编号" min-width="150" />
<el-table-column prop="io_type" label="出入类型">
<template slot-scope="scope">
{{ dict.label.io_type[scope.row.io_type] }}
</template>
</el-table-column>
<el-table-column prop="pcsn" label="批次" />
<el-table-column prop="vehicle_code" label="载具编码" show-overflow-tooltip/>
<el-table-column prop="qty" label="数量" :formatter="crud.formatNum3"/>
<el-table-column prop="bill_status" label="单据状态" >
<el-table-column prop="vehicle_code" label="载具号" show-overflow-tooltip />
<el-table-column prop="qty" label="数量" :formatter="crud.formatNum3" />
<el-table-column prop="bill_status" label="单据状态">
<template slot-scope="scope">
{{ dict.label.st_bill_status[scope.row.bill_status] }}
</template>
</el-table-column>
<el-table-column prop="start_point_code" label="起始点位编码" min-width="120"/>
<el-table-column prop="end_point_code" label="终点点位编码" min-width="120"/>
<!-- <el-table-column prop="start_region_id" label="起始区域" />-->
<!-- <el-table-column prop="end_region_id" label="终点区域" />-->
<el-table-column prop="start_point_code" label="起始点位号" min-width="120" />
<el-table-column prop="end_point_code" label="终点点位号" min-width="120" />
<!-- <el-table-column prop="start_region_id" label="起始区域" />-->
<!-- <el-table-column prop="end_region_id" label="终点区域" />-->
<el-table-column prop="remark" label="备注" />
<el-table-column prop="update_optname" label="修改人姓名" min-width="100"/>
<el-table-column prop="update_time" label="修改时间" min-width="140"/>
<el-table-column prop="confirm_optname" label="确认人姓名" min-width="100"/>
<el-table-column prop="confirm_time" label="确认时间" min-width="140"/>
<el-table-column prop="update_optname" label="修改人姓名" min-width="100" />
<el-table-column prop="update_time" label="修改时间" min-width="140" />
<el-table-column prop="confirm_optname" label="确认人姓名" min-width="100" />
<el-table-column prop="confirm_time" label="确认时间" min-width="140" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
@@ -135,7 +136,7 @@
<script>
import crudBill from '@/views/wms/st/regionio'
import CRUD, {crud, form, header, presenter} from '@crud/crud'
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'
@@ -174,7 +175,7 @@ export default {
bill_status: [
{ required: true, message: '单据状态不能为空', trigger: 'blur' }
]
} }
}}
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据