diff --git a/src/views/pharmaceuticals/purApplyDrug/pureApplySearchDetails.vue b/src/views/pharmaceuticals/purApplyDrug/pureApplySearchDetails.vue
index 06780ac7..6a1954e4 100644
--- a/src/views/pharmaceuticals/purApplyDrug/pureApplySearchDetails.vue
+++ b/src/views/pharmaceuticals/purApplyDrug/pureApplySearchDetails.vue
@@ -159,13 +159,13 @@
         <el-table-column label="申购单号" prop="billNo"></el-table-column>
         <el-table-column label="药品编码" prop="nameCode"></el-table-column>
         <el-table-column label="药品名称" prop="productName"></el-table-column>
-        <el-table-column label="规格型号" prop="spec"></el-table-column>
+        <el-table-column label="包装规格" prop="spec"></el-table-column>
         <el-table-column label="申购数量" prop="count"></el-table-column>
         <el-table-column label="计量单位" prop="measname"></el-table-column>
         <el-table-column label="供应商" prop="supName"></el-table-column>
         <el-table-column label="生产企业" prop="manufactory"></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>
 
       <pagination
diff --git a/src/views/pharmaceuticals/purOderDrug/purOrderAuditDrug.vue b/src/views/pharmaceuticals/purOderDrug/purOrderAuditDrug.vue
index efd64926..83fbd527 100644
--- a/src/views/pharmaceuticals/purOderDrug/purOrderAuditDrug.vue
+++ b/src/views/pharmaceuticals/purOderDrug/purOrderAuditDrug.vue
@@ -282,7 +282,8 @@
         <el-table-column label="序号" type="index" width="60"></el-table-column>
         <el-table-column label="药品标识" prop="nameCode"></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="bzgg" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="制剂规格" prop="prepnSpec" show-overflow-tooltip></el-table-column>
         <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column>
         <el-table-column label="价格" prop="price" show-overflow-tooltip="true" width="100"></el-table-column>
         <el-table-column label="申购数量" prop="count"></el-table-column>
diff --git a/src/views/pharmaceuticals/purOderDrug/purOrderDetailDialog.vue b/src/views/pharmaceuticals/purOderDrug/purOrderDetailDialog.vue
index 78561ca8..ca5c3d96 100644
--- a/src/views/pharmaceuticals/purOderDrug/purOrderDetailDialog.vue
+++ b/src/views/pharmaceuticals/purOderDrug/purOrderDetailDialog.vue
@@ -153,7 +153,8 @@
           <el-table-column label="序号" type="index" width="60"></el-table-column>
           <el-table-column label="药品标识" prop="nameCode"></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="bzgg" show-overflow-tooltip="true"></el-table-column>
+          <el-table-column label="制剂规格" prop="prepnSpec" show-overflow-tooltip></el-table-column>
           <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column>
           <el-table-column label="价格" prop="price" show-overflow-tooltip="true" width="100"></el-table-column>
           <el-table-column width="150" label="采购数量">
diff --git a/src/views/pharmaceuticals/purOderDrug/purOrderEditDialog.vue b/src/views/pharmaceuticals/purOderDrug/purOrderEditDialog.vue
index 4c487ad1..672916a4 100644
--- a/src/views/pharmaceuticals/purOderDrug/purOrderEditDialog.vue
+++ b/src/views/pharmaceuticals/purOderDrug/purOrderEditDialog.vue
@@ -146,7 +146,8 @@
           <el-table-column label="序号" type="index" width="60"></el-table-column>
           <el-table-column label="药品标识" prop="nameCode"></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="bzgg" show-overflow-tooltip="true"></el-table-column>
+          <el-table-column label="制剂规格" prop="prepnSpec" show-overflow-tooltip></el-table-column>
           <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column>
           <el-table-column label="价格" prop="price" show-overflow-tooltip="true" width="100"></el-table-column>
           <el-table-column width="150" label="采购数量">
diff --git a/src/views/pharmaceuticals/purOderDrug/purOrderSelectProduct.vue b/src/views/pharmaceuticals/purOderDrug/purOrderSelectProduct.vue
index 4f543ba6..bf510ba8 100644
--- a/src/views/pharmaceuticals/purOderDrug/purOrderSelectProduct.vue
+++ b/src/views/pharmaceuticals/purOderDrug/purOrderSelectProduct.vue
@@ -20,7 +20,7 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="药品编码:" class="query-form-item">
-              <el-input v-model="listQuery.unionCode" style="width: 90%" placeholder="请输入DI/医保编码/商品条码"
+              <el-input v-model="listQuery.unionCode" style="width: 90%" placeholder="药品编码/医保编码"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
@@ -31,7 +31,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="规格型号:" class="query-form-item">
+            <el-form-item label="包装规格:" class="query-form-item">
               <el-input v-model="listQuery.ggxh" style="width: 90%" placeholder="请输入规格型号" clearable="true"></el-input>
             </el-form-item>
           </el-col>
@@ -76,7 +76,8 @@
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="药品标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>
         <el-table-column label="药品通用名称" prop="cpmctymc" show-overflow-tooltip width="140"></el-table-column>
