diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 431c5a420..5e4d26b1e 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -254,7 +254,7 @@ const open = async (type: string, row?: any, masterParmas?: any) => { } } } - if (row.id || row.masterId) { + if (row?.id || row?.masterId) { formLoading.value = true try { nextTick(() => { diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue index c3b0f3a7a..9066457e4 100644 --- a/src/components/Detail/src/Detail.vue +++ b/src/components/Detail/src/Detail.vue @@ -23,6 +23,7 @@ @button-base-click="buttonBaseClick" :routeName="routeName" @searchFormClick="searchFormClick" + :allSchemas="detailAllSchemas" /> { // 初始化当前全选状态 const initSelectSta = () => { RedisApi.getRedis(routeName.value).then(res => { - const _myTableColumns = props.allSchemas.tableColumns + const _myTableColumns = props.allSchemas?.tableColumns // 有缓存 if (res) { checkedDataList.value = [] @@ -140,7 +140,7 @@ const initSelectSta = () => { } }) // 字段设置 显示全部字段 - _myTableColumns.forEach((myTableItem, index) => { + _myTableColumns?.forEach((myTableItem, index) => { // 列表字段第一个不能参与排序及显隐操作(详情弹窗必备) // 列表字段操作列不能参与排序及显隐操作 if (index != 0) { @@ -157,7 +157,7 @@ const initSelectSta = () => { } else { // 无缓存 checkedDataList.value = [] allData.value = [] - _myTableColumns.forEach((item, index) => { + _myTableColumns?.forEach((item, index) => { // 列表字段第一个不能参与排序及显隐操作(详情弹窗必备) // 列表字段操作列不能参与排序及显隐操作 if (index != 0) { diff --git a/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue b/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue index b0dbe8f3c..e3fcf3ed4 100644 --- a/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue +++ b/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue @@ -67,8 +67,8 @@ import * as ProductionLineCodeApi from '@/api/wms/productionline' import BasicForm from '@/components/BasicForm/src/BasicForm.vue' // import { Itembasic, Productionline, Location } from '@/utils/disposition/tableColumns' import { Itembasic } from './../itembasic/itembasic.data' -import { Productionline } from './../productionline/productionline.data' -import { Location } from './../location/location.data' +import { Productionline } from './../../factoryModeling/productionline/productionline.data' +import { Location } from './../../factoryModeling/location/location.data' import { Productionlineitem, ProductionlineitemRules } from './productionlineitem.data' import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' diff --git a/src/views/wms/purchaseclaimRequestMain/index.vue b/src/views/wms/purchaseclaimRequestMain/index.vue index 0165dd06e..8860777b7 100644 --- a/src/views/wms/purchaseclaimRequestMain/index.vue +++ b/src/views/wms/purchaseclaimRequestMain/index.vue @@ -13,6 +13,7 @@ :routeName="routeName" @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick" + :allSchemas="PurchaseclaimRequestMain.allSchemas" />