From f2de5e1d88878b0316b94db9ec8300ccbd93592e Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Mon, 20 Mar 2023 10:53:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=8E=82=E5=AE=B6=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E7=94=9F=E4=BA=A7=E4=BC=81=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/business/stockOrder.vue                    | 2 +-
 src/views/basic/product/SelectDIDetailDialog.vue           | 2 +-
 src/views/basic/product/UdiInfoSelectRel.vue               | 6 +++---
 src/views/basic/product/productEdit.vue                    | 4 ++--
 src/views/basic/product/udiInfoselectErpUdi.vue            | 6 +++---
 src/views/biz/UdiTrace.vue                                 | 2 +-
 src/views/diSearch/udiInfoSearch.vue                       | 2 +-
 src/views/inout/IoArrivalSearchOrder.vue                   | 4 ++--
 src/views/inout/IoAuditedOrder.vue                         | 2 +-
 src/views/inout/IoCheckSuccessOrder.vue                    | 4 ++--
 src/views/inout/IoDeliverySearchOrder.vue                  | 4 ++--
 src/views/inout/IoInoutSearchOrder.vue                     | 4 ++--
 src/views/inout/IoSupSearchOrder.vue                       | 2 +-
 src/views/inout/receive/receiveAuditDetail.vue             | 2 +-
 src/views/inout/uploadManage/uploadOrder.vue               | 2 +-
 src/views/inventory/DeviceMAOrderCompleted.vue             | 2 +-
 src/views/inventory/DeviceMAOrderModify.vue                | 2 +-
 src/views/inventory/DeviceReceiveOrderCompleted.vue        | 2 +-
 src/views/inventory/InvCountOrderModify.vue                | 2 +-
 src/views/inventory/InvMAOrderModify.vue                   | 2 +-
 src/views/inventory/InvPlace.vue                           | 2 +-
 src/views/inventory/InvPreProducts.vue                     | 6 +++---
 src/views/inventory/InvProducts.vue                        | 6 +++---
 src/views/inventory/InvStatistics.vue                      | 6 +++---
 src/views/purchase/purArrival/purArrivalDetailDialog.vue   | 2 +-
 src/views/purchase/purArrival/purArrivalEditDialog.vue     | 2 +-
 src/views/purchase/purDelivery/purDeliveryAuditDialog.vue  | 2 +-
 src/views/purchase/purDelivery/purDeliveryDetailDialog.vue | 2 +-
 src/views/purchase/purDelivery/purDeliveryEditDialog.vue   | 2 +-
 src/views/remind/invRemindMsg.vue                          | 2 +-
 src/views/remind/invWarning.vue                            | 2 +-
 src/views/supplier/company/basicCompanyProductsImport.vue  | 2 +-
 src/views/supplier/company/basicCompanyproductDetail.vue   | 4 ++--
 src/views/supplier/company/basicCompanyproductEdit.vue     | 2 +-
 src/views/supplier/company/supCompanyProduct.vue           | 4 ++--
 src/views/supplier/company/udiInfoRelevance.vue            | 4 ++--
 src/views/supplier/company/udiInfoselectErpUdi.vue         | 6 +++---
 src/views/supplier/products/selectDIDetailDialog.vue       | 2 +-
 38 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/src/views/basic/business/stockOrder.vue b/src/views/basic/business/stockOrder.vue
index 8e43bd0..e835e28 100644
--- a/src/views/basic/business/stockOrder.vue
+++ b/src/views/basic/business/stockOrder.vue
@@ -141,7 +141,7 @@
                 <el-table-column label="实际数量"  prop="reCount"></el-table-column>
                 <el-table-column label="单据数量" prop="count"></el-table-column>
                 <el-table-column label="价格"  prop="price"></el-table-column>
-                <el-table-column label="生产厂家" prop="ylqxzcrbarmc"></el-table-column>
+                <el-table-column label="生产企业" prop="ylqxzcrbarmc"></el-table-column>
                 <el-table-column label="注册/备案凭证号"  prop="zczbhhzbapzbh"></el-table-column>
 
             </el-table>
