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-18 11:24:05 +08:00
parent b101cc1150
commit 2caca17527
115 changed files with 193 additions and 5544 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
lms/nladmin-ui/src/api/wms/basedata/master/classstandard.js → lms/nladmin-ui/src/api/wms/basedata/classstandard.js
View File

0
lms/nladmin-ui/src/api/wms/basedata/master/customerbase.js → lms/nladmin-ui/src/api/wms/basedata/customerbase.js
View File

34
lms/nladmin-ui/src/api/wms/basedata/master/businesstypematerial.js
View File

@@ -1,34 +0,0 @@
import request from '@/utils/request'
export function add(data) {
return request({
url: 'api/businesstypematerial',
method: 'post',
data
})
}
export function del(ids) {
return request({
url: 'api/businesstypematerial/',
method: 'delete',
data: ids
})
}
export function edit(data) {
return request({
url: 'api/businesstypematerial',
method: 'put',
data
})
}
export function getTypeCode() {
return request({
url: 'api/businesstypematerial/getTypeCode',
method: 'get'
})
}
export default { add, edit, del, getTypeCode }

50
lms/nladmin-ui/src/api/wms/basedata/master/materialparameters.js
View File

@@ -1,50 +0,0 @@
import request from '@/utils/request'
export function add(data) {
return request({
url: 'api/MaterialParameters',
method: 'post',
data
})
}
export function del(ids) {
return request({
url: 'api/MaterialParameters/',
method: 'delete',
data: ids
})
}
export function edit(data) {
return request({
url: 'api/MaterialParameters',
method: 'put',
data
})
}
export function save(data) {
return request({
url: 'api/MaterialParameters/save',
method: 'put',
data
})
}
export function queryMaterialParam(data) {
return request({
url: 'api/MaterialParameters/materialParam',
method: 'post',
data
})
}
export function getSeries() {
return request({
url: 'api/MaterialParameters/getSeries',
method: 'get'
})
}
export default { add, edit, del, save, queryMaterialParam, getSeries }

0
lms/nladmin-ui/src/api/wms/basedata/master/materialbase.js → lms/nladmin-ui/src/api/wms/basedata/materialbase.js
View File

0
lms/nladmin-ui/src/api/wms/basedata/master/mdPbMeasureunit.js → lms/nladmin-ui/src/api/wms/basedata/mdPbMeasureunit.js
View File

33
lms/nladmin-ui/src/api/wms/basedata/pdm/workProcedure.js
View File

@@ -1,33 +0,0 @@
import request from '@/utils/request'
export function add(data) {
return request({
url: 'api/workProcedure',
method: 'post',
data
})
}
export function del(ids) {
return request({
url: 'api/workProcedure/',
method: 'delete',
data: ids
})
}
export function edit(data) {
return request({
url: 'api/workProcedure',
method: 'put',
data
})
}
export function downSelect() {
return request({
url: 'api/workProcedure/downSelect'
})
}
export default { add, edit, del, downSelect }

43
lms/nladmin-ui/src/api/wms/basedata/st/sectattr.js
View File

@@ -1,43 +0,0 @@
import request from '@/utils/request'
export function add(data) {
return request({
url: 'api/sectattr',
method: 'post',
data
})
}
export function del(ids) {
return request({
url: 'api/sectattr/',
method: 'delete',
data: ids
})
}
export function edit(data) {
return request({
url: 'api/sectattr',
method: 'put',
data
})
}
export function getSect(params) {
return request({
url: 'api/sectattr/getSect',
method: 'get',
params
})
}
export function changeActive(data) {
return request({
url: 'api/sectattr/changeActive',
method: 'put',
data
})
}
export default { add, edit, del, getSect, changeActive }

43
lms/nladmin-ui/src/api/wms/basedata/st/storattr.js
View File

@@ -1,43 +0,0 @@
import request from '@/utils/request'
export function add(data) {
return request({
url: 'api/Storattr',
method: 'post',
data
})
}
export function del(ids) {
return request({
url: 'api/Storattr/',
method: 'delete',
data: ids
})
}
export function edit(data) {
return request({
url: 'api/Storattr',
method: 'put',
data
})
}
export function getStor(params) {
return request({
url: 'api/Storattr/getStor',
method: 'get',
params
})
}
export function changeActive(data) {
return request({
url: 'api/Storattr/changeActive',
method: 'put',
data
})
}
export default { add, edit, del, getStor, changeActive }

35
lms/nladmin-ui/src/api/wms/basedata/st/structattr.js
View File

@@ -1,35 +0,0 @@
import request from '@/utils/request'
export function add(data) {
return request({
url: 'api/structattr',
method: 'post',
data
})
}
export function del(ids) {
return request({
url: 'api/structattr/',
method: 'delete',
data: ids
})
}
export function edit(data) {
return request({
url: 'api/structattr',
method: 'put',
data
})
}
export function changeActive(data) {
return request({
url: 'api/structattr/changeActive',
method: 'put',
data
})
}
export default { add, edit, del, changeActive }

49
lms/nladmin-ui/src/api/wms/basedata/st/structivt.js
View File

@@ -1,49 +0,0 @@
import request from '@/utils/request'
export function add(data) {
return request({
url: 'api/structivt',
method: 'post',
data
})
}
export function del(ids) {
return request({
url: 'api/structivt/',
method: 'delete',
data: ids
})
}
export function edit(data) {
return request({
url: 'api/structivt',
method: 'put',
data
})
}
export function getStruct() {
return request({
url: 'api/structivt/getStruct',
method: 'get'
})
}
export function getStructById(data) {
return request({
url: 'api/structivt/getStructById',
method: 'post',
data
})
}
export function getUnits() {
return request({
url: 'api/structivt/getUnits',
method: 'get'
})
}
export default { add, edit, del, getStruct, getStructById, getUnits }

0
lms/nladmin-ui/src/api/wms/basedata/master/supplierbase.js → lms/nladmin-ui/src/api/wms/basedata/supplierbase.js
View File

0
lms/nladmin-ui/src/api/wms/basedata/master/storagevehicleinfo.js → lms/nladmin-ui/src/api/wms/basedata/vehicle.js
View File

2
lms/nladmin-ui/src/views/monitor/online/index.vue
View File

@@ -29,7 +29,7 @@
<el-table-column prop="ip" label="登录IP" />
<el-table-column show-overflow-tooltip prop="address" label="登录地点" />
<el-table-column prop="browser" label="浏览器" width="145px" />
<el-table-column prop="loginTime" label="登录时间">
<el-table-column prop="loginTime" label="登录时间" min-width="110" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.loginTime) }}</span>
</template>

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

