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

src/views/wms/issueManage/itemcodeConsumeRecord/index.vue

@@ -100,7 +100,7 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultAddBtn({hasPermi:'wms:itemcodeConsumeRecord:create'}), // 新增
-  defaultButtons.defaultImportBtn(null), // 导入
+  // defaultButtons.defaultImportBtn(null), // 导入
   defaultButtons.defaultExportBtn(null), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选

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

@@ -300,7 +300,8 @@ const buttonTableClick = async (val, row) => {
         basicFormRef.value.formRef.setValues({
           reversepostingdate:dayjs().valueOf(),
           // tcCInvoiceRemark:`回转${row['supplierName']}发票 ${row['goldenTaxInvoiceNumber']}`
-          tcCInvoiceRemark:`冲销凭证${row['voucherNumber']}`
+          tcCInvoiceRemark:`冲销凭证${row['voucherNumber']||''}`,
+          tcCInvoiceAllocationRemark:`模具分摊冲销凭证${row['allocationTransferNumber']||''}`
 
         })
       })

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

@@ -700,7 +700,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault:11,
   },
   {
-    label: '说明',//回转说明	
+    label: '发票说明',//回转说明	
     field: 'tcCInvoiceRemark',
     sortTableDefault:11,
     table: {
@@ -1427,12 +1427,12 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
     isDetail: true,
   },
   {
-    label: '说明', //回转说明	
+    label: '发票说明', //回转说明	
     field: 'tcCInvoiceRemark',
   },
   {
-    label: '',
-    field: '',
+    label: '模具分摊说明',
+    field: 'tcCInvoiceAllocationRemark',
     isForm: false,
     isTable: false,
     isSearch: false,
@@ -2017,7 +2017,7 @@ export const SupplierinvoiceRecordMainTransfer = useCrudSchemas(reactive<CrudSch
     },
   },
   {
-    label: '说明',
+    label: '发票说明',
     field: 'tcCInvoiceRemark',
     sort: 'custom',
     isSearch: false,
@@ -2032,6 +2032,23 @@ export const SupplierinvoiceRecordMainTransfer = useCrudSchemas(reactive<CrudSch
         showWordLimit:true
       }
     }
+  },
+  {
+    label: '模具分摊说明',
+    field: 'tcCInvoiceAllocationRemark',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    isForm: true,
+    isDetail:false,
+    form: {
+      componentProps: {
+        style: { 'padding-bottom': '20px'},
+        type:"textarea",
+        maxlength:50,
+        showWordLimit:true
+      }
+    }
   }
 ]))