diff --git a/src/views/supplier/drugProducts/supProductsAdd.vue b/src/views/supplier/drugProducts/supProductsAdd.vue
index 49d872d..45dec04 100644
--- a/src/views/supplier/drugProducts/supProductsAdd.vue
+++ b/src/views/supplier/drugProducts/supProductsAdd.vue
@@ -32,23 +32,63 @@
-
+
-
+
+ v-model.trim="newProductData.bzgg">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -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)) {
- this.$message.warning("规格型号不能为空");
+ if (this.$isBlank(this.newProductData.bzgg)) {
+ 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;
diff --git a/src/views/supplier/drugProducts/supProductsAddDi.vue b/src/views/supplier/drugProducts/supProductsAddDi.vue
index e9abd99..01d3530 100644
--- a/src/views/supplier/drugProducts/supProductsAddDi.vue
+++ b/src/views/supplier/drugProducts/supProductsAddDi.vue
@@ -571,14 +571,23 @@ export default {
let query = {
id: row.id,
};
- delThrDiProducts(query).then((res) => {
- if (res.code === 20000) {
- _this.$message.success("删除成功");
- _this.getList();
- } else {
- _this.$message.error("删除失败");
- }
- });
+ _this.$confirm('此操作将永久删除该取药品信息, 是否继续?', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ delThrDiProducts(query).then((res) => {
+ if (res.code === 20000) {
+ _this.$message.success("删除成功");
+ _this.getList();
+ } else {
+ _this.$message.error("删除失败");
+ }
+ });
+ }).catch(() => {
+
+ })
+
},
closeDialog() {
this.selectErpDialogVisible = false;