From e76ac76b801848d43b4a2b1386310d32180b34c1 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Mon, 20 Mar 2023 10:56:57 +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/product/product.vue                  | 4 ++--
 src/views/basic/product/udiInfoRelevance.vue         | 4 ++--
 src/views/basic/product/udilnfoManageSpDetail.vue    | 4 ++--
 src/views/inout/DialogSelectRl.vue                   | 6 +++---
 src/views/inout/IoCheckErrorOrder.vue                | 4 ++--
 src/views/inout/IoDealOrder.vue                      | 2 +-
 src/views/inout/IoEditOrder.vue                      | 4 ++--
 src/views/inout/PanelCreateOrderBizDetail.vue        | 2 +-
 src/views/inout/PanelCreateOrderCodeDetail.vue       | 2 +-
 src/views/inout/receive/DialogNewReceive.vue         | 2 +-
 src/views/inventory/DeviceReceiveOrderAudit.vue      | 2 +-
 src/views/inventory/DeviceReceiveOrderModify.vue     | 2 +-
 src/views/inventory/InvMAOrderAudit.vue              | 2 +-
 src/views/inventory/InvSupProuducts.vue              | 8 ++++----
 src/views/inventory/inner/innerOrderEditDialog.vue   | 2 +-
 src/views/purchase/purApply/purApplyEditDiaolog.vue  | 4 ++--
 src/views/purchase/purOrder/purOrderDetailDialog.vue | 2 +-
 src/views/purchase/purOrder/purOrderEditDialog.vue   | 2 +-
 src/views/supplier/company/SelectDIDetailDialog.vue  | 2 +-
 src/views/supplier/company/basicProductEdit.vue      | 4 ++--
 src/views/thirdSys/product/thrProductsSelect.vue     | 6 +++---
 21 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue
index 08dbaf4..22a9fd9 100644
--- a/src/views/basic/product/product.vue
+++ b/src/views/basic/product/product.vue
@@ -200,7 +200,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>
             </el-card>
             <el-card>
@@ -645,7 +645,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/udiInfoRelevance.vue b/src/views/basic/product/udiInfoRelevance.vue
index 55d1947..6a7b5a3 100644
--- a/src/views/basic/product/udiInfoRelevance.vue
+++ b/src/views/basic/product/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/basic/product/udilnfoManageSpDetail.vue b/src/views/basic/product/udilnfoManageSpDetail.vue
index ad3434c..da36a90 100644
--- a/src/views/basic/product/udilnfoManageSpDetail.vue
+++ b/src/views/basic/product/udilnfoManageSpDetail.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>
 
 
@@ -291,7 +291,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/inout/DialogSelectRl.vue b/src/views/inout/DialogSelectRl.vue
index 6df4916..d745fb0 100644
--- a/src/views/inout/DialogSelectRl.vue
+++ b/src/views/inout/DialogSelectRl.vue
@@ -20,7 +20,7 @@
         show-overflow-tooltip
       ></el-table-column>
       <el-table-column
-        label="生产厂家"
+        label="生产企业"
         prop="ylqxzcrbarmc"
         show-overflow-tooltip
       ></el-table-column>
@@ -92,7 +92,7 @@
         ></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>
       <el-table
@@ -435,7 +435,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/inout/IoCheckErrorOrder.vue b/src/views/inout/IoCheckErrorOrder.vue
index db8946c..7ebd02f 100644
--- a/src/views/inout/IoCheckErrorOrder.vue
+++ b/src/views/inout/IoCheckErrorOrder.vue
@@ -234,7 +234,7 @@
             prop="price"
           ></el-table-column>
           <el-table-column
-            label="生产厂家"
+            label="生产企业"
             prop="manufacturer"
             show-overflow-tooltip
           ></el-table-column>
@@ -321,7 +321,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/IoDealOrder.vue b/src/views/inout/IoDealOrder.vue
index 4ec2cd4..a534cdb 100644
--- a/src/views/inout/IoDealOrder.vue
+++ b/src/views/inout/IoDealOrder.vue
@@ -285,7 +285,7 @@
             prop="price" width="100"
           ></el-table-column>
           <el-table-column
-            label="生产厂家"
+            label="生产企业"
             prop="manufacturer" width="160"
             show-overflow-tooltip
           ></el-table-column>
