root/lanzhouhailiang_one
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-27 10:32:25 +08:00
parent 3d021c44e7
commit 4ff5944d5d
47 changed files with 1639 additions and 1330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,7 @@
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="80px"
label-width="90px"
label-suffix=":"
>
<el-form-item label="模糊搜索">
@@ -19,6 +19,23 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="区域类型">
<el-select
v-model="query.region_id"
clearable
filterable
size="mini"
placeholder="区域类型"
class="filter-item"
@change="getPointStatusAndTypeList"
>
<el-option
v-for="item in regionList"
:label="item.region_name"
:value="item.region_id"
/>
</el-select>
</el-form-item>
<el-form-item label="点位类型">
<el-select
v-model="query.point_type"
@@ -29,31 +46,12 @@
@change="hand"
>
<el-option
v-for="item in dict.sch_point_type"
v-for="item in pointTypesList"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="区域类型">
<el-select
v-model="query.region_id"
clearable
filterable
size="mini"
placeholder="区域类型"
class="filter-item"
@change="hand"
>
<el-option
v-for="item in reginoList"
:label="item.region_name"
:value="item.region_id"
/>
</el-select>
</el-form-item>
<el-form-item label="点位状态">
<el-select
v-model="query.point_status"
@@ -65,45 +63,68 @@
@change="hand"
>
<el-option
v-for="item in dict.sch_point_status"
v-for="item in pointStatusList"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="锁定类型">
<el-select
v-model="query.lock_type"
<el-form-item v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624')" label="块">
<el-input
v-model="query.block_num"
clearable
size="mini"
placeholder="锁定类型"
class="filter-item"
placeholder="块"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624' || query.region_id=='1557538851726168064')" label="排">
<el-input
v-model="query.row_num"
clearable
size="mini"
placeholder="排"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624' || query.region_id=='1557538851726168064')" label="列">
<el-input
v-model="query.col_num"
clearable
size="mini"
placeholder="列"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624' || query.region_id=='1557538851726168064')" label="层">
<el-input
v-model="query.layer_num"
clearable
size="mini"
placeholder="层"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="锁定类型">
<el-switch
v-model="query.lock_type"
active-value="2"
inactive-value="1"
active-color="#409EFF"
inactive-color="#C0CCDA"
@change="hand"
>
<el-option
v-for="item in dict.d_lock_type"
:label="item.label"
:value="item.value"
/>
</el-select>
/>
</el-form-item>
<el-form-item label="是否启用">
<el-select
<el-switch
v-model="query.is_used"
clearable
size="mini"
placeholder="是否启用"
class="filter-item"
active-value="0"
inactive-value="1"
active-color="#C0CCDA"
inactive-color="#409EFF"
@change="hand"
>
<el-option
v-for="item in dict.is_used"
:label="item.label"
:value="item.value"
/>
</el-select>
/>
</el-form-item>
<rrOperation />
</el-form>
@@ -112,15 +133,52 @@
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission">
<el-button
v-if="crud.query.is_used == 0"
slot="right"
class="filter-item"
type="info"
:loading="syncLoading"
icon="el-icon-refresh"
size="mini"
@click="sync()"
type="primary"
icon="el-icon-circle-check"
:disabled="crud.selections.length === 0"
@click="changeUsed(crud.selections, 1)"
>
仓位同步
启用
</el-button>
<el-button
v-if="crud.query.is_used == 1"
slot="right"
class="filter-item"
size="mini"
type="primary"
icon="el-icon-circle-close"
:disabled="crud.selections.length === 0"
@click="changeUsed(crud.selections, 0)"
>
禁用
</el-button>
<el-button
v-if="crud.query.lock_type == 1"
slot="right"
class="filter-item"
size="mini"
type="danger"
icon="el-icon-circle-check"
:disabled="crud.selections.length === 0"
@click="changeLock(crud.selections, 2)"
>
锁定
</el-button>
<el-button
v-if="crud.query.lock_type == 2"
slot="right"
class="filter-item"
size="mini"
type="danger"
icon="el-icon-circle-close"
:disabled="crud.selections.length === 0"
@click="changeLock(crud.selections, 1)"
>
解锁
</el-button>
</crudOperation>
<!--表单组件-->
@@ -135,6 +193,20 @@
<el-form-item v-if="false" label="点位标识" prop="point_id">
<el-input v-model="form.point_id" style="width: 370px;" />
</el-form-item>
<el-form-item label="所属区域" prop="region_id">
<el-select
v-model="form.region_id"
placeholder="请选择"
style="width: 370px;"
@change="getPointStatusAndTypeList"
>
<el-option
v-for="item in regionList"
:label="item.region_name"
:value="item.region_id"
/>
</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-form-item>
@@ -148,9 +220,10 @@
placeholder="点位状态"
class="filter-item"
style="width: 370px;"
clearable
>
<el-option
v-for="item in dict.sch_point_status"
v-for="item in pointStatusList"
:label="item.label"
:value="item.value"
/>
@@ -171,16 +244,16 @@
/>
</el-select>
</el-form-item>
<el-form-item label="设备点位类型" prop="device_point_type">
<el-form-item label="点位类型" prop="device_point_type">
<el-select
v-model="form.device_point_type"
v-model="form.point_type"
size="mini"
placeholder="设备点位类型"
class="filter-item"
style="width: 370px;"
>
<el-option
v-for="item in dict.device_point_type"
v-for="item in pointTypesList"
:label="item.label"
:value="item.value"
/>
@@ -189,51 +262,7 @@
<el-form-item label="载具编码" prop="vehicle_code">
<el-input v-model="form.vehicle_code" clearable style="width: 370px;" />
</el-form-item>
<el-form-item label="是否专机" prop="is_host">
<el-radio-group v-model="form.is_host">
<el-radio
v-for="item in dict.IS_OR_NOT"
:label="item.value"
>{{ item.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="点位类型" prop="point_type">
<el-radio-group v-model="form.point_type">
<el-radio
v-for="item in dict.sch_point_type"
:label="item.value"
>{{ item.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="所属区域" prop="region_id">
<el-select
v-model="form.region_id"
placeholder="请选择"
style="width: 370px;"
>
<el-option
v-for="item in reginoList"
:label="item.region_name"
:value="item.region_id"
/>
</el-select>
</el-form-item>
<el-form-item label="点位位置">
<el-select
v-model="form.point_location"
filterable
style="width: 370px"
class="filter-item"
>
<el-option
v-for="item in dict.point_location"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" style="width: 370px;" rows="2" type="textarea" />
</el-form-item>
@@ -255,37 +284,24 @@
<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="region_name" label="所属区域" width="110" />
<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="载具编码" />
<el-table-column label="是否启用" align="center" prop="is_used">
<template slot-scope="scope">
<el-switch
:value="format_is_used(scope.row.is_used)"
active-color="#409EFF"
inactive-color="#F56C6C"
@change="changeEnabled(scope.row, scope.row.is_used)"
/>
</template>
</el-table-column>
<el-table-column prop="taskdtl_type" label="锁定任务类型" width="110" :formatter="taskdtl_typeFormat" />
<el-table-column prop="task_code" label="锁定任务编码" width="100" />
<el-table-column prop="inv_code" label="锁定单据编码" width="130" />
<el-table-column prop="inv_type" label="锁定单据类型" width="110" :formatter="invtypeFormat" />
<el-table-column prop="vehicle_type" label="托盘类型">
<template slot-scope="scope">
{{ dict.label.storagevehicle_type[scope.row.vehicle_type] }}
</template>
</el-table-column>
<el-table-column prop="vehicle_qty" label="载具数量" />
<el-table-column prop="vehicle_type" label="是否专机">
<el-table-column prop="remark" label="备注" min-width="100" show-overflow-tooltip />
<el-table-column prop="is_used" label="是否启用">
<template slot-scope="scope">
{{ dict.label.IS_OR_NOT[scope.row.is_host] }}
{{ scope.row.is_used=='1' ? '是' : '否' }}
</template>
</el-table-column>
<el-table-column prop="update_optname" label="修改者" />
<el-table-column prop="update_optname" label="修改人" />
<el-table-column prop="update_time" label="修改时间" width="150" />
<el-table-column
v-permission="[]"
@@ -309,39 +325,18 @@
</template>
<script>
import crudPoint, { changeActive } from '@/views/wms/sch/point/point'
import crudRegion from '@/views/wms/sch/region'
import crudPoint, { changeActive } from '@/views/wms/sch/point'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
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,
point_location: null
}
const defaultForm = { point_id: null, point_code: null, point_name: null, point_type: null, point_status: null, lock_type: '1', 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 }
export default {
name: 'Point',
dicts: ['sch_point_type', 'point_location', 'sch_area_type', 'sch_point_status', 'is_used', 'd_lock_type', 'SCH_TASK_TYPE_DTL', 'storagevehicle_type', 'IS_OR_NOT', 'device_point_type'],
dicts: ['vehicle_type', 'd_lock_type', 'SCH_TASK_TYPE_DTL', 'vehicle_type'],
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
@@ -356,7 +351,6 @@ export default {
download: false,
reset: true
},
crudMethod: { ...crudPoint }
})
},
@@ -365,8 +359,10 @@ export default {
return {
syncLoading: false,
invtypelist: [],
pointStatusList: [],
pointTypesList: [],
options: [],
reginoList: [],
regionList: [],
permission: {},
rules: {
point_code: [
@@ -381,25 +377,16 @@ export default {
region_id: [
{ required: true, message: '区域类型不能为空', trigger: 'blur' }
],
point_status: [
{ required: true, message: '点位状态不能为空', trigger: 'blur' }
],
lock_type: [
{ required: true, message: '锁定类型不能为空', trigger: 'blur' }
],
is_host: [
{ required: true, message: '是否专机不能为空', trigger: 'blur' }
]
}
}
},
created() {
/* checkoutbill.getInvTypes().then(res => {
this.invtypelist = res
})*/
crudPoint.getRegion().then(res => {
this.reginoList = res
this.regionList = res
})
},
methods: {
@@ -407,19 +394,14 @@ export default {
[CRUD.HOOK.beforeRefresh]() {
return true
},
[CRUD.HOOK.afterToCU]() {
if (this.form.region_id) {
this.getPointStatusAndTypeList(this.form.region_id)
}
},
hand(value) {
this.crud.toQuery()
},
taskdtl_typeFormat(row) {
return this.dict.label.SCH_TASK_TYPE_DTL[row.taskdtl_type]
},
invtypeFormat(row) {
for (const item of this.invtypelist) {
if (item.code === row.inv_type) {
return item.name
}
}
},
format_is_used(is_used) {
return is_used === '1'
},
@@ -442,14 +424,39 @@ export default {
}).catch(() => {
})
},
sync() {
this.syncLoading = true
crudPoint.syncStruct().then(() => {
getPointStatusAndTypeList(id) {
if (id) {
this.getPointStatusList(id)
this.getPointTypeList(id)
this.crud.toQuery()
}
},
getPointStatusList(id) {
crudRegion.getPointStatusSelectById(id).then(res => {
this.pointStatusList = res
})
},
getPointTypeList(id) {
crudRegion.getPointTypeSelectById(id).then(res => {
this.pointTypesList = res
})
},
changeUsed(data, flag) { // 更改启用状态
const param = {}
param.data = data
param.used = flag
crudPoint.changeUsed(param).then(res => {
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.syncLoading = false
}).catch(err => {
console.log(err.response.data.message)
this.crud.toQuery()
})
},
changeLock(data, flag) { // 更改锁定状态
const param = {}
param.data = data
param.lock_type = flag
crudPoint.changeLock(param).then(res => {
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})
}

26
lms/nladmin-ui/src/views/wms/sch/point/point.js
View File

@@ -23,14 +23,6 @@ export function edit(data) {
data
})
}
export function syncStruct() {
return request({
url: 'api/point/syncStruct',
method: 'put'
})
}
export function findPoints(area_type) {
return request({
url: 'api/point/area_type/' + area_type
@@ -60,4 +52,20 @@ export function getRegion() {
})
}
export default { add, edit, del, syncStruct, changeActive, findPoints, getPoint, getRegion }
export function changeUsed(data) {
return request({
url: 'api/point/changeUsed',
method: 'post',
data: data
})
}
export function changeLock(data) {
return request({
url: 'api/point/changeLock',
method: 'post',
data: data
})
}
export default { add, edit, del, changeActive, findPoints, getPoint, getRegion, changeUsed, changeLock }