diff --git a/src/pages/database/goods/goodstechnology/components/goodstechnologymaken.jsx b/src/pages/database/goods/goodstechnology/components/goodstechnologymaken.jsx
index dee6c1e..15545a2 100644
--- a/src/pages/database/goods/goodstechnology/components/goodstechnologymaken.jsx
+++ b/src/pages/database/goods/goodstechnology/components/goodstechnologymaken.jsx
@@ -175,14 +175,14 @@ const goodstechnologymaken = (props) => {
item.data.forEach(item => {
const obj = {};
let propsdatanew = [];
- let propsdata = Technologyacton.filter(x => x.technologyId == item.chnologyId)
+ let propsdata = Technologyacton?.filter(x => x.technologyId == item.chnologyId)
obj.stepName = item.stepName;
obj.id = item.id;
obj.chnologyId = item.chnologyId;
obj.sort = item.sort;
obj.actionJson = item.actionJson
obj.optiondata = JSON.parse(item.actionJson)
- propsdata.forEach(x => {
+ propsdata?.forEach(x => {
let sd = {
id: x.id,
actionName: x.actionName,
@@ -205,10 +205,11 @@ const goodstechnologymaken = (props) => {
}
const GetGoodsTechnologyvalue=(value,va,item)=>{
let godata=[]
+ console.log("va",va)
GetGoodsTechnology(value).then((r)=>{
if (r.data.length > 0) {
var Technologyacton=[];
- godata = r.data.map(x => {
+ godata = r.data?.map(x => {
if(x.technologyActionInfo.length>0){
x.technologyActionInfo.forEach(p=>{
@@ -217,8 +218,12 @@ const goodstechnologymaken = (props) => {
}
return { value: x.id, label: x.name }
})
+ console.log("godata",godata)
setTechnologyattralldata(Technologyacton)
setgoodstechnologydata(godata)
+ }else{
+ setTechnologyattralldata([])
+ setgoodstechnologydata([])
}
//setfromdata([])
if(va=="edit"){
@@ -431,6 +436,7 @@ const goodstechnologymaken = (props) => {
选择设备: