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

rev 修改

Browse Source
This commit is contained in:
gengby
2023-04-06 10:40:52 +08:00
parent eda9ba4614
commit a2a817ad24
12 changed files with 171 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
wcs/nladmin-ui/src/views/acs/device/config.vue
View File

@@ -22,13 +22,13 @@
:value="item.value"
/>
</el-select>
<span style="color: #C0C0C0;margin-left: 10px;"/>
<span style="color: #C0C0C0;margin-left: 10px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="设备编号" prop="device_code">
<el-input v-model="form.device_code" disabled/>
<span style="color: #C0C0C0;margin-left: 10px;"/>
<el-input v-model="form.device_code" disabled />
<span style="color: #C0C0C0;margin-left: 10px;" />
</el-form-item>
</el-col>
</el-row>
@@ -36,8 +36,8 @@
<el-row>
<el-col :span="12">
<el-form-item label="设备名称" prop="device_name">
<el-input v-model="form.device_name" disabled/>
<span style="color: #C0C0C0;margin-left: 10px;"/>
<el-input v-model="form.device_name" disabled />
<span style="color: #C0C0C0;margin-left: 10px;" />
</el-form-item>
</el-col>
<el-col :span="12">
@@ -63,7 +63,7 @@
</el-col>
<!-- 组件-->
<component :is="currentComponent" :parent-form="form"/>
<component :is="currentComponent" :parent-form="form" />
</el-row>
</div>
@@ -80,7 +80,7 @@ import standard_manipulator_inspect_site from './driver/standard_manipulator_ins
import standard_special_inspect_site from './driver/standard_special_inspect_site'
import special_ordinary_site from './driver/special_ordinary_site'
import standard_conveyor_control_with_plcscanner
from '@/views/acs/device/driver/standard_conveyor_control_with_plcscanner'
from '@/views/acs/device/driver/standard_conveyor_control_with_plcscanner'
import non_line_manipulator_inspect_site from '@/views/acs/device/driver/non_line_manipulator_inspect_site'
import non_line_inspect_site from '@/views/acs/device/driver/non_line_inspect_site'
import manipulator_inspect_site_NDC from '@/views/acs/device/driver/manipulator_inspect_site_NDC'
@@ -108,7 +108,7 @@ import hailiang_auto_cache_line from '@/views/acs/device/driver/hailiang_one/hai
import hailiang_cleaning_feeding_line from '@/views/acs/device/driver/hailiang_one/hailiang_cleaning_feeding_line'
import hailiang_cleaning_machine from '@/views/acs/device/driver/hailiang_one/hailiang_cleaning_machine'
import hailiang_cleaning_machine_storage_station
from '@/views/acs/device/driver/hailiang_one/hailiang_cleaning_machine_storage_station'
from '@/views/acs/device/driver/hailiang_one/hailiang_cleaning_machine_storage_station'
import agv_ndc_one from '@/views/acs/device/driver/agv/agv_ndc_one'
import agv_ndc_two from '@/views/acs/device/driver/agv/agv_ndc_two'
import hailiang_xj_plc_test from '@/views/acs/device/driver/hailiang_one/hailiang_xj_plc_test'

8
wcs/nladmin-ui/src/views/acs/device/driver/hailiang_one/hailiang_old_special_device.vue
View File

@@ -86,15 +86,17 @@
<el-col :span="8">
<el-form-item label="满料框数量" prop="one_qty">
<el-input
type="number"
v-model="form.one_qty"
oninput="value = value.replace(/[^\d]/g, '')"/>
type="number"
oninput="value = value.replace(/[^\d]/g, '')"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="ip地址" prop="ip_address">
<el-input
v-model="form.ip_address"/>
v-model="form.ip_address"
/>
</el-form-item>
</el-col>
</el-row>

4
wcs/nladmin-ui/src/views/acs/device/driver/hailiang_one/hailiang_old_special_pick_station.vue
View File

@@ -85,8 +85,8 @@
</el-col>
<el-col :span="8">
<el-form-item label="满框数量" prop="full_num">
<el-input type="number" oninput="value = value.replace(/[^\d]/g, '')" v-model="form.full_num" />
</el-form-item>
<el-input v-model="form.full_num" type="number" oninput="value = value.replace(/[^\d]/g, '')" />
</el-form-item>
</el-col>
</el-row>
</el-form>

