修改页面布局，新增一个字段

README.md

@@ -15,4 +15,6 @@
 #### 使用说明
 
 1. 打包项目：点开package.json文件
-2. 点击运行 build:prod-bjyjb": "vue-cli-service build --mode prod-bjyjb 这个
+2. 先删除node_modules文件夹下的.cache文件夹
+3. 点击运行 build:prod-bjyjb": "vue-cli-service build --mode prod-bjyjb 这个
+4. 或者不点击(但一定要删除文件)，下控制台运行 npm run build:prod-bjyjb --no-cache

src/views/store/platformProduct/index.vue

@@ -191,7 +191,12 @@
           </el-popover>
         </template>
       </el-table-column>
-      <el-table-column label="商品名称" show-overflow-tooltip align="center" prop="productName"/>
+
+      <el-table-column label="商品名称" show-overflow-tooltip align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.commonName && scope.row.commonName !== '-' ? scope.row.commonName : scope.row.productName }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="分类" align="center" prop="cateName"/>
       <el-table-column label="售价" align="center" prop="price">
         <template slot-scope="scope">
@@ -274,20 +279,13 @@
       </template>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="商品名称" prop="productName">
-              <el-input v-model="form.productName" @blur="handleProductNameBlur" placeholder="请输入商品名称"  @input="onProductNameInput" :disabled="isViewMode"/>
-            </el-form-item>
-          </el-col>
           <el-col :span="12">
             <el-form-item label="商品分类" prop="cateId">
               <treeselect v-model="form.cateId" :options="categoryOptions" :normalizer="normalizer"
                           placeholder="请选择上级分类" @input="onCategoryOrStoreChange" :disabled="isViewMode"/>
             </el-form-item>
           </el-col>
-        </el-row>
 
-        <el-row>
           <el-col :span="12">
             <el-form-item label="商品类型" prop="productType">
               <el-select style="width: 240px" v-model="form.productType" placeholder="请选择商品类型" clearable
@@ -298,14 +296,28 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
 
-          <!-- 存储条件 -->
-          <el-form-item label="存储条件" prop="storageConditions" v-if="!isMedicalDeviceCategory">
-            <el-input v-model="form.storageConditions" placeholder="请输入存储条件" style="width: calc(100% - 120px);"/>
-          </el-form-item>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="商品名称" prop="productName">
+              <el-input v-model="form.productName" @blur="handleProductNameBlur" placeholder="请输入商品名称"  @input="onProductNameInput" :disabled="isViewMode"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="通用名称" prop="commonName" v-if="!isMedicalDeviceCategory">
+              <el-input v-model="form.commonName" placeholder="请输入通用名称" :disabled="isViewMode"/>
+            </el-form-item>
+          </el-col>
         </el-row>
 
         <el-row>
+          <el-col :span="12">
+              <!-- 存储条件 -->
+              <el-form-item label="存储条件" prop="storageConditions" v-if="!isMedicalDeviceCategory">
+                <el-input v-model="form.storageConditions" placeholder="请输入存储条件" :disabled="isViewMode"/>
+              </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="器械编码" prop="medicalDeviceCode" v-if="showMedicalDeviceCode">
               <el-input v-model="form.medicalDeviceCode" placeholder="请输入器械编码" @blur="onCategoryOrStoreChange" style="width: calc(100% - 120px);" :disabled="isViewMode"/>
@@ -352,11 +364,6 @@
                   <el-input v-model="form.drugRegCertNo" :placeholder="isMedicalDeviceCategory ?'请输入注册证号/备案凭证号' : '请输入批准文号'" :disabled="isViewMode"/>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
-                <el-form-item label="通用名称" prop="commonName" v-if="!isMedicalDeviceCategory">
-                  <el-input v-model="form.commonName" placeholder="请输入通用名称" :disabled="isViewMode"/>
-                </el-form-item>
-              </el-col>
             </el-row>
 
             <el-row>

src/views/store/storeProduct/index.vue

@@ -327,7 +327,11 @@
           </el-popover>
         </template>
       </el-table-column>
-      <el-table-column label="商品名称" show-overflow-tooltip align="center" prop="productName"/>
+      <el-table-column label="商品名称" show-overflow-tooltip align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.commonName && scope.row.commonName !== '-' ? scope.row.commonName : scope.row.productName }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="分类" align="center" prop="cateName"/>
       <!-- <el-table-column label="所属公司" align="center" prop="companyName" /> -->
       <el-table-column label="所属店铺" align="center" prop="storeName" v-if="medicalMallConfig.isStores"/>
