Merge remote-tracking branch 'origin/master_1' into master_1

This commit is contained in:
2025-04-15 12:16:57 +08:00
26 changed files with 2220 additions and 6 deletions

View File

@@ -0,0 +1,438 @@
<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-cascader
placeholder="所属库区"
:options="sects"
:props="{ checkStrictly: true }"
clearable
class="filter-item"
style="width: 200px;"
@change="sectQueryChange"
/>
</el-form-item>
<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-input
v-model="query.package_box_sn"
clearable
size="small"
placeholder="木箱码"
style="width: 200px;"
class="filter-item"
/>
</el-form-item>
<el-form-item label="子卷号">
<el-input
v-model="query.pcsn"
clearable
size="small"
placeholder="子卷号"
style="width: 200px;"
class="filter-item"
/>
</el-form-item>
<el-form-item label="sap批次">
<el-input
v-model="query.sap_pcsn"
clearable
size="small"
placeholder="sap批次"
style="width: 200px;"
class="filter-item"
/>
</el-form-item>
<el-form-item label="销售订单">
<el-input
v-model="query.sale_order_name"
clearable
size="small"
placeholder="销售订单"
style="width: 200px;"
class="filter-item"
/>
</el-form-item>
<el-form-item label="库存状态">
<el-select
v-model="query.ivt_status"
clearable
size="mini"
placeholder="全部"
style="width: 200px;"
class="filter-item"
@change="crud.toQuery"
>
<el-option
v-for="item in ivtStatusList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="生产区域">
<el-select
v-model="query.product_area"
clearable
multiple
size="mini"
class="filter-item"
style="width: 200px;"
@change="hand"
>
<el-option
v-for="item in dict.product_area"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="是否虚拟">
<el-select
v-model="query.is_virtual"
clearable
size="mini"
placeholder="请选择"
class="filter-item"
style="width: 200px;"
@change="crud.toQuery"
>
<el-option
v-for="item in dict.IS_OR_NOT"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="子卷状态">
<el-select
v-model="query.sub_type"
clearable
size="mini"
placeholder="请选择"
class="filter-item"
style="width: 200px;"
@change="crud.toQuery"
>
<el-option
v-for="item in dict.SUB_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="库存类型">
<el-select
v-model="query.ivt_flag"
clearable
multiple
size="mini"
style="width: 200px;"
placeholder="请选择"
class="filter-item"
@change="crud.toQuery"
>
<el-option
v-for="item in ivtTypeList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="是否退货">
<el-select
v-model="query.quality_scode"
clearable
size="mini"
style="width: 200px;"
placeholder="请选择"
class="filter-item"
@change="crud.toQuery"
>
<el-option
v-for="item in ivtQualityList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<rrOperation :crud="crud" />
</el-form>
</div>
<!--如果想在工具栏加入更多按钮可以使用插槽方式 slot = 'left' or 'right'-->
<crudOperation :permission="permission">
<!--<el-button
slot="right"
class="filter-item"
type="success"
icon="el-icon-check"
size="mini"
:loading="showDtlLoading"
@click="downdtl"
>
导出Excel
</el-button>-->
</crudOperation>
<!--表格渲染-->
<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="仓位编码"
:min-width="flexWidth('struct_code',crud.data,'仓位编码')"
/>
<el-table-column
prop="struct_name"
label="仓位名称"
:min-width="flexWidth('struct_name',crud.data,'仓位名称')"
/>
<el-table-column prop="stor_name" label="仓库" :min-width="flexWidth('stor_name',crud.data,'仓库')" />
<el-table-column prop="sect_name" label="库区" :min-width="flexWidth('sect_name',crud.data,'库区')" />
<el-table-column
prop="material_code"
label="物料编码"
:min-width="flexWidth('material_code',crud.data,'物料编码')"
/>
<el-table-column
prop="material_name"
label="物料名称"
:min-width="flexWidth('material_name',crud.data,'物料名称')"
/>
<el-table-column
prop="package_box_sn"
label="木箱码"
:min-width="flexWidth('package_box_sn',crud.data,'木箱码')"
/>
<el-table-column
prop="quanlity_in_box"
label="子卷数"
:min-width="flexWidth('quanlity_in_box',crud.data,'子卷数')"
/>
<el-table-column prop="pcsn" label="子卷号" :min-width="flexWidth('pcsn',crud.data,'子卷号')" />
<el-table-column prop="sap_pcsn" label="sap批次" :min-width="flexWidth('sap_pcsn',crud.data,'sap批次')" />
<el-table-column prop="sale_order_name" label="销售订单" :min-width="flexWidth('sale_order_name',crud.data,'销售订单')" />
<el-table-column prop="box_weight" label="毛重" :formatter="rounding2" />
<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="confirm_time" label="入库时间" min-width="150" />
<el-table-column prop="stock_age" label="库龄" min-width="150" />
<el-table-column prop="joint_type" label="接头数" min-width="150" />
<el-table-column prop="sub_type" label="子卷状态" min-width="150" :formatter="formatSubType" />
<el-table-column prop="produce_age" label="生产时长(天)" min-width="120" />
<el-table-column prop="paper_type" label="品质类型" min-width="150" />
<el-table-column prop="paper_code" label="管件编码" min-width="150" />
<el-table-column prop="paper_name" label="管件描述" min-width="250" />
<!-- <el-table-column prop="remark" label="超期原因" min-width="250">
<template scope="scope">
<el-select
v-model="scope.row.remark"
clearable
size="mini"
placeholder="全部"
style="width: 200px;"
class="filter-item"
>
<el-option
v-for="item in remarkList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</template>
</el-table-column>
<el-table-column align="center" label="操作" width="120" fixed="right">
<template scope="scope">
<el-button
type="primary"
class="filter-item"
size="mini"
icon="el-icon-edit"
@click.native.prevent="save(scope.row)"
/>
</template>
</el-table-column>-->
</el-table>
<!--分页组件-->
<pagination />
</div>
<UploadDialog :dialog-show.sync="viewShow" @tableChanged="querytable" />
</div>
</template>
<script>
import crudStructivt from '@/views/wms/basedata/st/ivt/structivt'
import CRUD, { presenter, header, crud } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import pagination from '@crud/Pagination'
import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
import UploadDialog from '@/views/wms/basedata/st/ivt/UploadDialog'
import { download } from '@/api/data'
import { downloadFile } from '@/utils'
export default {
name: 'ControlIvt',
dicts: ['ST_QUALITY_SCODE', 'product_area', 'IS_OR_NOT', 'SUB_TYPE'],
components: { pagination, crudOperation, rrOperation, UploadDialog },
mixins: [presenter(), header(), crud()],
cruds() {
return CRUD({
title: '库存管理', url: 'api/structivt/control', idField: 'stockrecord_id', sort: 'stockrecord_id,desc',
optShow: {
add: false,
edit: false,
showDtlLoading: false,
del: false,
download: false,
reset: true
},
crudMethod: { ...crudStructivt }
})
},
data() {
return {
sects: [],
viewShow: false,
ivtStatusList: [
{ 'value': 'canuse_qty', 'label': '可用数' },
{ 'value': 'warehousing_qty', 'label': '待入数' },
{ 'value': 'frozen_qty', 'label': '冻结数' }
],
ivtTypeList: [
{ 'value': ' ', 'label': '生产' },
{ 'value': '2', 'label': '改切' },
{ 'value': '1', 'label': '返检' }
],
ivtQualityList: [
{ 'value': '01', 'label': '否' },
{ 'value': '02', 'label': '是' }
],
remarkList: [
{ 'value': '1', 'label': '客户原因' },
{ 'value': '2', 'label': '生产质量原因' },
{ 'value': '3', 'label': '市场原因' }
],
permission: {},
rules: {}
}
},
created() {
crudUserStor.getSect({ 'stor_id': '' }).then(res => {
this.sects = res.content
})
this.crud.query.ivt_status = 'canuse_qty'
this.crud.toQuery()
},
methods: {
// 取两位小数点
rounding(row, column) {
return parseFloat(row[column.property]).toFixed(2)
},
rounding2(row, column) {
if (row.box_weight !== '') {
return parseFloat(row[column.property]).toFixed(2)
}
},
formatSubType(row) {
return this.dict.label.SUB_TYPE[row.sub_type]
},
// 钩子在获取表格数据之前执行false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
},
hand(value) {
this.crud.toQuery()
},
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()
},
querytable() {
this.crud.toQuery()
},
downdtl() {
if (this.currentRow !== null) {
this.showDtlLoading = true
download('/api/structivt/download', this.crud.query).then(result => {
downloadFile(result, '成品库存', 'xlsx')
this.showDtlLoading = false
}).catch(() => {
this.showDtlLoading = false
})
}
},
Import() {
this.viewShow = true
},
save(row) {
crudStructivt.save(row).then(res => {
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})
}
}
}
</script>
<style scoped>
</style>

