11/7 供应商新增药品信息1.0

src/views/supplier/drugProducts/supProductsAdd.vue

@@ -32,23 +32,63 @@
           <!--            </el-form-item>-->
           <!--          </el-col>-->
           <el-col :span="12" class="el-col">
-            <el-form-item label="产品名称:" prop="name">
+            <el-form-item label="药品名称:" prop="name">
               <el-input style="width: 90%" size="small" placeholder="请输入内容"
                         v-model.trim="newProductData.name"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12" class="el-col">
-            <el-form-item label="规格:" prop="spec">
+            <el-form-item label="包装规格:" prop="bzgg">
               <el-input style="width: 90%" size="small" placeholder="请输入内容"
-                        v-model.trim="newProductData.spec"></el-input>
+                        v-model.trim="newProductData.bzgg"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="制剂规格:" prop="prepnSpec">
+              <el-input style="width: 90%" size="small" placeholder="请输入内容"
+                        v-model.trim="newProductData.prepnSpec"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="剂型:" prop="prepnUnit">
+              <el-input style="width: 90%" size="small" placeholder="请输入内容"
+                        v-model.trim="newProductData.prepnUnit"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="包装材质:" prop="packMatrial">
+              <el-input style="width: 90%" size="small" placeholder="请输入包装材质"
+                        v-model.trim="newProductData.packMatrial"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="12" class="el-col">
             <el-form-item label="计量单位:" prop="measname">
               <el-input style="width: 90%" size="small" placeholder="请输入内容"
                         v-model.trim="newProductData.measname"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="药品类型:" prop="physicType">
+              <el-select v-model="newProductData.physicType" style="width: 90%" placeholder="选择药品类型">
+                <el-option label="普通药品" :value="3"></el-option>
+                <el-option label="特殊药品原料药" :value="1"></el-option>
+                <el-option label="特殊药品制剂" :value="2"></el-option>
+                <el-option label="未分类" :value="9"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="药品类型:" prop="majorType">
+              <el-select v-model="newProductData.majorType" style="width: 90%" placeholder="选择药品分类">
+                <el-option label="中药" :value="1"></el-option>
+                <el-option label="化学药" :value="2"></el-option>
+                <el-option label="生物制品" :value="3"></el-option>
+
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="12" class="el-col">
             <el-form-item label="生产企业:" prop="manufactory">
               <el-input style="width: 90%" size="small" placeholder="请输入内容"
@@ -98,7 +138,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12" class="el-col">
-            <el-form-item label="产品价格:" prop="price">
+            <el-form-item label="药品价格:" prop="price">
               <el-input style="width: 90%" size="small" placeholder="请输入内容"
                         v-model.trim="newProductData.price"></el-input>
             </el-form-item>
@@ -163,7 +203,9 @@ export default {
         code: null,
         registerNo: null,
         manufactory: null,
-        spec: null,
+        bzgg: null,
+        prepnUnit:null,
+        prepnSpec: null,
         measname: null,
         ylqxzcrbarmc: null,
         ylqxzcrbarywmc: null,
@@ -182,7 +224,8 @@ export default {
         basicPrductRemak8: null,
         basicPrductRemak7: null,
         price: null,
-
+        packMatrial: '',
+        majorType: 1
 
       },
       thirdSys: [],
@@ -200,10 +243,31 @@ export default {
       },
       rules: {
         name: [{required: true, message: "请输入产品名称", trigger: 'blur'}],
-        spec: [
+        bzgg: [
           {
             required: true,
-            message: "请输入规格型号",
+            message: "请输入包装规格",
+            trigger: "blur"
+          }
+        ],
+        prepnSpec: [
+          {
+            required: true,
+            message: "请输入制剂规格",
+            trigger: "blur"
+          }
+        ],
+        prepnUnit: [
+          {
+            required: true,
+            message: "请输入剂型",
+            trigger: "blur"
+          }
+        ],
+        packMatrial: [
+          {
+            required: true,
+            message: "请输入包装材质",
             trigger: "blur"
           }
         ],
@@ -294,12 +358,12 @@ export default {
       //   return;
       // }
       if (this.$isBlank(this.newProductData.name)) {
-        this.$message.warning("产品名称不能为空！");
+        this.$message.warning("药品名称不能为空！");
         return;
       }
 
-      if (this.$isBlank(this.newProductData.spec)) {
+      if (this.$isBlank(this.newProductData.bzgg)) {
-        this.$message.warning("规格型号不能为空");
+        this.$message.warning("包装规格不能为空");
         return;
       }
       if (this.$isBlank(this.newProductData.measname)) {
@@ -310,6 +374,18 @@ export default {
         this.$message.warning("生产企业不能为空！");
         return;
       }
+      if (this.$isBlank(this.newProductData.packMatrial)) {
+        this.$message.warning("包装材质不能为空！");
+        return;
+      }
+      if (this.$isBlank(this.newProductData.packMatrial)) {
+        this.$message.warning("剂型不能为空！");
+        return;
+      }
+      if (this.$isBlank(this.newProductData.prepnSpec)) {
+        this.$message.warning("制剂规格不能为空！");
+        return;
+      }
       // if (this.$isBlank(this.newProductData.registerNo)) {
       //   this.$message.warning("注册证号不能为空！");
       //   return;

src/views/supplier/drugProducts/supProductsAddDi.vue

@@ -571,6 +571,11 @@ export default {
       let query = {
         id: row.id,
       };
+      _this.$confirm('此操作将永久删除该取药品信息, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
         delThrDiProducts(query).then((res) => {
           if (res.code === 20000) {
             _this.$message.success("删除成功");
@@ -579,6 +584,10 @@ export default {
             _this.$message.error("删除失败");
           }
         });
+      }).catch(() => {
+
+      })
+
     },
     closeDialog() {
       this.selectErpDialogVisible = false;