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

rev：回传飞书

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-08-18 18:19:58 +08:00
parent c60a0ac94f
commit bf70cf7b23
20 changed files with 562 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

219
lms/nladmin-ui/src/views/wms/agvrush/devicestatus/index.vue
View File

@@ -2,36 +2,143 @@
<div class="app-container">
<!--工具栏-->
<div class="head-container">
<el-input
v-model="query.search"
clearable
style="width: 300px"
size="mini"
placeholder="输入设备编码或设备名称"
prefix-icon="el-icon-search"
class="filter-item"
/>
<rrOperation />
<el-form
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="80px"
label-suffix=":"
>
<el-form-item label="关键字">
<el-input
v-model="query.search"
clearable
size="mini"
placeholder="输入设备编码或设备名称"
prefix-icon="el-icon-search"
class="filter-item"
/>
</el-form-item>
<el-form-item label="车间区域">
<el-select
v-model="query.product_area"
size="mini"
placeholder="请选择"
class="filter-item"
clearable
>
<el-option
v-for="item in agvRegionList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="类型">
<el-select
v-model="query.device_type"
size="mini"
placeholder="请选择"
class="filter-item"
clearable
>
<el-option
v-for="item in deviceType"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<rrOperation/>
</el-form>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<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="1100px"
width="1300px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="140px">
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="设备编码" prop="device_code">
<el-input v-model="form.device_code" disabled style="width: 200px;" />
<el-input v-model="form.device_code" style="width: 200px;"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="设备名称" prop="device_name">
<el-input v-model="form.device_name" style="width: 200px;"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="区域" prop="product_area">
<el-select
v-model="form.product_area"
size="mini"
placeholder="请选择"
class="filter-item"
clearable
style="width: 200px"
>
<el-option
v-for="item in agvRegionList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="设备类型" prop="device_type">
<el-select
v-model="form.device_type"
size="mini"
placeholder="请选择"
class="filter-item"
clearable
style="width: 200px"
>
<el-option
v-for="item in deviceType"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否上报" prop="upload_flag">
<el-select
v-model="form.upload_flag"
size="mini"
placeholder="请选择"
class="filter-item"
clearable
style="width: 200px"
>
<el-option
v-for="item in isOrNot"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="联系人" prop="upload_user">
<el-select v-model="form.upload_user" placeholder="请选择" filterable multiple clearable style="width: 250px">
<el-select v-model="form.upload_user" placeholder="请选择" filterable multiple clearable
style="width: 200px">
<el-option
v-for="item in userList"
:key="item.username"
@@ -60,16 +167,16 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column prop="device_code" label="设备编码" show-overflow-tooltip width="150px" />
<el-table-column prop="device_name" label="设备名称" show-overflow-tooltip width="150px" />
<el-table-column prop="product_area" label="区域" show-overflow-tooltip />
<el-table-column prop="device_type" label="设备类型" show-overflow-tooltip />
<el-table-column prop="mode" label="工作状态" show-overflow-tooltip />
<el-table-column prop="mode_update_time" label="工作状态变更时间" show-overflow-tooltip width="150px" />
<el-table-column prop="error" label="故障状态" show-overflow-tooltip />
<el-table-column prop="error_msg" label="故障信息" width="180px" show-overflow-tooltip />
<el-table-column prop="error_update_time" label="故障状态更新时间" width="150px" show-overflow-tooltip />
<el-table-column prop="error_update_time" label="故障状态更新时间" width="150px" show-overflow-tooltip />
<el-table-column prop="device_code" label="设备编码" show-overflow-tooltip width="150px"/>
<el-table-column prop="device_name" label="设备名称" show-overflow-tooltip width="150px"/>
<el-table-column prop="product_area" label="区域" show-overflow-tooltip/>
<el-table-column prop="device_type" label="设备类型" :formatter="typeFormatter" show-overflow-tooltip/>
<el-table-column prop="mode" label="工作状态" :formatter="modeFormatter" show-overflow-tooltip/>
<el-table-column prop="mode_update_time" label="工作状态变更时间" show-overflow-tooltip width="150px"/>
<el-table-column prop="error" label="故障状态" :formatter="erroFormatter" show-overflow-tooltip/>
<el-table-column prop="error_msg" label="故障信息" width="180px" show-overflow-tooltip/>
<el-table-column prop="error_update_time" label="故障状态更新时间" width="150px" show-overflow-tooltip/>
<el-table-column prop="error_update_time" label="故障状态更新时间" width="150px" show-overflow-tooltip/>
<el-table-column label="是否上报" align="center" prop="upload_flag">
<template slot-scope="scope">
<el-switch
@@ -82,7 +189,7 @@
/>
</template>
</el-table-column>
<el-table-column prop="upload_user" label="负责人" width="150px" show-overflow-tooltip />
<el-table-column prop="upload_user" label="负责人" width="150px" show-overflow-tooltip/>
<el-table-column
v-permission="['admin','customerbase:edit','customerbase:del']"
label="操作"
@@ -99,7 +206,7 @@
</el-table-column>
</el-table>
<!--分页组件-->
<pagination />
<pagination/>
</div>
</div>
</template>
@@ -140,6 +247,24 @@ export default {
permission: {},
classes: [],
userList: [],
agvRegionList: [
{ 'label': 'A1', 'value': 'A1' },
{ 'label': 'A2', 'value': 'A2' },
{ 'label': 'A3', 'value': 'A3' },
{ 'label': 'A4', 'value': 'A4' },
{ 'label': 'LK', 'value': 'LK' }
],
isOrNot: [
{ 'label': '否', 'value': '0' },
{ 'label': '是', 'value': '1' }
],
deviceType: [
{ 'label': '输送线', 'value': '1' },
{ 'label': 'RGV', 'value': '2' },
{ 'label': '四向车', 'value': '3' },
{ 'label': 'AGV', 'value': '4' },
{ 'label': '其他', 'value': '5' }
],
rules: {}
}
},
@@ -150,7 +275,12 @@ export default {
},
[CRUD.HOOK.afterToCU](crud, form) {
this.getUserList()
form.upload_user = form.upload_user.split(',')
debugger
if (form.upload_user && form.upload_user !== '') {
form.upload_user = form.upload_user.split(',')
} else {
form.upload_user = null
}
},
// 改变状态
getUserList() {
@@ -158,6 +288,41 @@ export default {
this.userList = res
})
},
typeFormatter(row) {
if (row.device_type === '1') {
return '输送线'
} else if (row.device_type === '2') {
return 'RGV'
} else if (row.device_type === '3') {
return '四向车'
} else if (row.device_type === '4') {
return 'AGV'
} else if (row.device_type === '5') {
return '其他'
} else {
return ''
}
},
modeFormatter(row) {
if (row.mode === '0') {
return '脱机'
} else if (row.mode === '2') {
return '待机'
} else if (row.mode === '3') {
return '运行中'
} else {
return ''
}
},
erroFormatter(row) {
if (row.error === '0') {
return '无故障'
} else if (row.error > 0) {
return '故障中'
} else {
return ''
}
},
changeEnabled(data, val) {
this.$confirm('此操作将 "' + this.dict.label.is_used[val] + '" ' + data.device_code + ', 是否继续？', '提示', {
confirmButtonText: '确定',

4
lms/nladmin-ui/src/views/wms/st/outbill/index.vue
View File

@@ -200,6 +200,7 @@
:disabled="confirm_flag"
icon="el-icon-check"
size="mini"
v-permission="permission.confirm"
@click="confirm"
>
强制确认
@@ -347,7 +348,8 @@ export default {
permission: {
add: ['admin', 'checkoutbill:add'],
edit: ['admin', 'checkoutbill:edit'],
del: ['admin', 'checkoutbill:del']
del: ['admin', 'checkoutbill:del'],
confirm: ['admin', 'checkoutbill:confirm']
},
openMoneyDialog: false,
loadingConfirm: false,