Merge remote-tracking branch 'origin/intex' into intex

src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts

@@ -477,6 +477,16 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: false,
     isForm: false,
   },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 350
+    },
+    isTable: false,
+    isForm: false,
+  },
   // {
   //   label: '开始时间',
   //   field: 'beginTime',

src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@@ -614,7 +614,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -660,7 +660,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -669,15 +669,26 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:10,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
       width: 150
     },
-    sortTableDefault:11,
+    sortTableDefault: 10,
-    hiddenInMain:true
+    isTableForm: false,
+    isForm: false
   },
+  // {
+  //   label: '物料描述1',
+  //   field: 'itemDesc1',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:11,
+  //   hiddenInMain:true
+  // },
   {
     label: '物料描述2',
     field: 'itemDesc2',

src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@@ -614,7 +614,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -660,7 +660,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -669,14 +669,15 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:10,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
       width: 150
-    },
+  },
-    sortTableDefault:11,
+  sortTableDefault: 10,
-    hiddenInMain:true
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '物料描述2',

src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts

@@ -972,7 +972,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
       sortTableDefault: 1008
     },
     {
-      label: '物料代码',
+      label: '品番',
       field: 'itemCode',
       sort: 'custom',
       table: {
@@ -982,7 +982,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
       isSearch: true
     },
     {
-      label: '物料名称',
+      label: '品名',
       field: 'itemName',
       sort: 'custom',
       table: {
@@ -990,6 +990,17 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
       },
       sortTableDefault: 7
     },
+    {
+      label: '背番',
+      field: 'itemDesc1',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 7,
+      isTableForm: false,
+      isForm: false
+    },
     {
       label: '物料类型',
       field: 'itemType',

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

@@ -614,7 +614,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -660,7 +660,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -668,6 +668,17 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
     sortTableDefault:10,
   },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault: 10,
+    isTableForm: false,
+    isForm: false
+  },
   {
     label: '物料描述1',
     field: 'itemDesc1',

src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts

@@ -748,7 +748,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -766,7 +766,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -776,6 +776,17 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isTableForm: false,
     isForm: false
   },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault: 7,
+    isTableForm: false,
+    isForm: false
+  },
   {
     label: '物料类型',
     field: 'itemType',

src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@@ -614,7 +614,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -660,7 +660,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -669,14 +669,15 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:10,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
       width: 150
     },
-    sortTableDefault:11,
+    sortTableDefault: 10,
-    hiddenInMain:true
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '物料描述2',

src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts

@@ -748,7 +748,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -766,7 +766,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -776,6 +776,17 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isTableForm: false,
     isForm: false
   },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault: 7,
+    isTableForm: false,
+    isForm: false
+  },
   {
     label: '物料类型',
     field: 'itemType',

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

@@ -972,7 +972,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
       sortTableDefault: 1008
     },
     {
-      label: '物料代码',
+      label: '品番',
       field: 'itemCode',
       sort: 'custom',
       table: {
@@ -982,7 +982,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
       isSearch: true
     },
     {
-      label: '物料名称',
+      label: '品名',
       field: 'itemName',
       sort: 'custom',
       table: {
@@ -990,6 +990,17 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
       },
       sortTableDefault: 7
     },
+    {
+      label: '背番',
+      field: 'itemDesc1',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 7,
+      isTableForm: false,
+      isForm: false
+    },
     {
       label: '物料类型',
       field: 'itemType',

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

@@ -613,16 +613,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       disabled: true
     },
   },
-  {
+ 
-    label: '物料代码',
-    field: 'itemCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:10,
-    isSearch: true
-  },
   {
     label: '是否已发送检验申请',
     field: 'inspectRequestFlag',
@@ -660,7 +651,17 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料名称',
+    label: '品番',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault: 10,
+    isSearch: true
+  },
+  {
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -669,15 +670,26 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:10,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
       width: 150
     },
-    sortTableDefault:11,
+    sortTableDefault: 10,
-    hiddenInMain:true
+    isTableForm: false,
+    isForm: false
   },
