Merge branch 'refs/heads/intex_online20250725' into intex

1 day ago · 5d9e52b8be
6 changed files with 754 additions and 465 deletions
--- a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts
@ -204,16 +204,16 @@ export const InventorymoveJobMain = useCrudSchemas(reactive<CrudSchema[]>([
  //   },
  //   isTable: false,
  // },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: true,
-    sortTableDefault:1000,
-  },
+  // {
+  //   label: '备注',
+  //   field: 'remark',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable: true,
+  //   sortTableDefault:1000,
+  // },
  // {
  //   label: '自动完成',
  //   field: 'autoComplete',
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts
@ -289,15 +289,15 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
  //     width: 150
  //   },
  // },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:32,
-  },
+  // {
+  //   label: '备注',
+  //   field: 'remark',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:32,
+  // },
  {
    label: '创建时间',
    field: 'createTime',
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
@ -749,7 +749,7 @@ const submitForm = async (formType, submitData) => {
  parseFloat(filter.inventoryQty) > 0 && parseFloat(filter.inventoryQty) < parseFloat(filter.qty)
 );
 if(cmdExists){
-  message.warning("库存数量为正式，则数量不能大于库存数量")
+  message.warning("库存数量为正时，数量不能大于库存数量")
  return
 }
 // 1. 筛选出 inventoryQty <= 0 的记录，并提取它们的 itemCode
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
@ -76,6 +76,7 @@
    :buttondataTable="buttondataTable"
    @tableFormButton="tableFormButton"
    :isShowPackNumber="true"
+    :tabsExtend="true"
  />

  <!-- 记录子包装弹窗 -->
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts
@ -917,12 +917,12 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
    },
  }
 ]))
-export const accountantFormartDetail = ( cellValue) => {
+export const accountantFormartDetail = (row, column, cellValue) => {
  if (cellValue == 0) {
    return cellValue
  }
  if (!cellValue) {
-    return ''
+    return 0
  }
  cellValue = cellValue + '' || ''
  cellValue = Number(cellValue).toFixed(2)
@ -1510,7 +1510,13 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
  },
 ]))
 const singlePriceFormart = (row, column, cellValue) => {
-  cellValue= Number(cellValue).toFixed(5)
+  if (cellValue == 0) {
+    return cellValue
+  }
+  if (!cellValue) {
+    return 0
+  }
+  cellValue = String(Math.round(Number(cellValue) * 100000) / 100000)
  cellValue = cellValue + '' || ''

  let x = cellValue.split('.')
@ -1691,6 +1697,39 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
    isDetail: false,
    isTable: true,
  },
+  {
+    label: '受入号',
+    field: 'receivedNumber',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTableForm: false,
+    isDetail: false,
+    isTable: true,
+  },
+  {
+    label: '车型',
+    field: 'project',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTableForm: false,
+    isDetail: false,
+    isTable: true,
+  },
+  {
+    label: '税率(%)',
+    field: 'taxRate',
+    dictType: DICT_TYPE.TAX_RATE_DICT,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
  {
    label: '到货时间',
    field: 'planArriveTime',
@ -1799,6 +1838,27 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
      disabled: true
    }
  },
+  {
+    label: '金额（含模具费）',
+    field: 'singleAndAllocateAmount',
+    formatter: accountantFormartDetail,
+    table: {
+      width: 150
+    },
+    isForm: false,
+    form: {
+      componentProps: {
+        disabled: true,
+        precision: 2,
+      }
+    },
+    isTableForm: false,
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      precision: 2,
+    }
+  },
  {
    label: '总差额',
    field: 'differencePriceTotal',
@ -1826,6 +1886,69 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
      disabled: true
    }
  },
+  {
+    label: '金额（模具费）',
+    field: 'allocationAmount',
+    formatter: accountantFormartDetail,
+    table: {
+      width: 150
+    },
+    isForm: false,
+    form: {
+      componentProps: {
+        disabled: true,
+        precision: 2,
+      }
+    },
+    isTableForm: false,
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      precision: 2,
+    }
+  },
+  {
+    label: '金额（税额）',
+    field: 'singleAndAllocateTaxAmount',
+    formatter: accountantFormartDetail,
+    table: {
+      width: 150
+    },
+    isForm: false,
+    form: {
+      componentProps: {
+        disabled: true,
+        precision: 2,
+      }
+    },
+    isTableForm: false,
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      precision: 2,
+    }
+  },
+  {
+    label: '金额（合计金额） ',
+    field: 'singleAndAllocateTotal',
+    formatter: accountantFormartDetail,
+    table: {
+      width: 150
+    },
+    isForm: false,
+    form: {
+      componentProps: {
+        disabled: true,
+        precision: 2,
+      }
+    },
+    isTableForm: false,
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      precision: 2,
+    }
+  },
  {
    label: '模具分摊单价',
    field: 'allocationPrice',
@ -1846,6 +1969,27 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
      precision: 2,
    }
  },
