Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

src/api/wms/purchasereceiptRecordDetail/index.ts

@@ -45,7 +45,9 @@ export interface PurchasereceiptRecordDetailVO {
   interfaceType: string
   fromOwnerCode: string
   toOwnerCode: string
-  toBatch: string
+  toBatch: string,
+  parentPackingNumber:string
+  packingNumber:string
 }
 
 // 查询采购收货记录子列表
@@ -118,3 +120,8 @@ export const getScarceGoodsDetailPage = async (params) => {
 export const queryPurchaseceiptChildPackingNumber = async (params) => {
   return await request.get({ url: `/wms/purchasereceipt-record-detail/pageChildPackingNumber`, params })
 }
+
+// 查询采购收货缺货记录子包装数据
+export const queryPurchaseshortageChildPackingNumber = async (params) => {
+  return await request.get({ url: `/wms/purchaseshortage-detail/pageChildPackingNumber`, params })
+}

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

@@ -63,7 +63,7 @@
     @tableFormButton="tableFormButton"
   />
 
-  <!-- 子包装弹窗 -->
+  <!-- 记录子包装弹窗 -->
   <BasicForm
     ref="detailParenPackingRef"
     @success="getList"
@@ -76,6 +76,19 @@
     :isShowFooterButtton="false"
   />
 
+ <!-- 缺货子包装弹窗 -->
+ <BasicForm
+    ref="outStockDetailParenPackingRef"
+    @success="getList"
+    :tableAllSchemas="PurchasereceiptRecordDetailPackingNumber.allSchemas"
+    :tableFormRules="PurchasereceiptRecordDetailRules"
+    :tableData="outStockPackingDetatableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    :isShowFooterButtton="false"
+  />
+
 </template>
 
 <script setup lang="ts">
@@ -185,6 +198,7 @@ const handleCreateInspectRequest = async (number:string) => {
   }
 }
 
+
 // 子包装数据
 const detailParenPackingRef = ref()
 const { tableObject: packingDetatableData, tableMethods: packDetatableMethods } = useTable({
@@ -192,6 +206,14 @@ const { tableObject: packingDetatableData, tableMethods: packDetatableMethods }
 })
 const { getList:queryDetailList } = packDetatableMethods
 
+
+// 缺货子包装数据
+const outStockDetailParenPackingRef = ref()
+const { tableObject: outStockPackingDetatableData, tableMethods: outStockPackDetatableMethods } = useTable({
+  getListApi: PurchasereceiptRecordDetailApi.queryPurchaseshortageChildPackingNumber
+})
+const { getList:queryOutStockDetailList } = outStockPackDetatableMethods
+
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
@@ -210,15 +232,25 @@ const buttondataTable = ref([{
     link: true, // 文本展现按钮
   }])
 
+
+const tabeKey = ref("receiptDetail");  
 // 查看其他包装规格
 const tableFormButton = async (val , row) => {
-  if (val == 'viewParentPickingNumber') { //查看其他包装规格
+  if (val == 'viewParentPickingNumber' && tabeKey.value == 'receiptDetail') { //查看其他包装规格
-        packingDetatableData.params = {
+      packingDetatableData.params = {
-          masterId:row.masterId,
+        masterId:row.masterId,
-          parentPackingNumber:row.packingNumber
+        parentPackingNumber:row.packingNumber
-        }
+      }
-        await queryDetailList()
+      await queryDetailList()
-        detailParenPackingRef.value.open('create', row, null,'viewDetail')//查看明细数据
+      detailParenPackingRef.value.open('create', row, null,'viewDetail')//查看明细数据
+  }
+  if (val == 'viewParentPickingNumber' && tabeKey.value == 'scarceGoodsDetail') { //查看其他包装规格
+      outStockPackingDetatableData.params = {
+        masterId:row.masterId,
+        parentPackingNumber:row.packingNumber
+      }
+      await queryOutStockDetailList()
+      outStockDetailParenPackingRef.value.open('create', row, null,'viewDetail')//查看明细数据
   }
 }
 
@@ -252,9 +284,11 @@ const changeTabs = (data) =>{
   console.log(data)
     apiPage.value = PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPage
     detailAllSchemas.value = PurchasereceiptRecordDetail.allSchemas
+    tabeKey.value = 'receiptDetail'
   }else if(data.prop == 'scarceGoodsDetail'){
     apiPage.value = PurchasereceiptRecordDetailApi.getScarceGoodsDetailPage
     detailAllSchemas.value = PurchasereceiptRecordDetail.allSchemas
+    tabeKey.value = 'scarceGoodsDetail'
   }
 }
 

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

@@ -952,6 +952,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
       width: 180,
       fixed: 'left'
     },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '订单号',