-        <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip width="140"></el-table-column>
+        <el-table-column label="包装规格" prop="bzgg" show-overflow-tooltip width="140"></el-table-column>
+        <el-table-column label="制剂规格" prop="prepnSpec" show-overflow-tooltip></el-table-column>
         <el-table-column label="计量单位" prop="measname" show-overflow-tooltip width="100"></el-table-column>
         <el-table-column label="价格" prop="price" width="100"></el-table-column>
         <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip width="160"></el-table-column>
@@ -255,7 +256,8 @@ export default {
         ylqxzcrbarmc: null,
         thrPiId: null,
         page: 1,
-        limit: 10
+        limit: 10,
+        productsType: 2
       }
       this.multipleSelection = [];
       this.radioCheck = null;
diff --git a/src/views/pharmaceuticals/purPlanDrug/purOrderSelectProduct.vue b/src/views/pharmaceuticals/purPlanDrug/purOrderSelectProduct.vue
index c65b8301..0e5c9af9 100644
--- a/src/views/pharmaceuticals/purPlanDrug/purOrderSelectProduct.vue
+++ b/src/views/pharmaceuticals/purPlanDrug/purOrderSelectProduct.vue
@@ -20,7 +20,7 @@
         <el-row>
           <el-col :span="6">
             <el-form-item label="药品编码:" class="query-form-item">
-              <el-input v-model="listQuery.unionCode" style="width: 90%" placeholder="请输入DI/医保编码/商品条码"
+              <el-input v-model="listQuery.unionCode" style="width: 90%" placeholder="药品编码/医保编码"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
@@ -31,13 +31,13 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="规格型号:" class="query-form-item">
-              <el-input v-model="listQuery.ggxh" style="width: 90%" placeholder="请输入规格型号" clearable="true"></el-input>
+            <el-form-item label="包装规格:" class="query-form-item">
+              <el-input v-model="listQuery.ggxh" style="width: 90%" placeholder="请输入包装规格" clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="生产企业:" class="query-form-item">
-              <el-input v-model="listQuery.ylqxzcrbarmc" style="width: 90%" placeholder="请输入生产企业/注册备案人"
+              <el-input v-model="listQuery.ylqxzcrbarmc" style="width: 90%" placeholder="请输入生产企业"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
@@ -66,7 +66,7 @@
         <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="ggxh" show-overflow-tooltip></el-table-column>
+        <el-table-column label="包装规格" prop="bzgg" 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>-->
         <el-table-column label="配送企业" prop="companyName" show-overflow-tooltip></el-table-column>
@@ -232,7 +232,8 @@ export default {
         ylqxzcrbarmc: null,
         thrPiId: null,
         page: 1,
-        limit: 10
+        limit: 10,
+        productsType: 2,
       }
       this.multipleSelection = [];
       this.radioCheck = null;
diff --git a/src/views/pharmaceuticals/purPlanDrug/purPlanDetailDialog.vue b/src/views/pharmaceuticals/purPlanDrug/purPlanDetailDialog.vue
index cb7d50fe..2d9ffaf8 100644
--- a/src/views/pharmaceuticals/purPlanDrug/purPlanDetailDialog.vue
+++ b/src/views/pharmaceuticals/purPlanDrug/purPlanDetailDialog.vue
@@ -150,7 +150,8 @@
                   <el-table-column label="序号" type="index" width="60"></el-table-column>
                   <el-table-column label="药品标识" prop="nameCode"></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="bzgg" show-overflow-tooltip="true"></el-table-column>
+                  <el-table-column label="制剂规格" prop="prepnSpec" show-overflow-tooltip></el-table-column>
                   <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column>
                   <el-table-column label="采购数量" prop="count"></el-table-column>
                   <el-table-column label="批准文号" prop="zczbhhzbapzbh"></el-table-column>
diff --git a/src/views/pharmaceuticals/purPlanDrug/purPlanEditDialog.vue b/src/views/pharmaceuticals/purPlanDrug/purPlanEditDialog.vue
index e3f73391..233ed0a0 100644
--- a/src/views/pharmaceuticals/purPlanDrug/purPlanEditDialog.vue
+++ b/src/views/pharmaceuticals/purPlanDrug/purPlanEditDialog.vue
@@ -100,7 +100,7 @@
 <!--                :loading="loading"-->
 <!--              >术式套包录入-->
 <!--              </el-button>-->
-              <el-button type="primary" @click.native.stop="selectProductFunction()" :loading="loading">产品录入</el-button>
+              <el-button type="primary" @click.native.stop="selectProductFunction()" :loading="loading">药品录入</el-button>
 <!--              <el-button type="primary" :loading="loading" @click.native.stop="selectApply()">选入申购单</el-button>-->
             </el-button-group>
           </el-button-group>
@@ -109,8 +109,9 @@
                   highlight-current-row max-height="300" height="300" ref="multipleTable">
           <el-table-column label="序号" type="index" width="60"></el-table-column>
           <el-table-column label="药品标识" prop="nameCode"></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="productName" show-overflow-tooltip="true" width="100"></el-table-column>
+          <el-table-column label="包装规格" prop="bzgg" show-overflow-tooltip="true"></el-table-column>
+          <el-table-column label="制剂规格" prop="prepnSpec" show-overflow-tooltip></el-table-column>
           <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column>
           <el-table-column width="150" label="采购数量">
             <template slot-scope="scope">