diff --git a/src/views/basic/product/SelectDIDetailDialog.vue b/src/views/basic/product/SelectDIDetailDialog.vue
index 0c8c30a..1f47164 100644
--- a/src/views/basic/product/SelectDIDetailDialog.vue
+++ b/src/views/basic/product/SelectDIDetailDialog.vue
@@ -204,7 +204,7 @@
               <el-col :span="12" class="el-col">
                 <div class="text item">
                   <div class="itemTag">
-                    <span>生产厂家:&nbsp;</span>
+                    <span>生产企业:&nbsp;</span>
                   </div>
                   <el-input
                     style="width: 65%"
diff --git a/src/views/basic/product/UdiInfoSelectRel.vue b/src/views/basic/product/UdiInfoSelectRel.vue
index 1e7d154..89c57a5 100644
--- a/src/views/basic/product/UdiInfoSelectRel.vue
+++ b/src/views/basic/product/UdiInfoSelectRel.vue
@@ -44,10 +44,10 @@
 
           <el-row>
             <el-col :span="6">
-              <el-form-item class="query-form-item" label="生产厂家:">
+              <el-form-item class="query-form-item" label="生产企业:">
                 <el-input v-model="erpQuery.manufactory"
                           clearable="true"
-                          placeholder="生产厂家"></el-input>
+                          placeholder="生产企业"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -102,7 +102,7 @@
           <el-table-column label="计量单位" prop="measname" show-overflow-tooltip></el-table-column>
           <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
           <el-table-column label="注册/备案凭证号" prop="registerNo" show-overflow-tooltip></el-table-column>
-          <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
+          <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
         </el-table>
         <pagination
           v-show="pageTotal>0"
diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue
index 6eccf7a..c8174a5 100644
--- a/src/views/basic/product/productEdit.vue
+++ b/src/views/basic/product/productEdit.vue
@@ -15,7 +15,7 @@
           <el-table-column label="产品名称" prop="thirdName" show-overflow-tooltip></el-table-column>
           <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
           <el-table-column label="注册/备案凭证号" prop="registerNo" show-overflow-tooltip></el-table-column>
-          <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
+          <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
           <el-table-column label="操作">
             <template slot-scope="scope">
               <el-button type="text" @click="addSelectErp(scope.row)" :disabled="scope.row.thirdId==editQuery.nameCode">
@@ -70,7 +70,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="生产厂家:">
+            <el-form-item label="生产企业:">
               <el-input
                 style="width: 80%"
                 size="small"
diff --git a/src/views/basic/product/udiInfoselectErpUdi.vue b/src/views/basic/product/udiInfoselectErpUdi.vue
index 2bff339..dd5fe88 100644
--- a/src/views/basic/product/udiInfoselectErpUdi.vue
+++ b/src/views/basic/product/udiInfoselectErpUdi.vue
@@ -26,8 +26,8 @@
                     </el-row>
                   <el-row>
                       <el-col :span="6">
-                        <el-form-item label="生产厂家:">
-                            <el-input v-model="erpQuery.manufactory" style="width: 90%" clearable="true" placeholder="请输入生产厂家" @keyup.enter.native="keyup_submit($event)"></el-input>
+                        <el-form-item label="生产企业:">
+                            <el-input v-model="erpQuery.manufactory" style="width: 90%" clearable="true" placeholder="请输入生产企业" @keyup.enter.native="keyup_submit($event)"></el-input>
                         </el-form-item>
                       </el-col>
                       <el-col :span="6">
@@ -74,7 +74,7 @@
                     <el-table-column label="计量单位" prop="measname"></el-table-column>
                     <el-table-column label="规格型号" prop="spec"></el-table-column>
                     <el-table-column label="注册/备案凭证号" prop="registerNo"></el-table-column>
-                    <el-table-column label="生产厂家" prop="manufactory"></el-table-column>
+                    <el-table-column label="生产企业" prop="manufactory"></el-table-column>
                     <el-table-column label="配送企业" prop="supName"></el-table-column>
                 </el-table>
           <pagination
diff --git a/src/views/biz/UdiTrace.vue b/src/views/biz/UdiTrace.vue
index 8e9b96d..f1f41f1 100644
--- a/src/views/biz/UdiTrace.vue
+++ b/src/views/biz/UdiTrace.vue
@@ -237,7 +237,7 @@
               <el-col :span="12" class="el-col">
                 <div class="text item">
                   <div class="itemTag">