@@ -35,7 +35,7 @@
<el-table-column label="所属字典" width="135">
{{ query.dictName }}
</el-table-column>
<el-table-column prop="label" label="字典标签" align="center" width="100" />
<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">

2
lms/nladmin-ui/src/views/wms/basedata/master/class/index.vue → lms/nladmin-ui/src/views/wms/basedata/class/index.vue
View File

@@ -131,7 +131,7 @@
</template>
<script>
import crudClassstandard from '@/api/wms/basedata/master/classstandard'
import crudClassstandard from '@/api/wms/basedata/classstandard'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'

4
lms/nladmin-ui/src/views/wms/basedata/master/customer/index.vue → lms/nladmin-ui/src/views/wms/basedata/customer/index.vue
View File

@@ -163,7 +163,7 @@
</template>
<script>
import crudCustomerbase from '@/api/wms/basedata/master/customerbase'
import crudCustomerbase from '@/api/wms/basedata/customerbase'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
@@ -171,7 +171,7 @@ import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import crudClassstandard from '@/api/wms/basedata/master/classstandard'
import crudClassstandard from '@/api/wms/basedata/classstandard'
const defaultForm = {
cust_id: null,

10
lms/nladmin-ui/src/views/wms/basedata/master/material/index.vue → lms/nladmin-ui/src/views/wms/basedata/material/index.vue
View File

@@ -115,7 +115,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="静置时间" prop="standing_time">
<el-input-number v-model="form.standing_time" :controls="false" :min="0" label="分钟" style="width: 200px;"/>
<el-input-number v-model="form.standing_time" :controls="false" :min="0" label="分钟" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="8">
@@ -146,7 +146,7 @@
<el-table-column prop="material_model" label="物料型号" />
<el-table-column prop="class_name" label="物料分类" width="140" />
<el-table-column prop="unit_name" label="计量单位" />
<el-table-column prop="standing_time" label="静置时间（分钟）" width="130px"/>
<el-table-column prop="standing_time" label="静置时间（分钟）" width="130px" />
<el-table-column prop="product_series_name" label="系列" />
<el-table-column label="启用" align="center" prop="is_used">
<template slot-scope="scope">
@@ -184,7 +184,7 @@
</template>
<script>
import crudMaterialbase from '@/api/wms/basedata/master/materialbase'
import crudMaterialbase from '@/api/wms/basedata/materialbase'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
@@ -192,8 +192,8 @@ import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import crudClassstandard from '@/api/wms/basedata/master/classstandard'
import crudMdPbMeasureunit from '@/api/wms/basedata/master/mdPbMeasureunit'
import crudClassstandard from '@/api/wms/basedata/classstandard'
import crudMdPbMeasureunit from '@/api/wms/basedata/mdPbMeasureunit'
const defaultForm = {
material_id: null,

2
lms/nladmin-ui/src/views/wms/basedata/master/measure/index.vue → lms/nladmin-ui/src/views/wms/basedata/measure/index.vue
View File

@@ -75,7 +75,7 @@
</template>
<script>
import crudMdPbMeasureunit from '@/api/wms/basedata/master/mdPbMeasureunit'
import crudMdPbMeasureunit from '@/api/wms/basedata/mdPbMeasureunit'
import CRUD, { presenter, header, form, crud } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'

137
lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue
View File

@@ -1,137 +0,0 @@
<template>
<div class="app-container">
<!--工具栏-->
<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.struct"
clearable
size="small"
placeholder="仓位编码或名称"
style="width: 200px;"
class="filter-item"
/>
</el-form-item>
<el-form-item label="物料搜索">
<el-input
v-model="query.material"
clearable
size="small"
placeholder="物料编码、名称或规格"
style="width: 200px;"
class="filter-item"
/>
</el-form-item>
<el-form-item label="下料区域">
<el-select
v-model="query.region_id"
clearable
filterable
size="mini"
class="filter-item"
style="width: 200px;"
>
<el-option
v-for="item in reginoList"
:label="item.region_name"
:value="item.region_id"
/>
</el-select>
</el-form-item>
<rrOperation :crud="crud" />
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<!--表格渲染-->
<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="120" show-overflow-tooltip />
<el-table-column prop="point_name" label="仓位名称" min-width="120" show-overflow-tooltip />
<el-table-column prop="region_name" label="下料区域" min-width="120" show-overflow-tooltip />
<el-table-column prop="material_code" label="物料编码" min-width="120" show-overflow-tooltip />
<el-table-column prop="material_name" label="物料名称" min-width="120" show-overflow-tooltip />
<el-table-column prop="quality_scode" label="品质类型" min-width="120" show-overflow-tooltip >
<template slot-scope="scope">
{{ dict.label.ST_QUALITY_SCODE[scope.row.quality_scode] }}
</template>
</el-table-column>
<el-table-column prop="pcsn" label="批次" min-width="120" show-overflow-tooltip />
<el-table-column prop="canuse_qty" label="可用数" :formatter="rounding" />
<el-table-column prop="frozen_qty" label="冻结数" :formatter="rounding" />
<el-table-column prop="ivt_qty" label="库存数" :formatter="rounding" />
<el-table-column prop="warehousing_qty" label="待入数" :formatter="rounding" />
<el-table-column prop="unit_name" label="计量单位" />
<el-table-column prop="instorage_time" label="入库时间" min-width="150" />
</el-table>
<!--分页组件-->
<pagination />
</div>
</div>
</template>
<script>
import crudStructivt from '@/api/wms/basedata/st/structivt'
import CRUD, { presenter, header, form, crud } 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'
import crudPoint from '@/api/wms/sch/point'
const defaultForm = { stockrecord_id: null, cascader: null, struct_id: null, struct_code: null, struct_name: null, workprocedure_id: null, material_id: null, material_code: null, quality_scode: null, pcsn: null, canuse_qty: null, frozen_qty: null, ivt_qty: null, warehousing_qty: null, qty_unit_id: null, instorage_time: null, sale_id: null }
export default {
name: 'Structivt',
dicts: ['ST_QUALITY_SCODE'],
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({ title: '库存管理', url: 'api/structivt', idField: 'stockrecord_id', sort: 'stockrecord_id,desc',
optShow: {
add: false,
edit: false,
del: false,
download: false,
reset: true
},
crudMethod: { ...crudStructivt }})
},
data() {
return {
reginoList: [],
permission: {
},
rules: {
}
}
},
created() {
crudPoint.getRegion().then(res => {
this.reginoList = res
})
},
methods: {
// 取两位小数点
rounding(row, column) {
return parseFloat(row[column.property]).toFixed(2)
},
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
}
}
}
</script>
<style scoped>
</style>