diff --git a/src/views/inout/IoEditOrder.vue b/src/views/inout/IoEditOrder.vue
index a475901..e7d3811 100644
--- a/src/views/inout/IoEditOrder.vue
+++ b/src/views/inout/IoEditOrder.vue
@@ -128,7 +128,7 @@
             prop="price"
           ></el-table-column>
           <el-table-column
-            label="生产厂家"
+            label="生产企业"
             prop="manufacturer"
             show-overflow-tooltip
           ></el-table-column>
@@ -216,7 +216,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/PanelCreateOrderBizDetail.vue b/src/views/inout/PanelCreateOrderBizDetail.vue
index e34c201..36648e5 100644
--- a/src/views/inout/PanelCreateOrderBizDetail.vue
+++ b/src/views/inout/PanelCreateOrderBizDetail.vue
@@ -98,7 +98,7 @@
       >
       </el-table-column>
       <el-table-column width="150"
-                       label="生产厂家"
+                       label="生产企业"
                        prop="manufacturer"
                        show-overflow-tooltip
       ></el-table-column>
diff --git a/src/views/inout/PanelCreateOrderCodeDetail.vue b/src/views/inout/PanelCreateOrderCodeDetail.vue
index 466764d..28351dd 100644
--- a/src/views/inout/PanelCreateOrderCodeDetail.vue
+++ b/src/views/inout/PanelCreateOrderCodeDetail.vue
@@ -21,7 +21,7 @@
       <el-table-column label="扫码数量" width="80" prop="count" show-overflow-tooltip></el-table-column>
       <el-table-column label="实际数量" width="80" prop="reCount" show-overflow-tooltip></el-table-column>
       <el-table-column label="价格" width="150" prop="price" show-overflow-tooltip></el-table-column>
-      <el-table-column label="生产厂家" width="150" prop="manufacturer" show-overflow-tooltip></el-table-column>
+      <el-table-column label="生产企业" width="150" prop="manufacturer" show-overflow-tooltip></el-table-column>
       <el-table-column label="注册/备案凭证号" width="150" prop="certCode" show-overflow-tooltip></el-table-column>
     </el-table>
   </div>
diff --git a/src/views/inout/receive/DialogNewReceive.vue b/src/views/inout/receive/DialogNewReceive.vue
index d858e6f..8aabfc2 100644
--- a/src/views/inout/receive/DialogNewReceive.vue
+++ b/src/views/inout/receive/DialogNewReceive.vue
@@ -125,7 +125,7 @@
           </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="操作" width="150">
             <template slot-scope="scope">
               <el-button type="text" size="small" :disabled="scope.row.index === selectedIndex" @click.stop="true" @click.native="rowChange(scope.row)">编辑</el-button>
diff --git a/src/views/inventory/DeviceReceiveOrderAudit.vue b/src/views/inventory/DeviceReceiveOrderAudit.vue
index 33b7660..9f79a0c 100644
--- a/src/views/inventory/DeviceReceiveOrderAudit.vue
+++ b/src/views/inventory/DeviceReceiveOrderAudit.vue
@@ -109,7 +109,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/DeviceReceiveOrderModify.vue b/src/views/inventory/DeviceReceiveOrderModify.vue
index 663d38d..c98a0ec 100644
--- a/src/views/inventory/DeviceReceiveOrderModify.vue
+++ b/src/views/inventory/DeviceReceiveOrderModify.vue
@@ -185,7 +185,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/InvMAOrderAudit.vue b/src/views/inventory/InvMAOrderAudit.vue
index ac75198..4071c94 100644
--- a/src/views/inventory/InvMAOrderAudit.vue
+++ b/src/views/inventory/InvMAOrderAudit.vue
@@ -118,7 +118,7 @@
                          show-overflow-tooltip></el-table-column>
         <el-table-column width="250" label="注册/备案凭证号" prop="zczbhhzbapzbh"
                          show-overflow-tooltip></el-table-column>
-        <el-table-column width="200" label="生产厂家" prop="ylqxzcrbarmc"
+        <el-table-column width="200" label="生产企业" prop="ylqxzcrbarmc"
                          show-overflow-tooltip></el-table-column>
       </el-table>
 
diff --git a/src/views/inventory/InvSupProuducts.vue b/src/views/inventory/InvSupProuducts.vue
index 2d508a5..4dc6f6e 100644
--- a/src/views/inventory/InvSupProuducts.vue
+++ b/src/views/inventory/InvSupProuducts.vue
@@ -4,15 +4,15 @@
       <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
         <el-row>
           <el-col :span="4">