-                    <span>生产厂家:&nbsp;</span>
+                    <span>生产企业:&nbsp;</span>
                   </div>
                   <el-input
                     style="width: 65%"
diff --git a/src/views/diSearch/udiInfoSearch.vue b/src/views/diSearch/udiInfoSearch.vue
index 84a95b1..31fa4ea 100644
--- a/src/views/diSearch/udiInfoSearch.vue
+++ b/src/views/diSearch/udiInfoSearch.vue
@@ -110,7 +110,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12" class="el-col">
-                <el-form-item label="生产厂家:">
+                <el-form-item label="生产企业:">
                   <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.manufactory"></el-input>
                 </el-form-item>
               </el-col>
diff --git a/src/views/inout/IoArrivalSearchOrder.vue b/src/views/inout/IoArrivalSearchOrder.vue
index 8109fbc..3996d1a 100644
--- a/src/views/inout/IoArrivalSearchOrder.vue
+++ b/src/views/inout/IoArrivalSearchOrder.vue
@@ -268,7 +268,7 @@
             prop="expireDate"
           ></el-table-column>
           <el-table-column
-            label="生产厂家"
+            label="生产企业"
             prop="manufacturer"
             show-overflow-tooltip
           ></el-table-column>
@@ -355,7 +355,7 @@
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            label="生产厂家"
+            label="生产企业"
             prop="manufacturer"
             show-overflow-tooltip
           ></el-table-column>
diff --git a/src/views/inout/IoAuditedOrder.vue b/src/views/inout/IoAuditedOrder.vue
index fd3ddbd..f68b89b 100644
--- a/src/views/inout/IoAuditedOrder.vue
+++ b/src/views/inout/IoAuditedOrder.vue
@@ -225,7 +225,7 @@
             prop="price"
           ></el-table-column>
           <el-table-column
-            label="生产厂家"
+            label="生产企业"
             prop="manufacturer"
             show-overflow-tooltip
           ></el-table-column>
diff --git a/src/views/inout/IoCheckSuccessOrder.vue b/src/views/inout/IoCheckSuccessOrder.vue
index 9a238e0..4caae38 100644
--- a/src/views/inout/IoCheckSuccessOrder.vue
+++ b/src/views/inout/IoCheckSuccessOrder.vue
@@ -237,7 +237,7 @@
             prop="price"
           ></el-table-column>
           <el-table-column
-            label="生产厂家"
+            label="生产企业"
             prop="manufacturer"
             show-overflow-tooltip
           ></el-table-column>
@@ -324,7 +324,7 @@
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            label="生产厂家"
+            label="生产企业"
             prop="manufacturer"
             show-overflow-tooltip
           ></el-table-column>
diff --git a/src/views/inout/IoDeliverySearchOrder.vue b/src/views/inout/IoDeliverySearchOrder.vue
index f713e5d..cf8561c 100644
--- a/src/views/inout/IoDeliverySearchOrder.vue
+++ b/src/views/inout/IoDeliverySearchOrder.vue
@@ -279,7 +279,7 @@
             prop="price"
           ></el-table-column>
           <el-table-column
-            label="生产厂家"
+            label="生产企业"
             prop="manufacturer"
             show-overflow-tooltip
           ></el-table-column>
@@ -366,7 +366,7 @@
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            label="生产厂家"
+            label="生产企业"
             prop="manufacturer"
             show-overflow-tooltip
           ></el-table-column>
diff --git a/src/views/inout/IoInoutSearchOrder.vue b/src/views/inout/IoInoutSearchOrder.vue
index 15bc69c..2174e40 100644
--- a/src/views/inout/IoInoutSearchOrder.vue
+++ b/src/views/inout/IoInoutSearchOrder.vue
@@ -247,7 +247,7 @@
             prop="price"
           ></el-table-column>
           <el-table-column
-            label="生产厂家"
+            label="生产企业"
             prop="manufacturer"
             show-overflow-tooltip
           ></el-table-column>
@@ -334,7 +334,7 @@
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-            label="生产厂家"
+            label="生产企业"
             prop="manufacturer"
             show-overflow-tooltip
           ></el-table-column>