324
lms/nladmin-ui/src/views/wms/basedata/st/sect/index.vue
View File

@@ -1,324 +0,0 @@
<template>
<div class="app-container">
<!--工具栏-->
<div class="head-container">
<div v-if="crud.props.searchToggle">
<el-select
v-model="query.stor_id"
clearable
class="filter-item"
placeholder="所属仓库"
@change="crud.toQuery"
>
<el-option
v-for="item in stors"
:key="item.stor_id"
:label="item.stor_name"
:value="item.stor_id"
/>
</el-select>
<el-input
v-model="query.search"
clearable
class="filter-item"
style="width: 200px"
size="mini"
placeholder="输入库区编码或名称"
prefix-icon="el-icon-search"
@keyup.enter.native="crud.toQuery"
/>
<rrOperation />
</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="700px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="库区编码" prop="sect_code">
<el-input v-model="form.sect_code" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="库区名称" prop="sect_name">
<el-input v-model="form.sect_name" style="width: 200px;" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="库区简称">
<el-input v-model="form.simple_name" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="归属仓库" prop="stor_id">
<el-select
v-model="form.stor_id"
placeholder=""
style="width: 200px"
>
<el-option
v-for="item in stors"
:key="item.stor_id"
:label="item.stor_name"
:value="item.stor_id"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="库区容量" prop="capacity">
<el-input v-model="form.capacity" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="库区类型" prop="sect_type_attr">
<el-select
v-model="form.sect_type_attr"
placeholder=""
style="width: 200px"
>
<el-option
v-for="item in dict.st_sect_type"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="负责人">
<el-input v-model="form.sect_manager_name" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="联系电话" prop="mobile_no">
<el-input v-model="form.mobile_no" style="width: 200px;" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="备注">
<label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注</label>
<el-input v-model="form.remark" :rows="3" type="textarea" style="width: 550px;" />
</el-form-item>
</el-col>
</el-row>
</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 prop="sect_code" sortable label="库区编码" />
<el-table-column prop="sect_name" label="库区名称" width="150" />
<el-table-column prop="simple_name" label="库区简称" width="150" />
<el-table-column prop="stor_name" label="仓库名称" width="150" />
<el-table-column prop="capacity" label="容量" />
<el-table-column prop="sect_manager_name" label="负责人" />
<el-table-column prop="mobile_no" label="联系电话" width="100px" />
<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="ext_id" label="外部标识" />
<el-table-column prop="remark" label="备注" />
<el-table-column
v-permission="['admin','sectattr:edit','sectattr:del']"
label="操作"
width="120px"
fixed="right"
align="center"
>
<template slot-scope="scope">
<udOperation
:data="scope.row"
:permission="permission"
/>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<pagination />
</div>
</div>
</template>
<script>
import crudSectattr from '@/api/wms/basedata/st/sectattr'
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'
import crudStorattr from '@/api/wms/basedata/st/storattr'
import { isvalidPhone } from '@/utils/validate'
const defaultForm = {
sect_id: null,
sect_code: null,
sect_name: null,
simple_name: null,
sect_type_attr: null,
stor_id: null,
stor_type: null,
capacity: null,
width: null,
height: null,
zdepth: null,
xqty: null,
yqty: null,
zqty: null,
sect_manager_name: null,
mobile_no: null,
remark: null,
create_id: null,
create_name: null,
create_time: null,
update_optid: null,
update_optname: null,
update_time: null,
is_delete: null,
back_ground_color: null,
front_ground_color: null,
back_ground_pic: null,
font_direction_scode: null,
floor_no: null,
is_used: '',
ext_id: null
}
export default {
name: 'Sectattr',
dicts: ['st_sect_type', 'is_used'],
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
title: '库区',
optShow: { add: true, reset: true },
url: 'api/sectattr',
idField: 'sect_id',
sort: 'sect_id,desc',
crudMethod: { ...crudSectattr }
})
},
data() {
const validPhone = (rule, value, callback) => {
if (value && !isvalidPhone(value)) {
callback(new Error('请输入正确的11位手机号码'))
} else {
callback()
}
}
const numberOne = (rule, value, callback) => {
const numReg = /^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/
const numRe = new RegExp(numReg)
if (value) {
if (!numRe.test(value)) {
callback(new Error('只能输入数字'))
} else {
callback()
}
} else {
callback()
}
}
return {
stors: [],
permission: {
add: ['admin', 'user:add'],
edit: ['admin', 'user:edit'],
del: ['admin', 'user:del']
},
rules: {
sect_code: [
{ required: true, message: '库区编码不能为空', trigger: 'blur' }
],
sect_name: [
{ required: true, message: '库区名称不能为空', trigger: 'blur' }
],
sect_type_attr: [
{ required: true, message: '库区类型不能为空', trigger: 'blur' }
],
stor_id: [
{ required: true, message: '仓库标识不能为空', trigger: 'blur' }
],
capacity: [
{ required: false, message: '不能为空', trigger: 'blur' },
{ validator: numberOne }
],
mobile_no: [
{ required: false, trigger: 'blur', validator: validPhone }
]
}
}
},
created() {
crudStorattr.getStor().then(res => {
this.stors = res.content
})
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
},
// 改变状态
format_is_used(is_used) {
return is_used === '1'
},
changeEnabled(data, val) {
let msg = '此操作将停用，是否继续！'
if (val !== '1') {
msg = '此操作将启用，是否继续！'
}
this.$confirm(msg, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
crudSectattr.changeActive(data).then(res => {
this.crud.toQuery()
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
}).catch(() => {
data.is_used = !data.is_used
})
}).catch(() => {
})
}
}
}
</script>
<style scoped>
</style>

400
lms/nladmin-ui/src/views/wms/basedata/st/stor/index.vue
View File

