rev 修改
This commit is contained in:
@@ -32,7 +32,7 @@
|
||||
style="width: 190px"
|
||||
@change="crud.toQuery"
|
||||
>
|
||||
<el-option v-for="item in dict.task_status" :key="item.id" :label="item.label" :value="item.value"/>
|
||||
<el-option v-for="item in dict.task_status" :key="item.id" :label="item.label" :value="item.value" />
|
||||
</el-select>
|
||||
<el-input
|
||||
v-model="query.point_code"
|
||||
@@ -53,9 +53,9 @@
|
||||
style="width: 190px"
|
||||
@change="crud.toQuery"
|
||||
>
|
||||
<el-option v-for="item in dict.task_type" :key="item.id" :label="item.label" :value="item.value"/>
|
||||
<el-option v-for="item in dict.task_type" :key="item.id" :label="item.label" :value="item.value" />
|
||||
</el-select>
|
||||
<rrOperation/>
|
||||
<rrOperation />
|
||||
</div>
|
||||
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
|
||||
<crudOperation :permission="permission">
|
||||
@@ -80,16 +80,16 @@
|
||||
>
|
||||
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
|
||||
<el-form-item label="起点">
|
||||
<el-input v-model="form.start_point_code" style="width: 370px;"/>
|
||||
<el-input v-model="form.start_point_code" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="终点">
|
||||
<el-input v-model="form.next_point_code" style="width: 370px;"/>
|
||||
<el-input v-model="form.next_point_code" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="载具号">
|
||||
<el-input v-model="form.vehicle_code" style="width: 370px;"/>
|
||||
<el-input v-model="form.vehicle_code" style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="描述信息" prop="description">
|
||||
<el-input v-model="form.remark" style="width: 380px;" rows="5" type="textarea"/>
|
||||
<el-input v-model="form.remark" style="width: 380px;" rows="5" type="textarea" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
@@ -106,10 +106,10 @@
|
||||
style="width: 100%;"
|
||||
@selection-change="crud.selectionChangeHandler"
|
||||
>
|
||||
<el-table-column type="selection" width="55"/>
|
||||
<el-table-column v-if="false" prop="instruction_id" label="指令标识"/>
|
||||
<el-table-column prop="task_code" label="任务号" show-overflow-tooltip width="100"/>
|
||||
<el-table-column prop="instruction_code" label="指令编号" show-overflow-tooltip width="100"/>
|
||||
<el-table-column type="selection" width="55" />
|
||||
<el-table-column v-if="false" prop="instruction_id" label="指令标识" />
|
||||
<el-table-column prop="task_code" label="任务号" show-overflow-tooltip width="100" />
|
||||
<el-table-column prop="instruction_code" label="指令编号" show-overflow-tooltip width="100" />
|
||||
<el-table-column prop="instruction_type" label="指令类型" show-overflow-tooltip width="100">
|
||||
<template slot-scope="scope">
|
||||
{{ dict.label.task_type[scope.row.instruction_type] }}
|
||||
@@ -120,27 +120,27 @@
|
||||
{{ dict.label.task_status[scope.row.instruction_status] }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="link_num" label="关联编号" show-overflow-tooltip width="100"/>
|
||||
<el-table-column prop="priority" label="优先级" show-overflow-tooltip width="100"/>
|
||||
<el-table-column prop="link_num" label="关联编号" show-overflow-tooltip width="100" />
|
||||
<el-table-column prop="priority" label="优先级" show-overflow-tooltip width="100" />
|
||||
<el-table-column prop="send_status" label="下发状态" show-overflow-tooltip width="100">
|
||||
<template slot-scope="scope">
|
||||
{{ dict.label.send_status[scope.row.send_status] }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="start_point_code" label="取货点" show-overflow-tooltip width="100"/>
|
||||
<el-table-column prop="next_point_code" label="放货点" show-overflow-tooltip width="100"/>
|
||||
<el-table-column prop="put_point_code" label="中转点" show-overflow-tooltip width="100"/>
|
||||
<el-table-column prop="start_point_code" label="取货点" show-overflow-tooltip width="100" />
|
||||
<el-table-column prop="next_point_code" label="放货点" show-overflow-tooltip width="100" />
|
||||
<el-table-column prop="put_point_code" label="中转点" show-overflow-tooltip width="100" />
|
||||
<el-table-column prop="execute_status" label="执行状态" show-overflow-tooltip width="100">
|
||||
<template slot-scope="scope">
|
||||
{{ dict.label.execute_status[scope.row.execute_status] }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="execute_device_code" label="当前执行设备" show-overflow-tooltip width="130"/>
|
||||
<el-table-column prop="vehicle_code" label="载具号" show-overflow-tooltip width="100"/>
|
||||
<el-table-column prop="quantity" label="物料数量" show-overflow-tooltip width="100"/>
|
||||
<el-table-column prop="weight" label="物料重量" show-overflow-tooltip width="100"/>
|
||||
<el-table-column prop="carno" label="车号" show-overflow-tooltip width="100"/>
|
||||
<el-table-column prop="agv_jobno" label="AGV任务号" show-overflow-tooltip width="120"/>
|
||||
<el-table-column prop="execute_device_code" label="当前执行设备" show-overflow-tooltip width="130" />
|
||||
<el-table-column prop="vehicle_code" label="载具号" show-overflow-tooltip width="100" />
|
||||
<el-table-column prop="quantity" label="物料数量" show-overflow-tooltip width="100" />
|
||||
<el-table-column prop="weight" label="物料重量" show-overflow-tooltip width="100" />
|
||||
<el-table-column prop="carno" label="车号" show-overflow-tooltip width="100" />
|
||||
<el-table-column prop="agv_jobno" label="AGV任务号" show-overflow-tooltip width="120" />
|
||||
<el-table-column prop="agv_system_type" label="AGV系统类型" show-overflow-tooltip width="130">
|
||||
<template slot-scope="scope">
|
||||
{{ dict.label.agv_system_type[scope.row.agv_system_type] }}
|
||||
@@ -151,9 +151,9 @@
|
||||
{{ dict.label.agv_inst_type[scope.row.agv_inst_type] }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="remark" label="描述" show-overflow-tooltip width="100"/>
|
||||
<el-table-column prop="create_by" label="创建者" show-overflow-tooltip width="100"/>
|
||||
<el-table-column prop="create_time" label="创建时间" show-overflow-tooltip width="150"/>
|
||||
<el-table-column prop="remark" label="描述" show-overflow-tooltip width="100" />
|
||||
<el-table-column prop="create_by" label="创建者" show-overflow-tooltip width="100" />
|
||||
<el-table-column prop="create_time" label="创建时间" show-overflow-tooltip width="150" />
|
||||
<el-table-column
|
||||
v-permission="['admin','instruction:edit','instruction:del']"
|
||||
fixed="left"
|
||||
@@ -164,7 +164,7 @@
|
||||
<template slot-scope="scope">
|
||||
<el-dropdown trigger="click" @command="handleCommand">
|
||||
<span class="el-dropdown-link">
|
||||
<i class="el-icon-menu"/>
|
||||
<i class="el-icon-menu" />
|
||||
</span>
|
||||
<el-dropdown-menu slot="dropdown">
|
||||
<el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'a')">完成</el-dropdown-item>
|
||||
@@ -177,7 +177,7 @@
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<!--分页组件-->
|
||||
<pagination/>
|
||||
<pagination />
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
Reference in New Issue
Block a user