diff --git a/src/views/inout/IoSupSearchOrder.vue b/src/views/inout/IoSupSearchOrder.vue
index 4c27cc4..57b2e5c 100644
--- a/src/views/inout/IoSupSearchOrder.vue
+++ b/src/views/inout/IoSupSearchOrder.vue
@@ -268,7 +268,7 @@
             width="100"
           ></el-table-column>
           <el-table-column
-            label="生产厂家"
+            label="生产企业"
             prop="manufacturer"
             width="160"
             show-overflow-tooltip
diff --git a/src/views/inout/receive/receiveAuditDetail.vue b/src/views/inout/receive/receiveAuditDetail.vue
index ba9b1c2..800dc7b 100644
--- a/src/views/inout/receive/receiveAuditDetail.vue
+++ b/src/views/inout/receive/receiveAuditDetail.vue
@@ -75,7 +75,7 @@
           <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
           <el-table-column label="单据数量" prop="count" show-overflow-tooltip></el-table-column>
           <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
-          <el-table-column label="生产厂家" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
+          <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
         </el-table>
       </el-card>
     </el-form>
diff --git a/src/views/inout/uploadManage/uploadOrder.vue b/src/views/inout/uploadManage/uploadOrder.vue
index c92639b..4e64685 100644
--- a/src/views/inout/uploadManage/uploadOrder.vue
+++ b/src/views/inout/uploadManage/uploadOrder.vue
@@ -215,7 +215,7 @@
             prop="price"
           ></el-table-column>
           <el-table-column
-            label="生产厂家"
+            label="生产企业"
             prop="manufacturer"
             show-overflow-tooltip
           ></el-table-column>
diff --git a/src/views/inventory/DeviceMAOrderCompleted.vue b/src/views/inventory/DeviceMAOrderCompleted.vue
index e76b70c..fd714b4 100644
--- a/src/views/inventory/DeviceMAOrderCompleted.vue
+++ b/src/views/inventory/DeviceMAOrderCompleted.vue
@@ -65,7 +65,7 @@
         <el-table-column label="失效日期" prop="expireDate" width="150"></el-table-column>
         <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh"
                          show-overflow-tooltip></el-table-column>
-        <el-table-column label="生产厂家" prop="ylqxzcrbarmc"
+        <el-table-column label="生产企业" prop="ylqxzcrbarmc"
                          show-overflow-tooltip></el-table-column>
       </el-table>
 
diff --git a/src/views/inventory/DeviceMAOrderModify.vue b/src/views/inventory/DeviceMAOrderModify.vue
index ba7ebd4..c459a72 100644
--- a/src/views/inventory/DeviceMAOrderModify.vue
+++ b/src/views/inventory/DeviceMAOrderModify.vue
@@ -97,7 +97,7 @@
                            show-overflow-tooltip></el-table-column>
           <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh"
                            show-overflow-tooltip></el-table-column>
-          <el-table-column label="生产厂家" prop="ylqxzcrbarmc"
+          <el-table-column label="生产企业" prop="ylqxzcrbarmc"
                            show-overflow-tooltip></el-table-column>
         </el-table>
       </el-form>
diff --git a/src/views/inventory/DeviceReceiveOrderCompleted.vue b/src/views/inventory/DeviceReceiveOrderCompleted.vue
index f2d62b5..2c24df0 100644
--- a/src/views/inventory/DeviceReceiveOrderCompleted.vue
+++ b/src/views/inventory/DeviceReceiveOrderCompleted.vue
@@ -91,7 +91,7 @@
         <el-table-column label="失效日期" prop="expireDate" width="150"></el-table-column>
         <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh"
                          show-overflow-tooltip></el-table-column>
-        <el-table-column label="生产厂家" prop="ylqxzcrbarmc"
+        <el-table-column label="生产企业" prop="ylqxzcrbarmc"
                          show-overflow-tooltip></el-table-column>
       </el-table>
 
diff --git a/src/views/inventory/InvCountOrderModify.vue b/src/views/inventory/InvCountOrderModify.vue
index bc98241..ba15508 100644
--- a/src/views/inventory/InvCountOrderModify.vue
+++ b/src/views/inventory/InvCountOrderModify.vue
@@ -123,7 +123,7 @@
           <el-table-column label="生产日期(yyMMdd)" prop="produceDate"></el-table-column>
           <el-table-column label="失效日期(yyMMdd)" prop="expireDate" show-overflow-tooltip></el-table-column>
           <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
