Merge branch 'test' into hella_online_20240828

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

@@ -271,7 +271,8 @@ const buttonTableClick = async (val, row) => {
       basicFormRef.value.open('create', row)
       nextTick(()=>{
         basicFormRef.value.formRef.setValues({
-          reversepostingdate:dayjs().valueOf()
+          reversepostingdate:dayjs().valueOf(),
+          tcCInvoiceRemark:`回转${row['supplierName']}发票 ${row['goldenTaxInvoiceNumber']}`
         })
       })
 

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

@@ -468,17 +468,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault:6,
     isForm: false
   },
-  // {
-  //   label: '回转凭证号',
-  //   field: 'transferNumber',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 200,
-  //   },
-  //   isTable:true,
-  //   sortTableDefault:6,
-  //   isForm: false
-  // },
+  
   {
     label: '业务类型',
     field:'businessType',
@@ -684,6 +674,54 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
   //   isTable: false,
   //   isForm: false,
   // },
+  {
+    label: '回转凭证号',
+    field: 'transferNumber',
+    sort: 'custom',
+    table: {
+      width: 200,
+    },
+    sortTableDefault:11,
+    isTable:true,
+    isForm: false
+  },
+  {
+    label: '回转日期',
+    field: 'reversepostingdate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:11,
+  },
+  {
+    label: '冲销日记帐',
+    field: 'reverseInvoiceJournal',
+    sortTableDefault:11,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '调整账代码',
+    field: 'adjustmentJournal',
+    sortTableDefault:11,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '回转说明',
+    field: 'tcCInvoiceRemark',
+    sortTableDefault:11,
+    table: {
+      width: 150
+    },
+  },
   {
     label: '采购审批时间',
     field: 'procurementCreateTime',
@@ -1656,7 +1694,7 @@ export const SupplierinvoiceRecordMainTransfer = useCrudSchemas(reactive<CrudSch
     field: 'reversepostingdate',
     formatter: dateFormatter,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -1696,9 +1734,6 @@ export const SupplierinvoiceRecordMainTransfer = useCrudSchemas(reactive<CrudSch
 export const SupplierinvoiceRecordMainTransferRules = reactive({
   reversepostingdate: [
     { required: true, message: '请选择过账日期', trigger: 'change' }
-  ],
-  tcCInvoiceRemark: [
-    { required: true, message: '请填写说明', trigger: 'change' }
-  ],
+  ]
 })