4
wcs/nladmin-ui/src/views/acs/device/driver/hailiang_one/hailiang_old_special_pour_station.vue
View File

@@ -85,12 +85,12 @@
</el-col>
<el-col :span="8">
<el-form-item label="最大数量" prop="max_num">
<el-input type="number" oninput="value = value.replace(/[^\d]/g, '')" v-model="form.max_num" />
<el-input v-model="form.max_num" type="number" oninput="value = value.replace(/[^\d]/g, '')" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="最小数量" prop="min_num" label-width="100px">
<el-input type="number" oninput="value = value.replace(/[^\d]/g, '')" v-model="form.min_num" />
<el-input v-model="form.min_num" type="number" oninput="value = value.replace(/[^\d]/g, '')" />
</el-form-item>
</el-col>
</el-row>

18
wcs/nladmin-ui/src/views/acs/history/deviceErrorInfo/index.vue
View File

@@ -31,10 +31,10 @@
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
<rrOperation :crud="crud"/>
<rrOperation :crud="crud" />
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission"/>
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog
:close-on-click-modal="false"
@@ -43,7 +43,7 @@
:title="crud.status.title"
width="500px"
>
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px"/>
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px" />
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
@@ -58,11 +58,11 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55"/>
<el-table-column prop="device_code" label="设备编码"/>
<el-table-column prop="error_code" label="报警编码"/>
<el-table-column prop="error_info" label="报警信息"/>
<el-table-column prop="error_time" label="报警时间"/>
<el-table-column type="selection" width="55" />
<el-table-column prop="device_code" label="设备编码" />
<el-table-column prop="error_code" label="报警编码" />
<el-table-column prop="error_info" label="报警信息" />
<el-table-column prop="error_time" label="报警时间" />
<el-table-column
v-permission="['admin','acsDeviceErrorLog:edit','acsDeviceErrorLog:del']"
label="操作"
@@ -79,7 +79,7 @@
</el-table-column>
</el-table>
<!--分页组件-->
<pagination/>
<pagination />
</div>
</div>
</template>

50
wcs/nladmin-ui/src/views/acs/history/instRecord/index.vue
View File

@@ -32,7 +32,7 @@
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>
<el-select
v-model="query.status"
@@ -44,7 +44,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"
@@ -55,10 +55,10 @@
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
<Search/>
<Search />
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission"/>
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog
:close-on-click-modal="false"
@@ -69,16 +69,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">
@@ -95,9 +95,9 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column v-if="false" prop="instruction_id" label="指令标识"/>
<el-table-column prop="instruction_code" label="指令编号" show-overflow-tooltip width="100"/>
<el-table-column prop="task_code" label="任务号" show-overflow-tooltip width="100"/>
<el-table-column v-if="false" prop="instruction_id" label="指令标识" />
<el-table-column prop="instruction_code" label="指令编号" show-overflow-tooltip width="100" />
<el-table-column prop="task_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] }}
@@ -108,12 +108,12 @@
{{ dict.label.task_status[scope.row.instruction_status] }}
</template>
</el-table-column>
<el-table-column prop="link_num" show-overflow-tooltip label="关联编号" 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="vehicle_code" label="载具号" show-overflow-tooltip width="100"/>
<el-table-column prop="carno" label="车号" show-overflow-tooltip width="100"/>
<el-table-column prop="link_num" show-overflow-tooltip label="关联编号" 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="vehicle_code" label="载具号" show-overflow-tooltip width="100" />
<el-table-column prop="carno" label="车号" show-overflow-tooltip width="100" />
<el-table-column prop="agv_system_type" label="AGV系统类型" show-overflow-tooltip width="150">
<template slot-scope="scope">
{{ dict.label.agv_system_type[scope.row.agv_system_type] }}
@@ -124,16 +124,16 @@
{{ dict.label.agv_inst_type[scope.row.agv_inst_type] }}
</template>
</el-table-column>
<el-table-column prop="weight" label="物料重量" show-overflow-tooltip width="100"/>
<el-table-column prop="quantity" label="物料数量" show-overflow-tooltip width="100"/>
<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="135"/>
<el-table-column prop="update_by" label="修改者" show-overflow-tooltip width="100"/>
<el-table-column prop="update_time" label="修改时间" width="135"/>
<el-table-column prop="weight" label="物料重量" show-overflow-tooltip width="100" />
<el-table-column prop="quantity" label="物料数量" show-overflow-tooltip width="100" />
<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="135" />
<el-table-column prop="update_by" label="修改者" show-overflow-tooltip width="100" />
<el-table-column prop="update_time" label="修改时间" width="135" />
</el-table>
<!--分页组件-->
<pagination/>
<pagination />
</div>
</div>
</template>

