1.修复bug

ywj_dev
x_z 2 years ago
parent 4077aa17a1
commit 612d3ffdd4

@ -767,6 +767,7 @@ export default {
invChange() {
this.filterQuery.action = null;
this.busTypes = [];
this.getBusType();
},
printOrder(row) {

@ -2,8 +2,8 @@
<div>
<el-form :inline="true" :model="filterQuery" size="mini">
<el-row style="width: 100%">
<el-form-item class="query-form-item" label="货位号/名称">
<el-input v-model="filterQuery.key" placeholder="请输入货位号/名称:" clearable></el-input>
<el-form-item class="query-form-item" label="货位号/名称:">
<el-input v-model="filterQuery.key" placeholder="请输入货位号/名称" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button-group>
@ -11,7 +11,7 @@
type="primary"
icon="el-icon-refresh"
@click="onReset"
></el-button>
>重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit"></el-button>
<el-button type="primary" icon="el-icon-plus" @click="addSpace"></el-button>
</el-button-group>
@ -72,13 +72,13 @@
<el-col :span="11">
<el-form-item prop="code" label="货位编码">
<el-input v-model="formData.code" auto-complete="off" style="width: 90%"
placeholder="请输入货位编码"></el-input>
placeholder="请输入货位编码" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item prop="name" label="货位名称">
<el-input v-model="formData.name" auto-complete="off" style="width: 90%"
placeholder="请输入货位名称"></el-input>
placeholder="请输入货位名称" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
@ -86,7 +86,7 @@
<el-col :span="11">
<el-form-item prop="remark" label="货位分类">
<el-input v-model="formData.type" auto-complete="off" style="width: 90%"
placeholder="请输入货位分类"></el-input>
placeholder="请输入货位分类" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="11">
@ -125,6 +125,7 @@ import store from "../../store";
import {filterUplLocInv} from "@/api/system/invWarehouse";
import {filterSubByInv} from "@/api/system/invSubWarehouse";
import {getInvSpaceList, saveSpace, deleteSpace} from "@/api/inventory/invSpace";
import {isBlank} from "@/utils/strUtil";
export default {
name: "invInfo",
@ -276,6 +277,10 @@ export default {
this.formData = row;
},
addSpace() {
if (isBlank(this.invInfo.invStorageCode)) {
this.$message.warning("请先选择仓库!");
return;
}
this.modifySpaceVisible = true;
this.formName = "add";
this.resetForm();

@ -82,17 +82,17 @@
<el-table-column label="货位名称" prop="invSpaceName" width="200"></el-table-column>
<el-table-column label="产品名称" prop="productName" width="300" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="300" show-overflow-tooltip></el-table-column>
<el-table-column label="低库存预警" prop="lowStock" width="120">
<el-table-column label="低库存预警" prop="lowStock" width="180">
<template slot-scope="scope">
<el-tag>{{ enableMap[scope.row.lowStock] }}</el-tag>
</template>
</el-table-column>
<el-table-column label="负库存预警" prop="lackStock" width="120">
<el-table-column label="负库存预警" prop="lackStock" width="180">
<template slot-scope="scope">
<el-tag>{{ enableMap[scope.row.lackStock] }}</el-tag>
</template>
</el-table-column>
<el-table-column label="库存积压预警" prop="overStock" width="120">
<el-table-column label="库存积压预警" prop="overStock" width="180">
<template slot-scope="scope">
<el-tag>{{ enableMap[scope.row.overStock] }}</el-tag>
</template>
@ -102,12 +102,11 @@
<el-tag>{{ enableMap[scope.row.expireDate] }}</el-tag>
</template>
</el-table-column>
<el-table-column label="近效期预警" prop="recentDate" width="120">
<el-table-column label="近效期预警" prop="recentDate" width="180">
<template slot-scope="scope">
<el-tag>{{ enableMap[scope.row.recentDate] }}</el-tag>
</template>
</el-table-column>
<el-table-column label="备注" prop="remark" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" width="120" fixed="right">
<template slot-scope="scope">
<el-button

@ -29,6 +29,35 @@
</el-col>
</el-row>
<el-row>
<el-col :span="10">
<el-form-item class="query-form-item" label="低库存预警数量:">
<el-input v-model="setData.lowStockNum" disabled></el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item class="query-form-item" label="库存积压预警数量:">
<el-input v-model="setData.overStockNum" disabled></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="10">
<el-form-item class="query-form-item" label="近效期预警时间:">
<el-input v-model="setData.recentDateTime" disabled></el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item class="query-form-item" label="近效期预警时间单位:">
<el-input v-show="setData.isDateBy == 1" value="天" disabled></el-input>
<el-input v-show="setData.isDateBy == 2" value="小时" disabled></el-input>
</el-form-item>
</el-col>
</el-row>
<el-divider></el-divider>
<el-row>

@ -58,13 +58,13 @@
</el-button
>
<!-- <el-button-->
<!-- type="text"-->
<!-- :disabled="!configParms.basicInv"-->
<!-- @click.native.stop="popInvRelUser( scope.row)"-->
<!-- >用户管理-->
<!-- </el-button-->
<!-- >-->
<!-- <el-button-->
<!-- type="text"-->
<!-- :disabled="!configParms.basicInv"-->
<!-- @click.native.stop="popInvRelUser( scope.row)"-->
<!-- >用户管理-->
<!-- </el-button-->
<!-- >-->
<el-button
@ -322,14 +322,14 @@
</el-card>
<el-tabs type="border-card" style="margin: 15px">
<el-tab-pane>
<span slot="label">{{ currentRow.name }}-用户列表</span>
<el-tab-pane>
<span slot="label">{{ currentRow.name }}-用户列表</span>
<inv-rel-users :inputQuery="currentRow"
:configParms="configParms"
></inv-rel-users>
<inv-rel-users :inputQuery="currentRow"
:configParms="configParms"
></inv-rel-users>
</el-tab-pane>
</el-tab-pane>
<!-- <el-tab-pane>-->
<!-- <span slot="label">{{ currentRow.name }}-单据类型</span>-->
<!-- </el-tab-pane>-->
@ -436,6 +436,14 @@ export default {
status: "",
};
this.getList();
//
this.currentRow = {name: "仓库"};
this.currentInvInfo = {
invStorageCode: null,
invWarehouseCode: null
};
},
onSubmit() { //
@ -462,7 +470,7 @@ export default {
if (formName === "edit") {
this.subData = JSON.parse(JSON.stringify(data));
} else if (formName === "add") {
this.subData = {advanceType: false,spUse:false};
this.subData = {advanceType: false, spUse: false};
}
this.subFormVisible = true;
this.getSubThrsysDetailData();

Loading…
Cancel
Save