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

提交

Browse Source
This commit is contained in:
ls
2025-12-15 08:51:20 +08:00
parent 8565db7179
commit 21717f533f
44 changed files with 324 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -134,7 +134,7 @@
@change="hand"
/>
</el-form-item>
<rrOperation/>
<rrOperation />
</el-form>
</div>
@@ -220,7 +220,7 @@
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item v-if="false" label="点位标识" prop="point_id">
<el-input v-model="form.point_id" style="width: 370px;"/>
<el-input v-model="form.point_id" style="width: 370px;" />
</el-form-item>
<el-form-item label="所属区域" prop="region_id">
<el-select
@@ -237,10 +237,10 @@
</el-select>
</el-form-item>
<el-form-item label="点位编码" prop="point_code">
<el-input v-model="form.point_code" style="width: 370px;" :disabled="this.form.point_type==='01'"/>
<el-input v-model="form.point_code" style="width: 370px;" :disabled="this.form.point_type==='01'" />
</el-form-item>
<el-form-item label="点位名称" prop="point_name">
<el-input v-model="form.point_name" style="width: 370px;" :disabled="this.form.point_type==='01'"/>
<el-input v-model="form.point_name" style="width: 370px;" :disabled="this.form.point_type==='01'" />
</el-form-item>
<el-form-item label="点位状态" prop="point_status">
<el-select
@@ -289,17 +289,17 @@
</el-select>
</el-form-item>
<el-form-item label="载具编码" prop="vehicle_code">
<el-input v-model="form.vehicle_code" clearable style="width: 370px;"/>
<el-input v-model="form.vehicle_code" clearable style="width: 370px;" />
</el-form-item>
<el-form-item label="载具数量" prop="vehicle_qty">
<el-input-number v-model="form.vehicle_qty" :precision="0" :controls="false" :min="0" style="width: 370px;"/>
<el-input-number v-model="form.vehicle_qty" :precision="0" :controls="false" :min="0" style="width: 370px;" />
</el-form-item>
<el-form-item label="物料批次" prop="material_code">
<el-input v-model="form.material_code" clearable style="width: 370px;"/>
<el-input v-model="form.material_code" clearable style="width: 370px;" />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" style="width: 370px;" rows="2" type="textarea"/>
<el-input v-model="form.remark" style="width: 370px;" rows="2" type="textarea" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -316,34 +316,38 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55"/>
<el-table-column prop="point_code" label="点位编码" sortable width="100"/>
<el-table-column prop="point_name" label="点位名称" width="120" sortable show-overflow-tooltip/>
<el-table-column prop="region_name" label="区域名称" min-width="120" show-overflow-tooltip/>
<el-table-column prop="point_type_name" label="点位类型"/>
<el-table-column prop="point_status_name" label="点位状态"/>
<el-table-column prop="lock_type_name" label="锁定类型"/>
<el-table-column type="selection" width="55" />
<el-table-column prop="point_code" label="点位编码" sortable width="100" />
<el-table-column prop="point_name" label="点位名称" width="120" sortable show-overflow-tooltip />
<el-table-column prop="region_name" label="区域名称" min-width="120" show-overflow-tooltip />
<el-table-column prop="point_type_name" label="点位类型" />
<el-table-column prop="point_status_name" label="点位状态" />
<el-table-column prop="lock_type_name" label="锁定类型" />
<!-- <el-table-column prop="vehicle_type" label="载具类型" min-width="120">
<template slot-scope="scope">
{{ dict.label.vehicle_type[scope.row.vehicle_type] }}
</template>
</el-table-column>-->
<el-table-column prop="vehicle_code" label="载具编码"
:min-width="flexWidth('vehicle_code',crud.data,'载具编码')"
<el-table-column
prop="vehicle_code"
label="载具编码"
:min-width="flexWidth('vehicle_code',crud.data,'载具编码')"
/>
<el-table-column prop="material_code" label="物料批次"
:min-width="flexWidth('material_code',crud.data,'物料批次')"
<el-table-column
prop="material_code"
label="物料批次"
:min-width="flexWidth('material_code',crud.data,'物料批次')"
/>
<el-table-column prop="vehicle_qty" label="载具数量"/>
<el-table-column prop="product_area" label="生产区域"/>
<el-table-column prop="remark" label="备注" min-width="100" show-overflow-tooltip/>
<el-table-column prop="vehicle_qty" label="载具数量" />
<el-table-column prop="product_area" label="生产区域" />
<el-table-column prop="remark" label="备注" min-width="100" show-overflow-tooltip />
<el-table-column prop="is_used" label="是否启用">
<template slot-scope="scope">
{{ scope.row.is_used == '1' ? '是' : '否' }}
</template>
</el-table-column>
<el-table-column prop="update_optname" label="修改人"/>
<el-table-column prop="update_time" label="修改时间" width="150"/>
<el-table-column prop="update_optname" label="修改人" />
<el-table-column prop="update_time" label="修改时间" width="150" />
<el-table-column
v-permission="[]"
label="操作"
@@ -360,7 +364,7 @@
</el-table-column>
</el-table>
<!--分页组件-->
<pagination/>
<pagination />
</div>
</div>
</template>
@@ -473,7 +477,7 @@ export default {
if (this.currentRow !== null) {
crud.downloadLoading = true
download('/api/point/download', this.crud.query).then(result => {
//debugger
// debugger
downloadFile(result, '库存', 'xlsx')
crud.downloadLoading = false
}).catch(() => {
@@ -507,7 +511,7 @@ export default {
})
},
getPointStatusAndTypeList(id, flag) {
//debugger
// debugger
if (id) {
this.getPointStatusList(id, flag)
this.getPointTypeList(id, flag)
@@ -517,7 +521,7 @@ export default {
}
},
getPointStatusList(id, flag) {
//debugger
// debugger
crudRegion.getPointStatusSelectById(id).then(res => {
if (flag === 1) {
this.pointStatusList = res

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

@@ -143,8 +143,8 @@
<el-table-column prop="task_group_id" label="关联任务" width="100" show-overflow-tooltip />
<el-table-column prop="vehicle_code" label="载具编码1" width="130" show-overflow-tooltip />
<el-table-column prop="vehicle_code2" label="载具编码2" width="100" show-overflow-tooltip />
<el-table-column prop="request_param" label="请求参数" min-width="120" :formatter="formatSignal" show-overflow-tooltip/>
<el-table-column prop="response_param" label="响应参数" min-width="120" :formatter="formatSignal" show-overflow-tooltip/>
<el-table-column prop="request_param" label="请求参数" min-width="120" :formatter="formatSignal" show-overflow-tooltip />
<el-table-column prop="response_param" label="响应参数" min-width="120" :formatter="formatSignal" show-overflow-tooltip />
<el-table-column prop="task_name" label="任务描述" min-width="120" show-overflow-tooltip />
<el-table-column prop="create_name" label="创建人" width="135" show-overflow-tooltip />
<el-table-column prop="create_time" label="创建时间" width="135" show-overflow-tooltip />
@@ -318,31 +318,30 @@ export default {
formatSignal(row, column) {
if (row.task_type === '010911') {
if (column.property === 'response_param') {
return row.car_no === '4' ? '放满轴信号已发送' : '放满轴信号未发送';
return row.car_no === '4' ? '放满轴信号已发送' : '放满轴信号未发送'
}
if (column.property === 'request_param') {
return row.request_param === '3' ? '取空载具信号已发送' : '取空载具信号未发送';
return row.request_param === '3' ? '取空载具信号已发送' : '取空载具信号未发送'
}
} else if (row.task_type === '010904') {
if (column.property === 'request_param') {
return row.request_param === '3' ? '取空载具信号已发送' : '取空载具信号未发送';
return row.request_param === '3' ? '取空载具信号已发送' : '取空载具信号未发送'
}
} else if (row.task_type === '010901') {
if (column.property === 'response_param') {
return row.car_no === '4' ? '放满轴信号已发送' : '放满轴信号未发送';
return row.car_no === '4' ? '放满轴信号已发送' : '放满轴信号未发送'
}
}
else if (row.task_type === '010905'||row.task_type === '010913') {
} else if (row.task_type === '010905' || row.task_type === '010913') {
if (column.property === 'response_param') {
return row.response_param === '1' ? '二次分配已分配' : '二次分配未分配';
return row.response_param === '1' ? '二次分配已分配' : '二次分配未分配'
}
}
return row[column.property];
return row[column.property]
},
// 获取子节点数据
loadChildNodes({ action, parentNode, callback }) {
if (action === LOAD_CHILDREN_OPTIONS) {
//debugger
// debugger
crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
parentNode.children = res.content.map(function(obj) {
if (obj.hasChildren) {
@@ -357,11 +356,11 @@ export default {
}
},
hand(value) {
//debugger
// debugger
this.crud.toQuery()
},
handTaskStatus(value) {
//debugger
// debugger
if (value) {
this.query.task_status = this.task_status.toString()
}