From 23c8f26b9a18048b3c6cb3496bf0f770352229e2 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 18 Apr 2023 12:00:14 +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/inout/DialogInvoice.vue                   | 12 ++++++------
 src/views/inout/InvoiceRegistration.vue             |  1 +
 src/views/supplier/company/basicCompanyProducts.vue |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/views/inout/DialogInvoice.vue b/src/views/inout/DialogInvoice.vue
index 27bbdac..6f41851 100644
--- a/src/views/inout/DialogInvoice.vue
+++ b/src/views/inout/DialogInvoice.vue
@@ -9,14 +9,14 @@
         </el-button-group>
         <el-row>
           <el-col :span="11">
-            <el-form-item label="规格型号:" prop="code">
+            <el-form-item label="规格型号:" prop="ggxh">
               <el-input v-model="inputQuery.ggxh" auto-complete="off" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
 
 
           <el-col :span="11">
-            <el-form-item label="物资名称:" prop="code">
+            <el-form-item label="物资名称:" prop="cpmctymc">
               <el-input v-model="inputQuery.cpmctymc" auto-complete="off" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
@@ -24,14 +24,14 @@
 
         <el-row >
           <el-col :span="11">
-            <el-form-item  label="机械编码:" prop="name">
+            <el-form-item  label="机械编码:" prop="machineNo">
               <el-input v-model="inputQuery.machineNo" auto-complete="off" ></el-input>
             </el-form-item>
           </el-col>
 
 
           <el-col :span="11">
-            <el-form-item label="发票代码:" prop="code">
+            <el-form-item label="发票代码:" prop="invoiceCode">
               <el-input v-model="inputQuery.invoiceCode" auto-complete="off" ></el-input>
             </el-form-item>
           </el-col>
@@ -160,10 +160,10 @@ export default {
         licenseUrl:""
       },
       formRules: {
-        name: [
+        machineNo: [
           {required: true, message: "请输入机械编码", trigger: "blur"}
         ],
-        code: [
+        invoiceCode: [
           {required: true, message: "请输入发票代码", trigger: "blur"}
         ],
         invoiceEncode: [
diff --git a/src/views/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue
index 3b9b1ce..8b6a791 100644
--- a/src/views/inout/InvoiceRegistration.vue
+++ b/src/views/inout/InvoiceRegistration.vue
@@ -690,6 +690,7 @@ export default {
       }
 
       this.filterQuery.page = 1;
+      this.filterQuery.supInoivceSearch=null;
       this.getList();
     },
     hideSearch() {
diff --git a/src/views/supplier/company/basicCompanyProducts.vue b/src/views/supplier/company/basicCompanyProducts.vue
index e830491..de75118 100644
--- a/src/views/supplier/company/basicCompanyProducts.vue
+++ b/src/views/supplier/company/basicCompanyProducts.vue
@@ -5,7 +5,7 @@
         <el-row>
           <el-col :span="6">
             <el-form-item label="物资编码:">
-              <el-input v-model="filterQuery.unionCode" style="width: 90%" placeholder="请输入DI/医保编码/商品条码"
+              <el-input v-model="filterQuery.unionCode" style="width: 90%" placeholder="请输入产品编码"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>