-          <el-table-column label="生产厂家" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
+          <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
           <el-table-column label="操作">
             <template slot-scope="scope">
               <el-button
diff --git a/src/views/inventory/InvMAOrderModify.vue b/src/views/inventory/InvMAOrderModify.vue
index e002c21..2bff585 100644
--- a/src/views/inventory/InvMAOrderModify.vue
+++ b/src/views/inventory/InvMAOrderModify.vue
@@ -146,7 +146,7 @@
                            show-overflow-tooltip></el-table-column>
           <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh"
                            show-overflow-tooltip></el-table-column>
-          <el-table-column  label="生产厂家" prop="ylqxzcrbarmc"
+          <el-table-column  label="生产企业" prop="ylqxzcrbarmc"
                            show-overflow-tooltip></el-table-column>
           <el-table-column label="操作" >
             <template slot-scope="scope">
diff --git a/src/views/inventory/InvPlace.vue b/src/views/inventory/InvPlace.vue
index 97d6be8..3ece1e8 100644
--- a/src/views/inventory/InvPlace.vue
+++ b/src/views/inventory/InvPlace.vue
@@ -49,7 +49,7 @@
         <el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
         <el-table-column label="批准文号" prop="zczbhhzbapzbh" v-if="showSup" show-overflow-tooltip
                          width="120"></el-table-column>
-        <el-table-column label="生产厂家" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
+        <el-table-column label="生产企业" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
                          width="120"></el-table-column>
       </el-table>
       <pagination
diff --git a/src/views/inventory/InvPreProducts.vue b/src/views/inventory/InvPreProducts.vue
index 9ac7b37..5010df7 100644
--- a/src/views/inventory/InvPreProducts.vue
+++ b/src/views/inventory/InvPreProducts.vue
@@ -76,8 +76,8 @@
 
 
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="生产厂家:">
-              <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产厂家"
+            <el-form-item class="query-form-item" label="生产企业:">
+              <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产企业"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
@@ -147,7 +147,7 @@
         <!--        <el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>-->
         <!--        <el-table-column label="出库数量" prop="outCount" width="120"></el-table-column>-->
         <el-table-column label="库存数量" prop="reCount" width="120"></el-table-column>
-        <el-table-column label="生产厂家" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
+        <el-table-column label="生产企业" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
                          width="180"></el-table-column>
 
         <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" v-if="showSup" show-overflow-tooltip
diff --git a/src/views/inventory/InvProducts.vue b/src/views/inventory/InvProducts.vue
index a2a371d..e970daf 100644
--- a/src/views/inventory/InvProducts.vue
+++ b/src/views/inventory/InvProducts.vue
@@ -76,8 +76,8 @@
 
 
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="生产厂家:">
-              <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产厂家"
+            <el-form-item class="query-form-item" label="生产企业:">
+              <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产企业"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
@@ -147,7 +147,7 @@
         <!--        <el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>-->
         <!--        <el-table-column label="出库数量" prop="outCount" width="120"></el-table-column>-->
         <el-table-column label="库存数量" prop="reCount" width="120"></el-table-column>
-        <el-table-column label="生产厂家" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
+        <el-table-column label="生产企业" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
                          width="180"></el-table-column>
 
         <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" v-if="showSup" show-overflow-tooltip
diff --git a/src/views/inventory/InvStatistics.vue b/src/views/inventory/InvStatistics.vue
index 5d6e48d..483c9c1 100644
--- a/src/views/inventory/InvStatistics.vue
+++ b/src/views/inventory/InvStatistics.vue
@@ -68,8 +68,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item class="query-form-item" label="生产厂家:">
-              <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产厂家"
+            <el-form-item class="query-form-item" label="生产企业:">
+              <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产企业"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
@@ -119,7 +119,7 @@
         <el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>
         <el-table-column label="出库数量" prop="outCount" width="120"></el-table-column>
         <el-table-column label="结余数量" prop="reCount" width="120"></el-table-column>
