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

LMS版本同步马钢版本

Browse Source
This commit is contained in:
psh
2023-09-26 18:53:45 +08:00
parent 0ab255caee
commit 8d4e6281b5
125 changed files with 786 additions and 11512 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -241,7 +241,7 @@ export default {
name: 'Menu',
components: { Treeselect, IconSelect, crudOperation, rrOperation, udOperation, DateRangePicker },
cruds() {
return CRUD({ title: '菜单', idField: 'menu_id', url: 'api/sysMenu', crudMethod: { ...crudMenu }, sort: 'menu_sort,asc' })
return CRUD({ title: '菜单', idField: 'menu_id', url: 'api/sysMenu', crudMethod: { ...crudMenu }})
},
mixins: [presenter(), header(), form(defaultForm), crud()],
dicts: ['system_type'],

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

@@ -73,13 +73,10 @@
<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="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
<el-table-column prop="half_material_code" label="半成品编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
<el-table-column prop="raw_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="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'物料规格')" />
<el-table-column prop="class_id" label="物料分类标识" :min-width="flexWidth('class_id',crud.data,'物料分类标识')" />
<el-table-column prop="standing_time" label="静置时间(分钟)" :min-width="flexWidth('standing_time',crud.data,'静置时间(分钟)')" />
<el-table-column prop="cooling_time" label="冷却时间(分钟)" :min-width="flexWidth('cooling_time',crud.data,'静置时间(分钟)')" />
<el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')" />
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
<el-table-column prop="is_used" label="是否启用" :min-width="flexWidth('is_used',crud.data,'是否启用')">
@@ -124,13 +121,10 @@ import pagination from '@crud/Pagination'
const defaultForm = {
material_id: null,
material_code: null,
half_material_code: null,
raw_material_code: null,
material_name: null,
material_spec: null,
class_id: null,
standing_time: null,
cooling_time: null,
workshop_code: null,
remark: null,
is_used: true,

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

@@ -60,19 +60,7 @@
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission">
<el-button
slot="right"
class="filter-item"
type="success"
icon="el-icon-position"
size="mini"
:disabled="!(crud.selections[0]) || crud.selections[1]"
@click="submits(crud.selections[0])"
>
开工
</el-button>
</crudOperation>
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog
:close-on-click-modal="false"
@@ -105,7 +93,7 @@
</el-select>
</el-form-item>
<el-form-item label="物料名称" prop="material_name">
<el-input v-model="form.material_name" style="width: 240px;" @focus="getMaterial(1)" />
<el-input v-model="form.material_name" style="width: 240px;" @focus="getMaterial" />
</el-form-item>
<el-form-item label="物料编码">
<el-input v-model="form.material_code" style="width: 240px;" disabled />
@@ -120,12 +108,6 @@
style="width: 240px;"
/>
</el-form-item>
<el-form-item label="半成品编码" prop="material_name">
<el-input v-model="form.half_material_code" style="width: 240px;" disabled />
</el-form-item>
<el-form-item label="原料编码">
<el-input v-model="form.raw_material_code" style="width: 240px;" disabled />
</el-form-item>
<el-form-item label="计划开始时间" prop="planproducestart_date">
<el-date-picker
v-model="form.planproducestart_date"
@@ -284,11 +266,9 @@
<el-table-column prop="region_name" label="区域名称" :min-width="flexWidth('region_name',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="material_code" label="成品编码" :min-width="flexWidth('material_name',crud.data,'物料标识')" />
<el-table-column prop="half_material_code" label="半成品编码" :min-width="flexWidth('half_material_code',crud.data,'半成品编码')" />
<el-table-column prop="raw_material_code" label="泥料编码" :min-width="flexWidth('raw_material_code',crud.data,'物料标识')" />
<el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_name',crud.data,'物料标识')" />
<el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料标识')" />
<el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'物料标识')" />
<el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_name',crud.data,'物料标识')" />
<el-table-column prop="vehicle_type" label="载具类型" :min-width="flexWidth('vehicle_type',crud.data,'载具类型', 20)">
<template slot-scope="scope">
{{ dict.label.vehicle_type[scope.row.vehicle_type] }}
@@ -352,7 +332,7 @@
<!--分页组件-->
<pagination />
</div>
<MaterialDialog :dialog-show.sync="materialDialog" :flag="flag" @tableChanged="tableChanged" />
<MaterialDialog :dialog-show.sync="materialDialog" @tableChanged="tableChanged" />
</div>
</template>
@@ -375,8 +355,6 @@ const defaultForm = {
plan_qty: null,
real_qty: null,
material_id: null,
half_material_code: null,
raw_material_code: null,
vehicle_type: null,
planproducestart_date: null,
planproduceend_date: null,
@@ -447,8 +425,7 @@ export default {
regionList: [],
pointList: [],
regionCodeParam: null,
materialDialog: false,
flag: 1
materialDialog: false
}
},
created() {
@@ -487,23 +464,14 @@ export default {
})
}
},
getMaterial(flag) {
getMaterial() {
this.materialDialog = true
this.flag = flag
},
tableChanged(row, flag) {
if (flag === 1) {
this.form.material_name = row.material_name
this.form.material_id = row.material_id
this.form.material_spec = row.material_spec
this.form.material_code = row.material_code
this.form.half_material_code = row.half_material_code
this.form.raw_material_code = row.raw_material_code
} else {
this.form.raw_material_name = row.material_name
this.form.raw_material_id = row.material_id
this.form.raw_material_code = row.material_code
}
tableChanged(row) {
this.form.material_name = row.material_name
this.form.material_id = row.material_id
this.form.material_spec = row.material_spec
this.form.material_code = row.material_code
},
setRegionName(data) {
// 清空
@@ -524,13 +492,6 @@ export default {
this.crud.query.more_order_status = value.toString()
}
this.crud.toQuery()
},
// 下发
submits(row) {
crudPdmBdWorkorder.submits(row).then(res => {
this.crud.notify('下发成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})
}
}
}

10
lms/nladmin-ui/src/views/wms/pdm/workerorder/pdmBdWorkorder.js
View File

@@ -24,12 +24,4 @@ export function edit(data) {
})
}
export function submits(param) {
return request({
url: 'api/pdmBdWorkorder/submits',
method: 'post',
data: param
})
}
export default { add, edit, del, submits }
export default { add, edit, del }

16
lms/nladmin-ui/src/views/wms/sch/group/MaterialDialog.vue
View File

@@ -55,8 +55,6 @@
</template>
</el-table-column>
<el-table-column prop="material_code" label="物料编码" width="160" />
<el-table-column prop="half_material_code" label="半成品编码" width="160" />
<el-table-column prop="raw_material_code" label="泥料编码" width="160" />
<el-table-column prop="material_name" label="物料名称" width="180" show-overflow-tooltip />
<el-table-column prop="material_spec" label="物料规格" width="140" />
<!-- <el-table-column prop="class_name" label="物料分类" width="140" />-->
@@ -103,10 +101,6 @@ export default {
isSingle: {
type: Boolean,
default: true
},
flag: {
type: Number,
default: 1
}
},
data() {
@@ -149,7 +143,7 @@ export default {
// 处理单选
if (this.isSingle && this.tableRadio) {
this.$emit('update:dialogShow', false)
this.$emit('tableChanged', this.tableRadio, this.flag)
this.$emit('tableChanged', this.tableRadio)
return
}
this.rows = this.$refs.table.selection
@@ -159,14 +153,14 @@ export default {
}
this.crud.resetQuery(false)
this.$emit('update:dialogShow', false)
this.$emit('tableChanged', this.rows, this.flag)
this.$emit('tableChanged', this.rows)
}
}
}
</script>
<style rel="stylesheet/scss" lang="scss" scoped>
::v-deep .el-dialog__body {
padding-top: 0px;
}
::v-deep .el-dialog__body {
padding-top: 0px;
}
</style>

