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

初版

Browse Source
This commit is contained in:
张江玮
2023-04-14 10:18:48 +08:00
parent 71c1dedd18
commit 18b3f9b31f
161 changed files with 6167 additions and 9030 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,7 +10,7 @@
label-width="90px"
label-suffix=":"
>
<el-form-item label="模糊搜索">
<el-form-item label="编码名称">
<el-input
v-model="query.name"
clearable
@@ -19,18 +19,20 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="区域类型">
<el-form-item label="所属区域">
<el-select
v-model="query.region_id"
clearable
filterable
size="mini"
placeholder="区域类型"
placeholder="所属区域"
class="filter-item"
@clear="pointTypesList = null"
@change="getPointStatusAndTypeList(query.region_id, 1)"
>
<el-option
v-for="item in regionList"
:key="item.region_id"
:label="item.region_name"
:value="item.region_id"
/>
@@ -47,6 +49,7 @@
>
<el-option
v-for="item in pointTypesList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
@@ -63,69 +66,30 @@
@change="hand"
>
<el-option
v-for="item in pointStatusList"
v-for="item in dict.point_status"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<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="块"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item
v-if="(query.region_id=='1590223405414748160' || query.region_id=='1590223672247980032' || query.region_id=='1590223771673956352' || query.region_id=='1590223846013800448')"
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=='1590223405414748160' || query.region_id=='1590223672247980032' || query.region_id=='1590223771673956352' || query.region_id=='1590223846013800448')"
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=='1590223405414748160' || query.region_id=='1590223672247980032' || query.region_id=='1590223771673956352' || query.region_id=='1590223846013800448')"
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
<el-select
v-model="query.lock_type"
active-value="2"
inactive-value="1"
active-color="#409EFF"
inactive-color="#C0CCDA"
clearable
filterable
size="mini"
placeholder="锁定类型"
class="filter-item"
@change="hand"
/>
>
<el-option
v-for="item in dict.lock_type"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="是否启用">
@@ -199,111 +163,124 @@
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
width="520px"
width="600px"
>
<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-form ref="form" :model="form" :rules="rules" size="mini" label-width="160px">
<el-form-item label="点位编码" prop="point_code">
<el-input v-model="form.point_code" :disabled="crud.status.edit" style="width: 300px" />
</el-form-item>
<el-form-item label="点位名称" prop="point_name">
<el-input v-model="form.point_name" style="width: 300px" />
</el-form-item>
<el-form-item label="所属区域" prop="region_id">
<el-select
v-model="form.region_id"
placeholder="请选择"
style="width: 370px;"
style="width: 300px"
clearable
@change="getPointStatusAndTypeList(form.region_id, 2)"
@clear="pointTypesDialogList = null"
>
<el-option
v-for="item in regionList"
:key="item.region_id"
: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;" />
</el-form-item>
<el-form-item label="点位名称" prop="point_name">
<el-input v-model="form.point_name" style="width: 370px;" />
</el-form-item>
<el-form-item v-show="pointStatusDialogList.length > 0" label="点位状态" prop="point_status">
<el-select
v-model="form.point_status"
size="mini"
placeholder="点位状态"
class="filter-item"
style="width: 370px;"
clearable
>
<el-option
v-for="item in pointStatusDialogList"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="锁定类型" prop="lock_type">
<el-select
v-model="form.lock_type"
size="mini"
placeholder="锁定类型"
class="filter-item"
style="width: 370px;"
>
<el-option
v-for="item in dict.d_lock_type"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item v-show="pointTypesDialogList.length > 0" label="点位类型" prop="device_point_type">
<el-form-item label="点位类型" prop="point_type">
<el-select
v-model="form.point_type"
size="mini"
placeholder="设备点位类型"
class="filter-item"
style="width: 370px;"
style="width: 300px"
>
<el-option
v-for="item in pointTypesDialogList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item v-if="form.point_status !== '1'" label="载具编码" prop="vehicle_code">
<el-input v-model="form.vehicle_code" clearable style="width: 370px;" />
<el-form-item v-show="crud.status.edit" label="点位状态" prop="point_status">
<el-select
v-model="form.point_status"
size="mini"
placeholder="点位状态"
class="filter-item"
style="width: 300px"
clearable
>
<el-option
v-for="item in dict.point_status"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item v-if="form.point_status === '3'" label="库存数" prop="ivt_qty">
<el-input-number :controls="false" class="clear-number-input" v-model="form.ivt_qty" type="number" :min="1" :precision="3" :max="99999" label="库存数" size="mini" />
<el-form-item v-show="crud.status.edit" label="锁定类型" prop="lock_type">
<el-select
v-model="form.lock_type"
size="mini"
placeholder="锁定类型"
class="filter-item"
style="width: 300px"
>
<el-option
v-for="item in dict.lock_type"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item v-if="form.point_status === '3'" label="物料来源">
<el-radio-group v-model="choose" size="mini">
<el-radio-button label="物料" />
<el-radio-button label="工单" />
</el-radio-group>
<el-form-item v-show="crud.status.edit" label="载具类型" prop="vehicle_type">
<el-select
v-model="form.vehicle_type"
size="mini"
placeholder="载具类型"
class="filter-item"
style="width: 300px"
clearable
>
<el-option
v-for="item in dict.vehicle_type"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item v-if="false" label="物料名称" prop="vehicle_code">
<el-input suffix-icon="el-icon-date" v-model="form.material_id" clearable style="width: 370px;" @focus="getMaterial" />
<el-form-item v-show="crud.status.edit" label="载具编码" prop="vehicle_code">
<el-input v-model="form.vehicle_code" clearable style="width: 300px" />
</el-form-item>
<el-form-item v-if="form.point_status === '3'" label="物料名称" prop="vehicle_code">
<el-input v-model="form.material_name" clearable style="width: 370px;" @focus="getMaterial" />
</el-form-item>
<el-form-item label="有无光电">
<el-switch
v-model="form.is_light"
active-value="1"
inactive-value="0"
active-color="#409EFF"
inactive-color="#C0CCDA"
/>
<el-form-item label="关联设备" prop="device_code">
<el-select
v-model="form.device_code"
size="mini"
placeholder="关联设备"
class="filter-item"
style="width: 300px"
clearable
>
<el-option
v-for="item in deviceList"
:key="item.device_id"
:label="item.device_name"
:value="item.device_code"
/>
</el-select>
</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: 300px" rows="2" type="textarea" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button type="info" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
</div>
</el-dialog>
@@ -317,34 +294,32 @@
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55" />
<el-table-column prop="point_code" label="点位编码" sortable width="120" show-overflow-tooltip>
<el-table-column prop="point_code" label="点位编码" width="120" show-overflow-tooltip />
<el-table-column prop="point_name" label="点位名称" width="150" show-overflow-tooltip />
<el-table-column prop="region_name" label="所属区域" min-width="80" show-overflow-tooltip />
<el-table-column prop="point_type_name" label="点位类型" min-width="120" />
<el-table-column prop="point_status" label="点位状态">
<template slot-scope="scope">
<el-link type="warning" @click="toView(scope.row)">{{ scope.row.point_code }}</el-link>
{{ dict.label.point_status[scope.row.point_status] }}
</template>
</el-table-column>
<el-table-column prop="lock_type" label="锁定类型">
<template slot-scope="scope">
{{ dict.label.lock_type[scope.row.lock_type] }}
</template>
</el-table-column>
<el-table-column prop="is_used" label="是否启用">
<template slot-scope="scope">
{{ dict.label.true_or_false[scope.row.is_used] }}
</template>
</el-table-column>
<el-table-column prop="point_name" label="点位名称" width="150" 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="120"/>
<el-table-column prop="vehicle_qty" label="载具数量" />
<el-table-column prop="vehicle_code" label="载具编码" min-width="120" />
<el-table-column prop="remark" label="备注" min-width="100" show-overflow-tooltip />
<el-table-column prop="is_used" label="是否有光电" min-width="100">
<template slot-scope="scope">
{{ scope.row.is_light == '1' ? '是' : '否' }}
</template>
</el-table-column>
<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
@@ -366,7 +341,6 @@
<pagination />
</div>
<MaterialDialog :dialog-show.sync="materialDialog" @tableChanged3="tableChanged" />
<WorkOrderDialog :dialog-show.sync="workOrderDialog" @tableChanged4="tableChanged" />
<ViewDialog ref="viewDialog" />
</div>
</template>
@@ -381,20 +355,19 @@ import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import ViewDialog from '@/views/wms/sch/point/ViewDialog'
import MaterialDialog from '@/views/wms/sch/point/MaterialDialog'
import WorkOrderDialog from '@/views/wms/sch/point/WorkOrderDialog'
const defaultForm = {
point_id: null,
point_code: null,
point_name: null,
point_type: null,
point_status: null,
point_status: '0',
lock_type: '1',
vehicle_code: null,
source_id: null,
remark: null,
is_light: '0',
is_used: null,
is_used: '1',
is_delete: null,
create_id: null,
create_name: null,
@@ -405,8 +378,8 @@ const defaultForm = {
}
export default {
name: 'Point',
dicts: ['vehicle_type', 'd_lock_type', 'SCH_TASK_TYPE_DTL', 'vehicle_type'],
components: { WorkOrderDialog, MaterialDialog, pagination, crudOperation, rrOperation, udOperation, ViewDialog },
dicts: ['vehicle_type', 'lock_type', 'point_status', 'true_or_false'],
components: { MaterialDialog, pagination, crudOperation, rrOperation, udOperation, ViewDialog },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
@@ -415,7 +388,7 @@ export default {
idField: 'point_id',
optShow: {
add: true,
edit: true,
edit: false,
del: true,
download: false,
reset: true
@@ -428,7 +401,6 @@ export default {
return {
syncLoading: false,
materialDialog: false,
workOrderDialog: false,
choose: '物料',
invtypelist: [],
pointStatusList: [],
@@ -438,6 +410,7 @@ export default {
options: [],
regionList: [],
permission: {},
deviceList: [],
rules: {
point_code: [
{ required: true, message: '点位编码不能为空', trigger: 'blur' }
@@ -445,11 +418,14 @@ export default {
point_name: [
{ required: true, message: '点位名称不能为空', trigger: 'blur' }
],
point_status: [
{ required: true, message: '点位状态不能为空', trigger: 'blur' }
],
point_type: [
{ required: true, message: '点位类型不能为空', trigger: 'blur' }
],
region_id: [
{ required: true, message: '区域类型不能为空', trigger: 'blur' }
{ required: true, message: '所属区域不能为空', trigger: 'blur' }
],
lock_type: [
{ required: true, message: '锁定类型不能为空', trigger: 'blur' }
@@ -462,6 +438,9 @@ export default {
crudPoint.getRegion().then(res => {
this.regionList = res
})
crudPoint.getDevice().then(res => {
this.deviceList = res
})
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
@@ -500,7 +479,6 @@ export default {
},
getPointStatusAndTypeList(id, flag) {
if (id) {
this.getPointStatusList(id, flag)
this.getPointTypeList(id, flag)
}
if (flag === 1) {
@@ -549,13 +527,6 @@ export default {
this.$refs.viewDialog.setParentData(row)
}
},
getMaterial() {
if (this.choose == '物料') {
this.materialDialog = true
} else {
this.workOrderDialog = true
}
},
tableChanged(row) {
this.form.material_name = row.material_name
this.form.material_id = row.material_id