-        <el-table-column label="生产厂家" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
+        <el-table-column label="生产企业" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
                          width="120"></el-table-column>
         <el-table-column label="供应商" prop="supName" v-if="showSup" show-overflow-tooltip
                          width="120"></el-table-column>
diff --git a/src/views/purchase/purArrival/purArrivalDetailDialog.vue b/src/views/purchase/purArrival/purArrivalDetailDialog.vue
index 9f6933e..ef954b5 100644
--- a/src/views/purchase/purArrival/purArrivalDetailDialog.vue
+++ b/src/views/purchase/purArrival/purArrivalDetailDialog.vue
@@ -180,7 +180,7 @@
           </el-table-column>
           <el-table-column label="供应商" prop="supName" width="150" show-overflow-tooltip></el-table-column>
           <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" width="150" show-overflow-tooltip></el-table-column>
-          <el-table-column label="生产厂家" prop="manufactory" width="150" show-overflow-tooltip></el-table-column>
+          <el-table-column label="生产企业" prop="manufactory" width="150" show-overflow-tooltip></el-table-column>
           <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" width="150" show-overflow-tooltip></el-table-column>
         </el-table>
 
diff --git a/src/views/purchase/purArrival/purArrivalEditDialog.vue b/src/views/purchase/purArrival/purArrivalEditDialog.vue
index a1daee4..08daed1 100644
--- a/src/views/purchase/purArrival/purArrivalEditDialog.vue
+++ b/src/views/purchase/purArrival/purArrivalEditDialog.vue
@@ -145,7 +145,7 @@
           </el-table-column>
           <el-table-column label="供应商" prop="supName" width="150" show-overflow-tooltip></el-table-column>
           <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" width="150" show-overflow-tooltip></el-table-column>
-          <el-table-column label="生产厂家" prop="manufactory" width="150" show-overflow-tooltip></el-table-column>
+          <el-table-column label="生产企业" prop="manufactory" width="150" show-overflow-tooltip></el-table-column>
           <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" width="150" show-overflow-tooltip></el-table-column>
           <el-table-column label="操作" width="120" fixed="right">
             <template slot-scope="scope">
diff --git a/src/views/purchase/purDelivery/purDeliveryAuditDialog.vue b/src/views/purchase/purDelivery/purDeliveryAuditDialog.vue
index a1fa251..b80aa36 100644
--- a/src/views/purchase/purDelivery/purDeliveryAuditDialog.vue
+++ b/src/views/purchase/purDelivery/purDeliveryAuditDialog.vue
@@ -92,7 +92,7 @@
         <el-table-column width="150" label="送货数量" prop="count"></el-table-column>
         <el-table-column width="150" label="验收数量" prop="acceptCount"></el-table-column>
         <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" width="150" show-overflow-tooltip></el-table-column>
-        <el-table-column label="生产厂家" prop="manufactory" width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column label="生产企业" prop="manufactory" width="150" show-overflow-tooltip></el-table-column>
         <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" width="150" show-overflow-tooltip></el-table-column>
       </el-table>
     </el-card>
diff --git a/src/views/purchase/purDelivery/purDeliveryDetailDialog.vue b/src/views/purchase/purDelivery/purDeliveryDetailDialog.vue
index 11f04ed..add51da 100644
--- a/src/views/purchase/purDelivery/purDeliveryDetailDialog.vue
+++ b/src/views/purchase/purDelivery/purDeliveryDetailDialog.vue
@@ -104,7 +104,7 @@
           <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip></el-table-column>
           <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
           <el-table-column label="计量单位" prop="measname" show-overflow-tooltip></el-table-column>
-          <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
+          <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
           <el-table-column width="150" label="单据数量">
             <template slot-scope="scope">
               <el-input size="small" v-model="scope.row.count"
diff --git a/src/views/purchase/purDelivery/purDeliveryEditDialog.vue b/src/views/purchase/purDelivery/purDeliveryEditDialog.vue
index 78cc9a3..efdc312 100644
--- a/src/views/purchase/purDelivery/purDeliveryEditDialog.vue
+++ b/src/views/purchase/purDelivery/purDeliveryEditDialog.vue
@@ -117,7 +117,7 @@
             </template>
           </el-table-column>
           <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" width="150" show-overflow-tooltip></el-table-column>
