|
@@ -804,9 +804,16 @@ const getMenusData = async () => {
|
|
menus.value = arr
|
|
menus.value = arr
|
|
if (arr.length > 0) {
|
|
if (arr.length > 0) {
|
|
const item = arr[0]
|
|
const item = arr[0]
|
|
- console.log(item,'item');
|
|
|
|
menuItem.value = item
|
|
menuItem.value = item
|
|
menuKey.value = item?.id
|
|
menuKey.value = item?.id
|
|
|
|
+ if(item?.fieldList&&item?.fieldList.length>0){
|
|
|
|
+ item?.fieldList.forEach((item1)=>{
|
|
|
|
+ vesselTableColumn.value.push(({
|
|
|
|
+ key:item1?.fieldKey,
|
|
|
|
+ name:item1?.fieldName
|
|
|
|
+ }))
|
|
|
|
+ })
|
|
|
|
+ }
|
|
getVesselTableData()
|
|
getVesselTableData()
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -822,7 +829,7 @@ const menuChange = (item) => {
|
|
|
|
|
|
//表格数据
|
|
//表格数据
|
|
const vesselTableColumn = ref([
|
|
const vesselTableColumn = ref([
|
|
- {key:'key_1', name: '容器编号'},
|
|
|
|
|
|
+ // {key:'key_1', name: '容器编号'},
|
|
])
|
|
])
|
|
const vesselTableData = ref([])
|
|
const vesselTableData = ref([])
|
|
const vesselTablePage = ref({current: 1, size: 20, total: 0})
|
|
const vesselTablePage = ref({current: 1, size: 20, total: 0})
|
|
@@ -870,7 +877,7 @@ const vesselModalSave = () => {
|
|
const form = formData.value[item.index]
|
|
const form = formData.value[item.index]
|
|
const val =[]
|
|
const val =[]
|
|
vesselTableKeys.value.forEach((item)=>{
|
|
vesselTableKeys.value.forEach((item)=>{
|
|
- val.push(item.key_1)
|
|
|
|
|
|
+ val.push(item.key_2)
|
|
})
|
|
})
|
|
const newval=val.join('、')
|
|
const newval=val.join('、')
|
|
formData.value[item.index][item.KeyName] = setPosInsert(item.startPos, item.endPos, form[item.KeyName], newval)
|
|
formData.value[item.index][item.KeyName] = setPosInsert(item.startPos, item.endPos, form[item.KeyName], newval)
|