@@ -467,41 +471,56 @@
         </div>
       </template>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="商品分类" prop="cateId">
+              <treeselect v-model="form.cateId" :options="categoryOptions" :normalizer="normalizer"
+                          placeholder="请选择上级分类"/>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="商品类型" prop="productType">
+              <el-select style="width: 240px" v-model="form.productType" placeholder="请选择商品类型" clearable
+                       size="small">
+              <el-option v-for="item in productTypeOptions" :key="item.dictValue"
+                         :label="item.dictLabel" :value="item.dictValue"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
         <el-row>
           <el-col :span="12">
             <el-form-item label="商品名称" prop="productName">
               <el-input v-model="form.productName" placeholder="请输入商品名称"/>
             </el-form-item>
           </el-col>
+
           <el-col :span="12">
-            <el-form-item label="商品分类" prop="cateId">
-              <treeselect v-model="form.cateId" :options="categoryOptions" :normalizer="normalizer"
-                          placeholder="请选择上级分类"/>
+            <el-form-item label="通用名称" prop="commonName" v-if="!isMedicalDeviceCategory">
+              <el-input v-model="form.commonName" placeholder="请输入通用名称"/>
             </el-form-item>
           </el-col>
+
         </el-row>
 
         <el-row>
-          <el-form-item label="商品类型" prop="productType">
-            <el-select style="width: 240px" v-model="form.productType" placeholder="请选择商品类型" clearable
-                       size="small">
-              <el-option v-for="item in productTypeOptions" :key="item.dictValue"
-                :label="item.dictLabel" :value="item.dictValue"/>
-            </el-select>
-          </el-form-item>
-
           <!-- 存储条件 -->
-          <el-form-item label="存储条件" prop="storageConditions" v-if="!isMedicalDeviceCategory">
-            <el-input v-model="form.storageConditions" placeholder="请输入存储条件" style="width: calc(100% - 120px);"/>
-          </el-form-item>
+          <el-col :span="12">
+            <el-form-item label="存储条件" prop="storageConditions" v-if="!isMedicalDeviceCategory">
+              <el-input v-model="form.storageConditions" placeholder="请输入存储条件" style="width: calc(100% - 120px);"/>
+            </el-form-item>
+            </el-col>
+          <!-- 器械编码和显示器免按钮 -->
+          <el-col :span="12">
+            <el-form-item label="器械编码" prop="medicalDeviceCode" v-if="showMedicalDeviceCode">
+              <el-input v-model="form.medicalDeviceCode" @blur="handleMedicalDeviceCodeBlur" placeholder="请输入器械编码" style="width: calc(100% - 120px);"/>
+              <el-button type="primary" @click="showExemptDeviceDialog" style="margin-left: 10px;" v-if="showExemptDeviceButton">显示器免</el-button>
+            </el-form-item>
+          </el-col>
         </el-row>
 
-        <!-- 器械编码和显示器免按钮 -->
-        <el-form-item label="器械编码" prop="medicalDeviceCode" v-if="showMedicalDeviceCode">
-          <el-input v-model="form.medicalDeviceCode" @blur="handleMedicalDeviceCodeBlur" placeholder="请输入器械编码" style="width: calc(100% - 120px);"/>
-          <el-button type="primary" @click="showExemptDeviceDialog" style="margin-left: 10px;" v-if="showExemptDeviceButton">显示器免</el-button>
-        </el-form-item>
-
         <el-row>
           <el-col :span="12">
             <el-form-item label="关键字" prop="keyword">
@@ -513,8 +532,8 @@
               <el-input v-model="form.unitName" placeholder="请输入单位名"/>
             </el-form-item>
           </el-col>
-
         </el-row>
+
         <el-row :gutter="10">
           <el-col :span="12">
             <!-- 当分类包含"器械"时隐藏是否药品选项 -->
@@ -541,11 +560,6 @@
                   <el-input v-model="form.drugRegCertNo" placeholder="请输入药品注册证书编号"/>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
-                <el-form-item label="通用名称" prop="commonName" v-if="!isMedicalDeviceCategory">
-                  <el-input v-model="form.commonName" placeholder="请输入通用名称"/>
-                </el-form-item>
-              </el-col>
             </el-row>
 
             <el-row>
@@ -1725,6 +1739,9 @@ export default {
         // storeId :[
         //   { required: true, message: "所属店铺不能为空", trigger: "blur"}
         // ],
+        productType: [
+          { required: true, message: "商品类型不能为空", trigger: "blur" }
+        ],
       },
     };
   },