46
wcs/nladmin-ui/src/views/acs/history/taskRecord/index.vue
View File

@@ -32,7 +32,7 @@
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>
<el-select
v-model="query.status"
@@ -44,7 +44,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"
@@ -55,10 +55,10 @@
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
<Search/>
<Search />
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission"/>
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog
:close-on-click-modal="false"
@@ -69,7 +69,7 @@
>
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-form-item v-if="false" label="任务标识" prop="task_id">
<el-input v-model="form.task_id" style="width: 370px;"/>
<el-input v-model="form.task_id" style="width: 370px;" />
</el-form-item>
<el-form-item label="物料类型">
<el-select
@@ -195,13 +195,13 @@
</el-select>
</el-form-item>
<el-form-item label="优先级">
<el-input v-model="form.priority" style="width: 370px;"/>
<el-input v-model="form.priority" 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">
@@ -218,8 +218,8 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column v-if="false" prop="task_id" label="任务标识"/>
<el-table-column prop="task_code" label="任务号" show-overflow-tooltip width="120"/>
<el-table-column v-if="false" prop="task_id" label="任务标识" />
<el-table-column prop="task_code" label="任务号" show-overflow-tooltip width="120" />
<el-table-column prop="task_type" label="任务类型" show-overflow-tooltip width="100">
<template slot-scope="scope">
{{ dict.label.task_type[scope.row.task_type] }}
@@ -230,26 +230,26 @@
{{ dict.label.task_status[scope.row.task_status] }}
</template>
</el-table-column>
<el-table-column prop="link_num" show-overflow-tooltip label="关联编号" width="100"/>
<el-table-column prop="priority" label="优先级" show-overflow-tooltip width="80"/>
<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="vehicle_code" label="载具号" show-overflow-tooltip width="100"/>
<el-table-column prop="carno" label="车号" show-overflow-tooltip width="100"/>
<el-table-column prop="link_num" show-overflow-tooltip label="关联编号" width="100" />
<el-table-column prop="priority" label="优先级" show-overflow-tooltip width="80" />
<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="vehicle_code" label="载具号" show-overflow-tooltip width="100" />
<el-table-column prop="carno" label="车号" show-overflow-tooltip width="100" />
<el-table-column prop="agv_system_type" label="AGV系统类型" show-overflow-tooltip width="120">
<template slot-scope="scope">
{{ dict.label.agv_system_type[scope.row.agv_system_type] }}
</template>
</el-table-column>
<el-table-column prop="weight" label="物料重量" show-overflow-tooltip width="100"/>
<el-table-column prop="quantity" label="物料数量" show-overflow-tooltip width="100"/>
<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="135"/>
<el-table-column prop="weight" label="物料重量" show-overflow-tooltip width="100" />
<el-table-column prop="quantity" label="物料数量" show-overflow-tooltip width="100" />
<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="135" />
</el-table>
<!--分页组件-->
<pagination/>
<pagination />
</div>
</div>
</template>

36
wcs/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue
View File

