From 936f3377e88ec58bdbdcfd79135bd32d8c01159c Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 25 Apr 2023 17:34:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/basic/product/UdiInfoSelectLocalUdi.vue | 3 ++-
src/views/basic/product/udiInfoManageSp.vue | 1 +
src/views/inout/IoAuditedOrder.vue | 6 +++---
src/views/inout/IoEditOrder.vue | 12 ++++++------
src/views/inout/receive/receiveSearch.vue | 1 +
src/views/purchase/purPlan/purPlan.vue | 2 +-
src/views/purchase/purPlan/purPlanSearch.vue | 1 +
src/views/thirdSys/product/thrProductsAdd.vue | 2 +-
8 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/src/views/basic/product/UdiInfoSelectLocalUdi.vue b/src/views/basic/product/UdiInfoSelectLocalUdi.vue
index 906175ba..aee35ab9 100644
--- a/src/views/basic/product/UdiInfoSelectLocalUdi.vue
+++ b/src/views/basic/product/UdiInfoSelectLocalUdi.vue
@@ -540,7 +540,7 @@ export default {
},
checkCombine() {
- if (isBlank(this.relId)) {
+ if(isBlank(this.relId)) {
this.checkedUdi();
} else {
this.$confirm("是否确定关联DI产品名称:" + this.cpmctymc1 + ":与第三方产品名称" + this.data.cpmctymc, "提示", {
@@ -558,6 +558,7 @@ export default {
let selectData = this.multipleUdiSelection;
let selected = null;
if (this.multipleUdiSelection.length == 0) {
+ this.$message.warning('请选入产品!');
if (this.relId != null) {
this.combineQuery.relId = this.relId;
this.combineQuery.keys.push(this.currentRow.uuid);
diff --git a/src/views/basic/product/udiInfoManageSp.vue b/src/views/basic/product/udiInfoManageSp.vue
index 5fd6ce7a..b54a9cab 100644
--- a/src/views/basic/product/udiInfoManageSp.vue
+++ b/src/views/basic/product/udiInfoManageSp.vue
@@ -572,6 +572,7 @@ export default {
this.selectLocalVisible = false;
this.selectVersionVisible = false;
this.selectProductVisible = false;
+ this.getList();
},
onAddSubmit() {
if (this.checked == true) {
diff --git a/src/views/inout/IoAuditedOrder.vue b/src/views/inout/IoAuditedOrder.vue
index a8af54f9..0cdc26ab 100644
--- a/src/views/inout/IoAuditedOrder.vue
+++ b/src/views/inout/IoAuditedOrder.vue
@@ -188,10 +188,10 @@
<el-tab-pane>
<span slot="label">单据 {{ currentRow.billNo }}-单据详情</span>
<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
v-model="bizQuery.productName"
- placeholder="请输入产品名称"
+ placeholder="请输入物资名称"
clearable
>
</el-input>
@@ -274,7 +274,7 @@
<el-tab-pane>
<span slot="label">单据 {{ currentRow.billNo }}-扫码明细</span>
<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
v-model="resultQuery.code"
placeholder="请输入UDI码"
diff --git a/src/views/inout/IoEditOrder.vue b/src/views/inout/IoEditOrder.vue
index 43e9e1a6..537fc8f5 100644
--- a/src/views/inout/IoEditOrder.vue
+++ b/src/views/inout/IoEditOrder.vue
@@ -77,10 +77,10 @@
<el-tab-pane>
<span slot="label">单据 {{ currentRow.billNo }}-业务详情</span>
<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
v-model="bizQuery.productName"
- placeholder="请输入产品名称"
+ placeholder="请输入物资名称"
clearable
>
</el-input>
@@ -163,10 +163,10 @@
<el-tab-pane>
<span slot="label">单据 {{ currentRow.billNo }}-扫码详情</span>
<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
v-model="codeQuery.productName"
- placeholder="请输入产品名称"
+ placeholder="请输入物资名称"
clearable
>
</el-input>
@@ -192,7 +192,7 @@
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
- label="产品通用名"
+ label="物资名称"
prop="coName"
show-overflow-tooltip
></el-table-column>
@@ -251,7 +251,7 @@
<el-tab-pane>
<span slot="label">单据 {{ currentRow.billNo }}-扫码明细</span>
<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
v-model="resultQuery.code"
placeholder="请输入UDI码"
diff --git a/src/views/inout/receive/receiveSearch.vue b/src/views/inout/receive/receiveSearch.vue
index ceb842fe..4d380b9d 100644
--- a/src/views/inout/receive/receiveSearch.vue
+++ b/src/views/inout/receive/receiveSearch.vue
@@ -170,6 +170,7 @@ export default {
corpName: null,
type: 3,
editStatus: 2,
+ invCode:null
},
statusMap: {
1: "草稿",
diff --git a/src/views/purchase/purPlan/purPlan.vue b/src/views/purchase/purPlan/purPlan.vue
index ee905824..bca97d88 100644
--- a/src/views/purchase/purPlan/purPlan.vue
+++ b/src/views/purchase/purPlan/purPlan.vue
@@ -26,7 +26,7 @@
<el-col :span="8">
<el-form-item label="采购仓库">
- <el-select v-model="filterQuery.targetInvCode" style="width: 90%" clearable placeholder="请选择所属仓库">
+ <el-select v-model="filterQuery.invCode" style="width: 90%" clearable placeholder="请选择所属仓库">
<el-option
v-for="item in invList"
:key="item.name"
diff --git a/src/views/purchase/purPlan/purPlanSearch.vue b/src/views/purchase/purPlan/purPlanSearch.vue
index 635a9de5..bce34a18 100644
--- a/src/views/purchase/purPlan/purPlanSearch.vue
+++ b/src/views/purchase/purPlan/purPlanSearch.vue
@@ -308,6 +308,7 @@ export default {
deptCode: this.invCodebe,
};
this.actDateRange = [];
+ this.actAuditDateRange = [];
this.getList();
},
diff --git a/src/views/thirdSys/product/thrProductsAdd.vue b/src/views/thirdSys/product/thrProductsAdd.vue
index a0116b23..a2780392 100644
--- a/src/views/thirdSys/product/thrProductsAdd.vue
+++ b/src/views/thirdSys/product/thrProductsAdd.vue
@@ -204,7 +204,7 @@ export default {
this.$message.success("添加成功");
//清空弹窗数据
this.$emit("closeAddDialog", true);
- this.closeAddDialog();
+ this.closeAddDialog(true);
} else {
this.$message.error(res.message);
}