|
@@ -769,7 +769,7 @@
|
|
|
// 四级分类/物料分类
|
|
|
classifyId: '',
|
|
|
// 是否医药物料
|
|
|
- isMedicine: '2',
|
|
|
+ isMedicine: '0',
|
|
|
// DI
|
|
|
diCode: '',
|
|
|
// 物料名称
|
|
@@ -1047,7 +1047,7 @@
|
|
|
this.getInnerPackingUnitDetails(this.row.innerPackingUnit)
|
|
|
}
|
|
|
} else if (this.pageStu == 'add') {
|
|
|
- // alert('新增页面')
|
|
|
+ this.controlMedic('0');
|
|
|
console.log('页面状态', this.pageStu)
|
|
|
} else if (this.pageStu === 'copy') {
|
|
|
this.getDetails(this.row)
|
|
@@ -1374,7 +1374,10 @@
|
|
|
})
|
|
|
|
|
|
// Promise.all([form1, form2]).then(() => {
|
|
|
- if (this.basicForm.isMedicine == '0' && this.sysMaterialMedcineItemApply.length == 0) {
|
|
|
+ if (this.basicForm.isMedicine == '0'
|
|
|
+ && this.sysMaterialMedcineItemApply.length == 0
|
|
|
+ // && this.basicForm.oneClass !== "资产费用&7"
|
|
|
+ ) {
|
|
|
this.$modal.notifyWarning("医药物料需要维护物料类别!");
|
|
|
|
|
|
} else {
|
|
@@ -1419,7 +1422,10 @@
|
|
|
})
|
|
|
|
|
|
// Promise.all([form1, form2]).then(() => {
|
|
|
- if (this.basicForm.isMedicine == '0' && this.sysMaterialMedcineItemApply.length == 0) {
|
|
|
+ if (this.basicForm.isMedicine == '0'
|
|
|
+ && this.sysMaterialMedcineItemApply.length == 0
|
|
|
+ // && this.basicForm.oneClass !== "资产费用&7"
|
|
|
+ ) {
|
|
|
this.$modal.notifyWarning("医药物料需要维护物料类别!");
|
|
|
} else {
|
|
|
this.$modal.loading("保存中...");
|
|
@@ -1700,7 +1706,7 @@
|
|
|
console.log('内包装单位回显', res)
|
|
|
if (res.code === 200) {
|
|
|
this.innerPackingUnitOptions = res.data.tableBody
|
|
|
- console.log('1111', this.innerPackingUnitOptions)
|
|
|
+ // console.log('1111', this.innerPackingUnitOptions)
|
|
|
}
|
|
|
})
|
|
|
},
|