View File

@@ -0,0 +1,320 @@
<template>
<el-dialog
title="库存管控"
append-to-body
fullscreen
:visible.sync="dialogVisible"
@open="open"
@close="close"
>
<el-row :gutter="20">
<el-col :span="20" style="border: 1px solid white">
<span />
</el-col>
<el-col :span="4">
<span>
<el-button icon="el-icon-check" size="mini" type="primary" @click="submit">保存</el-button>
<el-button icon="el-icon-close" size="mini" type="info" @click="close">关闭</el-button>
</span>
</el-col>
</el-row>
<el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="85px" label-suffix=":">
<el-input v-show="false" v-model="form.stor_code" placeholder="仓库编码" />
<el-input v-show="false" v-model="form.stor_name" placeholder="仓库名称" />
<el-form-item label="单据号" prop="bill_code">
<label slot="label">&nbsp;&nbsp;&nbsp;:</label>
<el-input v-model="form.control_code" disabled placeholder="系统生成" clearable style="width: 210px" />
</el-form-item>
<el-form-item label="仓库" prop="stor_id">
<label slot="label">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
<el-select
v-model="form.stor_id"
clearable
placeholder="仓库"
class="filter-item"
style="width: 210px"
:disabled="crud.status.view > 0"
@change="storChange"
>
<el-option
v-for="item in storlist"
:key="item.stor_id"
:label="item.stor_name"
:value="item.stor_id"
/>
</el-select>
</el-form-item>
<el-form-item label="管控类型" prop="bill_type">
<el-select
v-model="form.bill_type"
disabled
filterable
size="mini"
placeholder="业务类型"
class="filter-item"
>
<el-option
v-for="item in dict.CONTORL_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="明细数" prop="detail_count">
<label slot="label">&nbsp;&nbsp;&nbsp;:</label>
<el-input v-model="form.detail_count" size="mini" disabled style="width: 210px" />
</el-form-item>
<el-form-item label="总重量" prop="total_qty">
<label slot="label">&nbsp;&nbsp;&nbsp;:</label>
<el-input-number
v-model="form.total_qty"
:controls="false"
:precision="3"
:min="0"
disabled
style="width: 210px"
/>
</el-form-item>
<el-form-item label="业务日期" prop="biz_date">
<el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px" value-format="yyyy-MM-dd" :disabled="crud.status.view > 0" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<label slot="label">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
<el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
</el-form-item>
</el-form>
<div class="crud-opts2">
<span class="role-span">管控明细</span>
<span class="crud-opts-right2">
<!--左侧插槽-->
<slot name="left" />
<el-button
slot="left"
class="filter-item"
type="primary"
icon="el-icon-plus"
size="mini"
@click="queryDtl()"
>
添加库存物料
</el-button>
</span>
</div>
<!--表格渲染-->
<el-table
ref="table"
:data="form.tableData"
style="width: 100%;"
border
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
>
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" width="190" align="center" />
<el-table-column prop="material_name" label="物料名称" align="center" min-width="150px" show-overflow-tooltip />
<el-table-column prop="box_no" label="箱号" align="center" min-width="250px" show-overflow-tooltip />
<el-table-column show-overflow-tooltip prop="pcsn" label="子卷号" width="150px" align="center" />
<el-table-column show-overflow-tooltip prop="sap_pcsn" label="sap批次号" width="140px" align="center" />
<el-table-column prop="plan_qty" label="重量" width="150" align="center">
<template scope="scope">
<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 show-overflow-tooltip prop="struct_code" label="仓位号" width="140px" align="center" />
<el-table-column align="center" label="操作" width="120" 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)" />
</template>
</el-table-column>
</el-table>
<AddDtl :dialog-show.sync="dtlShow" :stor-id="storId" :lock-type="lockType" @tableChanged="tableChanged" />
</el-dialog>
</template>
<script>
import CRUD, { crud, form } from '@crud/crud'
import AddDtl from '@/views/wms/st/outbill/AddDtl'
import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
import checkoutbill from '@/views/wms/st/outbill/checkoutbill'
import crudControl from '@/views/wms/control/ivtcontrol/control'
const defaultForm = {
control_code: '',
stor_id: '',
stor_code: '',
stor_name: '',
total_qty: '0',
detail_count: '0',
bill_type: '',
remark: '',
biz_date: new Date(),
tableData: []
}
export default {
name: 'AddDialog',
components: { AddDtl, crudControl },
mixins: [crud(), form(defaultForm)],
props: {
dialogShow: {
type: Boolean,
default: false
},
openType: {
type: String,
default: null
},
billType: {
type: String
},
lockType: {
type: String,
default: ''
}
},
dicts: ['CONTORL_TYPE'],
data() {
return {
dialogVisible: false,
dtlShow: false,
storlist: [],
storId: null,
rules: {
stor_id: [
{ required: true, message: '仓库不能为空', trigger: 'blur' }
],
bill_type: [
{ required: true, message: '业务类型不能为空', trigger: 'blur' }
],
biz_date: [
{ required: true, message: '业务日期不能为空', trigger: 'blur' }
]
}
}
},
watch: {
dialogShow: {
handler(newValue) {
this.dialogVisible = newValue
}
}
},
methods: {
open() {
this.form.bill_type = this.billType
crudUserStor.getUserStor().then(res => {
this.storlist = res
})
},
close() {
this.form.stor_code = ''
this.form.stor_id = ''
this.form.total_qty = '0'
this.form.detail_count = '0'
this.form.bill_type = ''
this.form.remark = ''
this.form.tableData = []
this.$emit('update:dialogShow', false)
},
[CRUD.HOOK.beforeSubmit]() {
if (this.form.tableData.length === 0) {
this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
},
storChange(row) {
this.storlist.forEach((item) => {
if (item.stor_id === row) {
this.form.stor_code = item.stor_code
this.form.stor_name = item.stor_name
}
})
},
queryDtl(index, row) {
if (this.form.stor_id === '') {
this.crud.notify('请选择仓库!', CRUD.NOTIFICATION_TYPE.INFO)
return
}
this.storId = this.form.stor_id
this.dtlShow = true
},
tableChanged(rows) {
const data = {
'data': rows
}
checkoutbill.queryBox(data).then(res => {
res.forEach((item) => {
debugger
if (this.form.tableData.length !== 0) {
this.flagnow = false
for (let i = 0; i < this.form.tableData.length; i++) {
if (this.form.tableData[i].box_no === item.box_no && this.form.tableData[i].pcsn === item.pcsn) {
this.flagnow = true
}
}
if (!this.flagnow) {
item.edit = true
this.form.tableData.splice(-1, 0, item)
this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.plan_qty)
}
} else {
item.edit = true
this.form.tableData.splice(-1, 0, item)
this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.plan_qty)
}
})
this.form.detail_count = this.form.tableData.length
})
},
deleteRow(index, rows) {
const box_no = rows[index].box_no
let len = rows.length
while (len--) {
const obj = rows[len]
if (box_no === obj.box_no) {
const index = rows.indexOf(obj)
if (index > -1) { // 移除找到的指定元素
this.form.total_qty = parseFloat(this.form.total_qty) - parseFloat(rows[index].plan_qty)
rows.splice(index, 1)
this.form.detail_count = this.form.tableData.length
}
}
}
},
submit() {
// 0-新增管控 1-新增解控 2-新增出库
if (this.form.tableData.length === 0) {
this.crud.notify('请至少选择一条明细!', CRUD.NOTIFICATION_TYPE.INFO)
return
}
this.form.open_type = this.openType
crudControl.addSubmit(this.form).then(res => {
this.crud.notify('操作成功!', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
this.close()
})
}
}
}
</script>
<style>
.crud-opts2 {
padding: 0 0;
display: -webkit-flex;
display: flex;
align-items: center;
}
.crud-opts2 .crud-opts-right2 {
margin-left: auto;
padding: 4px 4px;
}
.input-with-select {
background-color: #fff;
}
</style>