@@ -43,7 +43,7 @@
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>
<el-select
v-model="query.status"
@@ -55,7 +55,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"
@@ -66,10 +66,10 @@
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
<Search/>
<Search />
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission"/>
<crudOperation :permission="permission" />
<!--表格渲染-->
<el-table
ref="table"
@@ -86,8 +86,8 @@
@select-all="crud.selectAllChange"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column v-if="false" prop="task_id" label="任务标识"/>
<el-table-column prop="task_code" label="任务号(指令编号)" show-overflow-tooltip width="150"/>
<el-table-column v-if="false" prop="task_id" label="任务标识" />
<el-table-column prop="task_code" label="任务号(指令编号)" show-overflow-tooltip width="150" />
<el-table-column prop="task_type" label="任务类型" show-overflow-tooltip width="120">
<template slot-scope="scope">
{{ dict.label.task_type[scope.row.task_type] }}
@@ -98,12 +98,12 @@
{{ dict.label.task_status[scope.row.task_status] }}
</template>
</el-table-column>
<el-table-column prop="priority" label="优先级" show-overflow-tooltip width="80"/>
<el-table-column prop="start_point_code" label="取货点" show-overflow-tooltip width="120"/>
<el-table-column prop="next_point_code" label="放货点" show-overflow-tooltip width="120"/>
<el-table-column prop="put_point_code" label="中转点" show-overflow-tooltip width="120"/>
<el-table-column prop="vehicle_code" label="载具号" show-overflow-tooltip width="120"/>
<el-table-column prop="carno" label="车号" show-overflow-tooltip width="100"/>
<el-table-column prop="priority" label="优先级" show-overflow-tooltip width="80" />
<el-table-column prop="start_point_code" label="取货点" show-overflow-tooltip width="120" />
<el-table-column prop="next_point_code" label="放货点" show-overflow-tooltip width="120" />
<el-table-column prop="put_point_code" label="中转点" show-overflow-tooltip width="120" />
<el-table-column prop="vehicle_code" label="载具号" show-overflow-tooltip width="120" />
<el-table-column prop="carno" label="车号" show-overflow-tooltip width="100" />
<el-table-column prop="agv_system_type" label="AGV系统类型" show-overflow-tooltip width="150">
<template slot-scope="scope">
{{ dict.label.agv_system_type[scope.row.agv_system_type] }}
@@ -114,14 +114,14 @@
{{ dict.label.agv_inst_type[scope.row.agv_inst_type] }}
</template>
</el-table-column>
<el-table-column prop="weight" label="物料重量" show-overflow-tooltip width="100"/>
<el-table-column prop="quantity" label="物料数量" show-overflow-tooltip width="100"/>
<el-table-column prop="remark" label="备注" show-overflow-tooltip width="150"/>
<el-table-column prop="create_by" label="创建者" show-overflow-tooltip width="150"/>
<el-table-column prop="create_time" label="创建时间" show-overflow-tooltip width="150"/>
<el-table-column prop="weight" label="物料重量" show-overflow-tooltip width="100" />
<el-table-column prop="quantity" label="物料数量" show-overflow-tooltip width="100" />
<el-table-column prop="remark" label="备注" show-overflow-tooltip width="150" />
<el-table-column prop="create_by" label="创建者" show-overflow-tooltip width="150" />
<el-table-column prop="create_time" label="创建时间" show-overflow-tooltip width="150" />
</el-table>
<!--分页组件-->
<pagination/>
<pagination />
</div>
</div>
</template>

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

@@ -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>

46
wcs/nladmin-ui/src/views/acs/order/index.vue
View File