@@ -1,400 +0,0 @@
<template>
<div class="app-container">
<!--工具栏-->
<div class="head-container">
<el-input
v-model="query.search"
clearable
style="width: 300px"
size="mini"
placeholder="输入仓库编码或名称"
prefix-icon="el-icon-search"
class="filter-item"
/>
<rrOperation />
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， 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="700px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="仓库编码" prop="stor_code">
<el-input v-model="form.stor_code" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="仓库名称" prop="stor_name">
<el-input v-model="form.stor_name" style="width: 200px;" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="仓库简称">
<el-input v-model="form.simple_name" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="所属部门" prop="sysdeptid">
<treeselect
v-model="form.sysdeptid"
:options="depts"
:load-options="loadDepts"
style="width: 200px"
placeholder="选择部门"
/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="仓库容量" prop="stor_capacity">
<el-input v-model="form.stor_capacity" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="总面积(㎡)" prop="total_area">
<el-input v-model="form.total_area" style="width: 200px;" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="仓库性质" prop="stor_type_scode">
<el-select
v-model="form.stor_type_scode"
placeholder=""
style="width: 200px"
>
<el-option
v-for="item in dict.st_stor_type"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="仓库地址">
<el-input v-model="form.storea_ddress" style="width: 200px;" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="负责人">
<el-input v-model="form.principal" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="联系电话" prop="office_phone">
<el-input v-model="form.office_phone" style="width: 200px;" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-form-item label="仓库类型" required>
<el-col :span="4" />
<el-col :span="4">
<el-checkbox v-model="form.is_materialstore" true-label="1" false-label="0">原材料库</el-checkbox>
</el-col>
<el-col :span="4">
<el-checkbox v-model="form.is_semi_finished" true-label="1" false-label="0">半成品库</el-checkbox>
</el-col>
<el-col :span="4">
<el-checkbox v-model="form.is_productstore" true-label="1" false-label="0">成品库</el-checkbox>
</el-col>
<el-col :span="4">
<el-checkbox v-model="form.is_attachment" true-label="1" false-label="0">备件库</el-checkbox>
</el-col>
<el-col :span="4">
<el-checkbox v-model="form.is_virtualstore" true-label="1" false-label="0">虚拟库</el-checkbox>
</el-col>
</el-form-item>
</el-row>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="备注">
<label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注</label>
<el-input v-model="form.remark" :rows="3" type="textarea" style="width: 550px;" />
</el-form-item>
</el-col>
</el-row>
</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 prop="stor_code" label="仓库编码" />
<el-table-column prop="stor_name" label="仓库名称" width="150" />
<el-table-column prop="simple_name" label="简称" width="130" />
<el-table-column prop="stor_capacity" label="容量" />
<el-table-column prop="total_area" label="总面积(㎡)" />
<el-table-column prop="label" label="仓库性质" />
<el-table-column prop="storea_ddress" label="地址" />
<el-table-column prop="principal" label="负责人" />
<el-table-column prop="office_phone" label="联系电话" width="130" />
<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="remark" label="备注" />
<el-table-column
v-permission="['admin','stIvtBsrealstorattr:edit','stIvtBsrealstorattr:del']"
label="操作"
fixed="right"
width="120px"
align="center"
>
<template slot-scope="scope">
<udOperation
:data="scope.row"
:permission="permission"
/>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<pagination />
</div>
</div>
</template>
<script>
import crudStorattr from '@/api/wms/basedata/st/storattr'
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'
import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import { getDepts, getDeptSuperior } from '@/api/system/dept'
import { isvalidPhone } from '@/utils/validate'
import crudSectattr from '@/api/wms/basedata/st/sectattr'
const defaultForm = {
stor_id: null,
stor_code: null,
stor_name: null,
simple_name: null,
stor_capacity: null,
total_area: null,
stor_type_scode: null,
is_virtualstore: null,
is_semi_finished: null,
is_materialstore: null,
is_productstore: null,
is_reversed: null,
is_mvout_auto_cfm: null,
is_mvin_auto_cfm: null,
area: null,
storea_ddress: null,
principal: null,
office_phone: null,
mobile_no: null,
remark: null,
order_index: null,
whstate_scode: null,
is_used: '1',
base_class_id: null,
create_id: null,
create_name: null,
create_time: null,
update_optid: null,
update_optname: null,
update_time: null,
sysownerid: null,
sysdeptid: null,
syscompanyid: null,
is_delete: null,
ext_id: null,
depart_name: null,
company_name: null,
is_attachment: null
}
export default {
name: 'StIvtBsrealstorattr',
dicts: ['st_stor_type', 'is_used'],
components: { pagination, crudOperation, rrOperation, udOperation, Treeselect },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
title: '仓库',
optShow: { add: true, reset: true },
url: 'api/Storattr',
idField: 'stor_id',
sort: 'stor_id,desc',
crudMethod: { ...crudStorattr }
})
},
data() {
const validPhone = (rule, value, callback) => {
if (value && !isvalidPhone(value)) {
callback(new Error('请输入正确的11位手机号码'))
} else {
callback()
}
}
const numberOne = (rule, value, callback) => {
const numReg = /^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/
const numRe = new RegExp(numReg)
if (value) {
if (!numRe.test(value)) {
callback(new Error('只能输入数字'))
} else {
callback()
}
} else {
callback()
}
}
return {
depts: [],
permission: {},
rules: {
stor_code: [
{ required: true, message: '仓库编码不能为空', trigger: 'blur' }
],
stor_name: [
{ required: true, message: '仓库名称不能为空', trigger: 'blur' }
],
sysdeptid: [
{ required: true, message: '所属部门不能为空', trigger: 'blur' }
],
stor_capacity: [
{ required: false, message: '不能为空', trigger: 'blur' },
{ validator: numberOne }
],
total_area: [
{ required: false, message: '不能为空', trigger: 'blur' },
{ validator: numberOne }
],
office_phone: [
{ required: false, trigger: 'blur', validator: validPhone }
]
}
}
},
methods: {
// 新增与编辑前做的操作
[CRUD.HOOK.afterToCU](crud, form) {
if (form.id == null) {
this.getDepts()
} else {
this.getSupDepts(form.dept.id)
}
},
[CRUD.HOOK.beforeSubmit](crud, form) {
if (this.form.is_virtualstore === '0' && this.form.is_semi_finished === '0' && this.form.is_materialstore === '0' &&
this.form.is_productstore === '0' && this.form.is_attachment === '0') {
this.crud.notify('仓库类型至少选一条', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
if (!this.form.is_virtualstore && !this.form.is_semi_finished && !this.form.is_materialstore &&
!this.form.is_productstore && !this.form.is_attachment) {
this.crud.notify('仓库类型至少选一条', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
},
getDepts() {
getDepts({ enabled: true }).then(res => {
this.depts = res.content.map(function(obj) {
if (obj.hasChildren) {
obj.children = null
}
return obj
})
})
},
// 改变状态
format_is_used(is_used) {
return is_used === '1'
},
changeEnabled(data, val) {
let msg = '此操作将停用，是否继续！'
if (val !== '1') {
msg = '此操作将启用，是否继续！'
}
this.$confirm(msg, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
crudStorattr.changeActive(data).then(res => {
this.crud.toQuery()
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
}).catch(() => {
data.is_used = !data.is_used
})
}).catch(() => {
})
},
getSupDepts(deptId) {
getDeptSuperior(deptId).then(res => {
const date = res.content
this.buildDepts(date)
this.depts = date
})
},
buildDepts(depts) {
depts.forEach(data => {
if (data.children) {
this.buildDepts(data.children)
}
if (data.hasChildren && !data.children) {
data.children = null
}
})
},
loadDepts({ action, parentNode, callback }) {
if (action === LOAD_CHILDREN_OPTIONS) {
getDepts({ enabled: true, pid: parentNode.id }).then(res => {
parentNode.children = res.content.map(function(obj) {
if (obj.hasChildren) {
obj.children = null
}
return obj
})
setTimeout(() => {
callback()
}, 200)
})
}
},
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
}
}
}
</script>
<style scoped>
</style>

457
lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue
View File

@@ -1,457 +0,0 @@
<template>
<div class="app-container">
<div class="head-container">
<div v-if="crud.props.searchToggle">
<el-form
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="80px"
label-suffix=":"
>
<el-form-item label="所属库区">
<el-cascader
placeholder="所属库区"
:options="sects"
:props="{ checkStrictly: true }"
clearable
class="filter-item"
@change="sectQueryChange"
/>
</el-form-item>
<el-form-item label="锁定类型">
<el-select
v-model="query.lock_type"
clearable
size="mini"
placeholder="锁定类型"
class="filter-item"
@change="crud.toQuery"
>
<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-input
v-model="query.search"
clearable
size="mini"
placeholder="仓位编码、名称"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<rrOperation />
</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="700px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-suffix=":" label-width="90px">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="仓位编码" prop="struct_code">
<el-input v-model="form.struct_code" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="仓位名称" prop="struct_name">
<el-input v-model="form.struct_name" style="width: 200px;" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="仓位简称">
<el-input v-model="form.simple_name" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="归属库区" prop="sect_id">
<el-cascader
v-model="form.cascader"
style="width: 200px;"
:options="sects"
clearable
@change="sectChange"
/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="载具号">
<label slot="label">载&nbsp;&nbsp;具&nbsp;号:</label>
<el-input v-model="form.storagevehicle_code" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="锁定类型" prop="lock_type">
<el-select
v-model="form.lock_type"
style="width: 200px;"
placeholder=""
>
<el-option
v-for="item in dict.d_lock_type"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="容量" prop="capacity">
<label slot="label">容&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;量:</label>
<el-input v-model="form.capacity" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="承受重量" prop="weight">
<el-input v-model="form.weight" style="width: 200px;" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="宽度" prop="width">
<label slot="label">宽&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;度:</label>
<el-input v-model="form.width" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="深度" prop="zdepth">
<label slot="label">深&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;度:</label>
<el-input v-model="form.zdepth" style="width: 200px;" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="高度" prop="height">
<label slot="label">高&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;度:</label>
<el-input v-model="form.height" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="高度类型" prop="material_height_type">
<el-select
v-model="form.material_height_type"
placeholder=""
style="width: 200px"
>
<el-option
v-for="item in dict.ST_HEIGHT_TYPE"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="是否临时" prop="is_tempstruct">
<el-radio v-model="form.is_tempstruct" label="1">是</el-radio>
<el-radio v-model="form.is_tempstruct" label="0">否</el-radio>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="备注">
<label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
<el-input v-model="form.remark" style="width: 550px;" rows="2" type="textarea" />
</el-form-item>
</el-col>
</el-row>
</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="struct_code" label="仓位编码" width="120" show-overflow-tooltip />
<el-table-column prop="struct_name" label="仓位名称" width="150" show-overflow-tooltip />
<el-table-column prop="simple_name" label="仓位简称" width="100" />
<el-table-column prop="sect_name" label="所属库区" width="150" />
<el-table-column prop="stor_name" label="所属仓库" width="150" />
<el-table-column prop="storagevehicle_code" label="载具号" min-width="120" show-overflow-tooltip />
<el-table-column prop="lock_type" label="锁定类型" min-width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ dict.label.d_lock_type[scope.row.lock_type] }}
</template>
</el-table-column>
<el-table-column prop="sect_name" 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="150" :formatter="taskdtl_typeFormat" />
<el-table-column prop="task_code" label="锁定任务编码" width="150" />
<el-table-column prop="inv_code" label="锁定单据编码" width="150" />
<el-table-column prop="inv_type" label="锁定单据类型" width="150" :formatter="invtypeFormat" />
<el-table-column prop="remark" label="备注" show-overflow-tooltip />
<el-table-column
v-permission="['admin','structattr:edit','structattr:del']"
label="操作"
fixed="right"
width="120px"
align="center"
>
<template slot-scope="scope">
<udOperation
:data="scope.row"
:permission="permission"
/>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<pagination />
</div>
</div>
</template>
<script>
import crudStructattr from '@/api/wms/basedata/st/structattr'
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'
import crudSectattr from '@/api/wms/basedata/st/sectattr'
/* import checkoutbill from "@/api/wms/st/core/outbill/checkoutbill";*/
const defaultForm = {
struct_id: null,
cascader: null,
struct_code: null,
struct_name: null,
simple_name: null,
sect_id: null,
sect_code: null,
sect_name: null,
stor_id: null,
stor_code: null,
stor_name: null,
stor_type: null,
capacity: null,
width: null,
height: null,
zdepth: null,
weight: null,
xqty: null,
yqty: null,
zqty: null,
is_tempstruct: '0',
create_id: null,
create_name: null,
create_time: null,
update_optid: null,
update_optname: null,
update_time: null,
is_delete: null,
back_ground_color: null,
front_ground_color: null,
back_ground_pic: null,
font_direction_scode: null,
is_used: null,
is_zdepth: null,
storagevehicle_id: null,
storagevehicle_code: null,
storagevehicle_type: null,
is_emptyvehicle: null,
storagevehicle_qty: null,
lock_type: null,
material_height_type: null,
ext_id: null,
remark: null
}
export default {
name: 'Structattr',
dicts: ['ST_HEIGHT_TYPE', 'is_used', 'd_lock_type', 'SCH_TASK_TYPE_DTL'],
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
title: '仓位',
optShow: { add: true, reset: true },
url: 'api/structattr',
idField: 'struct_id',
crudMethod: { ...crudStructattr }
})
},
data() {
const numberOne = (rule, value, callback) => {
const numReg = /^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/
const numRe = new RegExp(numReg)
if (value) {
if (!numRe.test(value)) {
callback(new Error('只能输入数字'))
} else {
callback()
}
} else {
callback()
}
}
return {
sects: [],
invtypelist: [],
permission: {},
rules: {
struct_id: [
{ required: true, message: '仓位标识不能为空', trigger: 'blur' }
],
struct_code: [
{ required: true, message: '仓位编码不能为空', trigger: 'blur' }
],
struct_name: [
{ required: true, message: '仓位名称不能为空', trigger: 'blur' }
],
sect_id: [
{ required: true, message: '库区标识不能为空', trigger: 'blur' }
],
stor_id: [
{ required: true, message: '仓库标识不能为空', trigger: 'blur' }
],
capacity: [
{ required: false, message: '不能为空', trigger: 'blur' },
{ validator: numberOne }
],
weight: [
{ required: false, message: '不能为空', trigger: 'blur' },
{ validator: numberOne }
],
width: [
{ required: false, message: '不能为空', trigger: 'blur' },
{ validator: numberOne }
],
height: [
{ required: false, message: '不能为空', trigger: 'blur' },
{ validator: numberOne }
],
zdepth: [
{ required: false, message: '不能为空', trigger: 'blur' },
{ validator: numberOne }
],
material_height_type: [
{ required: true, message: '物料高度类型不能为空', trigger: 'blur' }
]
}
}
},
created() {
crudSectattr.getSect().then(res => {
this.sects = res.content
})
/* checkoutbill.getInvTypes().then(res => {
this.invtypelist = res
})*/
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
},
[CRUD.HOOK.afterToEdit](crud, form) {
const val = []
val[0] = form.stor_id
val[1] = form.sect_id
form.cascader = val
},
sectChange(val) {
this.form.sect_id = val[1]
},
invtypeFormat(row) {
for (const item of this.invtypelist) {
if (item.code === row.inv_type) {
return item.name
}
}
},
taskdtl_typeFormat(row) {
return this.dict.label.SCH_TASK_TYPE_DTL[row.taskdtl_type]
},
sectQueryChange(val) {
if (val.length === 1) {
this.query.stor_id = val[0]
this.query.sect_id = ''
}
if (val.length === 0) {
this.query.sect_id = ''
this.query.stor_id = ''
}
if (val.length === 2) {
this.query.stor_id = val[0]
this.query.sect_id = val[1]
}
this.crud.toQuery()
},
// 改变状态
format_is_used(is_used) {
return is_used === '1'
},
changeEnabled(data, val) {
let msg = '此操作将停用，是否继续！'
if (val !== '1') {
msg = '此操作将启用，是否继续！'
}
this.$confirm(msg, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
crudStructattr.changeActive(data).then(res => {
this.crud.toQuery()
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
}).catch(() => {
data.is_used = !data.is_used
})
}).catch(() => {
})
}
}
}
</script>
<style scoped>
</style>