@@ -960,6 +968,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '订单行',
@@ -968,6 +984,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '物料代码',
@@ -976,6 +1000,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '物料名称',
@@ -984,6 +1016,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '物料描述1',
@@ -992,6 +1032,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '物料描述2',
@@ -1000,6 +1048,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '从批次',
@@ -1008,6 +1064,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '到批次',
@@ -1016,6 +1080,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '替代批次',
@@ -1024,6 +1096,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '从包装号',
@@ -1032,6 +1112,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '到包装号',
@@ -1040,6 +1128,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '从器具号',
@@ -1048,6 +1144,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '到器具号',
@@ -1056,6 +1160,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '数量',
@@ -1066,6 +1178,12 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     },
     form: {
       component: 'InputNumber',
+      componentProps: {
+        disabled:true
+        }
+    },
+    tableForm: {
+      disabled: true,
     }
   },
   {
@@ -1079,6 +1197,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   
   {
@@ -1090,7 +1216,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     },
     form: {
       component: 'InputNumber',
+      componentProps: {
+        disabled:true
+        }
+    },
+    tableForm: {
+      disabled: true,
     }
+    
   },
   {
     label: '包装规格',
@@ -1102,8 +1235,16 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
-  },
+    form: {
+      componentProps: {
+      disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
     
+  },
   {
     label: '供应商计量数量',
     field: 'supplierQty',
@@ -1113,6 +1254,12 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     },
     form: {
       component: 'InputNumber',
+      componentProps: {
+        disabled:true
+        }
+    },
+    tableForm: {
+      disabled: true,
     }
   },
   {
@@ -1126,8 +1273,15 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
-  
   {
     label: '库存状态',
     field: 'inventoryStatus',
@@ -1139,6 +1293,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '从库位代码',
@@ -1147,6 +1309,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '到库位代码',
@@ -1155,6 +1325,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '从库位组代码',
@@ -1163,6 +1341,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '到库位组代码',
@@ -1171,6 +1357,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '从库区代码',
@@ -1179,6 +1373,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '到库区代码',
@@ -1187,6 +1389,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '从货主代码',
@@ -1195,6 +1405,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '到货主代码',
@@ -1203,6 +1421,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '到货日期',
@@ -1218,12 +1444,18 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     form: {
       component: 'DatePicker',
       componentProps: {
+        disabled: true,
         style: {width: '100%'},
         type: 'date',
         dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
+    tableForm: {
+      disabled: true,
+      type:'FormDate',
+      valueFormat: 'x',
+    }
   },
   {
     label: '生产日期',
@@ -1239,12 +1471,18 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     form: {
       component: 'DatePicker',
       componentProps: {
+        disabled: true,
         style: {width: '100%'},
         type: 'date',
         dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
+    tableForm: {
+      disabled: true,
+      type:'FormDate',
+      valueFormat: 'x',
+    }
   },
   {
     label: '过期日期',
@@ -1260,12 +1498,18 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     form: {
       component: 'DatePicker',
       componentProps: {
+        disabled: true,
         style: {width: '100%'},
         type: 'date',
         dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
+    tableForm: {
+      disabled: true,
+      type:'FormDate',
+      valueFormat: 'x',
+    }
   },
   {
     label: '转换率',
@@ -1276,6 +1520,12 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     },
     form: {
       component: 'InputNumber',
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
     }
   },
   {
@@ -1285,6 +1535,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '目检照片',
@@ -1293,6 +1551,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '不合格原因',
@@ -1305,6 +1571,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '单价',
@@ -1315,6 +1589,12 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     },
     form: {
       component: 'InputNumber',
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
     }
   },
   {
@@ -1326,17 +1606,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     },
     form: {
       component: 'InputNumber',
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
     }
   },
-  // {
-  //   label: '任务明细ID',
-  //   field: 'jobDetailId',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
- 
   {
     label: '项目代码',
     field: 'projectCode',
@@ -1344,15 +1621,15 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
-  // {
-  //   label: '代码',
-  //   field: 'code',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
   {
     label: '接口类型',
     field: 'interfaceType',
@@ -1364,6 +1641,14 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
+    form: {
+      componentProps: {
+        disabled:true
+      }
+    },
+    tableForm: {
+      disabled: true,
+    }
   },
   {
     label: '备注',
@@ -1372,33 +1657,13 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
     table: {
       width: 150
     },
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
     form: {
-      component: 'DatePicker',
       componentProps: {
-        type: 'datetime',
+        disabled:true
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
       }
     },
-  },
+    tableForm: {
-  {
+      disabled: true,
-    label: '创建者',
+    }
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
   }
 ]))