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

更新

Browse Source
This commit is contained in:
gengby
2022-11-09 11:17:53 +08:00
parent 8c5affeff6
commit d779f3110d
128 changed files with 10762 additions and 4900 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-ui/src/views/login.vue
View File

@@ -50,7 +50,7 @@ export default {
name: 'Login',
data() {
return {
title: '诺力开发平台',
title: '宏丰lms系统',
title_param: 'platform',
Background: Background,
codeUrl: '',

9
lms/nladmin-ui/src/views/wms/basedata/vehicle/vehicle.js
View File

@@ -31,4 +31,11 @@ export function getVehicle(code) {
})
}
export default { add, edit, del, getVehicle }
export function getVehicleByType(type) {
return request({
url: 'api/vehicle/getVehicleByType/' + type,
method: 'get'
})
}
export default { add, edit, del, getVehicle, getVehicleByType }

28
lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
View File

@@ -149,13 +149,13 @@
disabled
/>
</el-form-item>
<el-form-item label="物料规格" prop="material_spec">
<el-input
v-model="form.material_spec"
style="width: 200px;"
disabled
/>
</el-form-item>
<!-- <el-form-item label="物料规格" prop="material_spec">-->
<!-- <el-input-->
<!-- v-model="form.material_spec"-->
<!-- style="width: 200px;"-->
<!-- disabled-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="计划数量" prop="plan_qty">
<el-input v-model="form.plan_qty" style="width: 200px;" />
</el-form-item>
@@ -184,7 +184,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="所属工序">
<el-form-item label="所属工序" prop="workorder_procedure">
<el-select
v-model="form.workorder_procedure"
clearable
@@ -260,7 +260,7 @@
<el-table-column prop="device_name" label="设备" width="100" show-overflow-tooltip />
<el-table-column prop="material_code" label="物料编码" width="100" show-overflow-tooltip />
<el-table-column prop="material_name" label="物料名称" width="100" show-overflow-tooltip />
<el-table-column prop="material_spec" label="物料规格" width="100" show-overflow-tooltip />
<!-- <el-table-column prop="material_spec" label="物料规格" width="100" show-overflow-tooltip />-->
<el-table-column prop="planproducestart_date" label="计划开始时间" min-width="150" show-overflow-tooltip />
<el-table-column prop="planproduceend_date" label="计划结束时间" min-width="150" show-overflow-tooltip />
<el-table-column prop="realproducestart_date" label="实际开始时间" min-width="150" show-overflow-tooltip />
@@ -342,7 +342,8 @@ const defaultForm = {
device_code: null,
is_canupdate_update: '1',
material_spec: null,
sale_id: null
sale_id: null,
workorder_procedure: ''
}
export default {
name: 'Produceshiftorder',
@@ -407,6 +408,9 @@ export default {
],
is_canupdate_update: [
{ required: true, message: '不能为空', trigger: 'blur' }
],
workorder_procedure: [
{ required: true, message: '所属工序不能为空', trigger: 'blur' }
]
}
}
@@ -443,7 +447,7 @@ export default {
},
// 下发按钮禁用条件
is_disabled(len, row) {
if (len === 1 && row.order_status === '00') {
if (len === 1 && row.order_status === '1') {
return false
} else {
return true
@@ -463,7 +467,7 @@ export default {
// 下发
submits(row) {
crudWorkorder.submits({ workorder_id: row.workorder_id }).then(res => {
this.crud.notify('下发成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})
}

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

@@ -27,7 +27,7 @@
size="mini"
placeholder="区域类型"
class="filter-item"
@change="getPointStatusAndTypeList"
@change="getPointStatusAndTypeList(query.region_id, 1)"
>
<el-option
v-for="item in regionList"
@@ -198,7 +198,7 @@
v-model="form.region_id"
placeholder="请选择"
style="width: 370px;"
@change="getPointStatusAndTypeList"
@change="getPointStatusAndTypeList(form.region_id, 2)"
>
<el-option
v-for="item in regionList"
@@ -208,10 +208,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;" />
</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;" />
</el-form-item>
<el-form-item label="点位状态" prop="point_status">
<el-select
@@ -223,7 +223,7 @@
clearable
>
<el-option
v-for="item in pointStatusList"
v-for="item in pointStatusDialogList"
:label="item.label"
:value="item.value"
/>
@@ -253,7 +253,7 @@
style="width: 370px;"
>
<el-option
v-for="item in pointTypesList"
v-for="item in pointTypesDialogList"
:label="item.label"
:value="item.value"
/>
@@ -288,13 +288,13 @@
<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="载具编码" />
<el-table-column prop="vehicle_qty" 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="载具编码" />-->
<!-- <el-table-column prop="vehicle_qty" label="载具数量" />-->
<el-table-column prop="remark" label="备注" min-width="100" show-overflow-tooltip />
<el-table-column prop="is_used" label="是否启用">
<template slot-scope="scope">
@@ -360,7 +360,9 @@ export default {
syncLoading: false,
invtypelist: [],
pointStatusList: [],
pointStatusDialogList: [],
pointTypesList: [],
pointTypesDialogList: [],
options: [],
regionList: [],
permission: {},
@@ -396,7 +398,7 @@ export default {
},
[CRUD.HOOK.afterToCU]() {
if (this.form.region_id) {
this.getPointStatusAndTypeList(this.form.region_id)
this.getPointStatusAndTypeList(this.form.region_id, 2)
}
},
hand(value) {
@@ -424,21 +426,25 @@ export default {
}).catch(() => {
})
},
getPointStatusAndTypeList(id) {
getPointStatusAndTypeList(id, flag) {
if (id) {
this.getPointStatusList(id)
this.getPointTypeList(id)
this.crud.toQuery()
this.getPointStatusList(id, flag)
this.getPointTypeList(id, flag)
}
if (flag === 1) { this.crud.toQuery() }
},
getPointStatusList(id) {
getPointStatusList(id, flag) {
crudRegion.getPointStatusSelectById(id).then(res => {
this.pointStatusList = res
if (flag === 1) {
this.pointStatusList = res
} else {
this.pointStatusDialogList = res
}
})
},
getPointTypeList(id) {
getPointTypeList(id, flag) {
crudRegion.getPointTypeSelectById(id).then(res => {
this.pointTypesList = res
if (flag === 1) { this.pointTypesList = res } else { this.pointTypesDialogList = res }
})
},
changeUsed(data, flag) { // 更改启用状态

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

@@ -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="区域编码" 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="140" show-overflow-tooltip />
<el-table-column prop="region_code" label="区域编码" :min-width="flexWidth('region_code',crud.data,'区域编码')"/>
<el-table-column prop="region_name" label="区域名称" :min-width="flexWidth('region_name',crud.data,'区域名称')" />
<el-table-column prop="point_type_explain" label="点位类型说明" :min-width="flexWidth('point_type_explain',crud.data,'点位类型说明')" />
<el-table-column prop="point_status_explain" label="点位状态说明" :min-width="flexWidth('point_status_explain',crud.data,'点位状态说明')" />
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')"/>
<el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')"/>
<el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
@@ -92,6 +92,8 @@ const defaultForm = {
region_id: null,
region_code: null,
region_name: null,
point_type_explain: null,
point_status_explain: null,
remark: null,
create_id: null,
create_name: null,

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

@@ -218,7 +218,7 @@ export default {
sort: 'task_id,desc',
crudMethod: { ...crudTask },
query: {
task_code: '', vehicle_code: '', start_point_code: '', next_point_code: '', task_type: '', finished_type: '', task_status: ''
task_code: '', vehicle_code: '', start_point_code: '', next_point_code: '', task_type: '', finished_type: '', task_status: '-1'
},
optShow: {
add: false,

188
lms/nladmin-ui/src/views/wms/st/cppoint/cppInRegion.vue
View File

@@ -1,188 +0,0 @@
<template>
<div>
<!--工具栏-->
<div class="head-container">
<div v-if="crud.props.searchToggle">
<el-form
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="90px"
label-suffix=":"
>
<el-form-item label="单据编号">
<el-input
v-model="query.bill_code"
clearable
size="mini"
style="width: 185px;"
placeholder="单据编号"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="单据状态">
<el-select
v-model="query.bill_status"
clearable
filterable
size="mini"
class="filter-item"
style="width: 185px;"
@change="crud.toQuery"
>
<el-option
v-for="item in dict.st_bill_status"
: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>
<rrOperation :crud="crud" />
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="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="bill_code">
<el-input v-model="form.bill_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="出入类型" prop="io_type">
<el-input v-model="form.io_type" style="width: 370px;" />
</el-form-item>
<el-form-item label="批次">
<el-input v-model="form.pcsn" style="width: 370px;" />
</el-form-item>
<el-form-item label="载具编码">
<el-input v-model="form.vehicle_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="数量">
<el-input v-model="form.qty" style="width: 370px;" />
</el-form-item>
<el-form-item label="单据状态" prop="bill_status">
<el-input v-model="form.bill_status" style="width: 370px;" />
</el-form-item>
<el-form-item label="起始点位编码">
<el-input v-model="form.start_point_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="终点点位编码">
<el-input v-model="form.end_point_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="起始区域">
<el-input v-model="form.start_region_id" style="width: 370px;" />
</el-form-item>
<el-form-item label="终点区域">
<el-input v-model="form.end_region_id" style="width: 370px;" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
</div>
</el-dialog>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" />
<el-table-column prop="bill_code" label="单据编号" min-width="150" />
<el-table-column prop="io_type" label="出入类型">
<template slot-scope="scope">
{{ dict.label.io_type[scope.row.io_type] }}
</template>
</el-table-column>
<el-table-column prop="pcsn" label="批次" />
<el-table-column prop="vehicle_code" label="载具编码" show-overflow-tooltip />
<el-table-column prop="qty" label="数量" :formatter="crud.formatNum3" />
<el-table-column prop="bill_status" label="单据状态">
<template slot-scope="scope">
{{ dict.label.st_bill_status[scope.row.bill_status] }}
</template>
</el-table-column>
<el-table-column prop="start_point_code" label="起点" min-width="120" />
<el-table-column prop="end_point_code" label="终点" min-width="120" />
<!-- <el-table-column prop="start_region_id" label="起始区域" />-->
<!-- <el-table-column prop="end_region_id" label="终点区域" />-->
<el-table-column prop="remark" label="备注" />
<el-table-column prop="update_optname" label="修改人" min-width="100" />
<el-table-column prop="update_time" label="修改时间" min-width="140" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
:data="scope.row"
:permission="permission"
/>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<pagination />
</div>
</div>
</template>
<script>
import crudBill from '@/views/wms/st/regionio'
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 = { iostorinv_id: null, bill_code: null, io_type: null, material_id: null, pcsn: null, vehicle_code: null, qty: null, qty_unit_id: null, bill_status: null, start_point_code: null, end_point_code: null, start_region_id: null, end_region_id: null, cust_id: null, create_mode: null, task_id: null, remark: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, confirm_optid: null, confirm_optname: null, confirm_time: null, is_delete: null }
export default {
name: 'CppInRegion',
components: { pagination, crudOperation, rrOperation, udOperation },
dicts: ['io_type', 'st_bill_status'],
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
title: '养生区入库管理',
url: 'api/regionio',
idField: 'qty_unit_id',
sort: 'qty_unit_id,desc',
query: {
io_type: '1',
io_region: "'CPQYA01'"
},
crudMethod: { ...crudBill }
})
},
data() {
return {
permission: {
},
rules: {
bill_code: [
{ required: true, message: '单据编号不能为空', trigger: 'blur' }
],
io_type: [
{ required: true, message: '出入类型不能为空', trigger: 'blur' }
],
bill_status: [
{ required: true, message: '单据状态不能为空', trigger: 'blur' }
]
}}
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
}
}
}
</script>
<style scoped>
</style>

274
lms/nladmin-ui/src/views/wms/st/cppoint/cppInventory.vue
View File

@@ -1,274 +0,0 @@
<template>
<div>
<!--工具栏-->
<div class="head-container">
<div v-if="crud.props.searchToggle">
<el-form
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="90px"
label-suffix=":"
>
<el-form-item label="点位编码">
<el-input
v-model="query.point_code"
clearable
size="mini"
style="width: 185px;"
placeholder="点位编码"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="排">
<el-input
v-model="query.row_num"
clearable
size="mini"
style="width: 185px;"
placeholder="排"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="列">
<el-input
v-model="query.col_num"
clearable
size="mini"
style="width: 185px;"
placeholder="列"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="层">
<el-input
v-model="query.layer_num"
clearable
size="mini"
style="width: 185px;"
placeholder="层"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="载具类型">
<el-select
v-model="query.vehicle_type"
clearable
filterable
size="mini"
class="filter-item"
style="width: 185px;"
@change="hand"
>
<el-option
v-for="item in dict.vehicle_type"
: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.lock_type"
clearable
filterable
size="mini"
class="filter-item"
style="width: 185px;"
@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-switch
v-model="query.is_used"
active-value="0"
inactive-value="1"
active-color="#C0CCDA"
inactive-color="#409EFF"
@change="hand"
/>
</el-form-item>
<rrOperation :crud="crud" />
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission">
<el-button
slot="right"
class="filter-item"
size="mini"
type="primary"
icon="el-icon-sort"
:disabled="crud.selections.length === 0"
@click="outInventory(crud.selections)"
>
出库
</el-button>
</crudOperation>
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="550px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="120px">
<el-form-item label="点位编码" prop="standing_time">
<el-input v-model="form.point_code" style="width: 370px;" :disabled="true" />
</el-form-item>
<el-form-item label="托盘类型">
<el-select
v-model="form.vehicle_type"
clearable
filterable
size="mini"
class="filter-item"
style="width: 370px;"
>
<el-option
v-for="item in dict.vehicle_type"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="锁定类型">
<el-select
v-model="form.lock_type"
clearable
filterable
size="mini"
class="filter-item"
style="width: 185px;"
>
<el-option
v-for="item in dict.d_lock_type"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
</div>
</el-dialog>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" />
<el-table-column prop="point_code" label="点位编码" min-width="100" show-overflow-tooltip />
<el-table-column prop="region_name" label="区域名称" min-width="120" show-overflow-tooltip />
<el-table-column prop="pcsn" label="批次" />
<el-table-column prop="ivt_qty" label="库存数" :formatter="crud.formatNum3" />
<el-table-column prop="instorage_time" label="入库时间" min-width="150" show-overflow-tooltip />
<el-table-column prop="vehicle_type" label="托盘类型" min-width="100" />
<el-table-column prop="remark" label="备注" />
<el-table-column prop="is_used" label="是否启用">
<template slot-scope="scope">
{{ scope.row.is_used=='1' ? '是' : '否' }}
</template>
</el-table-column>
<el-table-column prop="lock_type" label="锁定类型">
<template slot-scope="scope">
{{ dict.label.d_lock_type[scope.row.lock_type] }}
</template>
</el-table-column>
<el-table-column prop="update_optname" label="修改人" />
<el-table-column prop="update_time" label="修改时间" min-width="150" show-overflow-tooltip />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
:data="scope.row"
:permission="permission"
:is-visiable-del="false"
/>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<pagination />
</div>
</div>
</template>
<script>
import crudStructivt from '../structivt'
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 = { point_id: null, point_code: null, pcsn: null, material_id: null, ivt_qty: null, qty_unit_id: null, instorage_time: null, ext_code: null, point_status: null, vehicle_type: null, row_num: null, col_num: null, layer_num: null, remark: null, is_used: null, is_lock: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null }
export default {
name: 'CppInventory',
dicts: ['sch_point_status', 'vehicle_type', 'is_used', 'd_lock_type'],
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
title: '成品库区',
url: 'api/structivt',
idField: 'point_id',
sort: 'point_id,desc',
optShow: {
add: false,
edit: true,
del: false,
download: false,
reset: true
},
query: {
region_code: "'CPQYA01'"
}
})
},
data() {
return {
permission: {
},
rules: {
is_used: [
{ required: true, message: '是否启用不能为空', trigger: 'blur' }
],
is_lock: [
{ required: true, message: '是否锁定不能为空', trigger: 'blur' }
]
}
}
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
},
hand(value) {
this.crud.toQuery()
},
outInventory(values) {
console.log(values)
crudStructivt.outInventory(values).then(res => {
this.crud.notify('出库成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})
}
}
}
</script>
<style scoped>
</style>

206
lms/nladmin-ui/src/views/wms/st/cppoint/cppOutRegion.vue
View File

@@ -1,206 +0,0 @@
<template>
<div>
<!--工具栏-->
<div class="head-container">
<div v-if="crud.props.searchToggle">
<el-form
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="90px"
label-suffix=":"
>
<el-form-item label="单据编号">
<el-input
v-model="query.bill_code"
clearable
size="mini"
style="width: 185px;"
placeholder="单据编号"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="单据状态">
<el-select
v-model="query.bill_status"
clearable
filterable
size="mini"
class="filter-item"
style="width: 185px;"
@change="crud.toQuery"
>
<el-option
v-for="item in dict.st_bill_status"
: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>
<rrOperation :crud="crud" />
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission">
<el-button
slot="right"
class="filter-item"
size="mini"
type="primary"
icon="el-icon-position"
:disabled="crud.selections.length === 0"
@click="makeTask(crud.selections)"
>
生成任务
</el-button>
</crudOperation>
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="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="bill_code">
<el-input v-model="form.bill_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="出入类型" prop="io_type">
<el-input v-model="form.io_type" style="width: 370px;" />
</el-form-item>
<el-form-item label="批次">
<el-input v-model="form.pcsn" style="width: 370px;" />
</el-form-item>
<el-form-item label="载具编码">
<el-input v-model="form.vehicle_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="数量">
<el-input v-model="form.qty" style="width: 370px;" />
</el-form-item>
<el-form-item label="单据状态" prop="bill_status">
<el-input v-model="form.bill_status" style="width: 370px;" />
</el-form-item>
<el-form-item label="起始点位编码">
<el-input v-model="form.start_point_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="终点点位编码">
<el-input v-model="form.end_point_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="起始区域">
<el-input v-model="form.start_region_id" style="width: 370px;" />
</el-form-item>
<el-form-item label="终点区域">
<el-input v-model="form.end_region_id" style="width: 370px;" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
</div>
</el-dialog>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" />
<el-table-column prop="bill_code" label="单据编号" min-width="150" />
<el-table-column prop="io_type" label="出入类型">
<template slot-scope="scope">
{{ dict.label.io_type[scope.row.io_type] }}
</template>
</el-table-column>
<el-table-column prop="pcsn" label="批次" />
<el-table-column prop="vehicle_code" label="载具编码" show-overflow-tooltip />
<el-table-column prop="qty" label="数量" :formatter="crud.formatNum3" />
<el-table-column prop="bill_status" label="单据状态">
<template slot-scope="scope">
{{ dict.label.st_bill_status[scope.row.bill_status] }}
</template>
</el-table-column>
<el-table-column prop="start_point_code" label="起点" min-width="120" />
<el-table-column prop="end_point_code" label="终点" min-width="120" />
<!-- <el-table-column prop="start_region_id" label="起始区域" />-->
<!-- <el-table-column prop="end_region_id" label="终点区域" />-->
<el-table-column prop="remark" label="备注" />
<el-table-column prop="update_optname" label="修改人" min-width="100" />
<el-table-column prop="update_time" label="修改时间" min-width="140" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
:data="scope.row"
:permission="permission"
/>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<pagination />
</div>
</div>
</template>
<script>
import crudBill from '@/views/wms/st/regionio'
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 = { iostorinv_id: null, bill_code: null, io_type: null, material_id: null, pcsn: null, vehicle_code: null, qty: null, qty_unit_id: null, bill_status: null, start_point_code: null, end_point_code: null, start_region_id: null, end_region_id: null, cust_id: null, create_mode: null, task_id: null, remark: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, confirm_optid: null, confirm_optname: null, confirm_time: null, is_delete: null }
export default {
name: 'CppOutRegion',
components: { pagination, crudOperation, rrOperation, udOperation },
dicts: ['io_type', 'st_bill_status'],
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
title: '成品区出库管理',
url: 'api/regionio',
idField: 'qty_unit_id',
sort: 'qty_unit_id,desc',
query: {
io_type: '2',
io_region: "'CPQYA01'"
},
crudMethod: { ...crudBill }
})
},
data() {
return {
permission: {
},
rules: {
bill_code: [
{ required: true, message: '单据编号不能为空', trigger: 'blur' }
],
io_type: [
{ required: true, message: '出入类型不能为空', trigger: 'blur' }
],
bill_status: [
{ required: true, message: '单据状态不能为空', trigger: 'blur' }
]
}}
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
},
makeTask(values) {
crudBill.makeTask(values).then(res => {
this.crud.notify('生成任务成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})
}
}
}
</script>
<style scoped>
</style>

31
lms/nladmin-ui/src/views/wms/st/cppoint/index.vue
View File

@@ -1,31 +0,0 @@
<template>
<div class="app-container">
<el-tabs type="border-card">
<el-tab-pane>
<span slot="label"><i class="el-icon-date" /> 库存查询</span>
<cpp-inventory />
</el-tab-pane>
<el-tab-pane label="入库管理">
<cpp-in-region />
</el-tab-pane>
<el-tab-pane label="出库管理">
<cpp-out-region />
</el-tab-pane>
</el-tabs>
</div>
</template>
<script>
import CppInventory from '@/views/wms/st/cppoint/cppInventory'
import CppInRegion from '@/views/wms/st/cppoint/cppInRegion'
import CppOutRegion from '@/views/wms/st/cppoint/cppOutRegion'
export default {
name: 'Cppoint',
components: { CppOutRegion, CppInRegion, CppInventory }
}
</script>
<style scoped>
</style>

20
lms/nladmin-ui/src/views/wms/st/ysa/index.vue
View File

@@ -5,24 +5,24 @@
<span slot="label"><i class="el-icon-date" /> 库存查询</span>
<Inventory />
</el-tab-pane>
<el-tab-pane label="修改记录" />
<el-tab-pane label="入库管理">
<ysq-in-region />
</el-tab-pane>
<el-tab-pane label="出库管理">
<ysq-out-region />
</el-tab-pane>
<!-- <el-tab-pane label="修改记录" />-->
<!-- <el-tab-pane label="入库管理">-->
<!-- <ysq-in-region />-->
<!-- </el-tab-pane>-->
<!-- <el-tab-pane label="出库管理">-->
<!-- <ysq-out-region />-->
<!-- </el-tab-pane>-->
</el-tabs>
</div>
</template>
<script>
import Inventory from '@/views/wms/st/ysa/inventory'
import YsqInRegion from '@/views/wms/st/ysa/ysqInRegion'
import YsqOutRegion from '@/views/wms/st/ysa/ysqOutRegion'
// import YsqInRegion from '@/views/wms/st/ysa/ysqInRegion'
// import YsqOutRegion from '@/views/wms/st/ysa/ysqOutRegion'
export default {
name: 'Ysapoint',
components: { YsqOutRegion, YsqInRegion, Inventory }
components: { Inventory }
}
</script>

203
lms/nladmin-ui/src/views/wms/st/ysa/inventory.vue
View File

@@ -20,35 +20,22 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="块">
<el-input
v-model="query.block_num"
<el-form-item label="所属区域">
<el-select
v-model="query.region_code"
clearable
filterable
size="mini"
class="filter-item"
style="width: 185px;"
placeholder="块"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="排">
<el-input
v-model="query.row_num"
clearable
size="mini"
style="width: 185px;"
placeholder="排"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="列">
<el-input
v-model="query.col_num"
clearable
size="mini"
style="width: 185px;"
placeholder="列"
@keyup.enter.native="crud.toQuery"
/>
@change="hand"
>
<el-option
v-for="item in region_code_list"
:label="item.region_name"
:value="item.region_code"
/>
</el-select>
</el-form-item>
<el-form-item label="载具类型">
<el-select
@@ -111,11 +98,36 @@
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="550px">
<el-dialog
:close-on-click-modal="false"
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
width="550px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="120px">
<el-form-item label="点位编码" prop="standing_time">
<el-input v-model="form.point_code" style="width: 370px;" :disabled="true" />
</el-form-item>
<el-form-item v-if="false" label="物料标识" prop="material_id">
<el-input v-model="form.material_id" style="width: 370px;" />
</el-form-item>
<el-form-item label="物料编码" prop="material_code">
<el-input
v-model="form.material_code"
style="width: 370px;"
clearable
@focus="materialShow=true"
@clear="form.material_id='',form.material_code='',form.material_name=''"
/>
</el-form-item>
<el-form-item label="物料名称" prop="material_name">
<el-input
v-model="form.material_name"
style="width: 370px;"
disabled
/>
</el-form-item>
<el-form-item label="托盘类型">
<el-select
v-model="form.vehicle_type"
@@ -124,6 +136,8 @@
size="mini"
class="filter-item"
style="width: 370px;"
@clear="form.vehicle_code=''"
@change="getVehicleByType(form.vehicle_type)"
>
<el-option
v-for="item in dict.vehicle_type"
@@ -132,25 +146,41 @@
/>
</el-select>
</el-form-item>
<el-form-item label="静置时间(min)" prop="standing_time">
<el-input v-model="form.standing_time" style="width: 370px;" />
</el-form-item>
<el-form-item label="锁定类型">
<el-form-item label="托盘编号">
<el-select
v-model="form.lock_type"
v-model="form.vehicle_code"
clearable
filterable
size="mini"
class="filter-item"
style="width: 185px;"
style="width: 370px;"
>
<el-option
v-for="item in dict.d_lock_type"
:label="item.label"
:value="item.value"
v-for="item in vehicleList"
:label="item.vehicle_code"
:value="item.vehicle_code"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="静置时间(min)" prop="standing_time">-->
<!-- <el-input v-model="form.standing_time" style="width: 370px;" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="锁定类型">-->
<!-- <el-select-->
<!-- v-model="form.lock_type"-->
<!-- clearable-->
<!-- filterable-->
<!-- size="mini"-->
<!-- class="filter-item"-->
<!-- style="width: 185px;"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in dict.d_lock_type"-->
<!-- :label="item.label"-->
<!-- :value="item.value"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
@@ -158,13 +188,28 @@
</div>
</el-dialog>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table
ref="table"
v-loading="crud.loading"
:data="crud.data"
size="mini"
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55" />
<el-table-column prop="point_code" label="点位编码" min-width="100" show-overflow-tooltip />
<el-table-column prop="region_name" label="区域名称" min-width="120" show-overflow-tooltip />
<el-table-column prop="pcsn" label="批次" />
<el-table-column prop="vehicle_type" label="托盘类型" min-width="100">
<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 prop="material_code" label="物料编号" />
<el-table-column prop="material_name" label="物料名称" />
<!-- <el-table-column prop="pcsn" label="批次" />-->
<el-table-column prop="ivt_qty" label="库存数" :formatter="crud.formatNum3" />
<el-table-column prop="instorage_time" label="入库时间" min-width="150" show-overflow-tooltip />
<el-table-column prop="instorage_time" label="出入库时间" min-width="150" show-overflow-tooltip />
<el-table-column prop="lock_type" label="锁定类型">
<template slot-scope="scope">
{{ dict.label.d_lock_type[scope.row.lock_type] }}
@@ -172,20 +217,15 @@
</el-table-column>
<el-table-column prop="is_used" label="是否启用">
<template slot-scope="scope">
{{ scope.row.is_used=='1' ? '是' : '否' }}
{{ scope.row.is_used == '1' ? '是' : '否' }}
</template>
</el-table-column>
<el-table-column prop="vehicle_type" label="托盘类型" min-width="100">
<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 prop="standing_time" label="静置时间(min)" min-width="120" />
<!-- <el-table-column prop="standing_time" label="静置时间(min)" min-width="120" />-->
</el-table>
<!--分页组件-->
<pagination />
</div>
<MaterDtl :dialog-show.sync="materialShow" :is-single="true" @setMaterValue="setMaterValue" />
</div>
</template>
@@ -196,16 +236,46 @@ import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import crudPoint from '@/api/wms/sch/point'
import MaterDtl from '@/views/wms/pub/MaterDialog'
import crudVehicle from '@/views/wms/basedata/vehicle/vehicle'
const defaultForm = { point_id: null, point_code: null, pcsn: null, material_id: null, ivt_qty: null, qty_unit_id: null, instorage_time: null, ext_code: null, point_status: null, vehicle_type: null, standing_time: null, block_num: null, row_num: null, col_num: null, layer_num: null, remark: null, is_used: null, is_lock: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null }
const defaultForm = {
point_id: null,
point_code: null,
pcsn: null,
material_id: null,
ivt_qty: null,
qty_unit_id: null,
instorage_time: null,
ext_code: null,
point_status: null,
vehicle_type: null,
standing_time: null,
block_num: null,
row_num: null,
col_num: null,
layer_num: null,
remark: null,
is_used: null,
is_lock: null,
create_id: null,
create_name: null,
create_time: null,
update_optid: null,
update_optname: null,
update_time: null,
material_code: '',
material_name: ''
}
export default {
name: 'Inventory',
components: { pagination, crudOperation, rrOperation, udOperation },
components: { pagination, crudOperation, rrOperation, udOperation, MaterDtl },
dicts: ['sch_point_status', 'vehicle_type', 'is_used', 'd_lock_type'],
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
title: '养生A区',
title: '库存查询',
url: 'api/structivt',
idField: 'point_id',
sort: 'point_id,desc',
@@ -216,16 +286,15 @@ export default {
download: false,
reset: true
},
query: {
region_code: "'YSQA01', 'YSAQKTPQ01'"
},
crudMethod: { ...crudStructivt }
})
},
data() {
return {
permission: {
},
permission: {},
region_code_list: [],
vehicleList: [],
materialShow: false,
rules: {
is_used: [
{ required: true, message: '是否启用不能为空', trigger: 'blur' }
@@ -236,16 +305,34 @@ export default {
}
}
},
created() {
crudPoint.getRegion().then(res => {
this.region_code_list = res
})
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
},
getVehicleByType(type) {
if (type !== '' && type !== null && type !== undefined) {
crudVehicle.getVehicleByType(type).then(res => {
this.vehicleList = res
})
}
},
// 新增编辑给form表单物料相关信息赋值
setMaterValue(row) {
this.form.material_id = row.material_id
this.form.material_code = row.material_code
this.form.material_name = row.material_name
},
hand(value) {
// 块排列 的参数整合
if (this.locations.length > 0) {
this.query.locationsOptions = this.locations[0] + '/' + this.locations[1] + '/' + this.locations[2]
}
// if (this.locations.length > 0) {
// this.query.locationsOptions = this.locations[0] + '/' + this.locations[1] + '/' + this.locations[2]
// }
this.crud.toQuery()
}
}