修改bug

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);

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) {

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码"

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码"

src/views/inout/receive/receiveSearch.vue

@@ -170,6 +170,7 @@ export default {
         corpName: null,
         type: 3,
         editStatus: 2,
+        invCode:null
       },
       statusMap: {
         1: "草稿",

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"

src/views/purchase/purPlan/purPlanSearch.vue

@@ -308,6 +308,7 @@ export default {
         deptCode: this.invCodebe,
       };
       this.actDateRange = [];
+      this.actAuditDateRange = [];
       this.getList();
     },
 

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);
                     }