完成入库计划显示库位物料台账
This commit is contained in:
parent
b1c91a6dad
commit
aa918b58bb
@ -393,6 +393,35 @@
|
||||
<!-- </el-form-item>-->
|
||||
<!-- </el-col>-->
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="长度" prop="length">
|
||||
<el-input-number v-model="form.length" :min="0" :percision="0" :step="1" disabled
|
||||
v-if="optType=='view'"/>
|
||||
<el-input-number v-model="form.length" :min="0" :percision="0" :step="1"
|
||||
placeholder="请输入长度"
|
||||
v-else/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="宽度" prop="width">
|
||||
<el-input-number v-model="form.width" :min="0" :percision="0" :step="1" disabled
|
||||
v-if="optType=='view'"/>
|
||||
<el-input-number v-model="form.width" :min="0" :percision="0" :step="1"
|
||||
placeholder="请输入宽度"
|
||||
v-else/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="高度" prop="height">
|
||||
<el-input-number v-model="form.height" :min="0" :percision="0" :step="1" disabled
|
||||
v-if="optType=='view'"/>
|
||||
<el-input-number v-model="form.height" :min="0" :percision="0" :step="1"
|
||||
placeholder="请输入高度"
|
||||
v-else/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<!-- <el-row v-if="form.safeStockFlag == 'Y'">-->
|
||||
<!-- <el-col :span="12">-->
|
||||
<!-- <el-form-item label="最小库存量">-->
|
||||
|
||||
@ -4,10 +4,11 @@ import WmsInPlanDetailEntityTableCmps from "@/views/mes/wm/inPlan/wmsInPlanDetai
|
||||
import {addPLAN, updatePLAN} from "@/api/wm/PLAN";
|
||||
import {listMdItem} from "@/api/mes/md/mdItem";
|
||||
import {listTYPE} from "@/api/md/TYPE";
|
||||
import {isDuplicateRfid} from "@/api/mes/md/baseKnife";
|
||||
import {isDuplicateRfid, listBaseKnife} from "@/api/mes/md/baseKnife";
|
||||
|
||||
export default {
|
||||
name: "wmsInPlanKnifeBackFormCmps",
|
||||
dicts: ['sys_yes_no', 'mes_item_product', 'is_locked', 'knife_fine_status', 'plan_source_type', 'in_plan_state'],
|
||||
components: {WmsInPlanDetailEntityTableCmps},
|
||||
props: {
|
||||
dataForm: {
|
||||
@ -25,6 +26,8 @@ export default {
|
||||
wmsInPlanDetailForm: {},
|
||||
// 库位列表
|
||||
areaList: [],
|
||||
BaseKnifeList: [],
|
||||
total: 0,
|
||||
// 入库计划明细实例 列表
|
||||
wmsInPlanDetailEntityList: [],
|
||||
// 表单校验
|
||||
@ -34,7 +37,12 @@ export default {
|
||||
localVisible: this.visible,
|
||||
// 入库计划类型
|
||||
inPlanTypeList: [],
|
||||
mdItemList: []
|
||||
mdItemList: [],
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
areaCode: ""
|
||||
}
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
@ -45,7 +53,6 @@ export default {
|
||||
methods: {
|
||||
/** 获取库位列表 */
|
||||
getAreaList(areaName = "") {
|
||||
this.loading = true;
|
||||
const params = {
|
||||
pageNum: 1,
|
||||
pageSize: 100,
|
||||
@ -124,6 +131,15 @@ export default {
|
||||
this.inPlanTypeList = response.rows;
|
||||
});
|
||||
},
|
||||
handleAreaSelectChange(){
|
||||
let result = this.areaList.filter(item => item.areaId == this.wmsInPlanDetailForm.cellId)
|
||||
this.queryParams.areaCode = result[0].areaCode
|
||||
|
||||
listBaseKnife(this.queryParams).then(response => {
|
||||
this.BaseKnifeList = response.rows;
|
||||
this.total = response.total;
|
||||
});
|
||||
},
|
||||
handlePlanTypeSelectChange(typeId) {
|
||||
this.$emit("planTypeSelectChange", typeId)
|
||||
},
|
||||
@ -194,20 +210,17 @@ export default {
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<el-dialog :title="title" :visible="visible" width="50%" append-to-body @close="handleClose"
|
||||
<el-dialog :title="title" :visible="visible" width="60%" append-to-body @close="handleClose"
|
||||
:close-on-click-modal="false">
|
||||
<!--状态为1已执行 则禁用-->
|
||||
<el-form ref="form" :model="localDataForm" :rules="rules" label-width="80px" inline
|
||||
:disabled="localDataForm.state === '1'">
|
||||
<!-- <el-form-item label="计划编码" prop="planCode">-->
|
||||
<!-- <el-input v-model="localDataForm.planCode" placeholder="请输入计划编码"></el-input>-->
|
||||
<!-- </el-form-item>-->
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input v-model="localDataForm.remark" placeholder="请输入备注"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="库位" prop="cellId" v-if="localDataForm.planTypeCode!=='ZDHK'">
|
||||
<el-select v-model="wmsInPlanDetailForm.cellId" placeholder="请选择库位" filterable remote
|
||||
:remote-method="getAreaList" clearable>
|
||||
:remote-method="getAreaList" clearable @change="handleAreaSelectChange">
|
||||
<el-option :label="item.areaName" :value="item.areaId.toString()" v-for="item in areaList"
|
||||
:key="item.areaId">
|
||||
<span style="float: left">{{ item.areaName }}</span>
|
||||
@ -232,6 +245,45 @@ export default {
|
||||
:planTypeId="localDataForm.planTypeId"
|
||||
:planTypeCode="localDataForm.planTypeCode"
|
||||
></wms-in-plan-detail-entity-table-cmps>
|
||||
|
||||
<el-divider content-position="center" v-if="localDataForm.planTypeCode!=='ZDHK'">库位包含物料</el-divider>
|
||||
<el-table :data="BaseKnifeList" v-if="localDataForm.planTypeCode!=='ZDHK'">
|
||||
<el-table-column label="台账ID" align="center" prop="baseKnifeId" min-width="60" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="rfid" align="center" prop="rfid" />
|
||||
<el-table-column label="刀具编码" align="center" prop="knifeCode" min-width="135" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="刀具名称" align="center" prop="knifeName" min-width="135" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="物料类型" align="center" key="itemOrProduct" prop="itemOrProduct"
|
||||
:show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.mes_item_product" :value="scope.row.itemOrProduct"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="刀具寿命" align="center" prop="knifeLife" min-width="100" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="刀具状态" align="center" prop="knifeFineState" min-width="100"
|
||||
:show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.knife_fine_status" :value="scope.row.knifeFineState"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="是否锁定" align="center" prop="isLocked" min-width="100" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.is_locked" :value="scope.row.isLocked"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="归属计划单" align="center" prop="planSheet" min-width="120"/>
|
||||
<el-table-column label="重置次数" align="center" prop="resetCount" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.itemOrProduct == 'PRODUCT'">{{ scope.row.resetCount }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<pagination
|
||||
v-show="total>0"
|
||||
:total="total"
|
||||
:page.sync="queryParams.pageNum"
|
||||
:limit.sync="queryParams.pageSize"
|
||||
@pagination="handleAreaSelectChange"
|
||||
/>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user