View File

@@ -0,0 +1,169 @@
<template>
<el-dialog
title="库存管控详情"
append-to-body
fullscreen
:visible.sync="dialogVisible"
@open="open"
@close="close"
>
<el-row :gutter="20">
<el-col :span="20" style="border: 1px solid white">
<span />
</el-col>
<el-col :span="4">
<span>
</span>
</el-col>
</el-row>
<el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" 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.control_code" disabled placeholder="系统生成" style="width: 210px" />
</el-form-item>
<el-form-item label="仓库" prop="stor_name">
<el-input v-model="form.stor_name" placeholder="仓库名称" style="width: 210px" disabled />
</el-form-item>
<el-form-item label="管控类型" prop="bill_type">
<el-select
v-model="form.bill_type"
disabled
filterable
size="mini"
placeholder="业务类型"
class="filter-item"
>
<el-option
v-for="item in dict.CONTORL_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="明细数" prop="detail_count">
<label slot="label">&nbsp;&nbsp;&nbsp;:</label>
<el-input v-model="form.detail_count" size="mini" disabled style="width: 210px" />
</el-form-item>
<el-form-item label="总重量" prop="total_qty">
<label slot="label">&nbsp;&nbsp;&nbsp;:</label>
<el-input-number
v-model="form.total_qty"
:controls="false"
:precision="3"
:min="0"
disabled
style="width: 210px"
/>
</el-form-item>
<el-form-item label="业务日期" prop="biz_date">
<el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px" value-format="yyyy-MM-dd" disabled />
</el-form-item>
<el-form-item label="备注" prop="remark">
<label slot="label">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
<el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea" disabled />
</el-form-item>
</el-form>
<div class="crud-opts2">
<span class="role-span">管控明细</span>
<span class="crud-opts-right2"/>
</div>
<!--表格渲染-->
<el-table
ref="table"
:data="tableDataDtl"
style="width: 100%;"
border
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
>
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" width="190" align="center" />
<el-table-column prop="material_name" label="物料名称" align="center" min-width="150px" show-overflow-tooltip />
<el-table-column prop="box_no" label="箱号" align="center" min-width="250px" show-overflow-tooltip />
<el-table-column show-overflow-tooltip prop="pcsn" label="子卷号" width="150px" align="center" />
<el-table-column show-overflow-tooltip prop="sap_pcsn" label="sap批次号" width="140px" align="center" />
<el-table-column prop="qty" label="重量" width="150" align="center">
<template scope="scope">
<span>{{ scope.row.qty }}</span>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="struct_code" label="仓位号" width="140px" align="center" />
</el-table>
</el-dialog>
</template>
<script>
import CRUD, { crud, form } from '@crud/crud'
import crudControl from '@/views/wms/control/ivtcontrol/control'
export default {
name: 'AddDialog',
components: {},
mixins: [crud()],
props: {
dialogShow: {
type: Boolean,
default: false
},
mstRow: {
type: Object
},
tableData: {
type: Array
}
},
dicts: ['CONTORL_TYPE'],
data() {
return {
dialogVisible: false,
dtlShow: false,
form: null,
tableDataDtl: []
}
},
watch: {
dialogShow: {
handler(newValue) {
this.dialogVisible = newValue
}
},
mstRow: {
handler(newValue) {
this.form = newValue
}
},
tableData: {
handler(newValue) {
this.tableDataDtl = newValue
}
}
},
methods: {
open() {
},
close() {
this.tableDataDtl = []
this.$emit('update:dialogShow', false)
}
}
}
</script>
<style>
.crud-opts2 {
padding: 0 0;
display: -webkit-flex;
display: flex;
align-items: center;
}
.crud-opts2 .crud-opts-right2 {
margin-left: auto;
padding: 4px 4px;
}
.input-with-select {
background-color: #fff;
}
</style>