-            <el-form-item class="query-form-item" label="产品标识DI:">
-              <el-input v-model="filterQuery.nameCode" placeholder="产品标识DI"
+            <el-form-item class="query-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="4">
-            <el-form-item class="query-form-item" label="产品名称:">
-              <el-input v-model="filterQuery.cpmctymc" placeholder="产品名称"
+            <el-form-item class="query-form-item" label="物资名称:">
+              <el-input v-model="filterQuery.cpmctymc" placeholder="物资名称"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
diff --git a/src/views/inventory/inner/innerOrderEditDialog.vue b/src/views/inventory/inner/innerOrderEditDialog.vue
index 7ad7d27..2480ca3 100644
--- a/src/views/inventory/inner/innerOrderEditDialog.vue
+++ b/src/views/inventory/inner/innerOrderEditDialog.vue
@@ -46,7 +46,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 label="单据数量">
                         <template slot-scope="scope">
                             <el-input size="small" v-model="scope.row.count"
diff --git a/src/views/purchase/purApply/purApplyEditDiaolog.vue b/src/views/purchase/purApply/purApplyEditDiaolog.vue
index c5adae0..0f513d9 100644
--- a/src/views/purchase/purApply/purApplyEditDiaolog.vue
+++ b/src/views/purchase/purApply/purApplyEditDiaolog.vue
@@ -80,7 +80,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"
@@ -93,7 +93,7 @@
                     </el-table-column>
                     <el-table-column label="供应商" prop="supName" show-overflow-tooltip></el-table-column>
                     <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" 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="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
                     <el-table-column label="操作"  width="120">
                         <template slot-scope="scope">
diff --git a/src/views/purchase/purOrder/purOrderDetailDialog.vue b/src/views/purchase/purOrder/purOrderDetailDialog.vue
index 5b2890c..b6a28ae 100644
--- a/src/views/purchase/purOrder/purOrderDetailDialog.vue
+++ b/src/views/purchase/purOrder/purOrderDetailDialog.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/purOrder/purOrderEditDialog.vue b/src/views/purchase/purOrder/purOrderEditDialog.vue
index 7a26284..62edd6d 100644
--- a/src/views/purchase/purOrder/purOrderEditDialog.vue
+++ b/src/views/purchase/purOrder/purOrderEditDialog.vue
@@ -90,7 +90,7 @@
                     </el-table-column>
                     <el-table-column label="供应商" prop="supName" show-overflow-tooltip></el-table-column>
                     <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" 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="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
                     <el-table-column label="操作"  width="120">
                         <template slot-scope="scope">
diff --git a/src/views/supplier/company/SelectDIDetailDialog.vue b/src/views/supplier/company/SelectDIDetailDialog.vue
index a242443..b3a41a1 100644
--- a/src/views/supplier/company/SelectDIDetailDialog.vue
+++ b/src/views/supplier/company/SelectDIDetailDialog.vue
@@ -206,7 +206,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/basicProductEdit.vue b/src/views/supplier/company/basicProductEdit.vue
index 13228da..727f983 100644
--- a/src/views/supplier/company/basicProductEdit.vue
+++ b/src/views/supplier/company/basicProductEdit.vue
@@ -20,7 +20,7 @@
                 ></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="操作" fixed="right">
                     <template slot-scope="scope">
                         <el-button
@@ -140,7 +140,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/thirdSys/product/thrProductsSelect.vue b/src/views/thirdSys/product/thrProductsSelect.vue
index 0704dd7..e875dca 100644
--- a/src/views/thirdSys/product/thrProductsSelect.vue
+++ b/src/views/thirdSys/product/thrProductsSelect.vue
@@ -26,8 +26,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="生产厂家:">
-            <el-input v-model="filterQuery.manufactory" clearable="true" style="width: 90%" placeholder="请输入生产厂家"></el-input>
+          <el-form-item label="生产企业:">
+            <el-input v-model="filterQuery.manufactory" clearable="true" style="width: 90%" placeholder="请输入生产企业"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
@@ -72,7 +72,7 @@
         <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="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="操作" width="60">
           <template slot-scope="scope">
             <el-button type="text" @click.native.stop="detailDialog(scope.row)">详情</el-button>