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

add:新增原材料入库功能

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-05-15 09:11:58 +08:00
parent 36fa3dfd95
commit 27454e664e
26 changed files with 895 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
mes/qd/src/views/wms/storage_manage/product/productIn/AddDialog.vue
View File

@@ -26,6 +26,25 @@
<label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
<el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable 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="bill_type">
<el-select
v-model="form.bill_type"
clearable
size="mini"
placeholder="业务类型"
class="filter-item"
>
<el-option
v-for="item in dict.ST_INV_IN_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="仓库" prop="stor_id">
<label slot="label">仓库</label>
<el-select
@@ -43,22 +62,28 @@
/>
</el-select>
</el-form-item>
<el-form-item label="业务类型" prop="bill_type">
<el-form-item label="车间" prop="workshop_id">
<label slot="label">车间</label>
<el-select
v-model="form.bill_type"
v-model="form.workshop_id"
clearable
size="mini"
placeholder="业务类型3"
placeholder="全部"
class="filter-item"
@change="crud.toQuery"
>
<el-option
v-for="item in dict.ST_INV_IN_TYPE"
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="仓位" prop="struct_id">
<label slot="label">仓位:</label>
<el-input v-model="form.struct_id" size="mini" disabled style="width: 210px" />
</el-form-item>
<el-form-item label="单据状态" prop="bill_status">
<el-select
v-model="form.bill_status"
@@ -91,9 +116,6 @@
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" />
@@ -214,6 +236,8 @@ const defaultForm = {
detail_count: '0',
bill_type: '',
remark: '',
workshop_id: '',
stor_id: '',
biz_date: new Date(),
create_mode: '',
tableData: []

213
mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/AddDialog.vue
View File

@@ -12,44 +12,33 @@
>
<el-row v-show="crud.status.cu > 0" :gutter="20">
<el-col :span="20" style="border: 1px solid white">
<span />
<span/>
</el-col>
<el-col :span="4">
<span>
<el-button icon="el-icon-check" size="mini" :loading="crud.cu === 2" type="primary" @click="crud.submitCU">保存</el-button>
<el-button icon="el-icon-check" size="mini" :loading="crud.cu === 2" type="primary"
@click="crud.submitCU">保存</el-button>
<el-button icon="el-icon-close" size="mini" type="info" @click="crud.cancelCU">关闭</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-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.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
<el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px"/>
</el-form-item>
<el-form-item label="仓库" prop="product_code">
<label slot="label">生产车间:</label>
<el-select
v-model="form.product_code"
clearable
class="filter-item"
style="width: 210px"
:disabled="crud.status.view > 0"
>
<el-option
v-for="item in dict.product_area"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
<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="业务类型">
<el-form-item label="业务类型" prop="bill_type">
<el-select
v-model="form.bill_type"
clearable
size="mini"
placeholder="业务类型3"
placeholder="业务类型"
class="filter-item"
>
<el-option
@@ -60,6 +49,52 @@
/>
</el-select>
</el-form-item>
<el-form-item label="仓库" prop="stor_id">
<label slot="label">仓库</label>
<el-select
v-model="form.stor_id"
clearable
class="filter-item"
@change="storChange"
style="width: 210px"
:disabled="crud.status.view > 0"
>
<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="workshop_id">
<label slot="label">车间</label>
<el-select
v-model="form.workshop_id"
clearable
size="mini"
placeholder="全部"
class="filter-item"
>
<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="仓位" prop="struct_id">
<label slot="label">仓位:</label>
<el-cascader
v-model="form.struct_id"
placeholder="请选择"
:options="sects"
:props="{ checkStrictly: true }"
clearable
@change="sectQueryChange"
/>
</el-form-item>
<el-form-item label="单据状态" prop="bill_status">
<el-select
v-model="form.bill_status"
@@ -79,7 +114,7 @@
</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-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>
@@ -92,12 +127,10 @@
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-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea"
:disabled="crud.status.view > 0"/>
</el-form-item>
</el-form>
@@ -105,7 +138,7 @@
<div class="crud-opts2" style="margin-bottom: 5px;">
<span class="crud-opts-right2">
<!--左侧插槽-->
<slot name="left" />
<slot name="left"/>
<el-button
slot="left"
class="filter-item"
@@ -127,23 +160,11 @@
border
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
>
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column type="index" label="序号" width="55" align="center"/>
<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="material_spec" label="物料规格" />
<el-table-column show-overflow-tooltip prop="pcsn" label="订单号">
<template slot-scope="scope">
<el-input
v-model="form.tableData[scope.$index].pcsn"
clearable
:controls="false"
controls-position="right"
size="small"
/>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="plan_qty" 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="plan_qty" label="入库重量">
<template slot-scope="scope">
<el-input-number
v-model="form.tableData[scope.$index].plan_qty"
@@ -156,6 +177,21 @@
/>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="qty_unit_name" label="单位"/>
<el-table-column show-overflow-tooltip prop="remark" label="明细备注">
<template slot-scope="scope">
<el-input
v-model="form.tableData[scope.$index].remark"
size="small"
:controls="false"
controls-position="right"
@change="changeQty"
/>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="source_bill_type_name" label="源单类型"/>
<el-table-column show-overflow-tooltip prop="source_bill_code" label="源单号"/>
<el-table-column show-overflow-tooltip prop="supp_name" label="供应商"/>
<el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="170" fixed="right">
<template scope="scope">
<el-button
@@ -180,9 +216,11 @@
</template>
<script>
import CRUD, { crud, form } from '@crud/crud'
import crudProductIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin'
import CRUD, {crud, form} from '@crud/crud'
import MaterDtl from '@/views/wms/pub/MaterDialog'
import crudStorattr from "@/api/wms/basedata/st/storattr";
import crudProductIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin'
import crudStructattr from "@/api/wms/basedata/st/structattr";
const defaultForm = {
bill_code: '',
@@ -190,6 +228,8 @@ const defaultForm = {
bill_status: '10',
total_qty: '0',
detail_count: '0',
stor_id: '',
struct_id: '',
bill_type: '',
remark: '',
biz_date: new Date(),
@@ -199,7 +239,7 @@ const defaultForm = {
export default {
name: 'AddDialog',
components: { MaterDtl },
components: {MaterDtl},
mixins: [crud(), form(defaultForm)],
dicts: ['IO_BILL_STATUS', 'ST_INV_IN_TYPE', 'ST_QUALITY_SCODE', 'bill_type', 'product_area'],
props: {
@@ -216,19 +256,22 @@ export default {
dialogVisible: false,
materShow: false,
dtlShow: false,
struct_id: '',
sect_id: '',
opendtlParam: null,
materType: '03', // 关键成品
storlist: [],
sects: [],
billtypelist: [],
rules: {
product_code: [
{ required: true, message: '生产车间不能为空', trigger: 'blur' }
{required: true, message: '生产车间不能为空', trigger: 'blur'}
],
bill_type: [
{ required: true, message: '业务类型不能为空', trigger: 'blur' }
{required: true, message: '业务类型不能为空', trigger: 'blur'}
],
biz_date: [
{ required: true, message: '业务日期不能为空', trigger: 'blur' }
{required: true, message: '业务日期不能为空', trigger: 'blur'}
]
}
}
@@ -242,8 +285,8 @@ export default {
},
methods: {
open() {
crudProductIn.queryStor().then(res => {
this.storlist = res
crudStorattr.queryStor({"stor_type": "3"}).then(res => {
this.storlist = res.content
})
},
close() {
@@ -251,7 +294,7 @@ export default {
},
[CRUD.HOOK.afterToEdit]() {
// 获取入库单明细
crudProductIn.getIODtl({ 'bill_code': this.form.bill_code }).then(res => {
crudProductIn.getIODtl({'iostorinv_id': this.form.iostorinv_id}).then(res => {
this.form.tableData = res
// 将明细变成不可编辑
for (let i = 0; i < this.form.tableData.length; i++) {
@@ -260,8 +303,16 @@ export default {
}
})
},
[CRUD.HOOK.beforeToEdit]() {
this.struct_id = this.crud.form.struct_id
this.sect_id = this.crud.form.sect_id
crudStructattr.getSectCascader({'stor_id': this.crud.form.stor_id}).then(res => {
this.sects = res.content
this.form.struct_id = this.search(this.sects, this.struct_id)
})
},
[CRUD.HOOK.afterToView]() {
crudProductIn.getIODtl({ 'bill_code': this.form.bill_code }).then(res => {
crudProductIn.getIODtl({'bill_code': this.form.bill_code}).then(res => {
this.form.tableData = res
// 将明细变成不可编辑
for (let i = 0; i < this.form.tableData.length; i++) {
@@ -278,13 +329,60 @@ export default {
return false
}
if (!this.form.stor_id) {
this.crud.notify('仓库不能为空！', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
if (!this.struct_id) {
this.crud.notify('仓位不能为空！', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
for (let i = 0; i < this.form.tableData.length; i++) {
const row = this.form.tableData[i]
if (!row.pcsn || !row.plan_qty) {
this.crud.notify('订单号、数量不能为空', CRUD.NOTIFICATION_TYPE.INFO)
if (!row.plan_qty) {
this.crud.notify('数量不能为空', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
}
for (let i = 0; i < this.form.tableData.length; i++) {
const row = this.form.tableData[i]
row.sect_id = this.sect_id
row.struct_id = this.struct_id
}
},
storChange(value) {
crudStructattr.getSectCascader({'stor_id': value}).then(res => {
this.sects = res.content
})
},
search(object, value) {
debugger
for (var key in object) {
if (object[key].value == value) return [object[key].value];
if (object[key].children && Object.keys(object[key].children).length > 0) {
var temp = search(object[key].children, value);
if (temp) return [object[key].value, temp].flat();
}
}
},
sectQueryChange(val) {
debugger
this.sectProp = val
if (val.length === 1) {
this.sect_id = val[0]
this.struct_id = ''
}
if (val.length === 0) {
this.sect_id = ''
this.struct_id = ''
}
if (val.length === 2) {
this.sect_id = val[0]
this.struct_id = val[1]
}
},
deleteRow(index, rows) {
const material_code = rows[index].material_code
@@ -304,6 +402,7 @@ export default {
tableChanged(rows) {
// 对新增的行进行校验不能存在相同物料批次
rows.forEach((item) => {
debugger
let same_mater = true
this.form.tableData.forEach((row) => {
if (row.material_code === item.material_code) {
@@ -315,6 +414,8 @@ export default {
item.ivt_level = '01'
item.is_active = '1'
item.plan_qty = '1'
item.qty_unit_id = item.base_unit_id
item.qty_unit_name = item.base_unit_name
this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.plan_qty)
this.form.tableData.splice(-1, 0, item)
}

3
mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/DivDialog.vue
View File

@@ -201,14 +201,13 @@
<script>
import CRUD, { crud } from '@crud/crud'
import StructDiv from '@/views/wms/pub/StructDialog'
import crudProductIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin'
import crudPoint from '@/api/wms/sch/point'
import crudRegion from '@/api/wms/sch/region'
export default {
name: 'DivDialog',
components: { StructDiv },
components: {},
mixins: [crud()],
dicts: ['IO_BILL_STATUS', 'MD_OVERSTRUCT_TYPE'],
props: {

67
mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/ViewDialog.vue
View File

@@ -9,10 +9,11 @@
@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" />
<el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px"/>
</el-form-item>
<el-form-item label="生产车间">
<el-select
@@ -70,7 +71,7 @@
</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-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>
@@ -84,11 +85,12 @@
/>
</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="true" />
<el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px"
value-format="yyyy-MM-dd" :disabled="true"/>
</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="true" />
<el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea" :disabled="true"/>
</el-form-item>
</el-form>
<div class="crud-opts2">
@@ -107,41 +109,13 @@
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
@current-change="handleDtlCurrentChange"
>
<el-table-column type="index" label="序号" width="55" 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 min-width="120" show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
<el-table-column prop="pcsn" label="订单号" width="150" align="center" />
<el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
<el-table-column prop="qty_unit_name" label="单位" align="center" />
<el-table-column show-overflow-tooltip prop="remark" label="明细备注" align="center" />
</el-table>
</el-card>
<div class="crud-opts2">
<span class="role-span">作业明细</span>
</div>
<el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
<!--表格渲染-->
<el-table
ref="table2"
:data="tabledis"
style="width: 100%;"
max-height="300"
size="mini"
border
:highlight-current-row="true"
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
@current-change="handleDisCurrentChange"
>
<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 min-width="120" show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
<el-table-column prop="pcsn" label="订单号" align="center" width="150" />
<el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
<el-table-column prop="point_code1" label="起始位置" align="center" />
<el-table-column prop="point_code2" label="目的位置" align="center" />
<el-table-column prop="task_code" label="任务号" align="center" />
<el-table-column prop="task_type_name" label="任务类型" align="center" width="150px" />
<el-table-column type="index" label="序号" width="55" 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="订单号" width="150" align="center"/>
<el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center"/>
<el-table-column prop="qty_unit_name" label="单位" align="center"/>
<el-table-column show-overflow-tooltip prop="remark" label="明细备注" align="center"/>
</el-table>
</el-card>
</el-dialog>
@@ -149,12 +123,12 @@
<script>
import { crud } from '@crud/crud'
import {crud} from '@crud/crud'
import crudProductIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin'
export default {
name: 'ViewDialog',
components: { },
components: {},
mixins: [crud()],
dicts: ['ST_INV_IN_TYPE', 'product_area', 'IO_BILL_STATUS'],
props: {
@@ -235,13 +209,13 @@ export default {
this.currentDis = current
},
queryTableDtl() {
crudProductIn.getIODtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {
crudProductIn.getIODtl({'iostorinv_id': this.form.iostorinv_id}).then(res => {
this.tableDtl = res
})
},
queryTableDdis() {
if (this.currentdtl !== null) {
crudProductIn.getDisTask({ 'iostorinvdtl_id': this.currentdtl.iostorinvdtl_id }).then(res => {
crudProductIn.getDisTask({'iostorinvdtl_id': this.currentdtl.iostorinvdtl_id}).then(res => {
this.tabledis = res
}).catch(() => {
this.tabledis = []
@@ -262,13 +236,14 @@ export default {
.crud-opts2 .el-dialog__title2 {
line-height: 24px;
font-size:20px;
color:#303133;
font-size: 20px;
color: #303133;
}
.crud-opts2 .role-span2 {
padding: 0px 0px 20px 0px;
}
.crud-opts2 {
padding: 10px 0px 0px 50px;
}

79
mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/index.vue
View File

@@ -23,10 +23,10 @@
@change="crud.toQuery"
>
<el-option
v-for="item in dict.IO_BILL_STATUS"
:key="item.value"
:label="item.label"
:value="item.value"
v-for="item in storlist"
:key="item.stor_id"
:label="item.stor_name"
:value="item.stor_id"
/>
</el-select>
</el-form-item>
@@ -52,7 +52,7 @@
<el-form-item label="生成方式">
<el-select
v-model="query.bill_type"
v-model="query.create_mode"
clearable
filterable
size="mini"
@@ -61,7 +61,7 @@
@change="crud.toQuery"
>
<el-option
v-for="item in dict.ST_INV_IN_TYPE"
v-for="item in dict.ST_INV_CREATE"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -127,7 +127,7 @@
</el-select>
</el-form-item>
<rrOperation />
<rrOperation/>
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -157,31 +157,32 @@
@select="handleSelectionChange"
@select-all="onSelectAll"
>
<el-table-column type="selection" width="55" />
<el-table-column type="selection" width="55"/>
<el-table-column show-overflow-tooltip :formatter="stateFormat" prop="bill_status" label="单据状态"/>
<el-table-column show-overflow-tooltip prop="bill_code" width="130" label="单据号">
<template slot-scope="scope">
<el-link type="warning" @click="toView(scope.row)">{{ scope.row.bill_code }}</el-link>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip :formatter="stateFormat" prop="bill_status" label="单据状态" />
<el-table-column prop="product_name" label="生产车间" width="130" show-overflow-tooltip />
<el-table-column show-overflow-tooltip prop="bill_type" min-width="120" label="业务类型" :formatter="bill_typeFormat" />
<el-table-column show-overflow-tooltip min-width="120" prop="biz_date" label="业务日期" />
<el-table-column label="明细数" align="center" prop="detail_count" />
<el-table-column prop="stor_name" label="生产车间" width="130" show-overflow-tooltip/>
<el-table-column show-overflow-tooltip prop="bill_type" min-width="120" label="业务类型"
:formatter="bill_typeFormat"/>
<el-table-column show-overflow-tooltip min-width="120" prop="biz_date" label="业务日期"/>
<el-table-column label="明细数量" align="center" prop="detail_count"/>
<el-table-column label="总重量" align="center" prop="total_qty">
<template slot-scope="scope">
{{ fun(scope.row.total_qty) }}
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="制单人" align="center" prop="create_name" />
<el-table-column label="制单时间" align="center" prop="create_time" width="150" />
<el-table-column label="修改人" align="center" prop="update_name" />
<el-table-column label="修改时间" align="center" prop="update_time" width="150" />
<el-table-column label="分配人" align="center" prop="dis_name" width="140px" />
<el-table-column label="分配时间" align="center" prop="dis_time" width="150" />
<el-table-column label="确认人" align="center" prop="confirm_name" width="150" />
<el-table-column label="确认时间" align="center" prop="confirm_time" width="150" />
<el-table-column label="备注" align="center" prop="remark"/>
<el-table-column label="制单人" align="center" prop="create_name"/>
<el-table-column label="制单时间" align="center" prop="create_time" width="150"/>
<el-table-column label="修改人" align="center" prop="update_name"/>
<el-table-column label="修改时间" align="center" prop="update_time" width="150"/>
<el-table-column label="分配人" align="center" prop="dis_name" width="140px"/>
<el-table-column label="分配时间" align="center" prop="dis_time" width="150"/>
<el-table-column label="确认人" align="center" prop="confirm_name" width="150"/>
<el-table-column label="确认时间" align="center" prop="confirm_time" width="150"/>
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
@@ -194,18 +195,18 @@
</el-table-column>
</el-table>
<!--分页组件-->
<pagination />
<pagination/>
</div>
<AddDialog @AddChanged="querytable" />
<ViewDialog :dialog-show.sync="viewShow" :rowmst="mstrow" @AddChanged="querytable" />
<DivDialog :dialog-show.sync="divShow" :stor-id="storId" :open-param="openParam" @AddChanged="querytable" />
<AddDialog @AddChanged="querytable"/>
<ViewDialog :dialog-show.sync="viewShow" :rowmst="mstrow" @AddChanged="querytable"/>
<DivDialog :dialog-show.sync="divShow" :stor-id="storId" :open-param="openParam" @AddChanged="querytable"/>
</div>
</template>
<script>
import productIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin'
import rawProductIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin'
import crudProductIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin'
import CRUD, { crud, header, presenter } from '@crud/crud'
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'
@@ -214,23 +215,25 @@ import DateRangePicker from '@/components/DateRangePicker/index'
import AddDialog from '@/views/wms/storage_manage/rawproduct/rawProductIn/AddDialog'
import DivDialog from '@/views/wms/storage_manage/rawproduct/rawProductIn/DivDialog'
import ViewDialog from '@/views/wms/storage_manage/rawproduct/rawProductIn/ViewDialog'
import { mapGetters } from 'vuex'
import {mapGetters} from 'vuex'
import crudStorattr from "@/api/wms/basedata/st/storattr";
export default {
name: 'RawProductIn',
components: { ViewDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination, DateRangePicker, DivDialog },
components: {ViewDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination, DateRangePicker, DivDialog},
cruds() {
return CRUD({
title: '',
optShow: { add: true, reset: true },
optShow: {add: true, reset: true},
idField: 'iostorinv_id',
url: '/api/in/productIn',
crudMethod: { ...productIn }
url: '/api/stIvtIostorinvYl',
sort: ['bill_code,desc'],
crudMethod: {...rawProductIn}
})
},
mixins: [presenter(), header(), crud()],
// 数据字典
dicts: ['IO_BILL_STATUS', 'ST_INV_IN_TYPE', 'product_area'],
dicts: ['IO_BILL_STATUS', 'ST_INV_IN_TYPE', 'product_area', 'ST_INV_CREATE'],
data() {
return {
height: document.documentElement.clientHeight - 180 + 'px;',
@@ -252,15 +255,15 @@ export default {
'user'
])
},
mounted: function() {
mounted: function () {
const that = this
window.onresize = function temp() {
that.height = document.documentElement.clientHeight - 180 + 'px;'
}
},
created() {
crudProductIn.queryStor().then(res => {
this.storlist = res
crudStorattr.queryStor({"stor_type": "3"}).then(res => {
this.storlist = res.content
})
},
methods: {
@@ -328,7 +331,7 @@ export default {
return this.dict.label.IO_BILL_STATUS[row.bill_status]
},
divOpen() {
crudProductIn.getIODtl({ 'bill_code': this.currentRow.bill_code, 'open_flag': '1' }).then(res => {
crudProductIn.getIODtl({'bill_code': this.currentRow.bill_code, 'open_flag': '1'}).then(res => {
this.openParam = res
debugger
this.storId = this.currentRow.product_code

46
mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin.js
View File

@@ -2,7 +2,7 @@ import request from '@/utils/request'
export function add(data) {
return request({
url: '/api/in/productIn',
url: '/api/stIvtIostorinvYl',
method: 'post',
data
})
@@ -10,23 +10,23 @@ export function add(data) {
export function del(ids) {
return request({
url: '/api/in/productIn',
method: 'delete',
url: '/api/stIvtIostorinvYl/delete',
method: 'post',
data: ids
})
}
export function edit(data) {
return request({
url: '/api/in/productIn',
method: 'put',
url: '/api/stIvtIostorinvYl/update',
method: 'post',
data
})
}
export function getType(params) {
return request({
url: '/api/in/productIn/getType',
url: '/api/stIvtIostorinvYl/getType',
method: 'get',
params
})
@@ -34,7 +34,7 @@ export function getType(params) {
export function getIODtl(data) {
return request({
url: '/api/in/productIn/getIODtl',
url: '/api/stIvtIostorinvYl/getIODtl',
method: 'post',
data
})
@@ -42,7 +42,7 @@ export function getIODtl(data) {
export function insertDtl(data) {
return request({
url: '/api/in/productIn/insertDtl',
url: '/api/stIvtIostorinvYl/insertDtl',
method: 'post',
data
})
@@ -50,7 +50,7 @@ export function insertDtl(data) {
export function commit(data) {
return request({
url: '/api/in/productIn/commit',
url: '/api/stIvtIostorinvYl/commit',
method: 'post',
data
})
@@ -58,7 +58,7 @@ export function commit(data) {
export function checkVehicle(data) {
return request({
url: '/api/in/productIn/checkVehicle',
url: '/api/stIvtIostorinvYl/checkVehicle',
method: 'post',
data
})
@@ -66,7 +66,7 @@ export function checkVehicle(data) {
export function confirmvehicle(data) {
return request({
url: '/api/in/productIn/confirmvehicle',
url: '/api/stIvtIostorinvYl/confirmvehicle',
method: 'post',
data
})
@@ -74,7 +74,7 @@ export function confirmvehicle(data) {
export function getDisDtl(data) {
return request({
url: '/api/in/productIn/getDisDtl',
url: '/api/stIvtIostorinvYl/getDisDtl',
method: 'post',
data
})
@@ -82,7 +82,7 @@ export function getDisDtl(data) {
export function divStruct(data) {
return request({
url: '/api/in/productIn/divStruct',
url: '/api/stIvtIostorinvYl/divStruct',
method: 'post',
data
})
@@ -90,7 +90,7 @@ export function divStruct(data) {
export function unDivStruct(data) {
return request({
url: '/api/in/productIn/unDivStruct',
url: '/api/stIvtIostorinvYl/unDivStruct',
method: 'post',
data
})
@@ -98,7 +98,7 @@ export function unDivStruct(data) {
export function divPoint(data) {
return request({
url: '/api/in/productIn/divPoint',
url: '/api/stIvtIostorinvYl/divPoint',
method: 'post',
data
})
@@ -106,7 +106,7 @@ export function divPoint(data) {
export function bucketDtl(data) {
return request({
url: '/api/in/productIn/bucketDtl',
url: '/api/stIvtIostorinvYl/bucketDtl',
method: 'post',
data
})
@@ -114,7 +114,7 @@ export function bucketDtl(data) {
export function updateTask(data) {
return request({
url: '/api/in/productIn/updateTask',
url: '/api/stIvtIostorinvYl/updateTask',
method: 'post',
data
})
@@ -122,7 +122,7 @@ export function updateTask(data) {
export function confirmTask(data) {
return request({
url: '/api/in/productIn/confirmTask',
url: '/api/stIvtIostorinvYl/confirmTask',
method: 'post',
data
})
@@ -130,7 +130,7 @@ export function confirmTask(data) {
export function confirm(data) {
return request({
url: '/api/in/productIn/confirm',
url: '/api/stIvtIostorinvYl/confirm',
method: 'post',
data
})
@@ -138,7 +138,7 @@ export function confirm(data) {
export function delDis(data) {
return request({
url: '/api/in/productIn/delDis',
url: '/api/stIvtIostorinvYl/delDis',
method: 'post',
data
})
@@ -146,7 +146,7 @@ export function delDis(data) {
export function queryBoxMater(data) {
return request({
url: '/api/in/productIn/queryBoxMater',
url: '/api/stIvtIostorinvYl/queryBoxMater',
method: 'post',
data
})
@@ -154,14 +154,14 @@ export function queryBoxMater(data) {
export function queryStor() {
return request({
url: '/api/in/productIn/queryStor',
url: '/api/stIvtIostorinvYl/queryStor',
method: 'post'
})
}
export function getDisTask(data) {
return request({
url: '/api/in/productIn/getDisTask',
url: '/api/stIvtIostorinvYl/getDisTask',
method: 'post',
data
})