View File

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

View File

@@ -0,0 +1,277 @@
<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-input
v-model="query.control_code"
size="mini"
clearable
placeholder="单据号"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="所属仓库">
<el-select
v-model="query.stor_id"
clearable
size="mini"
placeholder="全部"
class="filter-item"
@change="crud.toQuery"
>
<el-option
v-for="item in storlist"
:key="item.stor_id"
:label="item.stor_name"
:value="item.stor_id"
/>
</el-select>
</el-form-item>
<el-form-item label="创建时间" prop="createTime">
<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.bill_type"
clearable
size="mini"
placeholder="管控类型"
class="filter-item"
@change="crud.toQuery"
>
<el-option
v-for="item in dict.CONTORL_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="木箱号">
<el-input
v-model="query.box_no"
size="mini"
clearable
placeholder="木箱号"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="子卷号">
<el-input
v-model="query.pcsn"
size="mini"
clearable
placeholder="子卷号"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<rrOperation />
</el-form>
</div>
<!--如果想在工具栏加入更多按钮可以使用插槽方式 slot = 'left' or 'right'-->
<crudOperation :permission="permission">
<el-button
slot="right"
class="filter-item"
type="primary"
icon="el-icon-plus"
size="mini"
@click="addDialog('0')"
>
新增管控
</el-button>
<el-button
slot="right"
class="filter-item"
type="primary"
icon="el-icon-plus"
size="mini"
@click="untieDialog('1')"
>
库存解绑
</el-button>
<el-button
slot="right"
class="filter-item"
type="primary"
icon="el-icon-plus"
size="mini"
@click="outDialog('2')"
>
管控出库
</el-button>
</crudOperation>
<!--表格渲染-->
<el-table
ref="table"
v-loading="crud.loading"
size="mini"
:data="crud.data"
highlight-current-row
style="width: 100%;"
>
<el-table-column prop="control_code" label="单据号" :min-width="flexWidth('control_code',crud.data,'单据号')" >
<template slot-scope="scope">
<el-link type="warning" @click="toView(scope.$index, scope.row)">{{ scope.row.control_code }}</el-link>
</template>
</el-table-column>
<el-table-column prop="stor_name" label="仓库" :min-width="flexWidth('stor_name',crud.data,'仓库')" />
<el-table-column prop="bill_type" label="管控类型" :min-width="flexWidth('bill_type',crud.data,'管控类型')">
<template slot-scope="scope">
{{ dict.label.CONTORL_TYPE[scope.row.bill_type] }}
</template>
</el-table-column>
<el-table-column prop="biz_date" label="业务日期" :min-width="flexWidth('biz_date',crud.data,'业务日期')" />
<el-table-column prop="detail_count" label="明细数" :min-width="flexWidth('detail_count',crud.data,'明细数')" />
<el-table-column prop="total_qty" label="总重量" :formatter="crud.formatNum3" :min-width="flexWidth('total_qty',crud.data,'总重量')" />
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
<el-table-column prop="input_optname" label="制单人" :min-width="flexWidth('input_optname',crud.data,'制单人')" />
<el-table-column prop="input_time" label="制单时间" :min-width="flexWidth('input_time',crud.data,'制单时间')" />
</el-table>
<!--分页组件-->
<pagination />
</div>
<AddDialog :dialog-show.sync="addDialogShow" :open-type="open_type" :lock-type="lock_type" :bill-type="bill_type" />
<ViewDialog :dialog-show.sync="viewDialogShow" :mst-row="mstRow" :table-data="tableDataDtl" />
</div>
</template>
<script>
import crudControl from '@/views/wms/control/ivtcontrol/control'
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 crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
import AddDialog from '@/views/wms/control/ivtcontrol/AddDialog'
import ViewDialog from '@/views/wms/control/ivtcontrol/ViewDialog'
export default {
name: 'ControlMst',
components: { crudOperation, rrOperation, udOperation, pagination, crudUserStor, AddDialog, ViewDialog },
cruds() {
return CRUD({
title: '库存管控',
optShow: { add: false, reset: true },
idField: 'control_id',
url: '/api/control',
crudMethod: { ...crudControl }
})
},
mixins: [presenter(), header(), crud()],
// 数据字典
dicts: ['CONTORL_TYPE'],
data() {
return {
height: document.documentElement.clientHeight - 180 + 'px;',
permission: {
add: ['admin', 'inbill:add'],
edit: ['admin', 'inbill:edit'],
del: ['admin', 'inbill:del']
},
storlist: [],
tableDataDtl: [],
open_type: null,
lock_type: null,
bill_type: null,
mstRow: null,
addDialogShow: false,
viewDialogShow: false
}
},
mounted: function() {
const that = this
window.onresize = function temp() {
that.height = document.documentElement.clientHeight - 180 + 'px;'
}
},
created() {
crudUserStor.getUserStor().then(res => {
this.storlist = res
})
this.initQuery()
},
methods: {
/* 搜索框创建时间默认最近一周*/
initQuery() {
const end = new Date()
const start = new Date()
const endYear = end.getFullYear()
var endMonth = end.getMonth() + 1
if (end.getMonth() + 1 < 10) {
endMonth = '0' + endMonth.toString()
}
var endDay = end.getDate()
if (end.getDate() < 10) {
endDay = '0' + endDay.toString()
}
const endDate = endYear + '-' + endMonth + '-' + endDay + ' 23:59:59'
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
const startYear = start.getFullYear()
var startMonth = start.getMonth() + 1
if (start.getMonth() + 1 < 10) {
startMonth = '0' + startMonth.toString()
}
var startDay = start.getDate()
if (start.getDate() < 10) {
startDay = '0' + startDay.toString()
}
const startDate = startYear + '-' + startMonth + '-' + startDay + ' 00:00:00'
this.$set(this.query, 'createTime', [startDate, endDate])
this.crud.toQuery()
},
addDialog(type) {
this.open_type = type
this.addDialogShow = true
this.lock_type = '1'
this.bill_type = '0'
},
untieDialog(type) {
this.open_type = type
this.addDialogShow = true
this.lock_type = '88'
this.bill_type = '1'
},
outDialog(type) {
this.open_type = type
this.addDialogShow = true
this.lock_type = '88'
this.bill_type = '2'
},
toView(index, row) {
this.mstRow = row
this.viewDialogShow = true
crudControl.queryDtl({ 'control_id': row.control_id }).then(res => {
this.tableDataDtl = res
})
}
}
}
</script>
<style rel="stylesheet/scss" lang="scss" scoped>
::v-deep .el-dialog__body {
padding-top: 10px;
}
</style>

View File

@@ -153,6 +153,9 @@ export default {
},
storId: {
type: String
},
lockType: {
type: String
}
},
data() {
@@ -179,6 +182,7 @@ export default {
[CRUD.HOOK.beforeRefresh]() {
this.crud.query.mater_type = this.opendtlParam
this.crud.query.stor_id = this.storId
this.crud.query.lock_type = this.lockType
if (this.openShow) {
this.openShow = false
return false