diff --git a/src/views/basic/business/stockOrder.vue b/src/views/basic/business/stockOrder.vue
index 8138bd9..af79dc9 100644
--- a/src/views/basic/business/stockOrder.vue
+++ b/src/views/basic/business/stockOrder.vue
@@ -125,7 +125,7 @@
         <el-card class="el-card">
             <el-table v-loading="detailLoading" :data="detailList" style="width: 100%" border>
                 <el-table-column type="index" label="序号" width="50"></el-table-column>
-                <el-table-column label="产品通用名"  prop="coName"></el-table-column>
+                <el-table-column label="物资名称"  prop="coName"></el-table-column>
                 <el-table-column label="规格型号"  prop="spec"></el-table-column>
                 <el-table-column label="批次号"  prop="batchNo"></el-table-column>
                 <el-table-column label="生产日期"  prop="productDate">
@@ -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>
@@ -161,6 +161,7 @@
             :close-on-click-modal="false"
             :close-on-press-escape="false"
             width="70%"
+            append-to-body
             v-if="qrcodeDetailVisible"
             @close='closeQRCodeDetailDialog'
         >
diff --git a/src/views/basic/business/stockOrderDistribution.vue b/src/views/basic/business/stockOrderDistribution.vue
index efed7f8..52ca1f3 100644
--- a/src/views/basic/business/stockOrderDistribution.vue
+++ b/src/views/basic/business/stockOrderDistribution.vue
@@ -79,7 +79,7 @@
 
             <el-table v-loading="loading" :data="codeArray" style="width: 100%;" border max-height="350" height="350" ref="multipleTable">
                 <el-table-column label="序号" type="index" width="50"></el-table-column>
-                <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip width="200"></el-table-column>
+                <el-table-column label="物资名称" prop="productName" show-overflow-tooltip width="200"></el-table-column>
                 <el-table-column label="包装规格" prop="spec" show-overflow-tooltip width="200"></el-table-column>
                 <el-table-column label="批次号" prop="batchNo" show-overflow-tooltip></el-table-column>
                 <el-table-column label="生产日期" prop="productDate" show-overflow-tooltip></el-table-column>
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/basicCompanyProductsImport.vue b/src/views/basic/product/basicCompanyProductsImport.vue
index f1b7401..b31140f 100644
--- a/src/views/basic/product/basicCompanyProductsImport.vue
+++ b/src/views/basic/product/basicCompanyProductsImport.vue
@@ -9,8 +9,8 @@
                 </el-form-item>
             </el-col>
             <el-col :span="6">
-                <el-form-item label="产品通用名:">
-                    <el-input v-model="filterQuery.cpmctymc"  style="width:90%" placeholder="请输入产品通用名" clearable="true"></el-input>
+                <el-form-item label="物资名称:">
+                    <el-input v-model="filterQuery.cpmctymc"  style="width:90%" placeholder="请输入物资名称" clearable="true"></el-input>
                 </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -54,7 +54,7 @@
             <el-table-column label="最小销售产品标识" prop="nameCode" width="140"></el-table-column>
             <el-table-column label="产品编码" prop="thirdId" show-overflow-tooltip></el-table-column>
             <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
-            <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+            <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
             <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
             <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
             <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
@@ -88,7 +88,7 @@
 
           <el-table v-loading="loading" :data="detailList" style="width: 100%; margin-top: 20px" border @current-change="handleDetail" border highlight-current-row>
             <el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
-            <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+            <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
             <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
             <el-table-column label="包装层级" prop="bzcj" show-overflow-tooltip></el-table-column>
           </el-table>
diff --git a/src/views/basic/product/bindHospProduct.vue b/src/views/basic/product/bindHospProduct.vue
index c235759..44c87e6 100644
--- a/src/views/basic/product/bindHospProduct.vue
+++ b/src/views/basic/product/bindHospProduct.vue
@@ -22,8 +22,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="产品通用名:">
-              <el-input v-model="filterQuery.cpmctymc" placeholder="产品通用名" clearable="true"
+            <el-form-item class="query-form-item" label="物资名称:">
+              <el-input v-model="filterQuery.cpmctymc" placeholder="物资名称" clearable="true"
                         style="width: 90%"></el-input>
             </el-form-item>
           </el-col>
@@ -79,7 +79,7 @@
         <el-table-column label="最小销售产品标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>
         <el-table-column label="主系统产品编码" prop="mainId" show-overflow-tooltip></el-table-column>
         <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
-        <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+        <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
         <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
         <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue
index ef5e66d..22a9fd9 100644
--- a/src/views/basic/product/product.vue
+++ b/src/views/basic/product/product.vue
@@ -36,8 +36,8 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item class="query-form-item" label="产品通用名:">
-                  <el-input v-model="filterQuery.cpmctymc" placeholder="产品通用名" clearable="true"
+                <el-form-item class="query-form-item" label="物资名称:">
+                  <el-input v-model="filterQuery.cpmctymc" placeholder="物资名称" clearable="true"
                             style="width: 90%"></el-input>
                 </el-form-item>
               </el-col>
@@ -136,7 +136,7 @@
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
-              label="产品通用名"
+              label="物资名称"
               prop="cpmctymc"
               show-overflow-tooltip
             ></el-table-column>
@@ -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>
@@ -214,7 +214,7 @@
               <el-table v-loading="loading" :data="detailList" style="width: 100%; " border key="3"
                         highlight-current-row @current-change="handleDetail">
                 <el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
-                <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+                <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
                 <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
                 <el-table-column label="包装单位" prop="packUnit" show-overflow-tooltip></el-table-column>
               </el-table>
@@ -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/productEdit.vue b/src/views/basic/product/productEdit.vue
index 373d7e1..c8174a5 100644
--- a/src/views/basic/product/productEdit.vue
+++ b/src/views/basic/product/productEdit.vue
@@ -11,11 +11,11 @@
         <el-table :data="sysList" style="width: 100%;   margin-bottom: 8px" key="2" border>
           <el-table-column label="序号" type="index"></el-table-column>
           <el-table-column label="系统名称" prop="sysName" show-overflow-tooltip></el-table-column>
-          <el-table-column label="产品编码" prop="thirdId" show-overflow-tooltip></el-table-column>
+          <el-table-column label="物资编码" prop="thirdId" show-overflow-tooltip></el-table-column>
           <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">
@@ -45,7 +45,7 @@
         <el-table v-loading="loading" :data="detailList" style="width: 100%; " border key="3" highlight-current-row
                   @current-change="handleDetail">
           <el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
-          <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+          <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
           <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
           <el-table-column label="包装单位" prop="packUnit" show-overflow-tooltip></el-table-column>
           <el-table-column label="操作" width="180px">
@@ -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/productSingleEdit.vue b/src/views/basic/product/productSingleEdit.vue
index 946bbf4..7dc5aea 100644
--- a/src/views/basic/product/productSingleEdit.vue
+++ b/src/views/basic/product/productSingleEdit.vue
@@ -23,7 +23,7 @@
       </el-row>
       <el-row>
         <el-col span="20">
-          <el-form-item label="产品通用名:">
+          <el-form-item label="物资名称:">
             <el-input
               style="width: 90%"
               size="small"