@@ -41,9 +41,9 @@
style="width: 190px"
@change="crud.toQuery"
>
<el-option v-for="item in dict.order_status" :key="item.id" :label="item.label" :value="item.value"/>
<el-option v-for="item in dict.order_status" :key="item.id" :label="item.label" :value="item.value" />
</el-select>
<rrOperation/>
<rrOperation />
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission">
@@ -79,22 +79,22 @@
>
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="120px">
<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="material_code">
<el-input v-model="form.material_code" style="width: 370px;"/>
<el-input v-model="form.material_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="物料名称">
<el-input v-model="form.material_name" style="width: 370px;"/>
<el-input v-model="form.material_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="规格型号">
<el-input v-model="form.material_spec" style="width: 370px;"/>
<el-input v-model="form.material_spec" style="width: 370px;" />
</el-form-item>
<el-form-item label="满框数量" prop="one_qty">
<el-input v-model="form.one_qty" style="width: 370px;"/>
<el-input v-model="form.one_qty" style="width: 370px;" />
</el-form-item>
<el-form-item label="托盘模板">
<el-input v-model="form.lane_tray_template" style="width: 370px;" @input="handleEdit"/>
<el-input v-model="form.lane_tray_template" style="width: 370px;" @input="handleEdit" />
</el-form-item>
<el-form-item label="生产设备" prop="device_code">
<el-select
@@ -115,7 +115,7 @@
</el-select>
</el-form-item>
<el-form-item label="上料设备" prop="in_devices">
<el-input placeholder="清洗上料时储料仓设备号,多个设备以,分割" v-model="form.in_devices" style="width: 370px;"/>
<el-input v-model="form.in_devices" placeholder="清洗上料时储料仓设备号,多个设备以,分割" style="width: 370px;" />
</el-form-item>
<el-form-item label="agv搬运" prop="is_needmove">
<el-radio-group v-model="form.is_needmove" size="mini">
@@ -138,32 +138,32 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55"/>
<el-table-column prop="order_code" label="工单编码" min-width="120" show-overflow-tooltip/>
<el-table-column type="selection" width="55" />
<el-table-column prop="order_code" label="工单编码" min-width="120" show-overflow-tooltip />
<el-table-column prop="order_status" label="工单状态" min-width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ dict.label.order_status[scope.row.order_status] }}
</template>
</el-table-column>
<el-table-column prop="qty" label="生产数量" min-width="100" show-overflow-tooltip/>
<el-table-column prop="device_code" label="设备编号" min-width="100" show-overflow-tooltip/>
<el-table-column prop="material_code" label="物料编码" min-width="100" 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="one_qty" label="满框数量" min-width="100" show-overflow-tooltip/>
<el-table-column prop="qty" label="生产数量" min-width="100" show-overflow-tooltip />
<el-table-column prop="device_code" label="设备编号" min-width="100" show-overflow-tooltip />
<el-table-column prop="material_code" label="物料编码" min-width="100" 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="one_qty" label="满框数量" min-width="100" show-overflow-tooltip />
<el-table-column prop="is_needmove" label="是否AGV搬运" min-width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ dict.label.is_need_move[scope.row.is_needmove] }}
</template>
</el-table-column>
<el-table-column prop="lane_tray_template" label="托盘模板" min-width="100" show-overflow-tooltip/>
<el-table-column prop="in_devices" label="上料模板" min-width="100" show-overflow-tooltip/>
<el-table-column prop="tray_num" label="托盘总数" min-width="100" show-overflow-tooltip/>
<el-table-column prop="create_by" label="创建者" min-width="100" show-overflow-tooltip/>
<el-table-column prop="create_time" label="创建时间" min-width="150" show-overflow-tooltip/>
<el-table-column prop="lane_tray_template" label="托盘模板" min-width="100" show-overflow-tooltip />
<el-table-column prop="in_devices" label="上料模板" min-width="100" show-overflow-tooltip />
<el-table-column prop="tray_num" label="托盘总数" min-width="100" show-overflow-tooltip />
<el-table-column prop="create_by" label="创建者" min-width="100" show-overflow-tooltip />
<el-table-column prop="create_time" label="创建时间" min-width="150" show-overflow-tooltip />
</el-table>
<!--分页组件-->
<pagination/>
<pagination />
</div>
</div>
</template>

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

