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

Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

Browse Source
This commit is contained in:
lyd
2022-10-28 13:38:37 +08:00
parent e752d45e1e 9b78c6e411
commit 9f842a0626
1390 changed files with 124583 additions and 1779 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,8 +12,8 @@
<el-row>
<el-col :span="6">
<el-cascader
placeholder="所属库区"
v-model="query.sect"
placeholder="所属库区"
:options="sects"
:props="{ checkStrictly: true }"
clearable
@@ -79,7 +79,7 @@ export default {
url: 'api/structattr',
idField: 'struct_id',
sort: 'struct_id,desc',
query: { search: '', is_lock: '1', lock_type: '',sect_id: '', stor_id: '' },
query: { search: '', is_lock: '1', lock_type: '', sect_id: '', stor_id: '' },
crudMethod: { ...crudStructattr }
})
},

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

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

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

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

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

@@ -23,31 +23,23 @@
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
width="500px"
width="550px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item label="区域编码" prop="region_code">
<el-input v-model="form.region_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="区域名称" prop="region_name">
<el-input v-model="form.region_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="生产区域">
<el-select
v-model="form.product_area"
filterable
style="width: 370px"
class="filter-item"
>
<el-option
v-for="item in dict.product_area"
:label="item.label"
:value="item.value"
/>
</el-select>
<el-form-item label="点位类型说明">
<el-input v-model="form.point_type_explain" type="textarea" style="width: 370px;" />
</el-form-item>
<el-form-item label="点位状态说明">
<el-input v-model="form.point_status_explain" type="textarea" style="width: 370px;" />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" style="width: 370px;" />
<el-input v-model="form.remark" type="textarea" style="width: 370px;" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -66,23 +58,13 @@
>
<el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="region_id" label="区域标识" />
<el-table-column prop="region_code" label="区域编码" />
<el-table-column prop="region_name" label="区域名称" />
<el-table-column prop="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 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="create_name" label="创建人" />
<el-table-column prop="create_time" label="创建时间" min-width="120" show-overflow-tooltip />
<el-table-column prop="update_optname" label="修改人" />
<el-table-column prop="update_time" label="修改时间" min-width="120" show-overflow-tooltip />
<el-table-column prop="create_time" label="创建时间" min-width="140" show-overflow-tooltip />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
@@ -99,7 +81,7 @@
</template>
<script>
import crudRegion, { changeActive } from '@/views/wms/sch/region/region'
import crudRegion, { changeActive } from '@/views/wms/sch/region'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
@@ -110,9 +92,7 @@ const defaultForm = {
region_id: null,
region_code: null,
region_name: null,
product_area: null,
remark: null,
is_used: null,
create_id: null,
create_name: null,
create_time: null,
@@ -124,7 +104,6 @@ export default {
name: 'Region',
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
dicts: ['product_area'],
cruds() {
return CRUD({
title: '区域管理',
@@ -158,28 +137,6 @@ export default {
// 钩子：在获取表格数据之前执行，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(() => {
changeActive(data).then(res => {
this.crud.toQuery()
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
}).catch(() => {
data.is_used = !data.is_used
})
}).catch(() => {
})
}
}
}

18
lms/nladmin-ui/src/views/wms/sch/region/region.js
View File

@@ -32,4 +32,20 @@ export function changeActive(data) {
})
}
export default { add, edit, del, changeActive }
export function getPointStatusSelectById(id) {
return request({
url: 'api/region/getPointStatusSelectById',
method: 'post',
data: id
})
}
export function getPointTypeSelectById(id) {
return request({
url: 'api/region/getPointTypeSelectById',
method: 'post',
data: id
})
}
export default { add, edit, del, changeActive, getPointStatusSelectById, getPointTypeSelectById }

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

