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

src/components/Detail/src/Detail.vue

@@ -108,6 +108,7 @@
               <Annex v-show="tabsList[current].label==annexItem.label"
                   :annexData="annexItem"
                   :fileType="annexItem.fileType"
+                  :showAddBtn="!annexItem.hiddenUpload"
                   :showPreview="annexItem.showPreview"
                   :showDownload = "annexItem.showDownload"
                   :hiddenDelete = "annexItem.hiddenDelete"
@@ -518,6 +519,7 @@ const getAnnexFileList =  async (row) => {
         showPreview:item.showPreview||false, // 是否展示预览按钮
         showDownload:item.showDownload||false, // 是否展示下载按钮
         hiddenDelete:item.hiddenDelete || false, // 是否展示删除按钮
+        hiddenUpload:item.hiddenUpload || false, // 是否展示上传按钮
       })
       if(item?.subDetailTableData){
         const { tableObject:subTableObject, tableMethods:subTableMethods } = useTable({

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

@@ -35,6 +35,17 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault:2,
     isForm: false
   },
+  {
+    label: '财务凭证号',
+    field: 'voucher_number',
+    sort: 'custom',
+    table: {
+      width: 180,
+    },
+    sortTableDefault:2,
+    isForm: false
+  },
+  
   {
     label: '状态',
     field: 'status',

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

@@ -85,19 +85,7 @@
     ref="detailRef" 
     :isOpenSearchTable="true"
     fieldTableColumn="poLine"
-    :annexTable="[{
-      label: t('ts.合同附件'),
-      prop: 'Annex',
-      tableName:'contract'
-    },{
-      label: t('ts.发票附件'),
-      prop: 'Annex',
-      tableName:'invoice'
-    },{
-      label: t('ts.货运单附件'),
-      prop: 'Annex',
-      tableName:'waybill'
-    }]"
+    :annexTable="detailAnnexTable"
     :annexAlias="{
       label:t('ts.其他附件')
     }"
@@ -482,10 +470,28 @@ const handleImport = () => {
   /** 详情操作 */
   const detailRef = ref()
   const clicKRowId = ref();
+  const detailAnnexTable = ref(
+  [{
+    label: t('ts.合同附件'),
+    prop: 'Annex',
+    tableName:'contract',
+    hiddenDelete:false,
+    hiddenUpload:false
+  },{
+    label: t('ts.发票附件'),
+    prop: 'Annex',
+    tableName:'invoice'
+  },{
+    label: t('ts.货运单附件'),
+    prop: 'Annex',
+    tableName:'waybill'
+  }])
   const openDetail = (row : any, titleName : any, titleValue : any) => {
     const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
     if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
     clicKRowId.value = row.masterId
+    detailAnnexTable.value[0].hiddenDelete = Number(row.status)>=3
+    detailAnnexTable.value[0].hiddenUpload = Number(row.status)>=3
     detailRef.value.openDetail(row, titleName, titleValue)
   }
 

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

@@ -1150,6 +1150,25 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       }
     },
   },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    isDetail:false,
+    isTable: false,
+    isForm:false,
+    isTableForm:false,
+    isSearch:true,
+    formatter: dateFormatter,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD',
+        type: 'daterange',
+        defaultTime: [new Date('1 '), new Date('1 ')]
+      }
+    },
+  },
   {
     label: '到货时间',
     field: 'deliveryDate',