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

完善

Browse Source
This commit is contained in:
张江玮
2023-02-23 17:21:56 +08:00
parent 78b1d9e978
commit b183a782f3
11 changed files with 102 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/qd/src/views/wms/sch/point/index.vue
View File

@@ -189,7 +189,7 @@
clearable
>
<el-option
v-for="item in dict.current_material_type"
v-for="item in dict.material_type"
:key="item.id"
:label="item.label"
:value="item.value"
@@ -352,7 +352,7 @@ import pagination from '@crud/Pagination'
const defaultForm = { device_point_type: null, point_id: null, is_host: null, point_code: null, point_name: null, area_type: null, point_type: '00', point_status: '00', lock_type: '00', vehicle_code: null, source_id: null, remark: null, is_used: null, is_delete: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, material_type: [], region_id: null, prev_region_id: null, next_region_id: null, seq: 0, current_material_type: null, col: 1 }
export default {
name: 'Point',
dicts: ['sch_point_type', 'sch_area_type', 'sch_point_status', 'is_used', 'd_lock_type', 'SCH_TASK_TYPE_DTL', 'storagevehicle_type', 'IS_HOST', 'device_point_type', 'material_type', 'current_material_type'],
dicts: ['sch_point_type', 'sch_area_type', 'sch_point_status', 'is_used', 'd_lock_type', 'SCH_TASK_TYPE_DTL', 'storagevehicle_type', 'IS_HOST', 'device_point_type', 'material_type'],
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {

61
lms/qd/src/views/wms/sch/task/index.vue
View File

@@ -122,12 +122,12 @@
/>
</el-select>
</el-form-item>
<rrOperation />
<rrOperation/>
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<crudOperation :permission="permission"/>
<!--表格渲染-->
<el-table
ref="table"
@@ -137,30 +137,30 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="50" />
<el-table-column v-if="false" prop="taskdtl_id" label="任务标识" />
<el-table-column prop="task_code" label="任务编码" />
<el-table-column v-if="false" prop="task_type" label="任务类型" />
<el-table-column prop="task_type_name" label="任务类型" />
<el-table-column v-if="false" prop="taskdtl_type" label="任务明细" />
<el-table-column v-if="false" prop="taskdtl_type_name" label="任务明细" />
<el-table-column v-if="false" prop="task_status" label="任务状态" />
<el-table-column prop="task_status_name" label="任务状态" width="95px" :formatter="formatTaskStatusName" />
<el-table-column type="selection" width="50"/>
<el-table-column v-if="false" prop="taskdtl_id" label="任务标识"/>
<el-table-column prop="task_code" label="任务编码"/>
<el-table-column v-if="false" prop="task_type" label="任务类型"/>
<el-table-column prop="task_type_name" label="任务类型"/>
<el-table-column v-if="false" prop="taskdtl_type" label="任务明细"/>
<el-table-column v-if="false" prop="taskdtl_type_name" label="任务明细"/>
<el-table-column v-if="false" prop="task_status" label="任务状态"/>
<el-table-column prop="task_status_name" label="任务状态" width="95px" :formatter="formatTaskStatusName"/>
<!--
<el-table-column v-if="false" prop="finished_type" label="完成方式" />
-->
<!-- <el-table-column prop="finished_type_name" label="完成方式" :formatter="formatFinishTypeName"/>-->
<el-table-column prop="start_area_name" label="起始区域" width="95" show-overflow-tooltip />
<el-table-column prop="start_point_code" label="起点编码" width="85" />
<el-table-column prop="start_area_name" label="起始区域" width="95" show-overflow-tooltip/>
<el-table-column prop="start_point_code" label="起点编码" width="85"/>
<el-table-column prop="start_point_name" label="起点名称" width="105" show-overflow-tooltip/>
<el-table-column prop="next_area_name" label="下一区域" width="95" show-overflow-tooltip />
<el-table-column prop="next_point_code" label="下一点编码" width="90" />
<el-table-column prop="next_area_name" label="下一区域" width="95" show-overflow-tooltip/>
<el-table-column prop="next_point_code" label="下一点编码" width="90"/>
<el-table-column prop="next_point_name" label="下一点名称" width="105" show-overflow-tooltip/>
<el-table-column v-if="false" prop="material_code" label="物料编码" />
<el-table-column prop="remark" label="备注" width="120" show-overflow-tooltip />
<el-table-column v-if="false" prop="update_by" label="修改者" />
<el-table-column prop="create_time" label="创建时间" width="135" />
<el-table-column prop="update_time" label="修改时间" width="135" />
<el-table-column v-if="false" prop="material_code" label="物料编码"/>
<el-table-column prop="remark" label="备注" width="120" show-overflow-tooltip/>
<el-table-column v-if="false" prop="update_by" label="修改者"/>
<el-table-column prop="create_time" label="创建时间" width="135"/>
<el-table-column prop="update_time" label="修改时间" width="135"/>
<el-table-column
v-permission="['admin','instruction:edit','instruction:del']"
fixed="right"
@@ -171,21 +171,21 @@
<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,'d')">下发</el-dropdown-item>
<el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'a')">完成</el-dropdown-item>
<!-- <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'b')">取消</el-dropdown-item>-->
<!-- <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'b')">取消</el-dropdown-item>-->
<!-- <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'c')">拉回</el-dropdown-item>-->
<!-- <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'e')">详情</el-dropdown-item>-->
<!-- <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'e')">详情</el-dropdown-item>-->
</el-dropdown-menu>
</el-dropdown>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<pagination />
<pagination/>
</div>
<el-dialog
title="任务详情"
@@ -229,7 +229,14 @@ export default {
sort: 'taskdtl_id,desc',
crudMethod: { ...crudTask },
query: {
task_code:'',vehicle_code:'',start_point_code:'',next_point_code:'',task_type:'',taskdtl_type:'',finished_type:'',task_status:""
task_code: '',
vehicle_code: '',
start_point_code: '',
next_point_code: '',
task_type: '',
taskdtl_type: '',
finished_type: '',
task_status: '-1'
},
optShow: {
add: false,
@@ -251,9 +258,7 @@ export default {
taskStatusList: [],
taskTypeList: [],
finishTypeList: [],
permission: {
},
permission: {},
rules: {}
}
},