Merge remote-tracking branch 'origin/master'

ywj_dev
郑明梁 2 years ago
commit f02112a8bb

@ -5,7 +5,7 @@
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="记录ID:"> <el-form-item label="记录ID:">
<el-input v-model="filterQuery.genKey" style="width: 90%" placeholder="请输入记录ID"></el-input> <el-input v-model="filterQuery.genKey" style="width: 90%" placeholder="请输入记录ID" clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>

@ -5,7 +5,7 @@
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="搜索:"> <el-form-item label="搜索:">
<el-input v-model="query.key" placeholder="搜索" style="width: 90%"></el-input> <el-input v-model="query.key" placeholder="请输入关键字" style="width: 90%" clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -69,43 +69,43 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="往来单位名称:" prop="name"> <el-form-item label="往来单位名称:" prop="name">
<el-input v-model="formData.name" size="small" style="width: 90%" @input="change()" splaceholder="请输入往来单位名称"></el-input> <el-input v-model="formData.name" size="small" style="width: 90%" @input="change()" splaceholder="请输入往来单位名称" :disabled="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="往来单位编码:" prop="erpId"> <el-form-item label="往来单位编码:" prop="erpId">
<el-input v-model="formData.erpId" style="width: 90%" splaceholder="请输入往来单位编码" auto-complete="off" disabled="true"></el-input> <el-input v-model="formData.erpId" style="width: 90%" splaceholder="请输入往来单位编码" auto-complete="off" :disabled="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="社会信用号:" prop="creditNo"> <el-form-item label="社会信用号:" prop="creditNo">
<el-input v-model="formData.creditNo" style="width: 90%" splaceholder="请输入社会信用号" auto-complete="off"></el-input> <el-input v-model="formData.creditNo" style="width: 90%" splaceholder="请输入社会信用号" auto-complete="off" :disabled="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="联系人:" prop="contact"> <el-form-item label="联系人:" prop="contact">
<el-input v-model="formData.contact" style="width: 90%" splaceholder="请输入联系人" auto-complete="off"></el-input> <el-input v-model="formData.contact" style="width: 90%" splaceholder="请输入联系人" auto-complete="off" :disabled="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="地址:" prop="addr"> <el-form-item label="地址:" prop="addr">
<el-input type="" v-model="formData.addr" style="width: 90%" splaceholder="请输入地址" ete="off"></el-input> <el-input type="" v-model="formData.addr" style="width: 90%" splaceholder="请输入地址" ete="off" :disabled="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="联系电话:" prop="mobile"> <el-form-item label="联系电话:" prop="mobile">
<el-input v-model="formData.mobile" auto-complete="off" splaceholder="请输入联系电话" style="width: 90%"></el-input> <el-input v-model="formData.mobile" auto-complete="off" splaceholder="请输入联系电话" style="width: 90%" :disabled="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="拼音码:" prop="spell"> <el-form-item label="拼音码:" prop="spell">
<el-input v-model="formData.spell" auto-complete="off" splaceholder="请输入拼音码" style="width: 90%"></el-input> <el-input v-model="formData.spell" auto-complete="off" splaceholder="请输入拼音码" style="width: 90%" :disabled="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>