+  // {
+  //   label: '物料描述1',
+  //   field: 'itemDesc1',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:11,
+  //   hiddenInMain:true
+  // },
   {
     label: '物料描述2',
     field: 'itemDesc2',

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

@@ -749,7 +749,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -767,7 +767,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -777,6 +777,17 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isTableForm: false,
     isForm: false
   },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault: 7,
+    isTableForm: false,
+    isForm: false
+  },
   {
     label: '物料类型',
     field: 'itemType',

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts

@@ -34,6 +34,15 @@ if(PurchasePlanDetailSchemas?.tableColumns){
     formatter: dateFormatter2,
     sortTableDefault:2
   });
+  PurchasePlanDetailSchemas.tableColumns.splice(1, 0, {
+    label: '要货计划单号',
+    field: 'number',
+    table: {
+      width: 180
+    },
+    width: 180,
+    sortTableDefault:1
+  });
 }
 
 
@@ -1968,6 +1977,14 @@ export const SupplierdeliverRequestPackage2 = useCrudSchemas(reactive<CrudSchema
       disabled: true
     }
   },
+  {
+    label: '包装号',
+    field: 'number',
+    sort: 'custom',
+    tableForm: {
+      disabled: true
+    }
+  },
   {
     label: '批次',
     field: 'batch',

src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/purchasereceiptJobMain.data.ts

@@ -972,7 +972,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
       sortTableDefault: 1008
     },
     {
-      label: '物料代码',
+      label: '品番',
       field: 'itemCode',
       sort: 'custom',
       table: {
@@ -982,7 +982,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
       isSearch: true
     },
     {
-      label: '物料名称',
+      label: '品名',
       field: 'itemName',
       sort: 'custom',
       table: {
@@ -990,6 +990,17 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
       },
       sortTableDefault: 7
     },
+    {
+      label: '背番',
+      field: 'itemDesc1',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      sortTableDefault: 7,
+      isTableForm: false,
+      isForm: false
+    },
     {
       label: '物料类型',
       field: 'itemType',

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

@@ -614,7 +614,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -660,7 +660,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -669,15 +669,26 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:10,
   },
   {
-    label: '物料描述1',
+    label: '背番',
     field: 'itemDesc1',
     sort: 'custom',
     table: {
       width: 150
     },
-    sortTableDefault:11,
+    sortTableDefault: 10,
-    hiddenInMain:true
+    isTableForm: false,
+    isForm: false
   },
+  // {
+  //   label: '物料描述1',
+  //   field: 'itemDesc1',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:11,
+  //   hiddenInMain:true
+  // },
   {
     label: '物料描述2',
     field: 'itemDesc2',

src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts

@@ -748,7 +748,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -766,7 +766,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     table: {
@@ -776,6 +776,17 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isTableForm: false,
     isForm: false
   },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault: 7,
+    isTableForm: false,
+    isForm: false
+  },
   {
     label: '物料类型',
     field: 'itemType',

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts

@@ -1615,6 +1615,23 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     isDetail: false,
     isTable: true,
   },
+  {
+    label: '采购计量单位',
+    field: 'purchaseStdUom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    sortTableDefault:6,
+    table: {
+      width: 150
+    },
+    isForm:false,
+    isTableForm:true,
+    isDetail: false,
+    isTable: true,
+    tableForm:{
+      disabled:true
+    }
+  },
   {
     label: '物料名称',
     field: 'itemName',

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue

@@ -602,7 +602,7 @@ const searchTableSuccess = (formField, searchField, val, searchFormRef, type, ro
           newRow['invoicableQuantity'] = item['invoicableQuantity']
           newRow['itemCode'] = item['itemCode']
           newRow['itemName'] = item['itemName']
-          
+          newRow['purchaseStdUom'] = item['purchaseStdUom']
           newRow['deliveryDate'] = item['prhRcpDate']
           newRow['arrivalQty'] = item['prhRcvd']
           newRow['id'] = item['id']

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts

@@ -1991,6 +1991,22 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       disabled:true
     }
   },
+  {
+    label: '采购计量单位',
+    field: 'purchaseStdUom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    table: {
+      width: 150
+    },
+    isForm:false,
+    isTableForm:true,
+    isDetail: false,
+    isTable: true,
+    tableForm:{
+      disabled:true
+    }
+  },
   {
     label: '订单号',
     field: 'poNumber',