diff --git a/src/views/basic/product/udIInfoSelect.vue b/src/views/basic/product/udIInfoSelect.vue
index 367f089..54a18c1 100644
--- a/src/views/basic/product/udIInfoSelect.vue
+++ b/src/views/basic/product/udIInfoSelect.vue
@@ -18,8 +18,8 @@
                 </el-form-item>
             </el-col>
             <el-col :span="6" >
-                <el-form-item label="产品通用名:">
-                    <el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入产品通用名" clearable="true"></el-input>
+                <el-form-item label="物资名称:">
+                    <el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入物资名称" clearable="true"></el-input>
                 </el-form-item>
             </el-col>
             <el-col :span="6" >
@@ -75,7 +75,7 @@
             <el-table-column label="最小销售产品标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>
             <el-table-column label="产品编码" prop="thirdId" show-overflow-tooltip></el-table-column>
             <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
-            <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+            <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
             <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
             <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
             <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
@@ -96,7 +96,7 @@
 
             <el-table v-loading="loading" :data="detailList" style="width: 100%; margin-top: 20px" border @current-change="handleDetail" border highlight-current-row>
                 <el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
-                <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+                <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
                 <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
                 <el-table-column label="包装层级" prop="bzcj" show-overflow-tooltip></el-table-column>
             </el-table>
diff --git a/src/views/basic/product/udiInfoManageSp.vue b/src/views/basic/product/udiInfoManageSp.vue
index f023df6..de568d3 100644
--- a/src/views/basic/product/udiInfoManageSp.vue
+++ b/src/views/basic/product/udiInfoManageSp.vue
@@ -28,14 +28,14 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="产品编码:">
+            <el-form-item label="物资编码:">
               <el-input v-model="filterQuery.unionCode" style="width: 90%" placeholder="请输入DI/医保编码/商品条码"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="产品通用名:">
-              <el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入产品通用名"
+            <el-form-item label="物资名称:">
+              <el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入物资名称"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
@@ -67,8 +67,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="第三方产品编码:">
-              <el-input v-model="filterQuery.thrPiId" style="width: 90%" placeholder="请输入第三方产品编码"
+            <el-form-item label="第三方物资编码:">
+              <el-input v-model="filterQuery.thrPiId" style="width: 90%" placeholder="请输入第三方物资编码"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
@@ -103,9 +103,9 @@
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="供应商" prop="companyName" show-overflow-tooltip></el-table-column>
         <el-table-column label="最小销售产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
-        <el-table-column label="主系统产品编码" prop="mainId" show-overflow-tooltip></el-table-column>
+        <el-table-column label="主系统物资编码" prop="mainId" show-overflow-tooltip></el-table-column>
         <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
-        <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+        <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
         <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
         <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
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/udiInfoselectErpUdi.vue b/src/views/basic/product/udiInfoselectErpUdi.vue
index 76f86b8..dd5fe88 100644
--- a/src/views/basic/product/udiInfoselectErpUdi.vue
+++ b/src/views/basic/product/udiInfoselectErpUdi.vue
@@ -5,7 +5,7 @@
                     <el-row>
                       <el-col :span="6">
                         <el-form-item label="物品编码:">
-                            <el-input v-model="erpQuery.code"style="width: 90%" placeholder="请输入产品编码/商品条码/医保编码" clearable="true" @keyup.enter.native="keyupErp_submit($event)"></el-input>
+                            <el-input v-model="erpQuery.code"style="width: 90%" placeholder="请输入物资编码/商品条码/医保编码" clearable="true" @keyup.enter.native="keyupErp_submit($event)"></el-input>
                         </el-form-item>
                       </el-col>
                       <el-col :span="6">
@@ -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">
@@ -69,12 +69,12 @@
                           v-loading="erpLloading" @current-change="handleErpChange" @selection-change="handleSelectionChange">
                     <el-table-column v-if="isImport" type="selection" width="55"></el-table-column>
                     <el-table-column label="序号" type="index"></el-table-column>
-                    <el-table-column label="产品编码" prop="code"></el-table-column>
+                    <el-table-column label="物资编码" prop="code"></el-table-column>
                     <el-table-column label="产品名称" prop="name"></el-table-column>
                     <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
