药物加入字段

src/views/hisStore/platformProduct/index.vue

@@ -481,6 +481,11 @@
                   <el-input v-model="form.prescribeSpec" :placeholder="isMedicalDeviceCategory ? '请输入规格/型号':'请输入包装规格'"/>
                 </el-form-item>
               </el-col>
+              <el-col :span="12">
+                <el-form-item label="规格" v-if="!isMedicalDeviceCategory" prop="specification">
+                  <el-input v-model="form.specification" placeholder="请输入规格"/>
+                </el-form-item>
+              </el-col>
             </el-row>
 
             <el-row>
@@ -1027,8 +1032,8 @@
 <!-- 免于经营备案的第二类医疗器械产品弹窗 -->
 <el-dialog title="免于经营备案的第二类医疗器械产品" :visible.sync="exemptDeviceDialogVisible" width="80%" append-to-body :modal-append-to-body="false" z-index="9999" top="5vh" custom-class="exempt-device-dialog">
   <el-form :model="exemptDeviceQueryParams" ref="exemptDeviceQueryForm" :inline="true" label-width="80px">
-    <el-form-item label="产品名称">
-      <el-input v-model="exemptDeviceQueryParams.productName" placeholder="请输入产品名称" clearable size="small" @keyup.enter.native="handleExemptDeviceQuery" />
+    <el-form-item label="商品名称">
+      <el-input v-model="exemptDeviceQueryParams.productName" placeholder="请输入商品名称" clearable size="small" @keyup.enter.native="handleExemptDeviceQuery" />
     </el-form-item>
     <el-form-item>
       <el-button type="primary" icon="el-icon-search" size="mini" @click="handleExemptDeviceQuery">搜索</el-button>
@@ -1038,7 +1043,7 @@
 
   <el-table v-loading="exemptDeviceLoading" :data="exemptDeviceList" border>
     <el-table-column label="产品序号" align="center" prop="serialNumber" />
-    <el-table-column label="产品名称" align="center" prop="productName" />
+    <el-table-column label="商品名称" align="center" prop="productName" />
     <el-table-column label="目录名称" align="center" prop="directoryName" />
     <el-table-column label="产品描述" align="center" prop="productDescription" />
     <el-table-column label="产品用途" align="center" prop="usageStr" />
@@ -1529,6 +1534,7 @@ export default {
         isLicensePermanent:null,
         isBusinessPermanent:null,
         medicalDeviceCode: null, // 器械编码
+        specification:null//药品规格
       },
       // 表单校验
       rules: {

src/views/hisStore/statistics/storeProduct.vue

@@ -87,8 +87,8 @@
             :row-class-name="tableRowClassName"
             :span-method="objectSpanMethod">
 
-            <!-- 产品名称列 -->
-            <el-table-column prop="name" label="产品名称" width="100" align="center" class-name="sticky-column">
+            <!-- 商品名称列 -->
+            <el-table-column prop="name" label="商品名称" width="100" align="center" class-name="sticky-column">
               <template slot-scope="scope">
                 <span :class="{'group-name': scope.row.isGroup}">{{ scope.row.name }}</span>
               </template>

src/views/hisStore/storeProduct/index.vue

@@ -612,6 +612,11 @@
                   <el-input v-model="form.prescribeSpec" :placeholder="isMedicalDeviceCategory ? '请输入规格/型号':'请输入包装规格'"/>
                 </el-form-item>
               </el-col>
+              <el-col :span="12">
+                <el-form-item label="规格" v-if="!isMedicalDeviceCategory" prop="specification">
+                  <el-input v-model="form.specification" placeholder="请输入规格"/>
+                </el-form-item>
+              </el-col>
             </el-row>
 
             <el-row>
@@ -1150,8 +1155,8 @@
 <!-- 免于经营备案的第二类医疗器械产品弹窗 -->
 <el-dialog title="免于经营备案的第二类医疗器械产品" :visible.sync="exemptDeviceDialogVisible" width="80%" append-to-body :modal-append-to-body="false" z-index="9999" top="5vh" custom-class="exempt-device-dialog">
   <el-form :model="exemptDeviceQueryParams" ref="exemptDeviceQueryForm" :inline="true" label-width="80px">
-    <el-form-item label="产品名称">
-      <el-input v-model="exemptDeviceQueryParams.productName" placeholder="请输入产品名称" clearable size="small" @keyup.enter.native="handleExemptDeviceQuery" />
+    <el-form-item label="商品名称">
+      <el-input v-model="exemptDeviceQueryParams.productName" placeholder="请输入商品名称" clearable size="small" @keyup.enter.native="handleExemptDeviceQuery" />
     </el-form-item>
     <el-form-item>
       <el-button type="primary" icon="el-icon-search" size="mini" @click="handleExemptDeviceQuery">搜索</el-button>
@@ -1161,7 +1166,7 @@
 
   <el-table v-loading="exemptDeviceLoading" :data="exemptDeviceList" border>
     <el-table-column label="产品序号" align="center" prop="serialNumber" />
-    <el-table-column label="产品名称" align="center" prop="productName" />
+    <el-table-column label="商品名称" align="center" prop="productName" />
     <el-table-column label="目录名称" align="center" prop="directoryName" />
     <el-table-column label="产品描述" align="center" prop="productDescription" />
     <el-table-column label="产品用途" align="center" prop="usageStr" />

src/views/hisStore/storeProductAudit/index.vue

@@ -288,6 +288,11 @@
                   <el-input v-model="form.prescribeSpec" placeholder="请输入包装规格/型号"/>
                 </el-form-item>
               </el-col>
+              <el-col :span="12">
+                <el-form-item label="规格" v-if="!isMedicalDeviceCategory" prop="specification">
+                  <el-input v-model="form.specification" placeholder="请输入规格"/>
+                </el-form-item>
+              </el-col>
             </el-row>
 
             <el-row>

src/views/saler/competitorInfo/index.vue

@@ -12,7 +12,7 @@
       <el-form-item label="产品" prop="product">
         <el-input
           v-model="queryParams.product"
-          placeholder="请输入产品名称"
+          placeholder="请输入商品名称"
           clearable
           @keyup.enter.native="handleQuery"
         />