-          <el-table-column label="生产厂家" prop="manufactory" width="150" show-overflow-tooltip></el-table-column>
+          <el-table-column label="生产企业" prop="manufactory" width="150" show-overflow-tooltip></el-table-column>
           <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" width="150" show-overflow-tooltip></el-table-column>
           <el-table-column label="操作" width="120" fixed="right">
             <template slot-scope="scope">
diff --git a/src/views/remind/invRemindMsg.vue b/src/views/remind/invRemindMsg.vue
index 88357e5..23bd70f 100644
--- a/src/views/remind/invRemindMsg.vue
+++ b/src/views/remind/invRemindMsg.vue
@@ -162,7 +162,7 @@
         <el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
         <el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
         <el-table-column label="供应商" prop="supName" width="150" show-overflow-tooltip></el-table-column>
-        <el-table-column label="生产厂家" prop="manufactory" width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column label="生产企业" prop="manufactory" width="150" show-overflow-tooltip></el-table-column>
         <el-table-column label="批准文号" prop="zczbhhzbapzbh" width="150" show-overflow-tooltip></el-table-column>
         <el-table-column label="操作" width="100" fixed="right">
           <template slot-scope="scope">
diff --git a/src/views/remind/invWarning.vue b/src/views/remind/invWarning.vue
index d064660..95d35d5 100644
--- a/src/views/remind/invWarning.vue
+++ b/src/views/remind/invWarning.vue
@@ -75,7 +75,7 @@
         <el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>
         <el-table-column label="出库数量" prop="outCount" width="120"></el-table-column>
         <el-table-column label="结余数量" prop="reCount" width="120"></el-table-column>
-        <el-table-column label="生产厂家" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
+        <el-table-column label="生产企业" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
                          width="120"></el-table-column>
         <el-table-column label="供应商" prop="supName" v-if="showSup" show-overflow-tooltip
                          width="120"></el-table-column>
diff --git a/src/views/supplier/company/basicCompanyProductsImport.vue b/src/views/supplier/company/basicCompanyProductsImport.vue
index 0098102..6575470 100644
--- a/src/views/supplier/company/basicCompanyProductsImport.vue
+++ b/src/views/supplier/company/basicCompanyProductsImport.vue
@@ -354,7 +354,7 @@
           <el-col :span="12" class="el-col">
             <div class="text item">
               <div class="itemTag">
-                <span>生产厂家:&nbsp;</span>
+                <span>生产企业:&nbsp;</span>
               </div>
               <el-input
                 style="width: 65%"
diff --git a/src/views/supplier/company/basicCompanyproductDetail.vue b/src/views/supplier/company/basicCompanyproductDetail.vue
index 86c7e08..9e6ee47 100644
--- a/src/views/supplier/company/basicCompanyproductDetail.vue
+++ b/src/views/supplier/company/basicCompanyproductDetail.vue
@@ -8,7 +8,7 @@
       <el-table-column label="产品名称" prop="thirdName" show-overflow-tooltip></el-table-column>
       <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
       <el-table-column label="注册/备案凭证号" prop="registerNo" show-overflow-tooltip></el-table-column>
-      <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
+      <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
       <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button type="text" @click="addSelectErp(scope.row)" :disabled="scope.row.thirdId==editQuery.nameCode">关联</el-button>
@@ -461,7 +461,7 @@
             <el-col :span="12" class="el-col">
               <div class="text item">
                 <div class="itemTag">
-                  <span>生产厂家:&nbsp;</span>
+                  <span>生产企业:&nbsp;</span>
                 </div>
                 <el-input
                   style="width: 65%"
diff --git a/src/views/supplier/company/basicCompanyproductEdit.vue b/src/views/supplier/company/basicCompanyproductEdit.vue
index 92bc3d8..000f2f7 100644
--- a/src/views/supplier/company/basicCompanyproductEdit.vue
+++ b/src/views/supplier/company/basicCompanyproductEdit.vue
@@ -20,7 +20,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="生产厂家:">
+          <el-form-item label="生产企业:">
             <el-input style="width: 80%" size="small" splaceholder="请输入内容" v-model="editQuery.manufactory"
             ></el-input>
           </el-form-item>