6
lms/nladmin-ui/src/views/wms/sch/group/WorkOrderDialog.vue
View File

@@ -146,8 +146,8 @@ export default {
}
</script>
<style rel="stylesheet/scss" lang="scss" scoped>
::v-deep .el-dialog__body {
padding-top: 0px;
}
::v-deep .el-dialog__body {
padding-top: 0px;
}
</style>

26
lms/nladmin-ui/src/views/wms/sch/group/index.vue
View File

@@ -198,12 +198,12 @@
<el-form-item label="流程顺序">
<el-input v-model="form.flow_num" style="width: 240px;" />
</el-form-item>
<!-- <el-form-item label="上一任务">-->
<!-- <el-input v-model="form.before_task_code" style="width: 240px;" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="下一任务">-->
<!-- <el-input v-model="form.next_task_code" style="width: 240px;" />-->
<!-- </el-form-item>-->
<el-form-item label="上一任务">
<el-input v-model="form.before_task_code" style="width: 240px;" />
</el-form-item>
<el-form-item label="下一任务">
<el-input v-model="form.next_task_code" style="width: 240px;" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
<el-input v-model.trim="form.remark" style="width: 480px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
@@ -221,9 +221,8 @@
<!-- <el-table-column prop="child_vehicle_code" label="子载具编码" :min-width="flexWidth('child_vehicle_code',crud.data,'子载具编码')"/>-->
<el-table-column prop="source_vehicle_code" label="来源载具" :min-width="flexWidth('source_vehicle_code',crud.data,'来源载具')" />
<el-table-column prop="region_name" label="所属区域" :min-width="flexWidth('region_name',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="move_way" label="移动路径" :min-width="flexWidth('move_way',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="is_full" label="是否满托" :min-width="flexWidth('is_full',crud.data,'是否满托')">
<template slot-scope="scope">
{{ scope.row.is_full?'是':'否' }}
@@ -254,10 +253,8 @@
<!-- <el-table-column prop="is_first_flow_task" label="是否首个流程任务" :min-width="flexWidth('is_first_flow_task',crud.data,'是否首个流程任务')"/>-->
<!-- <el-table-column prop="flow_code" label="流程编码" :min-width="flexWidth('flow_code',crud.data,'流程编码')"/>-->
<!-- <el-table-column prop="flow_num" label="流程顺序" :min-width="flexWidth('flow_num',crud.data,'流程顺序')"/>-->
<el-table-column prop="into_kiln_time" label="入窑时间" :min-width="flexWidth('into_kiln_time',crud.data,'上一任务')" />
<el-table-column prop="out_kiln_time" label="出窑时间" :min-width="flexWidth('out_kiln_time',crud.data,'上一任务')" />
<!-- <el-table-column prop="before_task_code" label="上一任务" :min-width="flexWidth('before_task_code',crud.data,'上一任务')" />-->
<!-- <el-table-column prop="next_task_code" label="下一任务" :min-width="flexWidth('next_task_code',crud.data,'上一任务')" />-->
<el-table-column prop="before_task_code" label="上一任务" :min-width="flexWidth('before_task_code',crud.data,'上一任务')" />
<el-table-column prop="next_task_code" label="下一任务" :min-width="flexWidth('next_task_code',crud.data,'上一任务')" />
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
<el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
<el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
@@ -299,7 +296,6 @@ const defaultForm = {
material_id: null,
child_vehicle_code: null,
source_vehicle_code: null,
move_way: null,
point_code: null,
point_name: null,
is_full: true,
@@ -324,8 +320,6 @@ const defaultForm = {
before_task_code: null,
next_task_code: null,
remark: null,
out_kiln_time: null,
into_kiln_time: null,
is_delete: false
}
export default {

6
lms/nladmin-ui/src/views/wms/sch/point/PointDialog.vue
View File

@@ -165,8 +165,8 @@ export default {
}
</script>
<style rel="stylesheet/scss" lang="scss" scoped>
::v-deep .el-dialog__body {
padding-top: 0px;
}
::v-deep .el-dialog__body {
padding-top: 0px;
}
</style>

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

@@ -211,16 +211,6 @@
<el-form-item v-if="form.point_status !== '1'" label="载具编码" prop="vehicle_code">
<el-input v-model="form.vehicle_code" clearable style="width: 370px;" />
</el-form-item>
<el-form-item v-if="form.point_status !== '1'" label="载具类型" prop="vehicle_code">
<el-select v-model="form.vehicle_type" placeholder="请选择" clearable style="width: 370px;">
<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="可放载具类型" prop="can_vehicle_types">
<el-select v-model="form.can_vehicle_types" multiple placeholder="请选择" clearable style="width: 370px;">
<el-option
@@ -484,7 +474,7 @@ export default {
})
},
showButton(point_status) {
if (point_status && (point_status === '2' || point_status === '3')) {
if (point_status && point_status === '2') {
return true
}
return false

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

@@ -63,7 +63,7 @@
</el-select>
</el-form-item>
<el-form-item label="区域编码">
<el-input v-model="form.region_code" style="width: 370px;" />
<el-input v-model="form.region_code" style="width: 370px;" :disabled="crud.status.edit===1" />
</el-form-item>
<el-form-item label="区域名称">
<el-input v-model="form.region_name" style="width: 370px;" />

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

@@ -423,8 +423,8 @@ export default {
return CRUD({
title: '任务配置',
url: 'api/schBaseTaskconfig',
idField: 'config_code',
sort: 'config_code,desc',
idField: 'config_id',
sort: 'config_id,desc',
optShow: {
add: true,
edit: false,

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

@@ -109,9 +109,9 @@
<el-form-item label="载具编码">
<el-input v-model="form.vehicle_code" style="width: 240px;" />
</el-form-item>
<el-form-item label="优先级">
<el-input v-model="form.priority" style="width: 240px;" />
</el-form-item>
<!-- <el-form-item label="优先级">-->
<!-- <el-input v-model="form.priority" style="width: 240px;" />-->
<!-- </el-form-item>-->
<el-form-item v-if="false" label="处理类">
<el-input v-model="form.handle_class" style="width: 240px;" />
</el-form-item>
@@ -170,11 +170,15 @@
</el-table-column>
<el-table-column prop="remark" label="提示信息" :min-width="flexWidth('remark',crud.data,'提示信息')" />
<el-table-column prop="config_code" label="配置编码" :min-width="flexWidth('config_code',crud.data,'配置编码')" />
<el-table-column prop="point_code1" label="起点" :min-width="flexWidth('point_code1',crud.data,'点位1')" />
<el-table-column prop="point_code2" label="终点" :min-width="flexWidth('point_code2',crud.data,'点位2')" />
<el-table-column prop="point_code3" label="点位3" :min-width="flexWidth('point_code3',crud.data,'点位3')" />
<el-table-column prop="point_code4" label="点位4" :min-width="flexWidth('point_code4',crud.data,'点位4')" />
<el-table-column prop="vehicle_type" label="载具类型" :min-width="flexWidth('vehicle_type',crud.data,'载具类型')" />
<el-table-column prop="point_code1" label="起点1" :min-width="flexWidth('point_code1',crud.data,'点位1')" />
<el-table-column prop="point_code2" label="终点1" :min-width="flexWidth('point_code2',crud.data,'点位2')" />
<el-table-column prop="point_code3" label="起点2" :min-width="flexWidth('point_code3',crud.data,'点位3')" />
<el-table-column prop="point_code4" label="终点2" :min-width="flexWidth('point_code4',crud.data,'点位4')" />
<el-table-column prop="vehicle_type" label="载具类型" :min-width="flexWidth('vehicle_type',crud.data,'载具类型', 20)">
<template slot-scope="scope">
{{ dict.label.vehicle_type[scope.row.vehicle_type] }}
</template>
</el-table-column>
<el-table-column prop="vehicle_qty" label="载具数量" :min-width="flexWidth('vehicle_qty',crud.data,'载具数量')" />
<el-table-column prop="priority" label="优先级" :min-width="flexWidth('priority',crud.data,'优先级')" />
<el-table-column v-if="false" prop="handle_class" label="处理类" :min-width="flexWidth('handle_class',crud.data,'处理类')" />
@@ -183,7 +187,11 @@
<el-table-column prop="task_group_id" label="任务组标识" :min-width="flexWidth('task_group_id',crud.data,'任务组标识')" />
<el-table-column prop="task_group_seq" label="任务组顺序号" :min-width="flexWidth('task_group_seq',crud.data,'任务组顺序号')" />
<el-table-column prop="finished_type" label="任务完成类型" :min-width="flexWidth('finished_type',crud.data,'任务完成类型')" />
<el-table-column prop="create_mode" label="生成方式" :min-width="flexWidth('create_mode',crud.data,'生成方式')" />
<el-table-column prop="create_mode" label="生成方式" :min-width="flexWidth('create_mode',crud.data,'生成方式')">
<template slot-scope="scope">
{{ dict.label.create_mode[scope.row.create_mode] }}
</template>
</el-table-column>
<el-table-column prop="acs_trace_id" label="链路标识" :min-width="flexWidth('acs_trace_id',crud.data,'链路标识')" />
<el-table-column prop="request_param" label="生成任务的请求参数" :min-width="flexWidth('request_param',crud.data,'生成任务的请求参数')" />
<el-table-column prop="response_param" label="下发任务的请求参数" :min-width="flexWidth('response_param',crud.data,'下发任务的请求参数')" />
@@ -257,6 +265,7 @@ const defaultForm = {
}
export default {
name: 'Task',
dicts: ['vehicle_type', 'create_mode'],
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
@@ -333,7 +342,8 @@ export default {
}
const data = {
task_code: row.task_code,
method_name: method_name
method_name: method_name,
config_code: row.config_code
}
crudSchBaseTask.operation(data).then(res => {
this.crud.toQuery()

2
lms/nladmin-ui/vue.config.js
View File

@@ -19,8 +19,6 @@ module.exports = {
lintOnSave: process.env.NODE_ENV === 'development',
productionSourceMap: false,
devServer: {
allowedHosts: ['all'],
disableHostCheck: true,
port: port,
open: false,
overlay: {