|
@@ -24,7 +24,7 @@ export default [
|
|
|
attr: {
|
|
|
type:'ComputedInput',
|
|
|
formatter: (prop) => {
|
|
|
- return prop.materialMedcine.registrationNo;
|
|
|
+ return prop.materialMedcine != null ? prop.materialMedcine.registrationNo : null;
|
|
|
},
|
|
|
},
|
|
|
},
|
|
@@ -42,7 +42,7 @@ export default [
|
|
|
attr: {
|
|
|
type:'ComputedInput',
|
|
|
formatter: (prop) => {
|
|
|
- return prop.materialMedcine.isDrug == "0" ? "Y" : "N";
|
|
|
+ return prop.isDrug == "0" ? "Y" : "N";
|
|
|
},
|
|
|
},
|
|
|
},
|
|
@@ -51,7 +51,7 @@ export default [
|
|
|
attr: {
|
|
|
type:'ComputedInput',
|
|
|
formatter: (prop) => {
|
|
|
- return prop.materialMedcine.isDrug;
|
|
|
+ return prop.materialMedcine != null ? prop.materialMedcine.isDrug : null;
|
|
|
},
|
|
|
},
|
|
|
},
|
|
@@ -72,7 +72,7 @@ export default [
|
|
|
attr: {
|
|
|
type:'ComputedInput',
|
|
|
formatter: (prop) => {
|
|
|
- return prop.materialMedcine.dosageFrom;
|
|
|
+ return prop.materialMedcine != null ? prop.materialMedcine.dosageFrom : null;
|
|
|
},
|
|
|
},
|
|
|
},
|
|
@@ -81,7 +81,7 @@ export default [
|
|
|
attr: {
|
|
|
type:'ComputedInput',
|
|
|
formatter: (prop) => {
|
|
|
- return prop.materialMedcine.dosageFromName;
|
|
|
+ return prop.materialMedcine != null ? prop.materialMedcine.dosageFromName : null;
|
|
|
},
|
|
|
},
|
|
|
},
|
|
@@ -90,7 +90,7 @@ export default [
|
|
|
attr: {
|
|
|
type:'ComputedInput',
|
|
|
formatter: (prop) => {
|
|
|
- return prop.materialMedcine.curingType;
|
|
|
+ return prop.materialMedcine != null ? prop.materialMedcine.curingType : null;
|
|
|
},
|
|
|
},
|
|
|
},
|
|
@@ -99,7 +99,7 @@ export default [
|
|
|
attr: {
|
|
|
type:'ComputedInput',
|
|
|
formatter: (prop) => {
|
|
|
- return prop.materialMedcine.medicalInstruments;
|
|
|
+ return prop.materialMedcine != null ? prop.materialMedcine.medicalInstruments : null;
|
|
|
},
|
|
|
},
|
|
|
},
|
|
@@ -108,7 +108,7 @@ export default [
|
|
|
attr: {
|
|
|
type:'ComputedInput',
|
|
|
formatter: (prop) => {
|
|
|
- return prop.materialMedcine.ratifyBatchNo;
|
|
|
+ return prop.materialMedcine != null ? prop.materialMedcine.ratifyBatchNo : null;
|
|
|
},
|
|
|
},
|
|
|
},
|