采购收货显示包装好问题

src/components/BasicForm/src/BasicForm.vue

@@ -393,7 +393,13 @@ const props = defineProps({
   fixedScrollHieght:{
     type:Boolean,
     default:false
-  }
+  },
+  // 默认不显示包装号，采购收货记录显示包装号
+  isShowPackNumber:{
+    type: Boolean,
+    required: false,
+    default: false
+  },
 })
 
 const { t } = useI18n() // 国际化
@@ -444,7 +450,7 @@ const tabSheet = ref('TableForm')
 
 routeName.value = route.name
 const formHeight = ref({})
-if (!wsCache.get('ShowPackingNumber')) {
+if (!wsCache.get('ShowPackingNumber') && !props.isShowPackNumber) {
   if (formSchema.value) {
       formSchema.value = formSchema.value.filter(item => item.field != 'packingNumber' &&  item.field != 'fromPackingNumber')
   }
@@ -845,7 +851,7 @@ const submitForm = async () => {
       // 主子表——提交请求
       try {
         const data = unref(formRef)?.formModel
-          if (!wsCache.get('ShowPackingNumber')  ) {
+          if (!wsCache.get('ShowPackingNumber') && !props.isShowPackNumber) {
           data.packingNumber=''
           data.fromPackingNumber=''
         }
@@ -857,7 +863,7 @@ const submitForm = async () => {
       // 编辑
       try {
         const data = unref(formRef)?.formModel
-        if (!wsCache.get('ShowPackingNumber')  ) {
+        if (!wsCache.get('ShowPackingNumber') && !props.isShowPackNumber) {
           data.packingNumber=''
           data.fromPackingNumber=''
         }
@@ -874,7 +880,7 @@ const submitForm = async () => {
     try {
       const data = unref(formRef)?.formModel
       // 清空包装号
-       if (!wsCache.get('ShowPackingNumber') ) {
+       if (!wsCache.get('ShowPackingNumber') && !props.isShowPackNumber) {
           data.packingNumber=''
           data.fromPackingNumber=''
         }

src/components/Detail/src/Detail.vue

@@ -62,6 +62,8 @@
             v-model:pageSize="tableObjectRef.pageSize"
             v-model:currentPage="tableObjectRef.currentPage"
             v-model:sort="tableObjectRef.sort"
+            :isShowPackNumber="isShowPackNumber"
+            
           >
             <!-- <template #action="{ row }">
               <ButtonBase
@@ -79,6 +81,7 @@
             v-model:pageSize="tableObjectRef.pageSize"
             v-model:currentPage="tableObjectRef.currentPage"
             v-model:sort="tableObjectRef.sort"
+            :isShowPackNumber="isShowPackNumber"
           >
             <template v-for="name in Object.keys($slots)" :key="name" #[name]="{ row }">
               <slot :name="name" :row="row"></slot>
@@ -143,6 +146,7 @@
               v-model:pageSize="tableObjectRef.pageSize"
               v-model:currentPage="tableObjectRef.currentPage"
               v-model:sort="tableObjectRef.sort"
+              :isShowPackNumber="isShowPackNumber"
             />
           </ContentWrap> 
 
@@ -488,11 +492,17 @@ const props = defineProps({
     required: false,
     default: () => []
   },
+  // 默认不显示包装号，采购收货记录显示包装号
+  isShowPackNumber:{
+    type: Boolean,
+    required: false,
+    default: false
+  },
 })
 const allSchemas = ref(props.allSchemas)
 const detailAllSchemasRef = ref(props.detailAllSchemas)
 const detailAllSchemasRules = ref(props.detailAllSchemasRules)
-if (!wsCache.get('ShowPackingNumber')) {
+if (!wsCache.get('ShowPackingNumber') && !props.isShowPackNumber) {
   if (allSchemas.value) {
     allSchemas.value.detailSchema = props.allSchemas.detailSchema.filter(item => item.field != 'packingNumber')
   }

src/components/Table/src/Table.vue

@@ -65,6 +65,7 @@ export default defineComponent({
     rowKey: propTypes.string.def(''),
     // true 取消父子关联; false 关联
     isCheckStrictly: propTypes.bool.def(false),
+    isShowPackNumber:propTypes.bool.def(false),// 默认不显示包装号，采购收货记录显示包装号
   },
   emits: ['update:pageSize', 'update:currentPage', 'register', 'update:sort','getSelectionRows','rowClick'],
   setup(props, { attrs, slots, emit, expose }) {
@@ -103,8 +104,8 @@ export default defineComponent({
 
     const setColumn = (columnProps: TableSetPropsType[], columnsChildren?: TableColumn[]) => {
       let { columns } = unref(getProps)
-      
+      console.log(888,props.isShowPackNumber)
-      if (!wsCache.get('ShowPackingNumber')) {
+      if (!wsCache.get('ShowPackingNumber')&&!props.isShowPackNumber) {
         if (columns) {
           columns = columns.filter(item => item.field != 'packingNumber' && item.field != 'fromPackingNumber'&& item.field != 'toPackingNumber')
         }
@@ -346,7 +347,9 @@ export default defineComponent({
         showOverflowTooltip,
         border
       } = unref(getProps)
-      if (!wsCache.get('ShowPackingNumber')) {
+      
+      console.log(999,props.isShowPackNumber)
+      if (!wsCache.get('ShowPackingNumber') && !props.isShowPackNumber) {
         if (columns) {
          columns = columns.filter(item => item.field != 'packingNumber' && item.field != 'fromPackingNumber'&& item.field != 'toPackingNumber')
         }

src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/index.vue

@@ -35,6 +35,7 @@
       v-model:pageSize="tableObject.pageSize"
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
+      :isShowPackNumber="true"
     >
       <template #number="{ row }">
         <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
@@ -59,6 +60,7 @@
     :tableAllSchemas="PurchasereceiptRecordDetail.allSchemas"
     :tableFormRules="PurchasereceiptRecordDetailRules"
     :isBusiness="true"
+    :isShowPackNumber="true"
   />
 
   <!-- 详情 -->
@@ -73,6 +75,7 @@
     @changeTabs="changeTabs"
     :buttondataTable="buttondataTable"
     @tableFormButton="tableFormButton"
+    :isShowPackNumber="true"
   />
 
   <!-- 记录子包装弹窗 -->
@@ -86,6 +89,7 @@
     :isShowButton="false"
     :isShowReduceButton="false"
     :isShowFooterButtton="false"
+    :isShowPackNumber="true"
   />
 
   <!-- 缺货子包装弹窗 -->
@@ -99,6 +103,7 @@
     :isShowButton="false"
     :isShowReduceButton="false"
     :isShowFooterButtton="false"
+    :isShowPackNumber="true"
   />
   <el-dialog
     v-model="showQualityReport"

src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@@ -726,7 +726,9 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     sortTableDefault:15,
-    hiddenInMain:true
+    hiddenInMain: true,
+    isForm: false,
+    isTable:false
   },
   {
     label: '到包装号',

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue

@@ -35,6 +35,7 @@
       v-model:pageSize="tableObject.pageSize"
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
+      :isShowPackNumber="true"
     >
       <template #number="{ row }">
         <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
@@ -59,6 +60,7 @@
     :tableAllSchemas="PurchasereceiptRecordDetail.allSchemas"
     :tableFormRules="PurchasereceiptRecordDetailRules"
     :isBusiness="true"
+    :isShowPackNumber="true"
   />
 
   <!-- 详情 -->
@@ -73,6 +75,7 @@
     @changeTabs="changeTabs"
     :buttondataTable="buttondataTable"
     @tableFormButton="tableFormButton"
+    :isShowPackNumber="true"
   />
 
   <!-- 记录子包装弹窗 -->

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@@ -726,7 +726,9 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     sortTableDefault:15,
-    hiddenInMain:true
+    hiddenInMain: true,
+    isForm: false,
+    isTable:false,
   },
   {
     label: '到包装号',

src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/index.vue

@@ -35,6 +35,7 @@
       v-model:pageSize="tableObject.pageSize"
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
+      :isShowPackNumber="true"
     >
       <template #number="{ row }">
         <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
@@ -59,6 +60,7 @@
     :tableAllSchemas="PurchasereceiptRecordDetail.allSchemas"
     :tableFormRules="PurchasereceiptRecordDetailRules"
     :isBusiness="true"
+    :isShowPackNumber="true"
   />
 
   <!-- 详情 -->
@@ -73,6 +75,7 @@
     @changeTabs="changeTabs"
     :buttondataTable="buttondataTable"
     @tableFormButton="tableFormButton"
+    :isShowPackNumber="true"
   />
 
   <!-- 记录子包装弹窗 -->
@@ -86,6 +89,7 @@
     :isShowButton="false"
     :isShowReduceButton="false"
     :isShowFooterButtton="false"
+    :isShowPackNumber="true"
   />
 
   <!-- 缺货子包装弹窗 -->
@@ -99,6 +103,7 @@
     :isShowButton="false"
     :isShowReduceButton="false"
     :isShowFooterButtton="false"
+    :isShowPackNumber="true"
   />
   <el-dialog
     v-model="showQualityReport"

src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@@ -726,7 +726,9 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     sortTableDefault:15,
-    hiddenInMain:true
+    hiddenInMain: true,
+    isForm: false,
+    isTable: false,
   },
   {
     label: '到包装号',