From f1a2453ccee5dfcc78f12c853763b0c1a69d1ed6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Tue, 31 Oct 2023 16:22:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B9=B1=E4=B8=83=E5=85=AB?=
 =?UTF-8?q?=E7=B3=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue                  | 2 +-
 src/components/Detail/src/Detail.vue                        | 3 ++-
 src/components/rowDrop/index.vue                            | 6 +++---
 .../basicDataManage/itemManage/productionlineitem/index.vue | 4 ++--
 src/views/wms/purchaseclaimRequestMain/index.vue            | 1 +
 5 files changed, 9 insertions(+), 7 deletions(-)

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"
         />
         <Descriptions v-if="isBasic" :data="detailData" :schema="allSchemas.detailSchema" :columns="2" />
         <Table 
@@ -284,7 +285,7 @@ const { tableObject, tableMethods } = useTable({
 const { getList } = tableMethods
 // 列表头部按钮
 const HeadButttondata = ref([
-  defaultButtons.defaultAddBtn({ hide: masterParmas.value.status=='REQUEST_NEW'?false:true}), // 新增
+  defaultButtons.defaultAddBtn(null), // 新增
   defaultButtons.defaultFilterBtn(null), // 筛选
 ])
 // 头部按钮事件 
diff --git a/src/components/rowDrop/index.vue b/src/components/rowDrop/index.vue
index 2b026ed7e..e75fb9dbd 100644
--- a/src/components/rowDrop/index.vue
+++ b/src/components/rowDrop/index.vue
@@ -119,7 +119,7 @@ const dragover = (e) => {
 // 初始化当前全选状态
 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" 
   />
 
   <!-- 列表 -->