@@ -400,7 +400,7 @@ export default {
                     return;
                 }
                 if (selected != '') {
-                    this.$confirm("产品编码：" + selected + "已被添加,是否继续添加", "提示", {
+                    this.$confirm("物资编码：" + selected + "已被添加,是否继续添加", "提示", {
                         confirmButtonText: "确定",
                         cancelButtonText: "取消",
                         type: "warning",
@@ -459,7 +459,7 @@ export default {
 
                 if (this.currentRow.checked) {
 
-                    this.$confirm("产品编码：" + this.currentRow.code + "已被选入,是否继续选入", "提示", {
+                    this.$confirm("物资编码：" + this.currentRow.code + "已被选入,是否继续选入", "提示", {
                         confirmButtonText: "确定",
                         cancelButtonText: "取消",
                         type: "warning",
diff --git a/src/views/basic/product/udilnfoManageSpDetail.vue b/src/views/basic/product/udilnfoManageSpDetail.vue
index d710315..da36a90 100644
--- a/src/views/basic/product/udilnfoManageSpDetail.vue
+++ b/src/views/basic/product/udilnfoManageSpDetail.vue
@@ -4,17 +4,17 @@
     <el-table :data="sysList" style="width: 100%" key="2" border>
       <el-table-column label="序号" type="index"></el-table-column>
       <el-table-column label="系统名称" prop="sysName" show-overflow-tooltip></el-table-column>
-      <el-table-column label="产品编码" prop="thirdId" show-overflow-tooltip></el-table-column>
+      <el-table-column label="物资编码" prop="thirdId" show-overflow-tooltip></el-table-column>
       <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-table v-loading="loading" :data="detailList" style="width: 100%; margin-top: 20px" border key="3" @current-change="handleDetail">
       <el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
-      <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+      <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
       <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
       <el-table-column label="包装层级" prop="bzcj" 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/basic/product/unbindHospProduct.vue b/src/views/basic/product/unbindHospProduct.vue
index a3ae165..1aadfee 100644
--- a/src/views/basic/product/unbindHospProduct.vue
+++ b/src/views/basic/product/unbindHospProduct.vue
@@ -22,8 +22,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="产品通用名:">
-              <el-input v-model="filterQuery.cpmctymc" placeholder="产品通用名" clearable="true"
+            <el-form-item class="query-form-item" label="物资名称:">
+              <el-input v-model="filterQuery.cpmctymc" placeholder="物资名称" clearable="true"
                         style="width: 90%"></el-input>
             </el-form-item>
           </el-col>
@@ -79,7 +79,7 @@
         <el-table-column label="最小销售产品标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>
         <el-table-column label="主系统产品编码" prop="mainId" show-overflow-tooltip></el-table-column>
         <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
-        <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+        <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
         <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
         <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
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/DialogSelectProduct.vue b/src/views/inout/DialogSelectProduct.vue
index 28e4f3e..366e650 100644
--- a/src/views/inout/DialogSelectProduct.vue
+++ b/src/views/inout/DialogSelectProduct.vue
@@ -22,8 +22,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="产品通用名:">
-              <el-input v-model="listQuery.cpmctymc" placeholder="产品通用名" clearable="true"
+            <el-form-item class="query-form-item" label="物资名称:">
+              <el-input v-model="listQuery.cpmctymc" placeholder="物资名称" clearable="true"
                         style="width: 90%"></el-input>
             </el-form-item>
           </el-col>
@@ -91,7 +91,7 @@
           show-overflow-tooltip
         ></el-table-column>
         <el-table-column
-          label="产品通用名"
+          label="物资名称"
           prop="cpmctymc"
           show-overflow-tooltip
         ></el-table-column>
diff --git a/src/views/inout/DialogSelectReceiveOrder.vue b/src/views/inout/DialogSelectReceiveOrder.vue
index 1b0725e..92d3229 100644
--- a/src/views/inout/DialogSelectReceiveOrder.vue
+++ b/src/views/inout/DialogSelectReceiveOrder.vue
@@ -112,8 +112,8 @@
     <el-card class="el-card">
       <el-table v-loading="loading" :data="detailList" style="width: 100%">
         <el-table-column label="序号" type="index" width="120"></el-table-column>
-        <el-table-column label="产品编码" prop="nameCode"></el-table-column>
-        <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="物资编码" prop="nameCode"></el-table-column>
+        <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="批次号" prop="batchNo"></el-table-column>
         <el-table-column label="生产日期" prop="productDate"></el-table-column>
diff --git a/src/views/inout/DialogSelectRl.vue b/src/views/inout/DialogSelectRl.vue
index 19db5c9..d745fb0 100644
--- a/src/views/inout/DialogSelectRl.vue
+++ b/src/views/inout/DialogSelectRl.vue
@@ -20,12 +20,12 @@
         show-overflow-tooltip
       ></el-table-column>
       <el-table-column
-        label="生产厂家"
+        label="生产企业"
         prop="ylqxzcrbarmc"
         show-overflow-tooltip
       ></el-table-column>
       <el-table-column
-        label="产品通用名"
+        label="物资名称"
         prop="cpmctymc"
         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
@@ -109,7 +109,7 @@
         ></el-table-column>
 
         <el-table-column
-          label="产品通用名"
+          label="物资名称"
           prop="cpmctymc"
           show-overflow-tooltip
         ></el-table-column>
@@ -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/DialogSelectThrOrder.vue b/src/views/inout/DialogSelectThrOrder.vue
index c0e11b1..8f4b67d 100644
--- a/src/views/inout/DialogSelectThrOrder.vue
+++ b/src/views/inout/DialogSelectThrOrder.vue
@@ -114,7 +114,7 @@
       <el-table v-loading="loading" :data="detailList" style="width: 100%" border>
         <el-table-column label="序号" type="index" width="120"></el-table-column>
         <el-table-column label="产品编码" prop="productId"></el-table-column>
-        <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="批次号" prop="batchNo"></el-table-column>
         <el-table-column label="生产日期" prop="productDate"></el-table-column>
diff --git a/src/views/inout/InvoiceRegister.vue b/src/views/inout/InvoiceRegister.vue
index beee98c..45d5cc9 100644
--- a/src/views/inout/InvoiceRegister.vue
+++ b/src/views/inout/InvoiceRegister.vue
@@ -12,7 +12,7 @@
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column
-          label="产品通用名称"
+          label="物资名称称"
           prop="coName"
           show-overflow-tooltip
         ></el-table-column>
diff --git a/src/views/inout/IoArrivalSearchOrder.vue b/src/views/inout/IoArrivalSearchOrder.vue
index 25c8166..3996d1a 100644
--- a/src/views/inout/IoArrivalSearchOrder.vue
+++ b/src/views/inout/IoArrivalSearchOrder.vue
@@ -241,17 +241,24 @@
             prop="batchNo"
           ></el-table-column>
           <el-table-column
-            label="数量"
+            label="送货数量"
             prop="count"
           ></el-table-column>
           <el-table-column
             label="扫码数量"
             prop="scanCount"
           ></el-table-column>
+          <el-table-column
+            label="计量单位"
+            prop="price"
+          ></el-table-column>
           <el-table-column
             label="价格"
             prop="price"
           ></el-table-column>
+          <!--todo-->
+
+
           <el-table-column
             label="生产日期"
             prop="productDate"
@@ -261,7 +268,7 @@
             prop="expireDate"
           ></el-table-column>
           <el-table-column
-            label="生产厂家"
+            label="生产企业"
             prop="manufacturer"
             show-overflow-tooltip
           ></el-table-column>
@@ -335,11 +342,11 @@
             prop="expireDate"
           ></el-table-column>
           <el-table-column
-            label="单据数量"
+            label="送货数量"
             prop="orderCount"
           ></el-table-column>
           <el-table-column
-            label="扫码数量"
+            label="到货数量"
             prop="reCount"
           ></el-table-column>
           <el-table-column
@@ -348,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/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/IoCheckSuccessOrder.vue b/src/views/inout/IoCheckSuccessOrder.vue
index 5d36ccd..4caae38 100644
--- a/src/views/inout/IoCheckSuccessOrder.vue
+++ b/src/views/inout/IoCheckSuccessOrder.vue
@@ -204,7 +204,7 @@
         >
           <el-table-column label="序号" type="index"></el-table-column>
           <el-table-column
-            label="产品通用名称"
+            label="物资名称"
             prop="coName"
             show-overflow-tooltip
           ></el-table-column>
@@ -237,7 +237,7 @@
             prop="price"
           ></el-table-column>
           <el-table-column
-            label="生产厂家"
+            label="生产企业"
             prop="manufacturer"
             show-overflow-tooltip
           ></el-table-column>
@@ -288,7 +288,7 @@
         >
           <el-table-column label="序号" type="index"></el-table-column>
           <el-table-column
-            label="产品通用名"
+            label="物资名称"
             prop="coName"
             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/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/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/IoEditOrder.vue b/src/views/inout/IoEditOrder.vue
index f77d7a4..e7d3811 100644
--- a/src/views/inout/IoEditOrder.vue
+++ b/src/views/inout/IoEditOrder.vue
@@ -97,7 +97,7 @@
         >
           <el-table-column label="序号" type="index"></el-table-column>
           <el-table-column
-            label="产品通用名称"
+            label="物资名称"
             prop="coName"
             show-overflow-tooltip
           ></el-table-column>
@@ -128,7 +128,7 @@
             prop="price"
           ></el-table-column>
           <el-table-column
-            label="生产厂家"
+            label="生产企业"
             prop="manufacturer"
             show-overflow-tooltip
           ></el-table-column>
@@ -180,7 +180,7 @@
         >
           <el-table-column label="序号" type="index"></el-table-column>
           <el-table-column
-            label="产品通用名"
+            label="物资名称"
             prop="coName"
             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/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/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/inout/receive/receiveAdd.vue b/src/views/inout/receive/receiveAdd.vue
index 6c0bc7b..5d794ac 100644
--- a/src/views/inout/receive/receiveAdd.vue
+++ b/src/views/inout/receive/receiveAdd.vue
@@ -95,7 +95,7 @@
       <el-table v-loading="loading" :data="detailList" style="width: 100%" border>
         <el-table-column label="序号" type="index" width="120"></el-table-column>
         <el-table-column label="产品编码" prop="nameCode"></el-table-column>
-        <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="批次号" prop="batchNo"></el-table-column>
         <el-table-column label="生产日期" prop="productDate"></el-table-column>
diff --git a/src/views/inout/receive/receiveAudit.vue b/src/views/inout/receive/receiveAudit.vue
index 994bdda..1d53ac7 100644
--- a/src/views/inout/receive/receiveAudit.vue
+++ b/src/views/inout/receive/receiveAudit.vue
@@ -83,7 +83,7 @@
       <el-table v-loading="loading" :data="detailList" style="width: 100%" border>
         <el-table-column label="序号" type="index" width="120"></el-table-column>
         <el-table-column label="产品编码" prop="nameCode"></el-table-column>
-        <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="批次号" prop="batchNo"></el-table-column>
         <el-table-column label="生产日期" prop="productDate"></el-table-column>
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/receive/receiveSearch.vue b/src/views/inout/receive/receiveSearch.vue
index 7190e18..de0502c 100644
--- a/src/views/inout/receive/receiveSearch.vue
+++ b/src/views/inout/receive/receiveSearch.vue
@@ -81,7 +81,7 @@
       <el-table v-loading="loading" :data="detailList" style="width: 100%" border>
         <el-table-column label="序号" type="index" width="120"></el-table-column>
         <el-table-column label="产品编码" prop="nameCode"></el-table-column>
-        <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="批次号" prop="batchNo"></el-table-column>
         <el-table-column label="生产日期" prop="productDate"></el-table-column>
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 19117c6..fd714b4 100644
--- a/src/views/inventory/DeviceMAOrderCompleted.vue
+++ b/src/views/inventory/DeviceMAOrderCompleted.vue
@@ -56,7 +56,7 @@
       <el-table v-loading="detailLoading" :data="detailList" style="width: 100%; margin-top: 10px;">
         <el-table-column label="序号" type="index" width="50"></el-table-column>
         <el-table-column label="条码" width="200" prop="code" show-overflow-tooltip></el-table-column>
-        <el-table-column label="产品通用名" prop="productName" width="200"></el-table-column>
+        <el-table-column label="物资名称" prop="productName" width="200"></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip></el-table-column>
         <el-table-column label="批次号" prop="batchNo" width="150"></el-table-column>
         <el-table-column label="序列号" prop="serialNo" width="150"></el-table-column>
@@ -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 6f105b8..c459a72 100644
--- a/src/views/inventory/DeviceMAOrderModify.vue
+++ b/src/views/inventory/DeviceMAOrderModify.vue
@@ -63,7 +63,7 @@
                   border max-height="300" height="300">
           <el-table-column label="序号" type="index" width="50"></el-table-column>
           <el-table-column label="条码" width="180" prop="code" show-overflow-tooltip></el-table-column>
-          <el-table-column width="150" label="产品通用名" prop="productName" show-overflow-tooltip></el-table-column>
+          <el-table-column width="150" label="物资名称" prop="productName" show-overflow-tooltip></el-table-column>
           <el-table-column width="150" label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
           <el-table-column width="150" label="批次号" prop="batchNo"></el-table-column>
           <el-table-column width="150" label="养护数量" prop="count"></el-table-column>
@@ -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/DeviceReceiveOrderAudit.vue b/src/views/inventory/DeviceReceiveOrderAudit.vue
index 9f56bb1..9f79a0c 100644
--- a/src/views/inventory/DeviceReceiveOrderAudit.vue
+++ b/src/views/inventory/DeviceReceiveOrderAudit.vue
@@ -100,7 +100,7 @@
       <el-table v-loading="detailLoading" :data="detailList" style="width: 100%; margin-top: 10px;">
         <el-table-column label="序号" type="index" width="50"></el-table-column>
         <el-table-column label="条码" width="200" prop="code" show-overflow-tooltip></el-table-column>
-        <el-table-column label="产品通用名" prop="productName" width="200"></el-table-column>
+        <el-table-column label="物资名称" prop="productName" width="200"></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip></el-table-column>
         <el-table-column label="批次号" prop="batchNo" width="150"></el-table-column>
         <el-table-column label="序列号" prop="serialNo" width="150"></el-table-column>
@@ -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/DeviceReceiveOrderCompleted.vue b/src/views/inventory/DeviceReceiveOrderCompleted.vue
index 62fce61..2c24df0 100644
--- a/src/views/inventory/DeviceReceiveOrderCompleted.vue
+++ b/src/views/inventory/DeviceReceiveOrderCompleted.vue
@@ -82,7 +82,7 @@
       <el-table v-loading="detailLoading" :data="detailList" style="width: 100%; margin-top: 10px;">
         <el-table-column label="序号" type="index" width="50"></el-table-column>
         <el-table-column label="条码" width="200" prop="code" show-overflow-tooltip></el-table-column>
-        <el-table-column label="产品通用名" prop="productName" width="200"></el-table-column>
+        <el-table-column label="物资名称" prop="productName" width="200"></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip></el-table-column>
         <el-table-column label="批次号" prop="batchNo" width="150"></el-table-column>
         <el-table-column label="序列号" prop="serialNo" width="150"></el-table-column>
@@ -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/DeviceReceiveOrderModify.vue b/src/views/inventory/DeviceReceiveOrderModify.vue
index 2d11e0b..c98a0ec 100644
--- a/src/views/inventory/DeviceReceiveOrderModify.vue
+++ b/src/views/inventory/DeviceReceiveOrderModify.vue
@@ -148,7 +148,7 @@
           <el-table-column label="序号" type="index" width="50"></el-table-column>
           <el-table-column label="条码" width="180" prop="code" show-overflow-tooltip></el-table-column>
           <el-table-column width="150"
-                           label="产品通用名"
+                           label="物资名称"
                            prop="productName"
                            show-overflow-tooltip
           ></el-table-column>
@@ -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/InvCountOrderModify.vue b/src/views/inventory/InvCountOrderModify.vue
index 9c0606b..ba15508 100644
--- a/src/views/inventory/InvCountOrderModify.vue
+++ b/src/views/inventory/InvCountOrderModify.vue
@@ -115,7 +115,7 @@
                   highlight-current-row
                   border max-height="300" height="300">
           <el-table-column label="序号" type="index" width="50"></el-table-column>
-          <el-table-column width="150" label="产品通用名" prop="productName" show-overflow-tooltip></el-table-column>
+          <el-table-column width="150" label="物资名称" prop="productName" show-overflow-tooltip></el-table-column>
           <el-table-column width="150" label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
           <el-table-column width="150" label="批次号" prop="batchNo"></el-table-column>
           <el-table-column width="150" label="库存数量" prop="invNum"></el-table-column>
@@ -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/InvMAOrderAudit.vue b/src/views/inventory/InvMAOrderAudit.vue
index 846d15f..4071c94 100644
--- a/src/views/inventory/InvMAOrderAudit.vue
+++ b/src/views/inventory/InvMAOrderAudit.vue
@@ -86,7 +86,7 @@
       <el-table v-loading="detailLoading" :data="detailList" style="width: 100%; margin-top: 10px;">
         <el-table-column label="序号" type="index" width="50"></el-table-column>
         <el-table-column label="条码" width="150" prop="code" show-overflow-tooltip></el-table-column>
-        <el-table-column width="200" label="产品通用名" prop="productName"></el-table-column>
+        <el-table-column width="200" label="物资名称" prop="productName"></el-table-column>
         <el-table-column width="150" label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
         <el-table-column width="150" label="批次号" prop="batchNo"></el-table-column>
         <el-table-column label="养护日期" prop="createTime" width="150"></el-table-column>
@@ -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/InvMAOrderCompleted.vue b/src/views/inventory/InvMAOrderCompleted.vue
index ca443db..d5471c4 100644
--- a/src/views/inventory/InvMAOrderCompleted.vue
+++ b/src/views/inventory/InvMAOrderCompleted.vue
@@ -69,7 +69,7 @@
       <el-table v-loading="detailLoading" :data="detailList" style="width: 100%; margin-top: 10px;">
         <el-table-column label="序号" type="index" width="50"></el-table-column>
         <el-table-column label="条码" width="150" prop="code" show-overflow-tooltip></el-table-column>
-        <el-table-column width="200" label="产品通用名" prop="productName"></el-table-column>
+        <el-table-column width="200" label="物资名称" prop="productName"></el-table-column>
         <el-table-column width="150" label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
         <el-table-column width="150" label="批次号" prop="batchNo"></el-table-column>
         <el-table-column label="养护日期" prop="createTime" width="150"></el-table-column>
diff --git a/src/views/inventory/InvMAOrderModify.vue b/src/views/inventory/InvMAOrderModify.vue
index 1887d91..2bff585 100644
--- a/src/views/inventory/InvMAOrderModify.vue
+++ b/src/views/inventory/InvMAOrderModify.vue
@@ -109,7 +109,7 @@
           <el-table-column label="序号" type="index" width="50"></el-table-column>
           <el-table-column label="条码" width="180" prop="code" show-overflow-tooltip></el-table-column>
           <el-table-column width="150"
-                           label="产品通用名"
+                           label="物资名称"
                            prop="productName"
                            show-overflow-tooltip
           ></el-table-column>
@@ -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/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 0a56bb5..7157a3e 100644
--- a/src/views/inventory/inner/innerOrderEditDialog.vue
+++ b/src/views/inventory/inner/innerOrderEditDialog.vue
@@ -38,15 +38,17 @@
 
             <el-card>
                 <el-button-group style="display: flex">
-                    <el-button type="primary" size="small" @click.native.stop="selectProductFunction()" style="margin: 0px 60px 10px auto; height: 35px" :loading="loading">产品录入</el-button>
+                    <el-button type="primary" size="small" @click.native.stop="selectProductFunction()" style="margin: 0px 0px 10px auto; height: 35px" :loading="loading">产品录入</el-button>
+                  <el-button type="primary" size="small" @click.native.stop="stockOrderList()" style=" height: 35px">内部码</el-button>
+
                 </el-button-group>
 
                 <el-table v-loading="loading" :data="codeArray" style="width: 100%;" :row-class-name="tableRowClassName" border max-height="300" height="300" ref="multipleTable">
                     <el-table-column label="序号" type="index" width="50"></el-table-column>
-                    <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip></el-table-column>
+                    <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"
@@ -109,12 +111,27 @@
                 :filterType="2"
             ></stockOrderNewSelectProduct>
         </el-dialog>
+
+
+      <el-dialog
+        title="内部码打印"
+        :visible.sync="haveDistributionVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        width="80%"
+        v-if="haveDistributionVisible"
+        :append-to-body='true'
+      >
+        <stockOrder
+        ></stockOrder>
+      </el-dialog>
     </div>
 </template>
 
 <script>
 import draggable from "vuedraggable";
 import stockOrderNewSelectProduct from "@/views/inventory/inner/innerOrderSelectProduct";
+import stockOrder from "@/views/basic/business/stockOrder";
 import {
   inserThrOrderWeb,
   delInnerOrderDetail,
@@ -162,6 +179,7 @@ export default {
             formVisible: false,
             deleteLoading: false,
             orderNo: null,
+          haveDistributionVisible:false,
             statusMap: {
                 1: "草稿",
                 2: "未审核",
@@ -190,6 +208,7 @@ export default {
     components: {
         draggable,
         stockOrderNewSelectProduct,
+      stockOrder,
     },
     methods: {
         saveOrder(status) {
@@ -258,6 +277,9 @@ export default {
           updateOrderDetail(row);
           this.selectedIndex = "";
         },
+      stockOrderList(){
+        this.haveDistributionVisible = true;
+      },
         selectProductFunction() {
           if(this.query.id==null) {
             inserThrOrderWeb({innerOrderEntity: this.formData,editStatus:1})
diff --git a/src/views/inventory/inner/innerOrderSelectProduct.vue b/src/views/inventory/inner/innerOrderSelectProduct.vue
index 335a8c1..a2d2186 100644
--- a/src/views/inventory/inner/innerOrderSelectProduct.vue
+++ b/src/views/inventory/inner/innerOrderSelectProduct.vue
@@ -22,8 +22,8 @@
                         </el-form-item>
                       </el-col>
                       <el-col :span="6">
-                        <el-form-item label="产品通用名:" class="query-form-item">
-                            <el-input v-model="listQuery.cpmctymc" style="width: 90%"  placeholder="请输入产品通用名" clearable="true"></el-input>
+                        <el-form-item label="物资名称:" class="query-form-item">
+                            <el-input v-model="listQuery.cpmctymc" style="width: 90%"  placeholder="请输入物资名称" clearable="true"></el-input>
                         </el-form-item>
                       </el-col>
                       <el-col :span="6">
@@ -60,7 +60,7 @@
                     <el-table-column label="最小销售产品标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>
                     <el-table-column label="产品编码" prop="thirdId" show-overflow-tooltip></el-table-column>
                     <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc"></el-table-column>
-                    <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+                    <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
                     <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
                     <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
                     <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
diff --git a/src/views/inventory/trace/invUdiTraceOrder.vue b/src/views/inventory/trace/invUdiTraceOrder.vue
index 9b4202b..2b2cc42 100644
--- a/src/views/inventory/trace/invUdiTraceOrder.vue
+++ b/src/views/inventory/trace/invUdiTraceOrder.vue
@@ -129,7 +129,7 @@
       >
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column
-          label="产品通用名"
+          label="物资名称"
           prop="coName"
           :show-overflow-tooltip="true"
         ></el-table-column>
diff --git a/src/views/purchase/company/basicSelectSingleProducts.vue b/src/views/purchase/company/basicSelectSingleProducts.vue
index 9fab203..072b63a 100644
--- a/src/views/purchase/company/basicSelectSingleProducts.vue
+++ b/src/views/purchase/company/basicSelectSingleProducts.vue
@@ -9,8 +9,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="产品通用名:">
-                <el-input v-model="filterQuery.cpmctymc"  style="width:90%" placeholder="请输入产品通用名" clearable="true"></el-input>
+              <el-form-item label="物资名称:">
+                <el-input v-model="filterQuery.cpmctymc"  style="width:90%" placeholder="请输入物资名称" clearable="true"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -54,7 +54,7 @@
           <el-table-column label="最小销售产品标识" prop="nameCode" width="140"></el-table-column>
           <el-table-column label="产品编码" prop="thirdId" show-overflow-tooltip></el-table-column>
           <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
-          <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+          <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
           <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
           <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
           <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
@@ -87,7 +87,7 @@
 
           <el-table v-loading="loading" :data="detailList" style="width: 100%; margin-top: 20px" border @current-change="handleDetail" border highlight-current-row>
             <el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
-            <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+            <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
             <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
             <el-table-column label="包装层级" prop="bzcj" show-overflow-tooltip></el-table-column>
           </el-table>
diff --git a/src/views/purchase/company/companyProducts.vue b/src/views/purchase/company/companyProducts.vue
index 982ce7c..2a1c385 100644
--- a/src/views/purchase/company/companyProducts.vue
+++ b/src/views/purchase/company/companyProducts.vue
@@ -9,8 +9,8 @@
                 </el-form-item>
             </el-col>
             <el-col :span="6">
-                <el-form-item label="产品通用名:">
-                    <el-input v-model="filterQuery.cpmctymc"  style="width:90%" placeholder="请输入产品通用名" clearable="true"></el-input>
+                <el-form-item label="物资名称:">
+                    <el-input v-model="filterQuery.cpmctymc"  style="width:90%" placeholder="请输入物资名称" clearable="true"></el-input>
                 </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -53,7 +53,7 @@
             <el-table-column label="最小销售产品标识" prop="nameCode" width="140"></el-table-column>
             <el-table-column label="产品编码" prop="thirdId" show-overflow-tooltip></el-table-column>
             <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
-            <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+            <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
             <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
             <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
             <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
@@ -86,7 +86,7 @@
 
           <el-table v-loading="loading" :data="detailList" style="width: 100%; margin-top: 20px" border @current-change="handleDetail" border highlight-current-row>
             <el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
-            <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+            <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
             <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
             <el-table-column label="包装层级" prop="bzcj" show-overflow-tooltip></el-table-column>
           </el-table>
diff --git a/src/views/purchase/purApply/purApply.vue b/src/views/purchase/purApply/purApply.vue
index 837f09a..06a4e8a 100644
--- a/src/views/purchase/purApply/purApply.vue
+++ b/src/views/purchase/purApply/purApply.vue
@@ -80,7 +80,7 @@
         <el-card class="el-card">
             <el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row>
                 <el-table-column label="序号" type="index" width="120"></el-table-column>
-                <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="申购数量" prop="count"></el-table-column>
                 <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
diff --git a/src/views/purchase/purApply/purApplyEditDiaolog.vue b/src/views/purchase/purApply/purApplyEditDiaolog.vue
index 7005a0c..0f513d9 100644
--- a/src/views/purchase/purApply/purApplyEditDiaolog.vue
+++ b/src/views/purchase/purApply/purApplyEditDiaolog.vue
@@ -77,10 +77,10 @@
 
                 <el-table v-loading="loading" :data="codeArray" style="width: 100%;" :row-class-name="tableRowClassName" border highlight-current-row max-height="300" height="300" ref="multipleTable">
                     <el-table-column label="序号" type="index" width="50"></el-table-column>
-                    <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip></el-table-column>
+                    <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/purApply/purApplyProducts.vue b/src/views/purchase/purApply/purApplyProducts.vue
index 2f0fc58..b25b81e 100644
--- a/src/views/purchase/purApply/purApplyProducts.vue
+++ b/src/views/purchase/purApply/purApplyProducts.vue
@@ -9,8 +9,8 @@
                 </el-form-item>
             </el-col>
             <el-col :span="6">
-                <el-form-item label="产品通用名:">
-                    <el-input v-model="filterQuery.cpmctymc"  style="width:90%" placeholder="请输入产品通用名" clearable="true"></el-input>
+                <el-form-item label="物资名称:">
+                    <el-input v-model="filterQuery.cpmctymc"  style="width:90%" placeholder="请输入物资名称" clearable="true"></el-input>
                 </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -54,7 +54,7 @@
             <el-table-column label="最小销售产品标识" prop="nameCode" width="140"></el-table-column>
             <el-table-column label="产品编码" prop="thirdId" show-overflow-tooltip></el-table-column>
             <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
-            <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+            <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
             <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
             <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
             <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
@@ -87,7 +87,7 @@
 
           <el-table v-loading="loading" :data="detailList" style="width: 100%; margin-top: 20px" border @current-change="handleDetail" border highlight-current-row>
             <el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
-            <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+            <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
             <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
             <el-table-column label="包装层级" prop="bzcj" show-overflow-tooltip></el-table-column>
           </el-table>
diff --git a/src/views/purchase/purApply/purOrderSelectProduct.vue b/src/views/purchase/purApply/purOrderSelectProduct.vue
index e365208..7c8be12 100644
--- a/src/views/purchase/purApply/purOrderSelectProduct.vue
+++ b/src/views/purchase/purApply/purOrderSelectProduct.vue
@@ -22,8 +22,8 @@
                         </el-form-item>
                       </el-col>
                       <el-col :span="6">
-                        <el-form-item label="产品通用名:" class="query-form-item">
-                            <el-input v-model="listQuery.cpmctymc" style="width: 90%"  placeholder="请输入产品通用名" clearable="true"></el-input>
+                        <el-form-item label="物资名称:" class="query-form-item">
+                            <el-input v-model="listQuery.cpmctymc" style="width: 90%"  placeholder="请输入物资名称" clearable="true"></el-input>
                         </el-form-item>
                       </el-col>
                       <el-col :span="6">
@@ -60,7 +60,7 @@
                     <el-table-column label="最小销售产品标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>
                     <el-table-column label="产品编码" prop="thirdId" show-overflow-tooltip></el-table-column>
                     <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc"></el-table-column>
-                    <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+                    <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
                     <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
                     <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
                     <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
diff --git a/src/views/purchase/purApply/purUdiRlDetailDialog.vue b/src/views/purchase/purApply/purUdiRlDetailDialog.vue
index a08cae7..cc7b50b 100644
--- a/src/views/purchase/purApply/purUdiRlDetailDialog.vue
+++ b/src/views/purchase/purApply/purUdiRlDetailDialog.vue
@@ -9,7 +9,7 @@
 
       <el-table v-loading="loading" :data="detailList" style="width: 100%; margin-top: 20px" border @current-change="handleDetail" border highlight-current-row>
         <el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
-        <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+        <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
         <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
         <el-table-column label="包装层级" prop="bzcj" show-overflow-tooltip></el-table-column>
       </el-table>
diff --git a/src/views/purchase/purApply/pureApplyDetailDialog.vue b/src/views/purchase/purApply/pureApplyDetailDialog.vue
index d8689a2..84a5507 100644
--- a/src/views/purchase/purApply/pureApplyDetailDialog.vue
+++ b/src/views/purchase/purApply/pureApplyDetailDialog.vue
@@ -94,7 +94,7 @@
             <el-card>
                 <el-table v-loading="loading" :data="codeArray" style="width: 100%;" :row-class-name="tableRowClassName" border highlight-current-row max-height="300" height="300" ref="multipleTable">
                     <el-table-column label="序号" type="index" width="50"></el-table-column>
-                    <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip></el-table-column>
+                    <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 width="150" label="单据数量" prop="count"></el-table-column>
                     <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
diff --git a/src/views/purchase/purApply/pureApplySearch.vue b/src/views/purchase/purApply/pureApplySearch.vue
index 8b05e5d..a648231 100644
--- a/src/views/purchase/purApply/pureApplySearch.vue
+++ b/src/views/purchase/purApply/pureApplySearch.vue
@@ -78,7 +78,7 @@
             <el-table v-loading="loading" :data="detailList" style="width: 100%">
                 <el-table-column label="序号" type="index" width="120"></el-table-column>
                 <!-- <el-table-column label="产品编码" prop="productId"></el-table-column> -->
-                <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="申购数量" prop="count"></el-table-column>
                 <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
diff --git a/src/views/purchase/purApply/selectApplyListDialog.vue b/src/views/purchase/purApply/selectApplyListDialog.vue
index aa74e28..cd43f24 100644
--- a/src/views/purchase/purApply/selectApplyListDialog.vue
+++ b/src/views/purchase/purApply/selectApplyListDialog.vue
@@ -65,7 +65,7 @@
     <el-card class="el-card">
       <el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row>
         <el-table-column label="序号" type="index" width="120"></el-table-column>
-        <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="申购数量" prop="count"></el-table-column>
         <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></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/purArrival/purArrivalSelectProduct.vue b/src/views/purchase/purArrival/purArrivalSelectProduct.vue
index 06988bf..751826b 100644
--- a/src/views/purchase/purArrival/purArrivalSelectProduct.vue
+++ b/src/views/purchase/purArrival/purArrivalSelectProduct.vue
@@ -25,8 +25,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="产品通用名:" class="query-form-item">
-              <el-input v-model="listQuery.cpmctymc" style="width: 90%" placeholder="请输入产品通用名"
+            <el-form-item label="物资名称:" class="query-form-item">
+              <el-input v-model="listQuery.cpmctymc" style="width: 90%" placeholder="请输入物资名称"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
@@ -65,7 +65,7 @@
         <el-table-column label="最小销售产品标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>
         <el-table-column label="产品编码" prop="thirdId" show-overflow-tooltip></el-table-column>
         <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc"></el-table-column>
-        <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+        <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
         <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
         <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
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/purchase/purOrder/purOrderDetailDialog.vue b/src/views/purchase/purOrder/purOrderDetailDialog.vue
index 9a2639e..b6a28ae 100644
--- a/src/views/purchase/purOrder/purOrderDetailDialog.vue
+++ b/src/views/purchase/purOrder/purOrderDetailDialog.vue
@@ -101,10 +101,10 @@
             <el-card>
                 <el-table v-loading="loading" :data="codeArray" style="width: 100%;" :row-class-name="tableRowClassName" border highlight-current-row max-height="300" height="300" ref="multipleTable">
                     <el-table-column label="序号" type="index" width="50"></el-table-column>
-                    <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip></el-table-column>
+                    <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/purchase/purOrder/purOrderOrderSelectProduct.vue b/src/views/purchase/purOrder/purOrderOrderSelectProduct.vue
index 70169af..4ba0746 100644
--- a/src/views/purchase/purOrder/purOrderOrderSelectProduct.vue
+++ b/src/views/purchase/purOrder/purOrderOrderSelectProduct.vue
@@ -19,7 +19,7 @@
                                       clearable="true"></el-input>
                         </el-form-item>
                         <el-form-item class="query-form-item">
-                            <el-input v-model="listQuery.cpmctymc" placeholder="产品通用名" clearable="true"></el-input>
+                            <el-input v-model="listQuery.cpmctymc" placeholder="物资名称" clearable="true"></el-input>
                         </el-form-item>
                         <el-form-item class="query-form-item">
                             <el-input v-model="listQuery.ggxh" placeholder="规格型号" clearable="true"></el-input>
@@ -81,7 +81,7 @@
                         show-overflow-tooltip
                     ></el-table-column>
                     <el-table-column
-                        label="产品通用名"
+                        label="物资名称"
                         prop="cpmctymc"
                         show-overflow-tooltip
                     ></el-table-column>
diff --git a/src/views/purchase/purOrder/purOrderSelectProduct.vue b/src/views/purchase/purOrder/purOrderSelectProduct.vue
index 953b311..a44c864 100644
--- a/src/views/purchase/purOrder/purOrderSelectProduct.vue
+++ b/src/views/purchase/purOrder/purOrderSelectProduct.vue
@@ -24,8 +24,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="产品通用名:" class="query-form-item">
-              <el-input v-model="listQuery.cpmctymc" style="width: 90%" placeholder="请输入产品通用名"
+            <el-form-item label="物资名称:" class="query-form-item">
+              <el-input v-model="listQuery.cpmctymc" style="width: 90%" placeholder="请输入物资名称"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
@@ -64,7 +64,7 @@
         <el-table-column label="最小销售产品标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>
         <el-table-column label="产品编码" prop="thirdId" show-overflow-tooltip></el-table-column>
         <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc"></el-table-column>
-        <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+        <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
         <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
         <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
diff --git a/src/views/purchase/purPlan/purPlanAudit.vue b/src/views/purchase/purPlan/purPlanAudit.vue
index 09b1af3..6c806ea 100644
--- a/src/views/purchase/purPlan/purPlanAudit.vue
+++ b/src/views/purchase/purPlan/purPlanAudit.vue
@@ -81,7 +81,7 @@
             <el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row>
                 <el-table-column label="序号" type="index" width="120"></el-table-column>
                 <!-- <el-table-column label="产品编码" prop="productId"></el-table-column> -->
-                <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="申购数量" prop="count"></el-table-column>
                 <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
diff --git a/src/views/purchase/purReturned/purReturned.vue b/src/views/purchase/purReturned/purReturned.vue
index 0c5af1a..4f36510 100644
--- a/src/views/purchase/purReturned/purReturned.vue
+++ b/src/views/purchase/purReturned/purReturned.vue
@@ -83,7 +83,7 @@
       <el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row>
         <el-table-column label="序号" type="index" width="120"></el-table-column>
         <!-- <el-table-column label="产品编码" prop="productId"></el-table-column> -->
-        <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="退货数量" prop="count"></el-table-column>
         <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
diff --git a/src/views/purchase/purReturned/purReturnedAudit.vue b/src/views/purchase/purReturned/purReturnedAudit.vue
index 462d78c..5ac3cfc 100644
--- a/src/views/purchase/purReturned/purReturnedAudit.vue
+++ b/src/views/purchase/purReturned/purReturnedAudit.vue
@@ -81,7 +81,7 @@
       <el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row>
         <el-table-column label="序号" type="index" width="120"></el-table-column>
         <!-- <el-table-column label="产品编码" prop="productId"></el-table-column> -->
-        <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="退货数量" prop="count"></el-table-column>
         <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
diff --git a/src/views/purchase/purReturned/purReturnedDetailDialog.vue b/src/views/purchase/purReturned/purReturnedDetailDialog.vue
index 806e968..1921490 100644
--- a/src/views/purchase/purReturned/purReturnedDetailDialog.vue
+++ b/src/views/purchase/purReturned/purReturnedDetailDialog.vue
@@ -102,7 +102,7 @@
         <el-table v-loading="loading" :data="codeArray" style="width: 100%;" :row-class-name="tableRowClassName" border
                   highlight-current-row max-height="300" height="300" ref="multipleTable">
           <el-table-column label="序号" type="index" width="50"></el-table-column>
-          <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip></el-table-column>
+          <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 width="150" label="退货数量" prop="count">
           </el-table-column>
diff --git a/src/views/purchase/purReturned/purReturnedEditDialog.vue b/src/views/purchase/purReturned/purReturnedEditDialog.vue
index cc88c8a..888a065 100644
--- a/src/views/purchase/purReturned/purReturnedEditDialog.vue
+++ b/src/views/purchase/purReturned/purReturnedEditDialog.vue
@@ -104,7 +104,7 @@
         <el-table v-loading="loading" :data="codeArray" style="width: 100%;" :row-class-name="tableRowClassName" border
                   highlight-current-row max-height="300" height="300" ref="multipleTable">
           <el-table-column label="序号" type="index" width="50"></el-table-column>
-          <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip></el-table-column>
+          <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 width="150" label="退货数量">
             <template slot-scope="scope">
diff --git a/src/views/purchase/purReturned/purReturnedSearch.vue b/src/views/purchase/purReturned/purReturnedSearch.vue
index f0ad531..3b4647b 100644
--- a/src/views/purchase/purReturned/purReturnedSearch.vue
+++ b/src/views/purchase/purReturned/purReturnedSearch.vue
@@ -81,7 +81,7 @@
       <el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row>
         <el-table-column label="序号" type="index" width="120"></el-table-column>
         <!-- <el-table-column label="产品编码" prop="productId"></el-table-column> -->
-        <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="退货数量" prop="count"></el-table-column>
         <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
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/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/basicCompanyProducts.vue b/src/views/supplier/company/basicCompanyProducts.vue
index d4d37c4..f442d7b 100644
--- a/src/views/supplier/company/basicCompanyProducts.vue
+++ b/src/views/supplier/company/basicCompanyProducts.vue
@@ -10,8 +10,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="产品通用名:">
-              <el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入产品通用名"
+            <el-form-item label="物资名称:">
+              <el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入物资名称"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
@@ -76,7 +76,7 @@
         <el-table-column label="最小销售产品标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>
         <el-table-column label="产品编码" prop="thirdId" show-overflow-tooltip></el-table-column>
         <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
-        <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+        <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
         <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
         <el-table-column label="物资分类" prop="qxlb" show-overflow-tooltip></el-table-column>
diff --git a/src/views/supplier/company/basicCompanyProductsImport.vue b/src/views/supplier/company/basicCompanyProductsImport.vue
index 260ce59..6575470 100644
--- a/src/views/supplier/company/basicCompanyProductsImport.vue
+++ b/src/views/supplier/company/basicCompanyProductsImport.vue
@@ -10,8 +10,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="产品通用名:">
-              <el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="产品通用名"
+            <el-form-item label="物资名称:">
+              <el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="物资名称"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
@@ -66,7 +66,7 @@
         <el-table-column label="最小销售产品标识" prop="nameCode" width="140"></el-table-column>
         <el-table-column label="产品编码" prop="thirdId" show-overflow-tooltip></el-table-column>
         <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
-        <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+        <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
         <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
         <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
@@ -89,7 +89,7 @@
         <el-table v-loading="loading" :data="detailList" style="width: 100%; margin-top: 20px" border
                   @current-change="handleDetail" border highlight-current-row>
           <el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
-          <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+          <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
           <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
           <el-table-column label="包装层级" prop="bzcj" show-overflow-tooltip></el-table-column>
         </el-table>
@@ -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 fb26cd2..9e6ee47 100644
--- a/src/views/supplier/company/basicCompanyproductDetail.vue
+++ b/src/views/supplier/company/basicCompanyproductDetail.vue
@@ -8,7 +8,14 @@
       <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>
+          <el-button type="text" @click.native.stop="removeErp(scope.row)" :disabled="editQuery.flbm==null || scope.row.thirdId==null || scope.row.thirdId==''">解绑
+          </el-button>
+        </template>
+      </el-table-column>
     </el-table>
   </el-card>
   <el-card>
@@ -18,7 +25,12 @@
                         margin-bottom: 8px">
       <span>产品标识:</span>
     </div>
-
+    <div style=" float: right;
+                        text-align: right;
+                        margin-bottom: 8px;">
+      <el-button type="primary" size="mini" icon="search" @click="removeDi" v-if="productType!=1" style="text-align:right">解绑DI器械信息
+      </el-button>
+    </div>
     <el-table v-loading="loading" :data="detailList" style="width: 100%; " border key="3" highlight-current-row @current-change="handleDetail">
       <el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
       <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
@@ -449,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 f905022..05b0d83 100644
--- a/src/views/supplier/company/basicCompanyproductEdit.vue
+++ b/src/views/supplier/company/basicCompanyproductEdit.vue
@@ -61,7 +61,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/basicProductEdit.vue b/src/views/supplier/company/basicProductEdit.vue
index bec39b4..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
@@ -70,7 +70,7 @@
                 ></el-table-column>
 
                 <el-table-column
-                    label="产品通用名"
+                    label="物资名称"
                     prop="cpmctymc"
                     show-overflow-tooltip
                 ></el-table-column>
@@ -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/supplier/company/selectProduct.vue b/src/views/supplier/company/selectProduct.vue
index fdf871e..2a9fb62 100644
--- a/src/views/supplier/company/selectProduct.vue
+++ b/src/views/supplier/company/selectProduct.vue
@@ -22,7 +22,7 @@
                             <el-input
                                 v-model="unionQuery.cpmctymc"
                                 size="mini"
-                                placeholder="产品通用名"
+                                placeholder="物资名称"
                             ></el-input>
                         </el-form-item>
                         <el-form-item class="query-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>
diff --git a/src/views/thirdSys/order/thrOrder.vue b/src/views/thirdSys/order/thrOrder.vue
index fda6c2d..d8953a8 100644
--- a/src/views/thirdSys/order/thrOrder.vue
+++ b/src/views/thirdSys/order/thrOrder.vue
@@ -100,7 +100,7 @@
       <el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row>
         <el-table-column label="序号" type="index" width="120"></el-table-column>
         <el-table-column label="产品编码" prop="productId"></el-table-column>
-        <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="批次号" prop="batchNo"></el-table-column>
         <el-table-column label="生产日期" prop="productDate"></el-table-column>
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>