4
lms/nladmin-ui/src/views/wms/basedata/master/supp/index.vue → lms/nladmin-ui/src/views/wms/basedata/supp/index.vue
View File

@@ -173,13 +173,13 @@
</template>
<script>
import crudSupplierbase from '@/api/wms/basedata/master/supplierbase'
import crudSupplierbase from '@/api/wms/basedata/supplierbase'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import rrOperation from '@crud/RR.operation'
import crudClassstandard from '@/api/wms/basedata/master/classstandard'
import crudClassstandard from '@/api/wms/basedata/classstandard'
import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'

61
lms/nladmin-ui/src/views/wms/basedata/master/storagevehicleinfo/index.vue → lms/nladmin-ui/src/views/wms/basedata/vehicle/index.vue
View File

@@ -13,7 +13,7 @@
>
<el-form-item label="载具类型">
<el-select
v-model="query.storagevehicle_type"
v-model="query.vehicle_type"
clearable
size="mini"
placeholder="请选择"
@@ -22,7 +22,7 @@
@change="hand"
>
<el-option
v-for="item in dict.storagevehicle_type"
v-for="item in dict.vehicle_type"
:label="item.label"
:value="item.value"
/>
@@ -31,7 +31,7 @@
<el-form-item label="载具号">
<el-input
v-model="query.storagevehicle_code_begin"
v-model="query.vehicle_code_begin"
clearable
size="mini"
placeholder="起始载具号"
@@ -41,7 +41,7 @@
/>
-
<el-input
v-model="query.storagevehicle_code_end"
v-model="query.vehicle_code_end"
clearable
size="mini"
placeholder="结束载具号"
@@ -76,9 +76,9 @@
width="450px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item label="载具类型" prop="storagevehicle_type">
<el-form-item label="载具类型" prop="vehicle_type">
<el-select
v-model="form.storagevehicle_type"
v-model="form.vehicle_type"
clearable
size="mini"
placeholder="请选择"
@@ -87,15 +87,15 @@
@change="getVehicle"
>
<el-option
v-for="item in dict.storagevehicle_type"
v-for="item in dict.vehicle_type"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<br>
<el-form-item label="起始载具号" prop="storagevehicle_code">
<el-input v-model="form.storagevehicle_code" :disabled="true" style="width: 250px;" />
<el-form-item label="起始载具号" prop="vehicle_code">
<el-input v-model="form.vehicle_code" :disabled="true" style="width: 250px;" />
</el-form-item>
<el-form-item label="载具数量" prop="num">
<el-input-number v-model="form.num" :precision="0" style="width: 150px;" />
@@ -122,15 +122,8 @@
>
<el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="storagevehicle_id" label="载具标识" />
<el-table-column prop="storagevehicle_type_name" label="载具类型" />
<el-table-column prop="storagevehicle_code" label="载具编码" />
<el-table-column prop="storagevehicle_name" label="载具名称" />
<el-table-column prop="is_task" label="是否搬运中" :formatter="formatIsTask"/>
<el-table-column prop="point_code" label="当前点位" width="120px"/>
<el-table-column prop="start_point_code" label="起点" width="120px"/>
<el-table-column prop="next_point_code" label="终点" width="120px"/>
<el-table-column prop="material_code" label="物料编码" />
<el-table-column prop="material_name" label="物料名称" />
<el-table-column prop="vehicle_type_name" label="载具类型" />
<el-table-column prop="vehicle_code" label="载具编码" />
<el-table-column label="是否启用" align="center" prop="is_used">
<template slot-scope="scope">
<el-switch
@@ -142,9 +135,9 @@
</template>
</el-table-column>
<el-table-column prop="create_name" label="创建人" />
<el-table-column prop="create_time" label="创建时间" width="150px"/>
<el-table-column prop="create_time" label="创建时间" width="150px" />
<el-table-column
v-permission="['admin','storagevehicleinfo:edit','storagevehicleinfo:del']"
v-permission="['admin','vehicle:edit','vehicle:del']"
label="操作"
width="100px"
align="center"
@@ -166,7 +159,7 @@
</template>
<script>
import crudStoragevehicleinfo from '@/api/wms/basedata/master/storagevehicleinfo'
import crudStoragevehicleinfo from '@/api/wms/basedata/vehicle'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
@@ -176,8 +169,7 @@ import { getLodop } from '@/assets/js/lodop/LodopFuncs'
const defaultForm = {
storagevehicle_id: null,
storagevehicle_code: null,
storagevehicle_name: null,
vehicle_code: null,
one_code: null,
two_code: null,
rfid_code: null,
@@ -189,7 +181,7 @@ const defaultForm = {
update_time: null,
is_delete: null,
is_used: '1',
storagevehicle_type: null,
vehicle_type: null,
vehicle_width: null,
vehicle_long: null,
vehicle_height: null,
@@ -200,7 +192,7 @@ const defaultForm = {
}
export default {
name: 'Storagevehicleinfo',
dicts: ['storagevehicle_type'],
dicts: ['vehicle_type'],
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
@@ -233,7 +225,7 @@ export default {
resultCodeArr: [],
permission: {},
rules: {
storagevehicle_code: [
vehicle_code: [
{ required: true, message: '不能为空', trigger: 'blur' }
],
create_id: [
@@ -251,7 +243,7 @@ export default {
is_used: [
{ required: true, message: '不能为空', trigger: 'blur' }
],
storagevehicle_type: [
vehicle_type: [
{ required: true, message: '不能为空', trigger: 'blur' }
],
overstruct_type: [
@@ -301,7 +293,7 @@ export default {
return
}
for (let i = 0; i < _selectData.length; i++) {
const code = _selectData[i].storagevehicle_code
const code = _selectData[i].vehicle_code
const LODOP = getLodop()
LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮
// 打印纸张大小设置https://www.it610.com/article/2094844.html
@@ -316,7 +308,7 @@ export default {
},
addAndprint() {
const data = this.form
if (!this.form.storagevehicle_type) {
if (!this.form.vehicle_type) {
this.crud.notify('载具类型不能为空', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
@@ -343,19 +335,12 @@ export default {
getVehicle(code) {
if (!code) {
this.crud.notify('请选择载具类型', CRUD.NOTIFICATION_TYPE.INFO)
this.form.storagevehicle_code = ''
this.form.vehicle_code = ''
return false
}
crudStoragevehicleinfo.getVehicle(code).then(res => {
this.form.storagevehicle_code = res.value
this.form.vehicle_code = res.value
})
},
formatIsTask(row) {
if (row.is_task === '1') {
return '是'
} else {
return '否'
}
}
}
}

10
lms/nladmin-ui/src/views/wms/pdm/produce/ViewDialog.vue
View File

@@ -182,11 +182,10 @@
<script>
import { crud } from '@crud/crud'
import crudWorkProcedure from '@/api/wms/basedata/pdm/workProcedure'
import crudProduceshiftorder from '@/api/wms/pdm/produceshiftorder'
import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import crudClassstandard from '@/api/wms/basedata/master/classstandard'
import crudClassstandard from '@/api/wms/basedata/classstandard'
export default {
name: 'ViewDialog',
@@ -259,7 +258,6 @@ export default {
},
methods: {
open() {
this.getworkprocedure()
this.initClass3()
this.is_null()
crudProduceshiftorder.getDtl({ workorder_id: this.form.workorder_id }).then(res => {
@@ -333,12 +331,6 @@ export default {
this.classes3 = data
})
},
getworkprocedure() {
// 查询工序
crudWorkProcedure.downSelect({}).then(res => {
this.workprocedureList = res
})
},
close() {
this.$emit('AddChanged')
},

34
lms/nladmin-ui/src/views/wms/pdm/produce/index.vue
View File

@@ -175,7 +175,7 @@
<el-form-item label="载具类型" prop="vehicle_type">
<el-select v-model="form.vehicle_type" style="width: 200px" filterable placeholder="请选择">
<el-option
v-for="item in dict.storagevehicle_type"
v-for="item in dict.vehicle_type"
:label="item.label"
:value="item.value"
/>
@@ -200,9 +200,6 @@
<el-form-item v-if="crud.status.edit" label="报工数量" prop="report_qty">
<el-input v-model="form.report_qty" style="width: 200px;" />
</el-form-item>
<el-form-item label="销售单标识">
<el-input v-model="form.sale_id" style="width: 200px;" />
</el-form-item>
<el-form-item label="是否搬运" prop="is_needmove">
<el-radio
v-for="item in dict.IS_OR_NOT"
@@ -212,16 +209,7 @@
>{{ item.label }}
</el-radio>
</el-form-item>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<el-form-item label="允许修改报工数量" prop="is_canupdate_update">
<el-radio
v-for="item in dict.IS_OR_NOT"
:key="item.id"
v-model="form.is_canupdate_update"
:label="item.value"
>{{ item.label }}
</el-radio>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
@@ -239,7 +227,7 @@
>
<el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="workorder_id" label="生产班次工单标识" />
<el-table-column prop="produceorder_code" label="工单编号" width="140px">
<el-table-column prop="produceorder_code" label="工单编号" width="120px">
<template slot-scope="scope">
<el-link type="warning" @click="toView(scope.row)">{{ scope.row.produceorder_code }}</el-link>
</template>
@@ -259,15 +247,13 @@
<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="sale_id" label="销售单标识" width="100" show-overflow-tooltip />
<el-table-column prop="material_weight" label="物料单重" :formatter="rounding" />
<el-table-column prop="planproducestart_date" label="计划生产开始时间" width="150" />
<el-table-column prop="planproduceend_date" label="计划生产结束时间" width="150" />
<el-table-column prop="realproducestart_date" label="实际生产开始时间" width="150" />
<el-table-column prop="realproduceend_date" label="实际生产结束时间" width="150" />
<el-table-column prop="vehicle_type" label="载具类型">
<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 />
<el-table-column prop="realproduceend_date" label="实际结束时间" min-width="150" show-overflow-tooltip />
<el-table-column prop="vehicle_type" label="载具类型" min-width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ dict.label.storagevehicle_type[scope.row.vehicle_type] }}
{{ dict.label.vehicle_type[scope.row.vehicle_type] }}
</template>
</el-table-column>
<el-table-column prop="is_needmove" label="是否搬运">
@@ -354,7 +340,7 @@ export default {
name: 'Produceshiftorder',
components: { pagination, crudOperation, rrOperation, udOperation, MaterDtl, ViewDialog, DeviceDialog },
mixins: [presenter(), header(), form(defaultForm), crud()],
dicts: ['PDM_BI_SHIFTTYPE', 'MPS_BD_ORDERSTATUS', 'is_used', 'PDM_BI_ORDERTYPE', 'IS_OR_NOT', 'storagevehicle_type'],
dicts: ['PDM_BI_SHIFTTYPE', 'MPS_BD_ORDERSTATUS', 'is_used', 'PDM_BI_ORDERTYPE', 'IS_OR_NOT', 'vehicle_type'],
cruds() {
return CRUD({
title: '工单', url: 'api/produceshiftorder', idField: 'workorder_id', sort: 'workorder_id,desc',

4
lms/nladmin-ui/src/views/wms/pub/MaterDialog.vue
View File

@@ -75,13 +75,13 @@
<script>
import crudMaterialbase from '@/api/wms/basedata/master/materialbase'
import crudMaterialbase from '@/api/wms/basedata/materialbase'
import CRUD, { header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import pagination from '@crud/Pagination'
import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import crudClassstandard from '@/api/wms/basedata/master/classstandard'
import crudClassstandard from '@/api/wms/basedata/classstandard'
export default {
name: 'MaterDtl',

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

@@ -245,13 +245,9 @@
/>
</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] }}
{{ dict.label.vehicle_type[scope.row.vehicle_type] }}
</template>
</el-table-column>
<el-table-column prop="vehicle_qty" label="载具数量" />
@@ -295,7 +291,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 }
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'],
dicts: ['sch_point_type', 'sch_area_type', 'sch_point_status', 'is_used', 'd_lock_type', 'SCH_TASK_TYPE_DTL', 'vehicle_type', 'IS_HOST', 'device_point_type'],
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {

10
lms/nladmin-ui/src/views/wms/st/inbill/index.vue
View File

@@ -55,7 +55,7 @@
filterable
size="mini"
class="filter-item"
style="width: 200px;"
style="width: 185px;"
>
<el-option
v-for="item in dict.st_bill_status"
@@ -104,7 +104,7 @@
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" >
<crudOperation :permission="permission">
<el-button
slot="right"
class="filter-item"
@@ -218,7 +218,7 @@
<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 v-if="false" prop="iostorinv_id" label="出入单标识" />
<el-table-column prop="bill_code" label="单据编号" show-overflow-tooltip width="120px">
<el-table-column prop="bill_code" label="单据编号" show-overflow-tooltip min-width="130px">
<template slot-scope="scope">
<el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.bill_code }}</el-link>
</template>
@@ -238,7 +238,7 @@
<el-table-column prop="end_point_name" label="终点点位" show-overflow-tooltip width="120px" />
<el-table-column prop="start_region_name" label="起始区域" />
<el-table-column prop="end_region_name" label="终点区域" />
<el-table-column prop="task_id" label="任务标识" show-overflow-tooltip width="120px"/>
<el-table-column prop="task_id" label="任务标识" show-overflow-tooltip width="120px" />
<el-table-column prop="create_mode" label="生成方式">
<template slot-scope="scope">
{{ dict.label.ST_CREATE_MODE[scope.row.create_mode] }}
@@ -263,7 +263,7 @@
</el-table-column>
</el-table>
<!--分页组件-->
<pagination/>
<pagination />
</div>
<MaterDialog :dialog-show.sync="materDialog" @setMaterValue="setMaterValue" />
<PointDialog :dialog-show.sync="pointDialog" :open-param="pointParam" @tableChanged2="tableChanged2" />

10
lms/nladmin-ui/src/views/wms/st/outbill/index.vue
View File

@@ -55,7 +55,7 @@
filterable
size="mini"
class="filter-item"
style="width: 200px;"
style="width: 185px;"
>
<el-option
v-for="item in dict.st_bill_status"
@@ -104,7 +104,7 @@
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" >
<crudOperation :permission="permission">
<el-button
slot="right"
class="filter-item"
@@ -218,7 +218,7 @@
<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 v-if="false" prop="iostorinv_id" label="出入单标识" />
<el-table-column prop="bill_code" label="单据编号" show-overflow-tooltip width="120px">
<el-table-column prop="bill_code" label="单据编号" show-overflow-tooltip min-width="140px">
<template slot-scope="scope">
<el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.bill_code }}</el-link>
</template>
@@ -238,7 +238,7 @@
<el-table-column prop="end_point_name" label="终点点位" show-overflow-tooltip width="120px" />
<el-table-column prop="start_region_name" label="起始区域" />
<el-table-column prop="end_region_name" label="终点区域" />
<el-table-column prop="task_id" label="任务标识" show-overflow-tooltip width="120px"/>
<el-table-column prop="task_id" label="任务标识" show-overflow-tooltip width="120px" />
<el-table-column prop="create_mode" label="生成方式">
<template slot-scope="scope">
{{ dict.label.ST_CREATE_MODE[scope.row.create_mode] }}
@@ -263,7 +263,7 @@
</el-table-column>
</el-table>
<!--分页组件-->
<pagination/>
<pagination />
</div>
<MaterDialog :dialog-show.sync="materDialog" :open-param="materParam" @getMaterial="getMaterial" />
<PointDialog :dialog-show.sync="pointDialog" :open-param="pointParam" @tableChanged2="tableChanged2" />