+  {
+    label: '含模具费单价',
+    field: 'singleAndAllocatePrice',
+    formatter: singlePriceFormart,
+    table: {
+      width: 150
+    },
+    isForm: false,
+    form: {
+      componentProps: {
+        disabled: true,
+        precision: 5,
+      }
+    },
+    isTableForm: false,
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      precision: 5,
+    }
+  },
  // {
  //   label: '未税差额',
  //   field: 'untaxedDifference',
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@ -172,7 +172,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
    isSearch: true,
    form: {
      // labelMessage: '信息提示说明！！！',
-      componentProps: {    
+      componentProps: {
        enterSearch: true,
        isSearchList: true, // 开启查询弹窗
        searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
@ -1003,7 +1003,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
    form: {
      component: 'InputNumber',
      componentProps: {
-        precision: 5,
+        precision: 2,
        disabled: true,
      }
    },
@ -1291,12 +1291,12 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
    },
  }
 ]))
-export const accountantFormartDetail = ( cellValue) => {
+export const accountantFormartDetail = (row, column, cellValue) => {
  if (cellValue == 0) {
    return cellValue
  }
  if (!cellValue) {
-    return ''
+    return 0
  }
  cellValue = cellValue + '' || ''
  cellValue = String(Math.round(Number(cellValue) * 100) / 100)
@ -1942,6 +1942,12 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
 ]))

 const singlePriceFormart = (row, column, cellValue) => {
+  if (cellValue == 0) {
+    return cellValue
+  }
+  if (!cellValue) {
+    return 0
+  }
  cellValue = String(Math.round(Number(cellValue) * 100000) / 100000)
  cellValue = cellValue + '' || ''

@ -2129,7 +2135,39 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
    isDetail: false,
    isTable: true,
  },
-  
+  {
+    label: '受入号',
+    field: 'receivedNumber',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTableForm: false,
+    isDetail: false,
+    isTable: true,
+  },
+  {
+    label: '车型',
+    field: 'project',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTableForm: false,
+    isDetail: false,
+    isTable: true,
+  },
+  {
+    label: '税率(%)',
+    field: 'taxRate',
+    dictType: DICT_TYPE.TAX_RATE_DICT,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
  //仅是主列表页面的筛选搜索条件
  {
    label: '收货日期',
@ -2230,6 +2268,7 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
  {
    label: '发票金额',
    field: 'contractAmountTotal',
+    formatter: singlePriceFormart,
    table: {
      width: 150
    },
@ -2249,6 +2288,27 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
      disabled: true
    }
  },
+  {
+    label: '金额（含模具费）',
+    field: 'singleAndAllocateAmount',
+    formatter: accountantFormartDetail,
+    table: {
+      width: 150
+    },
+    isForm: false,
+    form: {
+      componentProps: {
+        disabled: true,
+        precision: 2,
+      }
+    },
+    isTableForm: false,
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      precision: 2,
+    }
+  },
  {
    label: '总差额',
    field: 'differencePriceTotal',
@ -2281,6 +2341,69 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
      precision: 5,
    }
  },
+  {
+    label: '金额（模具费）',
+    field: 'allocationAmount',
+    formatter: accountantFormartDetail,
+    table: {
+      width: 150
+    },
+    isForm: false,
+    form: {
+      componentProps: {
+        disabled: true,
+        precision: 2,
+      }
+    },
+    isTableForm: false,
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      precision: 2,
+    }
+  },
+  {
+    label: '金额（税额）',
+    field: 'singleAndAllocateTaxAmount',
+    formatter: accountantFormartDetail,
+    table: {
+      width: 150
+    },
+    isForm: false,
+    form: {
+      componentProps: {
+        disabled: true,
+        precision: 2,
+      }
+    },
+    isTableForm: false,
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      precision: 2,
+    }
+  },
+  {
+    label: '金额（合计金额） ',
+    field: 'singleAndAllocateTotal',
+    formatter: accountantFormartDetail,
+    table: {
+      width: 150
+    },
+    isForm: false,
+    form: {
+      componentProps: {
+        disabled: true,
+        precision: 2,
+      }
+    },
+    isTableForm: false,
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      precision: 2,
+    }
+  },
  {
    label: '模具分摊单价',
    field: 'allocationPrice',
@ -2301,6 +2424,27 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
      precision: 5,
    }
  },
+  {
+    label: '含模具费单价',
+    field: 'singleAndAllocatePrice',
+    formatter: singlePriceFormart,
+    table: {
+      width: 150
+    },
+    isForm: false,
+    form: {
+      componentProps: {
+        disabled: true,
+        precision: 5,
+      }
+    },
+    isTableForm: false,
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      precision: 5,
+    }
+  },
  {
    label: '到货数量',
    field: 'arrivalQty',