新增药品

src/views/goods/common/rules.js

@@ -28,20 +28,24 @@ const rules1 = {
     { validator: checkBarcode, trigger: "submit" },
   ],
   medicCommonName: [
-    { required: true, message: "请输入商品通用名称", trigger: "blur" },
+    { required: true, message: "请输入通用名称", trigger: "blur" },
   ],
   medicGoodsName: [
-    { required: true, message: "请输入商品名称", trigger: "blur" },
+    {
+      required: true,
+      message: "请输入商品名称或品牌名/商品名",
+      trigger: "blur",
+    },
   ],
-  size: [{ required: true, message: "请输入商品规格", trigger: "blur" }],
+  size: [{ required: true, message: "请输入规格", trigger: "blur" }],
   manufacturer: [
-    { required: true, message: "请输入生产厂家", trigger: "blur" },
+    { required: true, message: "请输入生产企业", trigger: "blur" },
   ],
   medicalCategoryId: [
     { required: true, message: "请选择药品分类", trigger: "change" },
   ],
-  approvalNumber:[
-    { required: true, message: "请输入批准文号", trigger: "blur" }
+  approvalNumber: [
+    { required: true, message: "请输入批准文号", trigger: "blur" },
   ],
   // dosageId:[
   //   { required: true, message: "请选择剂型", trigger: "change" }

src/views/goods/create-good-new.vue

@@ -447,12 +447,13 @@
                 </el-option>
               </el-select>
             </el-form-item>
-        <el-form-item  :label="commonName"  prop="medicCommonName" class="medic-goods-max">
+          <div v-if="formData1.medicalCategoryId">
+        <el-form-item  label="通用名称"  prop="medicCommonName" class="medic-goods-max">
           <el-col :span="16">
             <el-input
                 size="small"
                 v-model="formData1.medicCommonName"
-                placeholder="请输入名称"
+                placeholder="请输入通用名称"
                 style="width:70%;"
                 maxlength="60"
                 show-word-limit
@@ -471,12 +472,12 @@
               <span class="word-num">(点击可快速录入下面的基本信息)</span>
             </el-col>
         </el-form-item>
-        <el-form-item label="品牌名/商品名" prop="medicGoodsName" class="medic-goods-max">
+        <el-form-item :label="commonName" prop="medicGoodsName" class="medic-goods-max">
           <el-col :span="16">
             <el-input
                 size="small"
                 v-model="formData1.medicGoodsName"
-                placeholder="请输入品牌名/商品名"
+                :placeholder="commonPlaceholder"
                 maxlength="60"
                 show-word-limit
             ></el-input>
@@ -521,6 +522,7 @@
             <span class="word-num"></span>
           </el-col>
         </el-form-item>
+        </div>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="isNewMeddialog = false">取 消</el-button>
@@ -666,8 +668,12 @@
     },
     computed: {
       commonName() {
-        return [4,5].includes(this.formData1.medicalCategoryId) ? '产品名称' : '通用名称';
+        return [4,5].includes(this.formData1.medicalCategoryId) ? '品牌名/商品名' : '商品名称';
+      },
+      commonPlaceholder() {
+        return [4,5].includes(this.formData1.medicalCategoryId) ? '请输入品牌名/商品名' : '请输入商品名称';
       }
+
     },
     created() {
       vm = this;
@@ -745,6 +751,10 @@
         if ([4,5].includes(val)) {
           this.isAddServe = true;
         }
+        const formData1Arr = ['medicCommonName','barCode','medicGoodsName','approvalNumber','size','manufacturer'];
+        formData1Arr.map(item => {
+          this.formData1[item] = '';
+        })
       },
       // 获取药品分类
       getCategorysList() {