@@ -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">
@@ -84,7 +84,7 @@
<el-dialog :close-on-click-modal="false" :visible.sync="formDia" :title="crud.status.title" width="550px">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
<el-form-item v-if="false" label="任务标识" prop="task_id">
<el-input v-model="form.task_id" style="width: 370px;"/>
<el-input v-model="form.task_id" style="width: 370px;" />
</el-form-item>
<el-form-item label="任务类型" prop="task_type">
<el-select
@@ -261,13 +261,13 @@
/>
</el-form-item>
<el-form-item label="载具号">
<el-input v-model="form.vehicle_code" style="width: 370px;" @change="isDisabled=false"/>
<el-input v-model="form.vehicle_code" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item
v-if="form.task_type !== '6' && form.task_type !== '7' && form.task_type !== '8'"
label="缓存线条码"
>
<el-input v-model="form.barcodeArr" style="width: 370px;" @change="isDisabled=false"/>
<el-input v-model="form.barcodeArr" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item
v-if="form.task_type !== '6' && form.task_type !== '7' && form.task_type !== '8'"
@@ -284,7 +284,7 @@
v-if="form.task_type !== '6' && form.task_type !== '7' && form.task_type !== '8'"
label="缓存线物料"
>
<el-input v-model="form.material_code" style="width: 370px;" @change="isDisabled=false"/>
<el-input v-model="form.material_code" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item
v-if="form.task_type !== '6' && form.task_type !== '7' && form.task_type !== '8'"
@@ -318,7 +318,7 @@
</el-select>
</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-input v-model="form.remark" style="width: 380px;" rows="5" type="textarea" @change="isDisabled=false" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -335,9 +335,9 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="25"/>
<el-table-column v-if="false" prop="task_id" show-overflow-tooltip label="任务标识"/>
<el-table-column prop="task_code" label="任务号" show-overflow-tooltip width="100"/>
<el-table-column type="selection" width="25" />
<el-table-column v-if="false" prop="task_id" show-overflow-tooltip label="任务标识" />
<el-table-column prop="task_code" label="任务号" show-overflow-tooltip width="100" />
<el-table-column prop="task_type" label="任务类型" show-overflow-tooltip width="120">
<template slot-scope="scope">
{{ dict.label.task_type[scope.row.task_type] }}
@@ -348,13 +348,13 @@
{{ dict.label.task_status[scope.row.task_status] }}
</template>
</el-table-column>
<el-table-column prop="link_num" show-overflow-tooltip label="关联编号" width="100"/>
<el-table-column prop="priority" label="优先级" show-overflow-tooltip width="100"/>
<el-table-column prop="start_point_code" label="取货点" show-overflow-tooltip width="100px"/>
<el-table-column prop="next_point_code" label="放货点" show-overflow-tooltip width="120px"/>
<el-table-column prop="put_point_code" label="中转点" show-overflow-tooltip width="100px"/>
<el-table-column prop="vehicle_code" label="载具号" show-overflow-tooltip width="110"/>
<el-table-column prop="quantity" label="数量" show-overflow-tooltip width="100"/>
<el-table-column prop="link_num" show-overflow-tooltip label="关联编号" width="100" />
<el-table-column prop="priority" label="优先级" show-overflow-tooltip width="100" />
<el-table-column prop="start_point_code" label="取货点" show-overflow-tooltip width="100px" />
<el-table-column prop="next_point_code" label="放货点" show-overflow-tooltip width="120px" />
<el-table-column prop="put_point_code" label="中转点" show-overflow-tooltip width="100px" />
<el-table-column prop="vehicle_code" label="载具号" show-overflow-tooltip width="110" />
<el-table-column prop="quantity" label="数量" show-overflow-tooltip width="100" />
<el-table-column prop="agv_system_type" label="AGV系统类型" show-overflow-tooltip width="110px">
<template slot-scope="scope">
{{ dict.label.agv_system_type[scope.row.agv_system_type] }}
@@ -365,12 +365,12 @@
{{ dict.label.is_or_no[scope.row.is_send] }}
</template>
</el-table-column>
<el-table-column prop="barcodeArr" label="缓存线条码" show-overflow-tooltip width="110"/>
<el-table-column prop="priority_floor" label="缓存线优先层" show-overflow-tooltip width="115"/>
<el-table-column prop="material_code" label="缓存线物料" show-overflow-tooltip width="115"/>
<el-table-column prop="remark" show-overflow-tooltip label="备注"/>
<el-table-column prop="create_by" show-overflow-tooltip label="创建者"/>
<el-table-column prop="create_time" label="创建时间" show-overflow-tooltip width="135"/>
<el-table-column prop="barcodeArr" label="缓存线条码" show-overflow-tooltip width="110" />
<el-table-column prop="priority_floor" label="缓存线优先层" show-overflow-tooltip width="115" />
<el-table-column prop="material_code" label="缓存线物料" show-overflow-tooltip width="115" />
<el-table-column prop="remark" show-overflow-tooltip label="备注" />
<el-table-column prop="create_by" show-overflow-tooltip label="创建者" />
<el-table-column prop="create_time" label="创建时间" show-overflow-tooltip width="135" />
<el-table-column
v-permission="['admin','task:edit','task:del']"
fixed="left"
@@ -381,7 +381,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>
@@ -393,7 +393,7 @@
</el-table-column>
</el-table>
<!--分页组件-->
<pagination/>
<pagination />
</div>
</div>
</template>

6
wcs/nladmin-ui/src/views/system/monitor/device/index.vue
View File

@@ -38,9 +38,9 @@
<el-form-item label="设备状态" label-width="80px">
<el-radio-group v-model="form.option">
<el-radio-button :label="0">禁止进出</el-radio-button>
<el-radio-button :label="1">允许进入</el-radio-button>
<el-radio-button :label="2">允许离开</el-radio-button>
<el-radio-button :label="0">禁止进出</el-radio-button>
<el-radio-button :label="1">允许进入</el-radio-button>
<el-radio-button :label="2">允许离开</el-radio-button>
</el-radio-group>
</el-form-item>
</el-form>