diff --git a/src/views/supplier/company/supCompanyProduct.vue b/src/views/supplier/company/supCompanyProduct.vue
index c6fbaa1..a930146 100644
--- a/src/views/supplier/company/supCompanyProduct.vue
+++ b/src/views/supplier/company/supCompanyProduct.vue
@@ -18,7 +18,7 @@
                     <el-form-item class="query-form-item">
                         <el-input
                             v-model="productQuery.ylqxzcrbarmc"
-                            placeholder="生产厂家"
+                            placeholder="生产企业"
                         ></el-input>
                     </el-form-item>
                     <el-form-item class="query-form-item">
@@ -67,7 +67,7 @@
                 <el-table-column label="产品名称" prop="cpmctymc"></el-table-column>
                 <el-table-column label="规格型号" prop="ggxh"></el-table-column>
                 <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh"></el-table-column>
-                <el-table-column label="生产厂家" prop="ylqxzcrbarmc"></el-table-column>
+                <el-table-column label="生产企业" prop="ylqxzcrbarmc"></el-table-column>
                 <el-table-column label="审核状态" prop="auditStatus" width="120">
                     <template slot-scope="scope">
                         <span>{{ auditStatusMap[scope.row.auditStatus] }}</span>
diff --git a/src/views/supplier/company/udiInfoRelevance.vue b/src/views/supplier/company/udiInfoRelevance.vue
index 55d1947..6a7b5a3 100644
--- a/src/views/supplier/company/udiInfoRelevance.vue
+++ b/src/views/supplier/company/udiInfoRelevance.vue
@@ -42,7 +42,7 @@
                         <el-form-item class="query-form-item">
                             <el-input v-model="erpQuery.manufactory"
                                       clearable="true"
-                                      placeholder="生产厂家"></el-input>
+                                      placeholder="生产企业"></el-input>
                         </el-form-item>
                     </el-row>
 
@@ -89,7 +89,7 @@
                     <el-table-column label="计量单位" prop="measname"></el-table-column>
                     <el-table-column label="规格型号" prop="spec"></el-table-column>
                     <el-table-column label="注册/备案凭证号" prop="registerNo"></el-table-column>
-                    <el-table-column label="生产厂家" prop="manufactory"></el-table-column>
+                    <el-table-column label="生产企业" prop="manufactory"></el-table-column>
                 </el-table>
                 <el-pagination
                     :page-size="erpQuery.limit"
diff --git a/src/views/supplier/company/udiInfoselectErpUdi.vue b/src/views/supplier/company/udiInfoselectErpUdi.vue
index b836427..1f445c9 100644
--- a/src/views/supplier/company/udiInfoselectErpUdi.vue
+++ b/src/views/supplier/company/udiInfoselectErpUdi.vue
@@ -43,10 +43,10 @@
 
         <el-row>
           <el-col :span="6">
-            <el-form-item label="生产厂家:">
+            <el-form-item label="生产企业:">
               <el-input
                 v-model="erpQuery.manufactory" clearable="true"
-                placeholder="请输入生产厂家"
+                placeholder="请输入生产企业"
                 style="width: 90%"
                 @keyup.enter.native="keyup_submit($event)"
               ></el-input>
@@ -107,7 +107,7 @@
         <el-table-column label="计量单位" prop="measname"></el-table-column>
         <el-table-column label="规格型号" prop="spec"></el-table-column>
         <el-table-column label="注册/备案凭证号" prop="registerNo"></el-table-column>
-        <el-table-column label="生产厂家" prop="manufactory"></el-table-column>
+        <el-table-column label="生产企业" prop="manufactory"></el-table-column>
         <el-table-column label="配送企业" prop="supName"></el-table-column>
       </el-table>
 
diff --git a/src/views/supplier/products/selectDIDetailDialog.vue b/src/views/supplier/products/selectDIDetailDialog.vue
index 4c05c75..1556656 100644
--- a/src/views/supplier/products/selectDIDetailDialog.vue
+++ b/src/views/supplier/products/selectDIDetailDialog.vue
@@ -88,7 +88,7 @@
                               </el-form-item>
                             </el-col>
                             <el-col :span="12" class="el-col">
-                              <el-form-item label="生产厂家:">
+                              <el-form-item label="生产企业:">
                                     <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.manufactory"></el-input>
                               </el-form-item>
                             </el-col>