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

add 新增需求

Browse Source
This commit is contained in:
gengby
2023-04-23 17:14:57 +08:00
parent 4ba04da9c5
commit 821741ba84
30 changed files with 2552 additions and 1809 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
acs/nladmin-ui/src/views/acs/instruction/index.vue
View File

@@ -153,8 +153,9 @@
<el-table-column prop="weight" label="重量" />
<el-table-column prop="agv_jobno" label="AGV任务号" />
<el-table-column prop="agv_inst_type" label="AGV任务类型" />
<el-table-column prop="agv_system_type" label="AGV系统类型" >
</el-table-column>
<el-table-column prop="agv_system_type" label="AGV系统类型" />
<el-table-column prop="start_height" label="取货高度" />
<el-table-column prop="next_height" label="放货高度" />
<el-table-column prop="remark" label="描述" />
<el-table-column prop="create_by" label="创建者" />
<el-table-column prop="create_time" label="创建时间" width="135" />

54
acs/nladmin-ui/src/views/acs/task/index.vue
View File

@@ -300,6 +300,12 @@
<el-form-item label="载具号">
<el-input v-model="form.vehicle_code" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item v-if="form.task_type === '4'" label="取货高度" prop="start_height">
<el-input v-model="form.start_height" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item v-if="form.task_type === '4'" label="放货高度" prop="next_height">
<el-input v-model="form.next_height" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item label="描述信息" prop="description">
<el-input v-model="form.remark" style="width: 380px;" rows="5" type="textarea" @change="isDisabled=false" />
</el-form-item>
@@ -310,7 +316,14 @@
</div>
</el-dialog>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table
ref="table"
v-loading="crud.loading"
:data="crud.data"
size="small"
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="25" />
<el-table-column v-if="false" prop="task_id" label="任务标识" />
<el-table-column prop="task_code" label="任务号" width="100" />
@@ -343,10 +356,18 @@
{{ dict.label.storage_task_type[scope.row.storage_task_type] }}
</template>
</el-table-column>
<el-table-column prop="start_height" label="取货高度" />
<el-table-column prop="next_height" label="放货高度" />
<el-table-column prop="remark" label="备注" />
<el-table-column prop="create_by" label="创建者" />
<el-table-column prop="create_time" label="创建时间" width="135" />
<el-table-column v-permission="['admin','task:edit','task:del']" fixed="left" label="操作" width="50px" align="center">
<el-table-column
v-permission="['admin','task:edit','task:del']"
fixed="left"
label="操作"
width="50px"
align="center"
>
<template slot-scope="scope">
<el-dropdown trigger="click" @command="handleCommand">
<span class="el-dropdown-link">
@@ -382,7 +403,8 @@ export default {
dicts: ['task_status', 'task_type', 'agv_system_type', 'storage_task_type'],
mixins: [presenter(), header(), crud()],
cruds() {
return CRUD({ title: '任务', url: 'api/task', idField: 'task_id', sort: 'task_id,desc',
return CRUD({
title: '任务', url: 'api/task', idField: 'task_id', sort: 'task_id,desc',
optShow: {
add: false,
edit: true,
@@ -390,7 +412,8 @@ export default {
reset: false,
download: true
},
crudMethod: { ...crudTask }})
crudMethod: { ...crudTask }
})
},
data() {
const checkFromY = (rule, value, callback) => {
@@ -480,9 +503,17 @@ export default {
to_x: null,
to_y: null,
to_z: null,
agv_system_type: ''
agv_system_type: '',
next_height: '0',
start_height: '0'
},
rules: {
start_height: [
{ required: true, message: '起点高度不能为空', trigger: 'change' }
],
next_height: [
{ required: true, message: '终点高度不能为空', trigger: 'change' }
],
start_point_code: [
{ required: true, message: '起点不能为空', trigger: 'change' }
],
@@ -517,10 +548,14 @@ export default {
},
methods: {
saveBtn() {
crudTask.add(this.form).then(res => {
this.crud.toQuery()
this.formDia = false
this.isDisabled = true
this.$refs.form.validate((valid) => {
if (valid) {
crudTask.add(this.form).then(res => {
this.crud.toQuery()
this.formDia = false
this.isDisabled = true
})
}
})
},
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
@@ -684,6 +719,7 @@ export default {
cursor: pointer;
color: #409EFF;
}
.el-icon-arrow-down {
font-size: 12px;
}