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

代码更新

Browse Source
This commit is contained in:
ldj_willow
2022-10-19 13:14:42 +08:00
parent cdd2225b5a
commit 8b89c10e33
31 changed files with 341 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
lms/nladmin-ui/src/views/system/dict/dictDetail.vue
View File

@@ -8,12 +8,27 @@
<div class="head-container">
<div v-if="crud.props.searchToggle">
<!-- 搜索 -->
<el-input v-model="query.label" clearable size="mini" placeholder="输入字典标签查询" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery" />
<el-input
v-model="query.label"
clearable
size="mini"
placeholder="输入字典标签查询"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="toQuery"
/>
<rrOperation />
</div>
</div>
<!--表单组件-->
<el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible="crud.status.cu > 0" :title="crud.status.title" width="500px">
<el-dialog
append-to-body
:close-on-click-modal="false"
:before-close="crud.cancelCU"
:visible="crud.status.cu > 0"
:title="crud.status.title"
width="500px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-form-item label="字典标签" prop="label">
<el-input v-model="form.label" style="width: 370px;" />
@@ -22,7 +37,22 @@
<el-input v-model="form.value" style="width: 370px;" />
</el-form-item>
<el-form-item label="排序" prop="dictSort">
<el-input-number v-model.number="form.dictSort" :min="0" :max="999" controls-position="right" style="width: 370px;" />
<el-input-number
v-model.number="form.dictSort"
:min="0"
:max="999"
controls-position="right"
style="width: 370px;"
/>
</el-form-item>
<el-form-item label="参数1" prop="para1">
<el-input v-model="form.para1" style="width: 370px;" />
</el-form-item>
<el-form-item label="参数2" prop="para2">
<el-input v-model="form.para2" style="width: 370px;" />
</el-form-item>
<el-form-item label="参数3" prop="para3">
<el-input v-model="form.para3" style="width: 370px;" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -31,14 +61,30 @@
</div>
</el-dialog>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" highlight-current-row style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table
ref="table"
v-loading="crud.loading"
:data="crud.data"
highlight-current-row
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column label="所属字典" min-width="150" show-overflow-tooltip>
{{ query.dictName }}
</el-table-column>
<el-table-column prop="label" label="字典标签" align="center" width="120" show-overflow-tooltip />
<el-table-column prop="value" label="字典值" align="center" width="60" />
<el-table-column prop="dictSort" label="排序" align="center" width="65" />
<el-table-column v-permission="['admin','dict:edit','dict:del']" label="操作" align="center" width="115px" fixed="right">
<el-table-column prop="para1" label="参数1" align="center" width="65" />
<el-table-column prop="para2" label="参数2" align="center" width="65" />
<el-table-column prop="para3" label="参数3" align="center" width="65" />
<el-table-column
v-permission="['admin','dict:edit','dict:del']"
label="操作"
align="center"
width="115px"
fixed="right"
>
<template slot-scope="scope">
<udOperation
:data="scope.row"
@@ -55,18 +101,19 @@
<script>
import crudDictDetail from '@/api/system/dictDetail'
import CRUD, { presenter, header, form } from '@crud/crud'
import CRUD, { form, header, presenter } from '@crud/crud'
import pagination from '@crud/Pagination'
import rrOperation from '@crud/RR.operation'
import udOperation from '@crud/UD.operation'
const defaultForm = { id: null, label: null, value: null, dictSort: 999 }
const defaultForm = { id: null, label: null, value: null, para1: null, para2: null, para3: null, dictSort: 999 }
export default {
components: { pagination, rrOperation, udOperation },
cruds() {
return [
CRUD({ title: '字典详情', url: 'api/dictDetail', query: { dictName: '' }, sort: ['dictSort,asc', 'id,desc'],
CRUD({
title: '字典详情', url: 'api/dictDetail', query: { dictName: '' }, sort: ['dictSort,asc', 'id,desc'],
crudMethod: { ...crudDictDetail },
optShow: {
add: true,
@@ -109,7 +156,7 @@ export default {
</script>
<style rel="stylesheet/scss" lang="scss" scoped>
::v-deep .el-input-number .el-input__inner {
text-align: left;
}
::v-deep .el-input-number .el-input__inner {
text-align: left;
}
</style>

16
lms/nladmin-ui/src/views/wms/sch/region/index.vue
View File

@@ -33,13 +33,13 @@
<el-input v-model="form.region_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="点位类型说明">
<el-input type="textarea" v-model="form.point_type_explain" style="width: 370px;" />
<el-input v-model="form.point_type_explain" type="textarea" style="width: 370px;" />
</el-form-item>
<el-form-item label="点位状态说明">
<el-input type="textarea" v-model="form.point_status_explain" style="width: 370px;" />
<el-input v-model="form.point_status_explain" type="textarea" style="width: 370px;" />
</el-form-item>
<el-form-item label="备注">
<el-input type="textarea" v-model="form.remark" style="width: 370px;" />
<el-input v-model="form.remark" type="textarea" style="width: 370px;" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -58,13 +58,13 @@
>
<el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="region_id" label="区域标识" />
<el-table-column prop="region_code" label="区域编码" />
<el-table-column prop="region_name" label="区域名称" />
<el-table-column prop="point_type_explain" label="点位类型说明" min-width="120" show-overflow-tooltip/>
<el-table-column prop="point_status_explain" label="点位状态说明" min-width="120" show-overflow-tooltip/>
<el-table-column prop="region_code" label="区域编码" min-width="120" />
<el-table-column prop="region_name" label="区域名称" min-width="130" />
<el-table-column prop="point_type_explain" label="点位类型说明" min-width="150" />
<el-table-column prop="point_status_explain" label="点位状态说明" min-width="120" />
<el-table-column prop="remark" label="备注" />
<el-table-column prop="create_name" label="创建人" />
<el-table-column prop="create_time" label="创建时间" min-width="120" show-overflow-tooltip />
<el-table-column prop="create_time" label="创建时间" min-width="140" show-overflow-tooltip />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation

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

@@ -30,28 +30,19 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="起始点位">
<el-form-item label="点位编码">
<el-input
v-model="query.start_point_code"
v-model="query.point_code"
clearable
style="width: 180px"
placeholder="起点"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="下一点位">
<el-input
v-model="query.next_point_code"
clearable
style="width: 180px"
placeholder="终点"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="任务类型">
<el-select
filterable
v-model="query.task_type"
filterable
style="width: 180px"
placeholder="任务类型"
class="filter-item"
@@ -65,34 +56,6 @@
/>
</el-select>
</el-form-item>
<el-form-item label="任务明细">
<el-select
filterable
v-model="query.taskdtl_type"
style="width: 180px"
placeholder="任务类型"
class="filter-item"
clearable
@change="hand"
>
<el-option
v-for="item in dict.SCH_TASK_TYPE_DTL"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker
v-model="query.createTime"
type="daterange"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
@change="crud.toQuery"
/>
</el-form-item>
<el-form-item label="完成方式">
<el-select
v-model="query.finished_type"
@@ -112,6 +75,17 @@
</el-select>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker
v-model="query.createTime"
type="daterange"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
@change="crud.toQuery"
/>
</el-form-item>
<el-form-item label="任务状态">
<el-select
@@ -150,24 +124,16 @@
<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 prop="taskdtl_type_name" label="任务明细" />
<el-table-column prop="task_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_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="85" />
<el-table-column prop="next_point_name" label="下一点名称" width="105" show-overflow-tooltip/>
<el-table-column prop="vehicle_code" label="载具编码" />
<el-table-column prop="point_code1" label="点位1" width="85" />
<el-table-column prop="point_code2" label="点位2" width="85" />
<!--<el-table-column prop="point_code3" label="点位3" width="85" />
<el-table-column prop="point_code4" label="点位4" width="85" />-->
<el-table-column prop="remark" label="备注" width="120" show-overflow-tooltip />
<el-table-column prop="update_by" label="修改者" v-if="false"/>
<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
@@ -185,9 +151,9 @@
<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>
@@ -225,7 +191,7 @@ import pagination from '@crud/Pagination'
export default {
name: 'Task',
dicts: ['SCH_TASK_TYPE', 'SCH_TASK_TYPE_DTL'],
dicts: [],
components: {
pagination, crudOperation, rrOperation
},
@@ -238,7 +204,7 @@ 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: ''
},
optShow: {
add: false,