|
|
@@ -344,7 +344,13 @@
|
|
|
</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"/>
|
|
|
@@ -506,8 +512,8 @@
|
|
|
</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 label="通用名称-" prop="commonName" v-if="!isMedicalDeviceCategory">
|
|
|
+ <el-input v-model="form.commonName" placeholder="请输入通用名称(没有请填写-)"/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