@ -255,6 +255,7 @@ export default {
zczbhhzbapzbh: "", zczbhhzbapzbh: "",
isCheck: 1 isCheck: 1
}; };
this.udidlList=[];
}, },
searchList() { searchList() {
this.unionQuery.page = 1; this.unionQuery.page = 1;

@ -261,11 +261,11 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="bizTotal>0" v-show="codeTotal>0"
:total="bizTotal" :total="codeTotal"
:page.sync="bizQuery.page" :page.sync="codeQuery.page"
:limit.sync="bizQuery.limit" :limit.sync="codeQuery.limit"
@pagination="getBizDetailList" @pagination="getOrderDetails"
/> />
</el-tab-pane> </el-tab-pane>
@ -362,8 +362,8 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="bizTotal>0" v-show="invTotal>0"
:total="bizTotal" :total="invTotal"
:page.sync="bizQuery.page" :page.sync="bizQuery.page"
:limit.sync="bizQuery.limit" :limit.sync="bizQuery.limit"
@pagination="getBizDetailList" @pagination="getBizDetailList"
@ -568,6 +568,7 @@ export default {
limit: 10 limit: 10
}, },
bizTotal: 0, bizTotal: 0,
invTotal: 0,
bizDetailLoading: false, bizDetailLoading: false,
bizDetailList: [], bizDetailList: [],
codeQuery: { codeQuery: {
@ -746,10 +747,10 @@ export default {
// //
getOrderDetails() { getOrderDetails() {
this.codeQuery.page = 1; this.codeQuery.page = 1;
this.resultQuery.page = 1; //this.resultQuery.page = 1;
this.getCodeDetailList(); this.getCodeDetailList();
this.getResultDetailList(); //this.getResultDetailList();
}, },
// //
clearDetailList() { clearDetailList() {
@ -929,17 +930,17 @@ export default {
this.bizDetailLoading = false; this.bizDetailLoading = false;
if (res.code === 20000) { if (res.code === 20000) {
this.bizDetailList = res.data.list || []; this.bizDetailList = res.data.list || [];
this.bizTotal = res.data.total || 0; this.invTotal = res.data.total || 0;
} else { } else {
this.$message.error(res.message); this.$message.error(res.message);
this.bizDetailList = []; this.bizDetailList = [];
this.bizTotal = 0; this.invTotal = 0;
} }
}).catch((error) => { }).catch((error) => {
this.bizDetailLoading = false; this.bizDetailLoading = false;
this.$message.error(error.message); this.$message.error(error.message);
this.bizDetailList = []; this.bizDetailList = [];
this.bizTotal = 0; this.invTotal = 0;
}) })
}, },

@ -337,10 +337,10 @@
<el-tab-pane> <el-tab-pane>
<span slot="label">单据 {{ currentRow.billNo }}-扫码明细</span> <span slot="label">单据 {{ currentRow.billNo }}-扫码明细</span>
<el-form :inline="true" :model="resultQuery" class="query-form" size="mini"> <el-form :inline="true" :model="resultQuery" class="query-form" size="mini">
<el-form-item class="query-form-item" label="物资名称:"> <el-form-item class="query-form-item" label="UDI码:">
<el-input <el-input
v-model="resultQuery.code" v-model="resultQuery.code"
placeholder="请输入物资名称" placeholder="请输入UDI码"
clearable clearable
> >
</el-input> </el-input>

@ -440,7 +440,7 @@
<el-tab-pane> <el-tab-pane>
<span slot="label">单据 {{ currentRow.billNo }}-扫码明细</span> <span slot="label">单据 {{ currentRow.billNo }}-扫码明细</span>
<el-form :inline="true" :model="resultQuery" class="query-form" size="mini"> <el-form :inline="true" :model="resultQuery" class="query-form" size="mini">
<el-form-item class="query-form-item" label="物资名称:"> <el-form-item class="query-form-item" label="UDI码:">
<el-input <el-input
v-model="resultQuery.code" v-model="resultQuery.code"
placeholder="请输入UDI码" placeholder="请输入UDI码"
@ -767,6 +767,7 @@ export default {
invChange() { invChange() {
this.filterQuery.action = null; this.filterQuery.action = null;
this.busTypes = [];
this.getBusType(); this.getBusType();
}, },
printOrder(row) { printOrder(row) {

@ -428,7 +428,7 @@
<el-tab-pane> <el-tab-pane>
<span slot="label">单据 {{ currentRow.billNo }}-扫码明细</span> <span slot="label">单据 {{ currentRow.billNo }}-扫码明细</span>
<el-form :inline="true" :model="resultQuery" class="query-form" size="mini"> <el-form :inline="true" :model="resultQuery" class="query-form" size="mini">
<el-form-item class="query-form-item" label="物资名称:"> <el-form-item class="query-form-item" label="UDI码:">
<el-input <el-input
v-model="resultQuery.code" v-model="resultQuery.code"
placeholder="请输入UDI码" placeholder="请输入UDI码"

@ -229,10 +229,10 @@
<el-tab-pane> <el-tab-pane>
<span slot="label">单据 {{ currentRow.billNo }}-业务详情</span> <span slot="label">单据 {{ currentRow.billNo }}-业务详情</span>
<el-form :inline="true" :model="bizQuery" class="query-form" size="mini"> <el-form :inline="true" :model="bizQuery" class="query-form" size="mini">
<el-form-item class="query-form-item" label="产品名称:"> <el-form-item class="query-form-item" label="物资名称:">
<el-input <el-input
v-model="bizQuery.productName" v-model="bizQuery.productName"
placeholder="请输入产品名称" placeholder="请输入物资名称"
clearable clearable
> >
</el-input> </el-input>
@ -313,10 +313,10 @@
<el-tab-pane> <el-tab-pane>
<span slot="label">单据 {{ currentRow.billNo }}-扫码详情</span> <span slot="label">单据 {{ currentRow.billNo }}-扫码详情</span>
<el-form :inline="true" :model="codeQuery" class="query-form" size="mini"> <el-form :inline="true" :model="codeQuery" class="query-form" size="mini">
<el-form-item class="query-form-item" label="产品名称:"> <el-form-item class="query-form-item" label="物资名称:">
<el-input <el-input
v-model="codeQuery.productName" v-model="codeQuery.productName"
placeholder="请输入产品名称" placeholder="请输入物资名称"
clearable clearable
> >
</el-input> </el-input>
@ -401,7 +401,7 @@
<el-tab-pane> <el-tab-pane>
<span slot="label">单据 {{ currentRow.billNo }}-扫码明细</span> <span slot="label">单据 {{ currentRow.billNo }}-扫码明细</span>
<el-form :inline="true" :model="resultQuery" class="query-form" size="mini"> <el-form :inline="true" :model="resultQuery" class="query-form" size="mini">
<el-form-item class="query-form-item" label="产品名称:"> <el-form-item class="query-form-item" label="UDI码:">
<el-input <el-input
v-model="resultQuery.code" v-model="resultQuery.code"
placeholder="请输入UDI码" placeholder="请输入UDI码"

@ -295,7 +295,7 @@
<el-tab-pane> <el-tab-pane>
<span slot="label">单据 {{ currentRow.billNo }}-扫码明细</span> <span slot="label">单据 {{ currentRow.billNo }}-扫码明细</span>
<el-form :inline="true" :model="resultQuery" class="query-form" size="mini"> <el-form :inline="true" :model="resultQuery" class="query-form" size="mini">
<el-form-item class="query-form-item" label="物资名称:"> <el-form-item class="query-form-item" label="UDI码:">
<el-input <el-input
v-model="resultQuery.code" v-model="resultQuery.code"
placeholder="请输入UDI码" placeholder="请输入UDI码"

@ -297,10 +297,10 @@
<el-tab-pane> <el-tab-pane>
<span slot="label">单据 {{ currentRow.billNo }}-扫码明细</span> <span slot="label">单据 {{ currentRow.billNo }}-扫码明细</span>
<el-form :inline="true" :model="resultQuery" class="query-form" size="mini"> <el-form :inline="true" :model="resultQuery" class="query-form" size="mini">
<el-form-item class="query-form-item" label="物资名称:"> <el-form-item class="query-form-item" label="UDI码:">
<el-input <el-input
v-model="resultQuery.code" v-model="resultQuery.code"
placeholder="请输入物资名称" placeholder="请输入UDI码"
clearable clearable
> >
</el-input> </el-input>

@ -323,10 +323,10 @@
<el-tab-pane> <el-tab-pane>
<span slot="label">单据 {{ currentRow.billNo }}-扫码明细</span> <span slot="label">单据 {{ currentRow.billNo }}-扫码明细</span>
<el-form :inline="true" :model="resultQuery" class="query-form" size="mini"> <el-form :inline="true" :model="resultQuery" class="query-form" size="mini">
<el-form-item class="query-form-item" label="物资名称:"> <el-form-item class="query-form-item" label="UDI码:">
<el-input <el-input
v-model="resultQuery.code" v-model="resultQuery.code"
placeholder="请输入物资名称" placeholder="请输入UDI码"
clearable clearable
> >
</el-input> </el-input>

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

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

@ -29,6 +29,35 @@
</el-col> </el-col>
</el-row> </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-divider></el-divider>
<el-row> <el-row>

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

Loading…
Cancel
Save