@@ -30,67 +30,22 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="起始点位">
<el-form-item label="点位编码">
<el-input
v-model="query.start_point_code"
v-model="query.point_code"
clearable
style="width: 180px"
placeholder="起点"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="下一点位">
<el-input
v-model="query.next_point_code"
clearable
style="width: 180px"
placeholder="终点"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="任务类型">
<el-select
<treeselect
v-model="query.task_type"
filterable
:load-options="loadChildNodes"
:options="classes1"
style="width: 180px"
placeholder="任务类型"
class="filter-item"
clearable
@change="hand"
>
<el-option
v-for="item in dict.SCH_TASK_TYPE"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="任务明细">
<el-select
v-model="query.taskdtl_type"
filterable
style="width: 180px"
placeholder="任务类型"
class="filter-item"
clearable
@change="hand"
>
<el-option
v-for="item in dict.SCH_TASK_TYPE_DTL"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker
v-model="query.createTime"
type="daterange"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
@change="crud.toQuery"
placeholder="请选择"
/>
</el-form-item>
<el-form-item label="完成方式">
@@ -112,6 +67,18 @@
</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.task_status"
@@ -146,49 +113,59 @@
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="50" />
<el-table-column v-if="false" prop="taskdtl_id" label="任务标识" />
<el-table-column prop="task_code" label="任务编码" />
<!-- <el-table-column v-if="true" prop="task_id" label="任务标识" min-width="150" show-overflow-tooltip />
<el-table-column v-if="true" prop="material_id" label="物料标识" min-width="150" show-overflow-tooltip />-->
<el-table-column prop="task_code" label="任务编码" min-width="100" show-overflow-tooltip />
<el-table-column v-if="false" prop="task_type" label="任务类型" />
<el-table-column prop="task_type_name" label="任务类型" />
<el-table-column v-if="false" prop="taskdtl_type" label="任务明细" />
<el-table-column prop="taskdtl_type_name" label="任务明细" />
<!--<el-table-column prop="acs_task_type" label="acs任务类型" min-width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ dict.label.acs_task_type[scope.row.acs_task_type] }}
</template>
</el-table-column>-->
<el-table-column prop="task_name" label="任务描述" min-width="120" show-overflow-tooltip />
<el-table-column v-if="false" prop="task_type_name" label="任务类型" min-width="120" show-overflow-tooltip />
<el-table-column v-if="false" prop="task_status" label="任务状态" />
<el-table-column prop="task_status_name" label="任务状态" width="95px" :formatter="formatTaskStatusName" />
<!--
<el-table-column v-if="false" prop="finished_type" label="完成方式" />
-->
<!-- <el-table-column prop="finished_type_name" label="完成方式" :formatter="formatFinishTypeName"/>-->
<el-table-column prop="start_area_name" label="起始区域" width="95" show-overflow-tooltip />
<el-table-column prop="start_point_code" label="起点编码" width="85" />
<el-table-column prop="start_point_name" label="起点名称" width="105" show-overflow-tooltip />
<el-table-column prop="next_area_name" label="下一区域" width="95" show-overflow-tooltip />
<el-table-column prop="next_point_code" label="下一点编码" width="85" />
<el-table-column prop="next_point_name" label="下一点名称" width="105" show-overflow-tooltip />
<el-table-column prop="vehicle_code" label="载具编码" />
<!--<el-table-column prop="vehicle_type" label="载具类型" min-width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ dict.label.vehicle_type[scope.row.vehicle_type] }}
</template>
</el-table-column>
<el-table-column prop="vehicle_code" label="载具编码" min-width="100" show-overflow-tooltip />-->
<el-table-column prop="point_code1" label="点位1" width="100" />
<el-table-column prop="point1_region_name" label="区域1" width="100" />
<el-table-column prop="point_code2" label="点位2" min-width="100" show-overflow-tooltip />
<el-table-column prop="point2_region_name" label="区域2" min-width="120" show-overflow-tooltip />
<!--<el-table-column prop="point_code3" label="点位3" min-width="100" show-overflow-tooltip />
<el-table-column prop="point3_region_name" label="区域3" min-width="120" show-overflow-tooltip />-->
<!--<el-table-column prop="point_code3" label="点位3" width="85" />
<el-table-column prop="point_code4" label="点位4" width="85" />-->
<el-table-column prop="remark" label="备注" width="120" show-overflow-tooltip />
<el-table-column v-if="false" prop="update_by" label="修改者" />
<el-table-column prop="create_time" label="创建时间" width="135" />
<el-table-column prop="update_time" label="修改时间" width="135" />
<el-table-column
v-permission="['admin','instruction:edit','instruction:del']"
fixed="right"
label="操作"
width="80px"
width="160px"
align="center"
>
<template slot-scope="scope">
<el-dropdown trigger="click" @command="handleCommand">
<span class="el-dropdown-link">
<i class="el-icon-menu" />
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'d')">下发</el-dropdown-item>
<el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'a')">完成</el-dropdown-item>
<!-- <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'b')">取消</el-dropdown-item>-->
<!-- <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'c')">拉回</el-dropdown-item>-->
<!-- <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'e')">详情</el-dropdown-item>-->
</el-dropdown-menu>
</el-dropdown>
<el-button
type="text"
icon="el-icon-upload"
@click="doOperate(scope.row, 'c')"
>下发</el-button>
<el-button
type="text"
icon="el-icon-success"
@click="doOperate(scope.row, 'a')"
>完成</el-button>
<el-button
type="text"
icon="el-icon-error"
@click="doOperate(scope.row, 'b')"
>取消</el-button>
</template>
</el-table-column>
</el-table>
@@ -204,7 +181,7 @@
<!-- 组件-->
<component
:is="currentComponent"
:task-uuid="taskdtl_id"
:task-uuid="task_id"
:dialog-visible="viewDialogVisible"
/>
<span slot="footer" class="dialog-footer">
@@ -216,28 +193,32 @@
</template>
<script>
import crudTask from '@/views/wms/sch/task/task'
import crudTask from '@/views/wms/sch/task'
import CRUD, { crud, 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 crudClassstandard from '@/views/wms/basedata/master/class/classstandard'
export default {
name: 'Task',
dicts: ['SCH_TASK_TYPE', 'SCH_TASK_TYPE_DTL'],
dicts: ['acs_task_type', 'vehicle_type'],
components: {
pagination, crudOperation, rrOperation
pagination, crudOperation, rrOperation, Treeselect, udOperation
},
mixins: [presenter(), header(), crud()],
cruds() {
return CRUD({
title: '任务',
url: 'api/task',
idField: 'taskdtl_id',
sort: 'taskdtl_id,desc',
idField: 'task_id',
sort: 'task_id,desc',
crudMethod: { ...crudTask },
query: {
task_code: '', vehicle_code: '', start_point_code: '', next_point_code: '', task_type: '', taskdtl_type: '', finished_type: '', task_status: ''
task_code: '', vehicle_code: '', start_point_code: '', next_point_code: '', task_type: '', finished_type: '', task_status: ''
},
optShow: {
add: false,
@@ -252,7 +233,6 @@ export default {
return {
viewDialogVisible: false,
fullscreen: false,
taskdtl_id: '',
currentComponent: '',
openParam: {},
create_time: [],
@@ -262,10 +242,12 @@ export default {
permission: {
},
rules: {}
rules: {},
classes1: []
}
},
created() {
this.initClass1()
crudTask.getTaskStatus().then(data => {
this.taskStatusList = data
})
@@ -276,6 +258,42 @@ export default {
this.crud.toQuery()
},
methods: {
initClass1() {
const param = {
parent_class_code: 'task_type'
}
crudClassstandard.getClassType(param).then(res => {
const data = res.content
this.buildTree(data)
this.classes1 = data
})
},
buildTree(classes) {
classes.forEach(data => {
if (data.children) {
this.buildTree(data.children)
}
if (data.hasChildren && !data.children) {
data.children = null // 重点代码
}
})
},
// 获取子节点数据
loadChildNodes({ action, parentNode, callback }) {
if (action === LOAD_CHILDREN_OPTIONS) {
crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
parentNode.children = res.content.map(function(obj) {
if (obj.hasChildren) {
obj.children = null
}
return obj
})
setTimeout(() => {
callback()
}, 100)
})
}
},
hand(value) {
this.crud.toQuery()
},
@@ -293,46 +311,28 @@ export default {
}
return ''
},
formatFinishTypeName(row, column) {
for (const item of this.finishTypeList) {
if (item.code === row.finished_type) {
return item.name
}
}
return ''
},
beforeHandleCommand(index, row, command) {
return {
'index': index,
'row': row,
'command': command
}
},
handleCommand(command) {
doOperate(row, command) {
let method_name = ''
switch (command.command) {
switch (command) {
case 'a':// 完成
method_name = 'forceFinish'
break
case 'b':// 取消
method_name = 'cancel'
break
case 'c':// 拉回
method_name = 'pullBack'
case 'c':// 下发
method_name = 'immediateNotifyAcs'
break
case 'd':// 下发
method_name = 'renotifyAcs'
break
case 'e':// 详情
case 'd':// 详情
method_name = 'view'
break
}
if (method_name === 'view') {
this.view(command.row)
this.view(row)
return
}
const data = {
task_id: command.row.task_id,
task_id: row.task_id,
method_name: method_name
}
crudTask.operation(data).then(res => {
@@ -343,7 +343,7 @@ export default {
})
},
view(row) {
this.taskdtl_id = row.taskdtl_id
this.task_id = row.task_id
switch (row.task_type) {
case '01':// 入库
this.fullscreen = true

32
lms/nladmin-ui/src/views/wms/st/inbill/AddDtl.vue
View File

@@ -22,22 +22,22 @@
@keyup.enter.native="crud.toQuery"
/>
<el-input
v-model="query.package_box_sn"
clearable
size="mini"
placeholder="箱号"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
v-model="query.package_box_sn"
clearable
size="mini"
placeholder="箱号"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
<el-input
v-model="query.container_name"
clearable
size="mini"
placeholder="子卷号"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
v-model="query.container_name"
clearable
size="mini"
placeholder="子卷号"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
<el-input
v-model="query.material_search"
@@ -143,12 +143,12 @@ export default {
return {
rowspan: 2,
colspan: 1
};
}
} else {
return {
rowspan: 0,
colspan: 0
};
}
}
}
},

30
lms/nladmin-ui/src/views/wms/st/inbill/BucketDtlDialog.vue
View File

@@ -17,38 +17,38 @@
@select="handleSelectionChange"
@select-all="onSelectAll"
>
<el-table-column prop="bucketunique" label="桶号" min-width="100" show-overflow-tooltip/>
<el-table-column prop="label" label="桶类别"/>
<el-table-column prop="material_code" label="物料编码" width="120px"/>
<el-table-column prop="material_name" label="物料名称" min-width="120"/>
<el-table-column prop="pcsn" label="批次" min-width="100" show-overflow-tooltip/>
<el-table-column prop="bucketunique" label="桶号" min-width="100" show-overflow-tooltip />
<el-table-column prop="label" label="桶类别" />
<el-table-column prop="material_code" label="物料编码" width="120px" />
<el-table-column prop="material_name" label="物料名称" min-width="120" />
<el-table-column prop="pcsn" label="批次" min-width="100" show-overflow-tooltip />
<el-table-column prop="storage_qty" label="数量">
<template slot-scope="scope">
{{ fun(scope.row.storage_qty) }}
</template>
</el-table-column>
<el-table-column prop="qty_unit_name" label="单位"/>
<el-table-column prop="quality_scode" :formatter="qualityFormat" label="品质类型"/>
<el-table-column prop="ivt_level" :formatter="ivtFormat" label="库存等级"/>
<el-table-column prop="is_active" :formatter="activeFormat" label="是否可用"/>
<el-table-column prop="storagevehicle_code" label="载具号"/>
<el-table-column prop="record_order" label="顺序号"/>
<el-table-column prop="bag_qty" label="袋数"/>
<el-table-column prop="qty_unit_name" label="单位" />
<el-table-column prop="quality_scode" :formatter="qualityFormat" label="品质类型" />
<el-table-column prop="ivt_level" :formatter="ivtFormat" label="库存等级" />
<el-table-column prop="is_active" :formatter="activeFormat" label="是否可用" />
<el-table-column prop="storagevehicle_code" label="载具号" />
<el-table-column prop="record_order" label="顺序号" />
<el-table-column prop="bag_qty" label="袋数" />
</el-table>
<!--分页组件-->
<pagination/>
<pagination />
</el-dialog>
</template>
<script>
import CRUD, {crud} from '@crud/crud'
import CRUD, { crud } from '@crud/crud'
import crudOperation from '@crud/CRUD.operation'
import pagination from '@crud/Pagination'
export default {
name: 'BucketDtlDiv',
components: {crudOperation, pagination},
components: { crudOperation, pagination },
mixins: [crud()],
props: {
dialogShow: {

2
lms/nladmin-ui/src/views/wms/st/inbill/TaskDialog.vue
View File

@@ -166,7 +166,7 @@ import crudRawAssist from '@/views/wms/st/inbill/rawassist'
export default {
name: 'TaskDialog',
components: {StructUpdateDiv },
components: { StructUpdateDiv },
mixins: [crud()],
dicts: ['io_bill_status', 'task_status'],
props: {

22
lms/nladmin-ui/src/views/wms/st/inbill/ViewDialog.vue
View File

@@ -8,7 +8,7 @@
@close="close"
@open="open"
>
<el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" size="mini" label-width="85px" label-suffix=":">
<el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" size="mini" label-width="85px" label-suffix=":">
<el-form-item label="单据号" prop="bill_code">
<label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
<el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
@@ -105,9 +105,9 @@
@current-change="handleDtlCurrentChange"
>
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="bill_code" label="出入库单号" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="bill_code" label="出入库单号" align="center" />
<el-table-column :formatter="bill_statusFormat" prop="bill_status" label="状态" />
<el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
<el-table-column prop="pcsn" label="批次号" align="center" />
<el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
@@ -135,13 +135,13 @@
>
<el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
<el-table-column prop="pcsn" label="批次号" align="center" />
<el-table-column prop="pcsn" label="批次号" align="center" />
<el-table-column prop="storagevehicle_code" label="载具号" align="center" />
<el-table-column prop="bucket_num" label="桶数" :formatter="crud.formatNum0" align="center" />
<el-table-column prop="bucket_num" label="桶数" :formatter="crud.formatNum0" align="center" />
<el-table-column prop="total_storage_qty" :formatter="crud.formatNum3" label="重量" align="center" />
<el-table-column prop="start_point_code" label="起始位置" align="center" />
<el-table-column prop="next_point_code" label="目的位置" align="center" />
<el-table-column prop="task_code" label="任务号" align="center" />
<el-table-column prop="start_point_code" label="起始位置" align="center" />
<el-table-column prop="next_point_code" label="目的位置" align="center" />
<el-table-column prop="task_code" label="任务号" align="center" />
<el-table-column prop="taskdtl_type" label="任务类型" align="center" width="150px" :formatter="taskdtl_typeFormat" />
<el-table-column prop="task_status" label="状态" align="center" width="110px" :formatter="task_statusFormat" />
</el-table>
@@ -153,8 +153,8 @@
import { crud } from '@crud/crud'
import checkoutbill from '@/views/wms/st/outbill/checkoutbill'
import crudStorattr from "@/views/wms/basedata/st/stor/storattr";
import crudRawAssist from "@/views/wms/st/inbill/rawassist";
import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
import crudRawAssist from '@/views/wms/st/inbill/rawassist'
export default {
name: 'ViewDialog',
@@ -179,7 +179,7 @@ export default {
storlist: [],
currentdtl: null,
currentDis: {},
form:{}
form: {}
}
},
watch: {

131
lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue
View File

@@ -50,16 +50,16 @@
<el-select
v-model="form.bill_type"
clearable
filterable
size="mini"
placeholder="业务类型"
style="width: 210px"
class="filter-item"
:disabled="crud.status.view > 0"
>
<el-option
v-for="item in billtypelist"
:key="item.code"
:label="item.name"
:value="item.code"
v-for="item in dict.ST_INV_OUT_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
@@ -118,7 +118,7 @@
size="mini"
@click="queryDtl()"
>
添加质检物料
添加物料
</el-button>
<el-button
slot="left"
@@ -142,7 +142,6 @@
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
>
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column prop="bill_status" label="订单状态" align="center" :formatter="bill_statusFormat" />
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" width="190" align="center">
<template scope="scope">
<el-input v-show="!scope.row.edit" v-model="scope.row.material_code" disabled class="input-with-select">
@@ -152,19 +151,20 @@
</template>
</el-table-column>
<el-table-column prop="material_name" label="物料名称" align="center" min-width="150px" show-overflow-tooltip />
<el-table-column show-overflow-tooltip prop="pcsn" label="批次号" align="center">
<el-table-column show-overflow-tooltip prop="pcsn" label="子卷号" align="center">
<template scope="scope">
<el-input v-show="!scope.row.edit" v-model="scope.row.pcsn" size="mini" />
<span v-show="scope.row.edit">{{ scope.row.pcsn }}</span>
</template>
</el-table-column>
<el-table-column prop="plan_qty" label="重量" width="150" align="center">
<el-table-column prop="plan_qty" label="出库重量" width="150" align="center">
<template scope="scope">
<el-input-number v-model="scope.row.plan_qty" :disabled="scope.row.edit" :precision="3" :controls="false" :min="0" style="width: 120px" />
<el-input-number v-show="!scope.row.edit" v-model="scope.row.plan_qty" :precision="3" :controls="false" :min="1" style="width: 120px" />
<span v-show="scope.row.edit">{{ scope.row.plan_qty }}</span>
</template>
</el-table-column>
<el-table-column prop="qty_unit_name" label="单位" align="center" />
<el-table-column prop="quality_scode" label="品质类型" align="center" width="110px">
<!-- <el-table-column prop="quality_scode" label="品质类型" align="center" width="110px">
<template slot-scope="scope">
<el-select
v-model="scope.row.quality_scode"
@@ -212,27 +212,25 @@
/>
</el-select>
</template>
</el-table-column>
</el-table-column>-->
<el-table-column prop="source_bill_type" label="源单类型" align="center" width="130px" :formatter="invtypeFormat" show-overflow-tooltip />
<el-table-column prop="source_bill_code" label="源单号" align="center" width="130px" show-overflow-tooltip />
<el-table-column show-overflow-tooltip prop="remark" label="明细备注" align="center">
<template scope="scope">
<el-input v-show="!scope.row.edit" v-model="scope.row.remark" size="mini" />
<span v-show="scope.row.edit">{{ scope.row.remark }}</span>
<el-input v-model="scope.row.remark" size="mini" />
<span>{{ scope.row.remark }}</span>
</template>
</el-table-column>
<el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="160" fixed="right">
<template scope="scope">
<el-button type="danger" class="filter-item" size="mini" icon="el-icon-delete" @click.native.prevent="deleteRow(scope.$index, form.tableData)" />
<el-button v-show="!scope.row.edit" type="primary" class="filter-item" size="mini" icon="el-icon-edit" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
<el-button v-show="scope.row.edit" type="success" class="filter-item" size="mini" icon="el-icon-check" @click="handleEdit(scope.$index, scope.row)">完成</el-button>
</template>
</el-table-column>
</el-table>
<AddDtl :dialog-show.sync="dtlShow" :open-param="materType" @tableChanged="tableChanged" />
<MaterDialog :dialog-show.sync="materShow" :mater-opt-code.sync="materType" @tableChanged2="tableChanged2" />
<MaterDialog :dialog-show.sync="materShow" :mater-opt-code.sync="materType" @setMaterValue="setMaterValue" />
</el-dialog>
</template>
@@ -268,7 +266,7 @@ export default {
default: false
}
},
dicts: ['io_bill_status', 'ST_QUALITY_SCODE', 'ST_IVT_LEVEL', 'is_used', 'QC_INV_TYPE'],
dicts: ['io_bill_status', 'ST_QUALITY_SCODE', 'ST_IVT_LEVEL', 'is_used', 'ST_INV_OUT_TYPE'],
data() {
return {
dialogVisible: false,
@@ -279,7 +277,6 @@ export default {
nowrow: {},
nowindex: '',
storlist: [],
billtypelist: [],
invtypelist: [],
rules: {
stor_id: [
@@ -304,19 +301,25 @@ export default {
methods: {
open() {
// 查询原材料库的仓库
crudStorattr.getStor({ 'is_materialstore': '1' }).then(res => {
crudStorattr.getStor({ 'is_productstore': '1' }).then(res => {
this.storlist = res.content
})
crudRawAssist.getType({ 'io_code': '0101', 'io_flag': '01' }).then(res => {
/* crudRawAssist.getType({ 'io_code': '0101', 'io_flag': '01' }).then(res => {
this.billtypelist = res
})
checkoutbill.getInvTypes().then(res => {
this.invtypelist = res
})
})*/
},
close() {
this.$emit('AddChanged')
},
[CRUD.HOOK.beforeSubmit]() {
if (this.form.tableData.length === 0) {
this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
},
[CRUD.HOOK.afterToEdit]() {
checkoutbill.getOutBillDtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {
this.form.tableData = res
@@ -340,14 +343,7 @@ export default {
})
},
invtypeFormat(row, column) {
for (const item of this.invtypelist) {
if (item.code === row.source_bill_type) {
return item.name
}
}
},
bill_statusFormat(row, column) {
return this.dict.label.io_bill_status[row.bill_status]
return this.dict.label.ST_INV_OUT_TYPE[row.source_bill_type]
},
storChange(row) {
this.storlist.forEach((item) => {
@@ -362,22 +358,22 @@ export default {
this.crud.notify('请选择业务类型！', CRUD.NOTIFICATION_TYPE.INFO)
return
}
checkoutbill.paramByCodeType({ 'bill_type': this.form.bill_type }).then(res => {
this.materType = res.materType
this.materShow = true
this.nowindex = index
this.nowrow = row
})
this.materShow = true
/* checkoutbill.paramByCodeType({ 'bill_type': this.form.bill_type }).then(res => {
this.materType = res.materType
this.nowindex = index
this.nowrow = row
})*/
},
async queryDtl(index, row) {
if (this.form.bill_type === '') {
this.crud.notify('请选择业务类型！', CRUD.NOTIFICATION_TYPE.INFO)
return
}
checkoutbill.paramByCodeType({ 'bill_type': this.form.bill_type }).then(res => {
this.materType = res.materType
this.dtlShow = true
})
this.dtlShow = true
/* checkoutbill.paramByCodeType({ 'bill_type': this.form.bill_type }).then(res => {
this.materType = res.materType
})*/
},
tableChanged(rows) {
const tablemap = new Map()
@@ -392,17 +388,11 @@ export default {
if (!this.flagnow) {
item.edit = true
item.quality_scode = '00'
item.ivt_level = '01'
item.is_active = '1'
item.bill_status = '10'
tablemap.set(item.material_id, item)
}
} else {
item.edit = true
item.quality_scode = '00'
item.ivt_level = '01'
item.is_active = '1'
item.bill_status = '10'
tablemap.set(item.material_id, item)
}
})
@@ -411,7 +401,7 @@ export default {
}
this.form.detail_count = this.form.tableData.length
},
tableChanged2(row) {
setMaterValue(row) {
for (let i = 0; i < this.form.tableData.length; i++) {
if (this.form.tableData[i].material_id === row.material_id) {
this.crud.notify('不允许添加相同物料！')
@@ -423,6 +413,8 @@ export default {
this.nowrow.material_name = row.material_name
this.nowrow.qty_unit_id = row.base_unit_id
this.nowrow.qty_unit_name = row.unit_name
this.nowrow.plan_qty = '1'
this.nowrow.edit = false
this.form.tableData.splice(this.nowindex, 1, this.nowrow) // 通过splice 替换数据 触发视图更新
},
async insertdtl() {
@@ -430,56 +422,15 @@ export default {
this.crud.notify('请选择业务类型！', CRUD.NOTIFICATION_TYPE.INFO)
return
}
this.form.tableData.push({ material_id: '', material_code: '', bill_status: '10', material_name: '', pcsn: '', quality_scode: '00', ivt_level: '01', is_active: '1', plan_qty: '2', qty_unit_name: '', qty_unit_id: '', remark: '', edit: false })
this.form.tableData.push({ material_id: '', material_code: '', material_name: '', pcsn: '', quality_scode: '00', plan_qty: '1', qty_unit_name: '', qty_unit_id: '', remark: '', edit: false })
this.form.detail_count = this.form.tableData.length
},
handleEdit(index, row) {
// 判断是否可以关闭编辑状态
if (!row.edit) {
if (!row.material_id || !row.plan_qty || parseFloat(row.plan_qty) <= 0) {
this.crud.notify('物料、数量不可为空！', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
if (row.quality_scode !== '00') {
this.crud.notify('请校验物料' + row.material_code + '，品质类型是否正确', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
if (row.ivt_level !== '01') {
this.crud.notify('请校验物料' + row.material_code + '，库存等级是否正确', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
if (row.is_active !== '1') {
this.crud.notify('请校验物料' + row.material_code + '，是否可用是否正确', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
}
row.edit = !row.edit
this.form.tableData.splice(index, 1, row) // 通过splice 替换数据 触发视图更新
if (row.edit) {
this.form.total_qty = 0
this.form.tableData.forEach((item) => {
this.form.total_qty = this.form.total_qty + item.plan_qty
})
}
},
deleteRow(index, rows) {
this.form.total_qty = parseFloat(this.form.total_qty) - parseFloat(rows[index].plan_qty)
rows.splice(index, 1)
this.nowindex = ''
this.nowrow = {}
this.form.detail_count = this.form.tableData.length
},
[CRUD.HOOK.beforeSubmit]() {
if (this.form.tableData.length === 0) {
this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
for (let i = 0; i < this.form.tableData.length; i++) {
if (!this.form.tableData[i].edit) {
this.crud.notify('尚有未完成编辑的物料明细序号' + (i + 1) + '，请检查！')
return false
}
}
}
}
}

16
lms/nladmin-ui/src/views/wms/st/outbill/AddDtl.vue
View File

@@ -14,19 +14,19 @@
<!-- 搜索 -->
<date-range-picker v-model="query.createTime" class="date-item" />
<el-input
v-model="query.bill_code"
v-model="query.material_code"
clearable
size="mini"
placeholder="质检单号模糊查询"
placeholder="物料编码、名称"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
<el-input
v-model="query.remark"
v-model="query.pcsn"
clearable
size="mini"
placeholder="物料"
placeholder="子卷号"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
@@ -44,12 +44,12 @@
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
>
<el-table-column type="selection" width="55" />
<el-table-column show-overflow-tooltip prop="biz_date" label="日期" />
<el-table-column show-overflow-tooltip prop="source_bill_code" label="单据号" />
<el-table-column show-overflow-tooltip prop="instorage_time" label="入库日期" />
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" />
<el-table-column show-overflow-tooltip prop="material_name" label="物料名称" />
<el-table-column show-overflow-tooltip prop="pcsn" label="批次" />
<el-table-column show-overflow-tooltip prop="plan_qty" :formatter="crud.formatNum3" label="检测重量" />
<el-table-column show-overflow-tooltip prop="box_no" label="箱号" />
<el-table-column show-overflow-tooltip prop="pcsn" label="子卷号" />
<el-table-column show-overflow-tooltip prop="plan_qty" :formatter="crud.formatNum3" label="重量" />
<el-table-column show-overflow-tooltip prop="qty_unit_name" label="重量单位" />
</el-table>
<!--分页组件-->

29
lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue
View File

@@ -111,8 +111,6 @@
<el-table-column show-overflow-tooltip prop="assign_qty" label="已分配重量" :formatter="crud.formatNum3" align="center" />
<el-table-column show-overflow-tooltip prop="unassign_qty" label="未分配重量" :formatter="crud.formatNum3" align="center" />
<el-table-column prop="quality_scode" label="品质类型" align="center" width="110px" :formatter="quality_scodeFormat" />
<el-table-column prop="ivt_level" label="库存等级" align="center" width="100px" :formatter="ivt_levelFormat" />
<el-table-column prop="is_active" label="是否可用" align="center" width="110px" :formatter="is_activeFormat" />
<el-table-column prop="source_bill_type" label="源单类型" align="center" width="130px" :formatter="invtypeFormat" />
<el-table-column show-overflow-tooltip prop="source_bill_code" label="源单编号" align="center" />
<el-table-column show-overflow-tooltip prop="qty_unit_name" label="单位" align="center" />
@@ -141,9 +139,24 @@
/>
</el-form-item>
<el-form-item label="站点选择" prop="point_code">
<el-input v-model="form2.point_code" disabled class="input-with-select" style="width: 200px">
<!-- <el-input v-model="form2.point_code" disabled class="input-with-select" style="width: 200px">
<el-button slot="append" icon="el-icon-search" @click="openPoint" />
</el-input>
</el-input>-->
<el-select
v-model="form2.point_code"
clearable
filterable
size="mini"
placeholder="业务类型"
class="filter-item"
>
<el-option
v-for="item in pointList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-form>
</div>
@@ -193,12 +206,12 @@
</el-table-column>
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
<el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
<el-table-column show-overflow-tooltip prop="pcsn" label="批次号" align="center" />
<el-table-column show-overflow-tooltip prop="pcsn" label="子卷批次号" align="center" />
<el-table-column show-overflow-tooltip prop="plan_qty" label="出库重量" :formatter="crud.formatNum3" align="center" />
<el-table-column show-overflow-tooltip prop="struct_code" label="仓位编码" align="center" />
<el-table-column show-overflow-tooltip prop="struct_name" label="仓位名称" align="center" />
<el-table-column show-overflow-tooltip prop="task_code" label="任务号" align="center" />
<el-table-column show-overflow-tooltip prop="point_name" label="出库点" align="center" />
<el-table-column show-overflow-tooltip prop="point_code" label="出库点" align="center" />
<el-table-column align="center" label="操作" width="160" fixed="right">
<template scope="scope">
<el-button :disabled="tabledisabled(scope.row)" type="danger" class="filter-item" size="mini" icon="el-icon-delete" @click.native.prevent="deleteRow(scope.row)" />
@@ -264,6 +277,10 @@ export default {
},
sects: [],
invtypelist: [],
pointList: [
{ 'label': '出入库站点1', 'value': 'IVN001' },
{ 'label': '出入库站点2', 'value': 'IVN002' }
],
rules: {
}
}

8
lms/nladmin-ui/src/views/wms/st/outbill/StructIvt.vue
View File

@@ -78,9 +78,9 @@
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column show-overflow-tooltip prop="sect_name" label="库区" align="center" />
<el-table-column show-overflow-tooltip prop="struct_code" label="仓位" align="center" />
<el-table-column show-overflow-tooltip prop="storagevehicle_code" label="载具号" align="center" />
<el-table-column show-overflow-tooltip prop="storagevehicle_code" label="箱号" align="center" />
<el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
<el-table-column show-overflow-tooltip prop="pcsn" label="批次号" align="center" />
<el-table-column show-overflow-tooltip prop="pcsn" label="子卷批次号" align="center" />
<el-table-column show-overflow-tooltip prop="canuse_qty" label="可出重量" :formatter="crud.formatNum3" align="center" />
<el-table-column show-overflow-tooltip prop="plan_qty" label="重量" :formatter="crud.formatNum3" width="160" align="center">
<template scope="scope">
@@ -176,7 +176,11 @@ export default {
}
},
handleEdit(index, row) {
debugger
// 判断是否可以关闭编辑状态
if (row.edit === undefined) {
row.edit = false
}
if (!row.edit) {
if (row.plan_qty > this.queryrow.unassign_qty) {
this.crud.notify('出库重量不能超过未分配数', CRUD.NOTIFICATION_TYPE.INFO)

13
lms/nladmin-ui/src/views/wms/st/outbill/TaskDialog.vue
View File

@@ -1,8 +1,8 @@
<template>
<el-dialog
v-loading.fullscreen.lock="fullscreenLoading"
append-to-body
:visible.sync="dialogVisible"
v-loading.fullscreen.lock="fullscreenLoading"
destroy-on-close
:show-close="false"
fullscreen
@@ -108,14 +108,13 @@
>
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
<el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
<el-table-column show-overflow-tooltip prop="pcsn" label="批次号" align="center" />
<el-table-column show-overflow-tooltip prop="storagevehicle_code" label="载具号" align="center" />
<el-table-column show-overflow-tooltip prop="bucket_num" :formatter="crud.formatNum0" label="桶数" align="center" />
<el-table-column show-overflow-tooltip prop="total_storage_qty" :formatter="crud.formatNum3" label="重量" align="center" />
<el-table-column show-overflow-tooltip prop="start_point_code" label="起始位置" align="center" />
<el-table-column show-overflow-tooltip prop="pcsn" label="子卷批次号" align="center" />
<el-table-column show-overflow-tooltip prop="box_no" label="箱号" align="center" />
<el-table-column show-overflow-tooltip prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
<el-table-column show-overflow-tooltip prop="struct_code" label="起始位置" align="center" />
<el-table-column show-overflow-tooltip prop="next_point_code" label="目的位置" align="center" />
<el-table-column show-overflow-tooltip prop="task_code" label="任务号" align="center" />
<el-table-column prop="taskdtl_type" label="任务类型" align="center" width="150px" :formatter="taskdtl_typeFormat" />
<el-table-column prop="task_type" label="任务类型" align="center" width="150px" :formatter="taskdtl_typeFormat" />
<el-table-column prop="task_status" label="状态" align="center" width="110px" :formatter="task_statusFormat" />
<el-table-column align="center" label="操作" width="160" fixed="right">
<template scope="scope">

43
lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue
View File

@@ -8,7 +8,7 @@
@close="close"
@open="open"
>
<el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" size="mini" label-width="85px" label-suffix=":">
<el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" size="mini" label-width="85px" label-suffix=":">
<el-form-item label="单据号" prop="bill_code">
<label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
<el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
@@ -35,16 +35,17 @@
<el-select
v-model="form.bill_type"
clearable
filterable
size="mini"
placeholder="业务类型"
style="width: 210px"
class="filter-item"
:disabled="true"
disabled
>
<el-option
v-for="item in billtypelist"
:key="item.code"
:label="item.name"
:value="item.code"
v-for="item in dict.ST_INV_OUT_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
@@ -105,9 +106,9 @@
@current-change="handleDtlCurrentChange"
>
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column prop="bill_code" label="出库单号" align="center" />
<el-table-column prop="bill_code" label="出库单号" align="center" />
<el-table-column :formatter="bill_statusFormat" prop="bill_status" label="状态" />
<el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
<el-table-column prop="pcsn" label="批次号" align="center" />
<el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
@@ -135,14 +136,13 @@
>
<el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
<el-table-column prop="pcsn" label="批次号" align="center" />
<el-table-column prop="storagevehicle_code" label="载具号" align="center" />
<el-table-column prop="bucket_num" label="桶数" :formatter="crud.formatNum0" align="center" />
<el-table-column prop="total_storage_qty" :formatter="crud.formatNum3" label="重量" align="center" />
<el-table-column prop="start_point_code" label="起始位置" align="center" />
<el-table-column prop="next_point_code" label="目的位置" align="center" />
<el-table-column prop="task_code" label="任务号" align="center" />
<el-table-column prop="taskdtl_type" label="任务类型" align="center" width="150px" :formatter="taskdtl_typeFormat" />
<el-table-column prop="pcsn" label="子卷批次号" align="center" />
<el-table-column prop="storagevehicle_code" label="箱号" align="center" />
<el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
<el-table-column prop="struct_code" label="起始位置" align="center" />
<el-table-column prop="next_point_code" label="目的位置" align="center" />
<el-table-column prop="task_code" label="任务号" align="center" />
<el-table-column prop="task_type" label="任务类型" align="center" width="150px" :formatter="taskdtl_typeFormat" />
<el-table-column prop="task_status" label="状态" align="center" width="110px" :formatter="task_statusFormat" />
</el-table>
</el-card>
@@ -153,14 +153,14 @@
import { crud } from '@crud/crud'
import checkoutbill from '@/views/wms/st/outbill/checkoutbill'
import crudStorattr from "@/views/wms/basedata/st/stor/storattr";
import crudRawAssist from "@/views/wms/st/inbill/rawassist";
import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
import crudRawAssist from '@/views/wms/st/inbill/rawassist'
export default {
name: 'ViewDialog',
components: { },
mixins: [crud()],
dicts: ['io_bill_status', 'work_status', 'task_status', 'SCH_TASK_TYPE_DTL'],
dicts: ['io_bill_status', 'work_status', 'task_status', 'SCH_TASK_TYPE_DTL','ST_INV_OUT_TYPE'],
props: {
dialogShow: {
type: Boolean,
@@ -175,11 +175,10 @@ export default {
dialogVisible: false,
tableDtl: [],
tabledis: [],
billtypelist: [],
storlist: [],
currentdtl: null,
currentDis: {},
form:{}
form: {}
}
},
watch: {

2
lms/nladmin-ui/src/views/wms/st/outbill/checkoutbill.js
View File

@@ -155,4 +155,4 @@ export function getType() {
method: 'get'
})
}
export default { add, edit, del, allDiv, allCancel, getOutBillDtl, getOutBillDis, setPoint, getOutBillTask, getStructIvt, manualDiv, confirm, issueTask, finishTask, cancleTaskfinish, getInvTypes, paramByCodeType, schAreaType,backConfirm, getOutBillDisDtl, getType }
export default { add, edit, del, allDiv, allCancel, getOutBillDtl, getOutBillDis, setPoint, getOutBillTask, getStructIvt, manualDiv, confirm, issueTask, finishTask, cancleTaskfinish, getInvTypes, paramByCodeType, schAreaType, backConfirm, getOutBillDisDtl, getType }

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

@@ -96,10 +96,10 @@
@change="crud.toQuery"
>
<el-option
v-for="item in billtypelist"
:key="item.code"
:label="item.name"
:value="item.code"
v-for="item in dict.ST_INV_OUT_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
@@ -172,18 +172,27 @@
</template>
</el-table-column>
<el-table-column :selectable="checkboxT" type="selection" width="55" />
<el-table-column show-overflow-tooltip prop="bill_code" width="130" label="订单编码">
<el-table-column show-overflow-tooltip prop="bill_code" width="130" label="单据编码">
<template slot-scope="scope">
<el-link type="warning" @click="toView(scope.$index, scope.row)">{{ scope.row.bill_code }}</el-link>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip :formatter="stateFormat" width="100" prop="bill_status" label="单据状态" />
<el-table-column prop="stor_name" label="仓库" width="100" />
<el-table-column show-overflow-tooltip prop="bill_type" :formatter="bill_typeFormat" min-width="120" label="业务类型" />
<el-table-column show-overflow-tooltip prop="bill_type" :formatter="bill_typeFormat" label="业务类型" />
<el-table-column show-overflow-tooltip width="135" prop="biz_date" label="业务日期" />
<el-table-column show-overflow-tooltip :formatter="create_modeFormat" prop="create_mode" label="生成方式" width="100" />
<el-table-column label="明细数" align="center" prop="detail_count" width="100" />
<el-table-column show-overflow-tooltip prop="input_time" width="135" label="创建日期" />
<el-table-column label="总重量" align="center" prop="total_qty" width="100" />
<el-table-column show-overflow-tooltip label="备注" align="center" prop="remark" width="100" />
<el-table-column show-overflow-tooltip label="制单人" align="center" prop="input_optname" />
<el-table-column show-overflow-tooltip label="制单时间" align="center" prop="input_time" width="140" />
<el-table-column show-overflow-tooltip label="修改人" align="center" prop="update_optname" />
<el-table-column show-overflow-tooltip label="修改时间" align="center" prop="update_time" width="140" />
<el-table-column show-overflow-tooltip label="分配人" align="center" prop="dis_optname" />
<el-table-column show-overflow-tooltip label="分配时间" align="center" prop="dis_time" width="140" />
<el-table-column show-overflow-tooltip label="确认人" align="center" prop="confirm_optname" />
<el-table-column show-overflow-tooltip label="确认时间" align="center" prop="confirm_time" width="140" />
</el-table>
<!--分页组件-->
<pagination />
@@ -224,7 +233,7 @@ export default {
},
mixins: [presenter(), header(), crud()],
// 数据字典
dicts: ['io_bill_status', 'ST_CREATE_MODE'],
dicts: ['io_bill_status', 'ST_CREATE_MODE','ST_INV_OUT_TYPE'],
data() {
return {
height: document.documentElement.clientHeight - 180 + 'px;',
@@ -270,7 +279,6 @@ export default {
this.viewShow = true
},
[CRUD.HOOK.beforeRefresh]() {
this.crud.query.buss_type = '0101'
this.handleCurrentChange(null)
},
handleSelectionChange(val, row) {
@@ -312,11 +320,7 @@ export default {
return this.dict.label.io_bill_status[row.bill_status]
},
bill_typeFormat(row) {
for (const item of this.billtypelist) {
if (item.code === row.bill_type) {
return item.name
}
}
return this.dict.label.ST_INV_OUT_TYPE[row.bill_type]
},
create_modeFormat(row) {
return this.dict.label.ST_CREATE_MODE[row.create_mode]