库存查询相关修改

20231126-yw
anthonywj 1 year ago
parent f4c8838925
commit 28d2fa74a3

@ -5,7 +5,7 @@ VUE_APP_TITLE = UDI管理系统
ENV = 'development'
# 开发环境
VUE_APP_BASE_API = 'http://127.0.0.1:9991'
VUE_APP_BASE_API = 'http://192.168.1.11:9991'
VUE_APP_SYNC_API ="http://127.0.0.1:10001"

@ -13,10 +13,10 @@ ENV = 'production'
刘恩典
VUE_APP_BASE_API = 'http://192.168.0.127:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://192.168.0.127:9150/UDI_WMS_MC/'
# 平潭正式
# VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
# 漳州中医院
# VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/'

@ -367,5 +367,10 @@
margin-top: -10px
}
.el-form-item {
margin-right: 10px;
margin-bottom: 1px;
margin-top: -5px;
}

@ -324,12 +324,6 @@ export default {
<style scoped>
.query-form-item {
display: block !important;
margin-right: 1px;
margin-bottom: 5px;
}
div /deep/ .el-table .warning-row {
background: #bebebe;
}

@ -396,10 +396,6 @@ div /deep/ .el-table .success-row {
/*transition: all .5s;*/
}
.query-form-item {
display: block !important;
margin-right: 10px;
margin-bottom: 5px;
}
</style>

@ -416,10 +416,6 @@ div /deep/ .el-table .success-row {
/*transition: all .5s;*/
}
.query-form-item {
display: block !important;
margin-right: 10px;
margin-bottom: 5px;
}
</style>

@ -525,11 +525,7 @@ export default {
font-family: "Microsoft YaHei";
}
.query-form-item {
display: block !important;
margin-right: 10px;
margin-bottom: 5px;
}
.edit-row {
display: flex;

@ -706,10 +706,6 @@ div /deep/ .el-table .success-row {
/*transition: all .5s;*/
}
.query-form-item {
display: block !important;
margin-right: 10px;
margin-bottom: 5px;
}
</style>

@ -650,11 +650,7 @@ export default {
width: 100%;
}
.query-form-item {
display: block !important;
margin-right: 10px;
margin-bottom: 5px;
}
.el-row {
display: flex;

@ -287,10 +287,6 @@ div /deep/ .el-table .success-row {
/*transition: all .5s;*/
}
.query-form-item {
display: block !important;
margin-right: 10px;
margin-bottom: 5px;
}
</style>

@ -254,11 +254,7 @@ export default {
font-family: "Microsoft YaHei";
}
.query-form-item {
display: block !important;
margin-right: 10px;
margin-bottom: 5px;
}
.edit-row {
display: flex;

@ -296,11 +296,7 @@ export default {
font-family: "Microsoft YaHei";
}
.query-form-item {
display: block !important;
margin-right: 10px;
margin-bottom: 5px;
}
.edit-row {
display: flex;

@ -2257,11 +2257,7 @@ export default {
font-family: "Microsoft YaHei";
}
.query-form-item {
display: block !important;
margin-right: 10px;
margin-bottom: 5px;
}
.edit-row {
display: flex;

@ -1817,11 +1817,6 @@ export default {
font-family: "Microsoft YaHei";
}
.query-form-item {
display: block !important;
margin-right: 10px;
margin-bottom: 5px;
}
.edit-row {
display: flex;

@ -2181,11 +2181,6 @@ export default {
font-family: "Microsoft YaHei";
}
.query-form-item {
display: block !important;
margin-right: 10px;
margin-bottom: 5px;
}
.edit-row {
display: flex;

@ -733,11 +733,6 @@ export default {
font-family: "Microsoft YaHei";
}
.query-form-item {
display: block !important;
margin-right: 10px;
margin-bottom: 5px;
}
.el-row {
display: flex;

@ -557,11 +557,6 @@ export default {
width: 100%;
}
.query-form-item {
display: block !important;
margin-right: 10px;
margin-bottom: 5px;
}
.el-row {
display: flex;

@ -584,12 +584,6 @@ export default {
font-family: "Microsoft YaHei";
}
.query-form-item {
display: block !important;
margin-right: 10px;
margin-bottom: 5px;
}
.edit-row {
display: flex;
flex-wrap: wrap;

@ -248,11 +248,6 @@ export default {
font-family: "Microsoft YaHei";
}
.query-form-item {
display: block !important;
margin-right: 10px;
margin-bottom: 5px;
}
.edit-row {
display: flex;

@ -1,23 +1,23 @@
<template>
<div>
<el-card style="margin: 5px;margin-top: -20px">
<el-form :model="formData" ref="dataForm" label-width="100px" style="margin-bottom: -15px">
<el-form :model="formData" ref="dataForm" class="query-form" label-width="100px" style="margin-bottom: -15px">
<el-button-group style="display: flex;margin: 0px 0 10px 80%; height: 35px">
<el-button
type="primary"
@click.native="saveDeviceReceiveOrder()"
type="primary"
@click.native="saveDeviceReceiveOrder()"
>草稿保存
</el-button>
<el-button
type="primary"
@click.native="submitAudit()"
type="primary"
@click.native="submitAudit()"
>提交审核
</el-button>
</el-button-group>
<el-row>
<el-col :span="10">
<el-form-item class="query-form-item" label="登记记录号:">
<el-form-item label="登记记录号:">
<el-input v-model="formData.orderId"
auto-complete="off"
:disabled="true"
@ -27,7 +27,7 @@
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item class="query-form-item" label="登记时间:">
<el-form-item label="登记时间:">
<el-input v-model="formData.createTime"
auto-complete="off"
:disabled="true"
@ -40,17 +40,17 @@
<el-row>
<el-col :span="10">
<el-form-item class="query-form-item" label="登记部门:">
<el-form-item label="登记部门:">
<el-select v-model="formData.fromDeptCode" placeholder="请选择登记部门信息"
:disabled="detailList.length >0 && this.paramValue == 0 "
style="width: 90%;"
disabled
clearable>
<el-option
v-for="item in deptList"
:key="item.name"
:label="item.name"
:value="item.code">
v-for="item in deptList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.parentName }}</span>
</el-option>
@ -59,7 +59,7 @@
</el-col>
<el-col :span="10" v-if="paramValue!=2">
<el-form-item class="query-form-item" label="设备来源:">
<el-form-item label="设备来源:">
<el-select v-model="formData.type" placeholder="请选择设备来源信息"
:disabled="detailList.length >0"
style="width: 90%"
@ -75,24 +75,24 @@
<el-row>
<el-col :span="15">
<el-form-item class="query-form-item" label="扫码录入:">
<el-form-item label="扫码录入:">
<el-input
id="inputer"
@focus="getInputFocus($event)"
@keypress.enter.native="enterKey($event)"
ref='inputRef'
style="ime-mode:disabled"
type="tel"
v-model="formData.code"
id="inputer"
@focus="getInputFocus($event)"
@keypress.enter.native="enterKey($event)"
ref='inputRef'
style="ime-mode:disabled"
type="tel"
v-model="formData.code"
></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-button
type="primary"
size="mini"
@click.native.stop="addCode()"
style="margin-left: 15px"
type="primary"
size="mini"
@click.native.stop="addCode()"
style="margin-left: 15px"
>扫码添加
</el-button>
</el-col>
@ -113,9 +113,12 @@
<el-table-column width="150" label="设备名称" prop="productName" show-overflow-tooltip></el-table-column>
<el-table-column width="150" label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
<el-table-column width="150" label="DI/物资编码" prop="nameCode" show-overflow-tooltip></el-table-column>
<el-table-column width="150" label="批次号" prop="batchNo" v-if="paramValue != 2" show-overflow-tooltip></el-table-column>
<el-table-column width="150" label="生产日期" prop="productionDate" v-if="paramValue != 2" show-overflow-tooltip></el-table-column>
<el-table-column width="150" label="失效日期" prop="expireDate" v-if="paramValue != 2" show-overflow-tooltip></el-table-column>
<el-table-column width="150" label="批次号" prop="batchNo" v-if="paramValue != 2"
show-overflow-tooltip></el-table-column>
<el-table-column width="150" label="生产日期" prop="productionDate" v-if="paramValue != 2"
show-overflow-tooltip></el-table-column>
<el-table-column width="150" label="失效日期" prop="expireDate" v-if="paramValue != 2"
show-overflow-tooltip></el-table-column>
<el-table-column width="120" label="批次号" v-if="paramValue == 2">
<template slot-scope="scope">
<el-input v-model="scope.row.batchNo"
@ -168,49 +171,49 @@
<el-dialog
title="库存产品录入"
:visible.sync="selectInvProductVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="80%"
v-if="selectInvProductVisible"
:append-to-body='true'
title="库存产品录入"
:visible.sync="selectInvProductVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="80%"
v-if="selectInvProductVisible"
:append-to-body='true'
>
<el-form label-width="100px" :model="filterQuery" size="mini" v-show="showSearch">
<el-row>
<el-col :span="8">
<el-form-item class="query-form-item" label="DI/物资编码:">
<el-form-item label="DI/物资编码:">
<el-input v-model="filterQuery.nameCode" style="width: 90%" placeholder="请输入DI/物资编码"
clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="设备名称:">
<el-form-item label="设备名称:">
<el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入设备名称"
clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="规格型号:">
<el-form-item label="规格型号:">
<el-input v-model="filterQuery.ggxh" style="width: 90%" placeholder="请输入规格型号" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item class="query-form-item" label="生产企业:">
<el-form-item label="生产企业:">
<el-input v-model="filterQuery.manufactory" style="width: 90%" placeholder="请输入生产企业"
clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="注册/备案号:">
<el-form-item label="注册/备案号:">
<el-input v-model="filterQuery.zczbhhzbapzbh" style="width: 90%" placeholder="请输入注册/备案号"
clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="供应商:">
<el-form-item label="供应商:">
<el-input v-model="filterQuery.supName" style="width: 90%" placeholder="请输入供应商"
clearable></el-input>
</el-form-item>
@ -218,13 +221,13 @@
</el-row>
<el-row>
<el-col :span="8">
<el-form-item class="query-form-item" label="仓库:">
<el-form-item label="仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择设备来源信息" style="width: 90%" clearable>
<el-option
v-for="item in invList"
:key="item.name"
:label="item.name"
:value="item.code">
v-for="item in invList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
</el-option>
@ -264,39 +267,39 @@
</el-table>
<pagination
v-show="productTotal>0"
:total="productTotal"
:limit.sync="filterQuery.limit"
:page.sync="filterQuery.page"
@pagination="queryInvProducts"
v-show="productTotal>0"
:total="productTotal"
:limit.sync="filterQuery.limit"
:page.sync="filterQuery.page"
@pagination="queryInvProducts"
></pagination>
</el-dialog>
<el-dialog
title="设备登记-物资字典录入"
:visible.sync="selectProductVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="85%"
v-if="selectProductVisible"
:append-to-body='true'
title="设备登记-物资字典录入"
:visible.sync="selectProductVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="85%"
v-if="selectProductVisible"
:append-to-body='true'
>
<el-form label-width="100px" :model="filterProductQuery" size="mini" v-show="showSearch">
<el-row>
<el-col :span="8">
<el-form-item class="query-form-item" label="DI/物资编码:">
<el-form-item label="DI/物资编码:">
<el-input v-model="filterProductQuery.nameCode" style="width: 90%" placeholder="请输入DI/物资编码"
clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="设备名称:">
<el-form-item label="设备名称:">
<el-input v-model="filterProductQuery.cpmctymc" style="width: 90%" placeholder="请输入设备名称"
clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="规格型号:">
<el-form-item label="规格型号:">
<el-input v-model="filterProductQuery.ggxh" style="width: 90%" placeholder="请输入规格型号"
clearable></el-input>
</el-form-item>
@ -304,19 +307,19 @@
</el-row>
<el-row>
<el-col :span="8">
<el-form-item class="query-form-item" label="生产企业:">
<el-form-item label="生产企业:">
<el-input v-model="filterProductQuery.manufactory" style="width: 90%" placeholder="请输入生产企业"
clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="注册/备案号:">
<el-form-item label="注册/备案号:">
<el-input v-model="filterProductQuery.zczbhhzbapzbh" style="width: 90%" placeholder="请输入注册/备案号"
clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="供应商:">
<el-form-item label="供应商:">
<el-input v-model="filterProductQuery.companyName" style="width: 90%" placeholder="请输入供应商"
clearable></el-input>
</el-form-item>
@ -347,40 +350,40 @@
</el-table>
<pagination
v-show="udiProductTotal>0"
:total="udiProductTotal"
:limit.sync="filterProductQuery.limit"
:page.sync="filterProductQuery.page"
@pagination="queryProductsList"
v-show="udiProductTotal>0"
:total="udiProductTotal"
:limit.sync="filterProductQuery.limit"
:page.sync="filterProductQuery.page"
@pagination="queryProductsList"
></pagination>
</el-dialog>
<el-dialog
title="设备登记-科室设备录入"
:visible.sync="selectDeviceVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="85%"
v-if="selectDeviceVisible"
:append-to-body='true'
title="设备登记-科室设备录入"
:visible.sync="selectDeviceVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="85%"
v-if="selectDeviceVisible"
:append-to-body='true'
>
<el-form label-width="100px" :model="filterDeviceQuery" size="mini" v-show="showSearch">
<el-row>
<el-col :span="8">
<el-form-item class="query-form-item" label="DI/物资编码:">
<el-form-item label="DI/物资编码:">
<el-input v-model="filterDeviceQuery.nameCode" style="width: 90%" placeholder="请输入DI/物资编码"
clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="设备名称:">
<el-form-item label="设备名称:">
<el-input v-model="filterDeviceQuery.deviceName" placeholder="请输入设备名称" style="width: 90%"
clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="规格型号:">
<el-form-item label="规格型号:">
<el-input v-model="filterDeviceQuery.ggxh" style="width: 90%" placeholder="请输入规格型号"
clearable></el-input>
</el-form-item>
@ -388,19 +391,19 @@
</el-row>
<el-row>
<el-col :span="8">
<el-form-item class="query-form-item" label="生产企业:">
<el-form-item label="生产企业:">
<el-input v-model="filterDeviceQuery.manufactory" style="width: 90%" placeholder="请输入生产企业"
clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="注册/备案号:">
<el-form-item label="注册/备案号:">
<el-input v-model="filterDeviceQuery.zczbhhzbapzbh" style="width: 90%" placeholder="请输入注册/备案号"
clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="供应商:">
<el-form-item label="供应商:">
<el-input v-model="filterDeviceQuery.supName" placeholder="请输入供应商" style="width: 90%"
clearable></el-input>
</el-form-item>
@ -432,11 +435,11 @@
</el-table>
<pagination
v-show="udiDeviceTotal>0"
:total="udiDeviceTotal"
:limit.sync="filterDeviceQuery.limit"
:page.sync="filterDeviceQuery.page"
@pagination="queryProductsList"
v-show="udiDeviceTotal>0"
:total="udiDeviceTotal"
:limit.sync="filterDeviceQuery.limit"
:page.sync="filterDeviceQuery.page"
@pagination="queryProductsList"
></pagination>
</el-dialog>
@ -669,7 +672,7 @@ export default {
this.$refs.inputRef.select();
},
addCode() {
if(isBlank(typeof this.formData)){
if (isBlank(typeof this.formData)) {
this.$message.warning("请先选择来源类型");
return;
}
@ -897,9 +900,9 @@ export default {
return;
}
let invProductIds = [];
this.multiProduct.forEach(item => {
invProductIds.push(item.id);
});
this.multiProduct.forEach(item => {
invProductIds.push(item.id);
});
let params = {
type: this.formData.type,
orderIdFk: this.formData.orderId,

@ -1,16 +1,16 @@
<template>
<div>
<el-card class="el-card">
<el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
<el-form :model="filterQuery" class="el-form" size="mini" label-width="100px" v-show="showSearch">
<el-row>
<el-col :span="8">
<el-form-item class="query-form-item" label="登记记录号:">
<el-form-item label="登记记录号:" class="el-form-item">
<el-input v-model="filterQuery.orderId" placeholder="请输入登记记录号" style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="登记部门:">
<el-form-item label="登记部门:">
<el-select v-model="filterQuery.fromDeptCode" placeholder="请选择登记部门" clearable="true"
style="width: 90%"
@change="getDeptList"
@ -26,7 +26,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="登记人:">
<el-form-item label="登记人:">
<el-input v-model="filterQuery.receiveUserName" placeholder="请输入登记人" style="width: 90%"
clearable="true"></el-input>
</el-form-item>
@ -68,9 +68,9 @@
<el-table-column label="登记记录号" prop="orderId"></el-table-column>
<el-table-column label="登记部门" prop="fromDeptName"></el-table-column>
<el-table-column label="设备来源" prop="fromInvName" v-if="paramValue == 0"></el-table-column>
<!-- <el-table-column label="领用货位" prop="fromInvSpaceName"></el-table-column>-->
<el-table-column label="登记人" prop="receiveUserName"></el-table-column>
<el-table-column label="登记时间" prop="createTime"></el-table-column>
<el-table-column label="备注" prop="remark"></el-table-column>
<el-table-column label="状态" prop="status" show-overflow-tooltip width="120">
<template slot-scope="scope">
<el-tag>{{ statusMap[scope.row.status] }}</el-tag>

@ -358,11 +358,6 @@ export default {
</script>
<style scoped>
.query-form-item {
display: block !important;
margin-right: 10px;
margin-bottom: 5px;
}
div /deep/ .el-table .warning-row {
background: #bebebe;

@ -887,11 +887,6 @@ export default {
font-family: "Microsoft YaHei";
}
.query-form-item {
display: block !important;
margin-right: 10px;
margin-bottom: 5px;
}
.el-row {
display: flex;

@ -466,11 +466,6 @@ export default {
font-family: "Microsoft YaHei";
}
.query-form-item {
display: block !important;
margin-right: 10px;
margin-bottom: 5px;
}
.el-row {
display: flex;

@ -103,39 +103,39 @@
<el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
<el-table-column label="往来单位" prop="fromName" width="180">
</el-table-column>
<el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="150"
sortable="custom"
:sort-orders="['ascending', 'descending']">
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="150"-->
<!-- sortable="custom"-->
<!-- :sort-orders="['ascending', 'descending']">-->
<!-- <template slot-scope="scope">-->
<!-- <i class="el-icon-time"></i>-->
<!-- <span>{{ scope.row.createTime }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="审核时间" prop="auditTime" show-overflow-tooltip width="150"
sortable="custom"
:sort-orders="['ascending', 'descending']">
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span>{{ scope.row.auditTime }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="审核时间" prop="auditTime" show-overflow-tooltip width="150"-->
<!-- sortable="custom"-->
<!-- :sort-orders="['ascending', 'descending']">-->
<!-- <template slot-scope="scope">-->
<!-- <i class="el-icon-time"></i>-->
<!-- <span>{{ scope.row.auditTime }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="所属部门" prop="deptName" width="120">
</el-table-column>
<el-table-column label="所属仓库" prop="invName" width="120">
</el-table-column>
<!-- <el-table-column label="所属部门" prop="deptName" width="120">-->
<!-- </el-table-column>-->
<!-- <el-table-column label="所属仓库" prop="invName" width="120">-->
<!-- </el-table-column>-->
<el-table-column label="审核人" prop="reviewUserName" width="120">
</el-table-column>
<el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="来源" prop="fromType" width="120">
<template slot-scope="scope">
<span>{{ fromTypeMap[scope.row.fromType] }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>-->
<!-- <el-table-column label="来源" prop="fromType" width="120">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ fromTypeMap[scope.row.fromType] }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="审核状态" prop="status" width="100">
<template slot-scope="scope">
<el-tag :type="statusAuditFilterType(scope.row.status)">{{
@ -160,6 +160,8 @@
</el-tag>
</template>
</el-table-column>
<el-table-column label="结果信息" prop="result" width="120"></el-table-column>
<el-table-column label="操作" width="100" fixed="right">
<template slot-scope="scope">
<el-button

@ -101,9 +101,18 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="过滤方式:">
<el-select
v-model="filterQuery.filterNoInv"
style="width: 90%"
clearable>
<el-option label="有库存" :value="1"></el-option>
<el-option label="零库存" :value="2"></el-option>
<el-option label="负库存" :value="3"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="供应商名称:">
<el-select
@ -249,6 +258,7 @@ export default {
invSpaceCode: null,
page: 1,
limit: 10,
filterNoInv: 1,
},
list: [],
total: 0,

@ -4,7 +4,7 @@
<el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
<el-row>
<el-col :span="18">
<el-form-item class="query-form-item" label="扫码查询:">
<el-form-item label="扫码查询:">
<el-input v-model="filterQuery.udiCode"
style="width: 97%"
placeholder="请扫描或输入UDI码"
@ -15,51 +15,49 @@
</el-row>
<el-row>
<el-col :span="6">
<el-form-item class="query-form-item" label="DI/物资编码:">
<el-form-item label="DI/物资编码:">
<el-input v-model="filterQuery.nameCode" placeholder="请输入DI/物资编码"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="物资名称:">
<el-form-item label="物资名称:">
<el-input v-model="filterQuery.cpmctymc" placeholder="请输入物资名称"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="规格型号:">
<el-form-item label="规格型号:">
<el-input v-model="filterQuery.ggxh" placeholder="请输入规格型号"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="批次号:">
<el-form-item label="批次号:">
<el-input v-model="filterQuery.batchNo" placeholder="请输入批次号"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item class="query-form-item" label="注册/备案号:">
<el-form-item label="注册/备案号:">
<el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="请输入注册/备案号"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="生产企业:">
<el-form-item label="生产企业:">
<el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="请输入生产企业"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="所属仓库:">
<el-form-item label="所属仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
style="width: 90%"
@change="invChange"
@ -75,7 +73,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="所属货位:">
<el-form-item label="所属货位:">
<el-select
v-model="filterQuery.invSpaceCode"
filterable
@ -101,10 +99,21 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item class="query-form-item" label="供应商名称:">
<el-form-item label="过滤方式:">
<el-select
v-model="filterQuery.filterNoInv"
style="width: 90%"
clearable>
<el-option label="有库存" :value="1"></el-option>
<el-option label="零库存" :value="2"></el-option>
<el-option label="负库存" :value="3"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="供应商名称:">
<el-select
v-model="filterQuery.supId"
filterable
@ -268,6 +277,7 @@ export default {
page: 1,
limit: 10,
udiCode: null,
filterNoInv: 1,
},
list: [],
total: 0,

@ -101,8 +101,18 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="过滤方式:">
<el-select
v-model="filterQuery.filterNoInv"
style="width: 90%"
clearable>
<el-option label="有库存" :value="1"></el-option>
<el-option label="零库存" :value="2"></el-option>
<el-option label="负库存" :value="3"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="供应商名称:">
<el-select
@ -130,7 +140,6 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="top-right-btn">
@ -241,6 +250,7 @@ export default {
invSpaceCode: null,
page: 1,
limit: 10,
filterNoInv: 1,
},
invSpaceCode: null,
list: [],

@ -803,10 +803,4 @@ export default {
<style scoped>
.query-form-item {
display: block !important;
margin-right: 10px;
margin-bottom: 1px;
margin-top: 8px;
}
</style>

@ -380,11 +380,6 @@ export default {
font-family: "Microsoft YaHei";
}
.query-form-item {
display: block !important;
margin-right: 10px;
margin-bottom: 5px;
}
.el-row {
display: flex;

@ -559,12 +559,6 @@ export default {
width: 25%;
}
.query-form-item {
display: block !important;
margin-right: 10px;
margin-bottom: 5px;
}
.text {
font-size: 13px;
font-family: "Microsoft YaHei";

@ -504,11 +504,6 @@ export default {
font-family: "Microsoft YaHei";
}
.query-form-item {
display: block !important;
margin-right: 10px;
margin-bottom: 5px;
}
.el-row {
display: flex;

@ -4,7 +4,7 @@
<el-form :model="listQuery" label-width="120px" v-show="showSearch">
<el-row>
<el-col :span="18">
<el-form-item label="UDI码:" class="query-form-item">
<el-form-item label="UDI码:" >
<el-input v-model="listQuery.udiCode" style="width: 96%" placeholder="请扫描或输入UDI码" clearable="true"
@keyup.enter.native="keyup_submit($event)"></el-input>
</el-form-item>
@ -12,25 +12,25 @@
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="拼音简写:" class="query-form-item">
<el-form-item label="拼音简写:" >
<el-input v-model="listQuery.pinyinInitial" @input="search" style="width: 100%" placeholder="请输入物资拼音简写"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="第三方物资编码:" class="query-form-item">
<el-form-item label="第三方物资编码:" >
<el-input v-model="listQuery.thrPiId" style="width: 100%" placeholder="第三方物资编码"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="分类编码:" class="query-form-item">
<el-form-item label="分类编码:" >
<el-input v-model="listQuery.flbm" style="width: 100%" placeholder="请输入分类编码"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="供应商:" class="query-form-item">
<el-form-item label="供应商:" >
<el-input v-model="listQuery.companyName" style="width: 100%" placeholder="请输入供应商"
clearable="true"></el-input>
</el-form-item>
@ -38,24 +38,24 @@
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="DI/物资编码:" class="query-form-item">
<el-form-item label="DI/物资编码:" >
<el-input v-model="listQuery.unionCode" style="width: 100%" placeholder="请输入DI/医保编码/商品条码"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="物资名称:" class="query-form-item">
<el-form-item label="物资名称:" >
<el-input v-model="listQuery.cpmctymc" style="width: 100%" placeholder="请输入物资名称"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="规格型号:" class="query-form-item">
<el-form-item label="规格型号:" >
<el-input v-model="listQuery.ggxh" style="width: 100%" placeholder="请输入规格型号" clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="生产企业:" class="query-form-item">
<el-form-item label="生产企业:" >
<el-input v-model="listQuery.manufactory" style="width: 100%" placeholder="请输入生产企业/注册备案人"
clearable="true"></el-input>
</el-form-item>
@ -64,20 +64,20 @@
<el-row>
<el-col :span="6">
<el-form-item label="物资分类:" class="query-form-item">
<el-form-item label="物资分类:" >
<el-input v-model="listQuery.category" style="width: 100%" placeholder="请输入物资分类名称"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6" v-if="productRemarkSet.remarkEnable1">
<el-form-item :label="productRemarkSet.remarkTitle1+':'" class="query-form-item">
<el-form-item :label="productRemarkSet.remarkTitle1+':'" >
<el-input v-model="listQuery.basicPrductRemak1" style="width: 100%"
:placeholder="productRemarkSet.remarkTitle1"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6" v-if="productRemarkSet.remarkEnable2">
<el-form-item :label="productRemarkSet.remarkTitle2 +':'" class="query-form-item">
<el-form-item :label="productRemarkSet.remarkTitle2 +':'" >
<el-input v-model="listQuery.basicPrductRemak2" style="width: 100%"
:placeholder="productRemarkSet.remarkTitle2"
clearable="true"></el-input>
@ -523,11 +523,6 @@ export default {
<style scoped>
.query-form-item {
display: block !important;
margin-right: 1px;
margin-bottom: 5px;
}
div /deep/ .el-table .warning-row {
background: #bebebe;

@ -468,12 +468,6 @@ export default {
font-family: "Microsoft YaHei";
}
.query-form-item {
display: block !important;
margin-right: 10px;
margin-bottom: 5px;
}
.el-row {
display: flex;
flex-wrap: wrap;

@ -517,12 +517,6 @@ export default {
font-family: "Microsoft YaHei";
}
.query-form-item {
display: block !important;
margin-right: 10px;
margin-bottom: 5px;
}
.el-row {
display: flex;
flex-wrap: wrap;

@ -515,11 +515,6 @@ export default {
font-family: "Microsoft YaHei";
}
.query-form-item {
display: block !important;
margin-right: 10px;
margin-bottom: 5px;
}
.el-row {
display: flex;

@ -276,11 +276,6 @@ export default {
font-family: "Microsoft YaHei";
}
.query-form-item {
display: block !important;
margin-right: 10px;
margin-bottom: 5px;
}
.el-row {
display: flex;

@ -491,11 +491,6 @@ export default {
font-family: "Microsoft YaHei";
}
.query-form-item {
display: block !important;
margin-right: 10px;
margin-bottom: 5px;
}
.el-row {
display: flex;

@ -431,11 +431,6 @@ export default {
font-family: "Microsoft YaHei";
}
.query-form-item {
display: block !important;
margin-right: 10px;
margin-bottom: 5px;
}
.el-row {
display: flex;

@ -428,11 +428,6 @@ export default {
</script>
<style scoped>
.query-form-item {
display: block !important;
margin-right: 10px;
margin-bottom: 5px;
}
div /deep/ .el-table .warning-row {
background: #bebebe;

@ -278,11 +278,6 @@ export default {
font-family: "Microsoft YaHei";
}
.query-form-item {
display: block !important;
margin-right: 10px;
margin-bottom: 5px;
}
.el-row {
display: flex;

@ -492,11 +492,6 @@ export default {
font-family: "Microsoft YaHei";
}
.query-form-item {
display: block !important;
margin-right: 10px;
margin-bottom: 5px;
}
.el-row {
display: flex;

@ -433,11 +433,6 @@ export default {
font-family: "Microsoft YaHei";
}
.query-form-item {
display: block !important;
margin-right: 10px;
margin-bottom: 5px;
}
.el-row {
display: flex;

@ -429,11 +429,6 @@ export default {
</script>
<style scoped>
.query-form-item {
display: block !important;
margin-right: 10px;
margin-bottom: 5px;
}
div /deep/ .el-table .warning-row {
background: #bebebe;

@ -276,11 +276,6 @@ export default {
font-family: "Microsoft YaHei";
}
.query-form-item {
display: block !important;
margin-right: 10px;
margin-bottom: 5px;
}
.el-row {
display: flex;

@ -440,12 +440,6 @@ export default {
font-family: "Microsoft YaHei";
}
.query-form-item {
display: block !important;
margin-right: 10px;
margin-bottom: 5px;
}
.el-row {
display: flex;
flex-wrap: wrap;

@ -515,16 +515,6 @@ export default {
font-family: "Microsoft YaHei";
}
.query-form {
margin-top: 10px;
display: flex;
}
.query-form-item {
display: block !important;
margin-right: 10px;
margin-bottom: 5px;
}
.el-row {
display: flex;

Loading…
Cancel
Save