diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index 38e9f17af..4cedb45c2 100644 --- a/src/locales/en-US.ts +++ b/src/locales/en-US.ts @@ -817,7 +817,7 @@ export default { 供应商名称:'Supplier Name', 税额:'Tax', 税后金额:'After-tax Amount', - 折扣金额:'Discount Amount', + 调整价差:'Discount Amount', 调整税额:'Adjusted Tax', 总差额:'Under Coverage', 金税票号:'Gold tax ticket number', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 2883bf661..fbb2fd3a7 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -817,7 +817,7 @@ export default { 供应商名称:'供应商名称', 税额:'税额', 税后金额:'税后金额', - 折扣金额:'折扣金额', + 调整价差:'调整价差', 调整税额:'调整税额', 总差额:'总差额', 金税票号:'金税票号', diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts index c1881761b..b80e1f2a5 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts @@ -181,7 +181,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ } }, { - label: '折扣金额', + label: '调整价差', field: 'discountAmount', sort: 'custom', table: { diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index e0ebcba1a..3733c51e0 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -402,7 +402,7 @@ const searchTableSuccessDetail = async (formField, searchField, val, formRef,sea { label: t('ts.打印'), name: 'mian_print', - hide: !row.voucher_number, + hide: !(roleList.value.indexOf('financial_accounting')>-1 && row.status==5), type: 'primary', color: '', link: true, // 文本展现按钮 @@ -570,6 +570,8 @@ const handleImport = () => { detailAnnexTable.value[0].hiddenUpload = true } // 发票附件 + var a = roleList.value.indexOf('supplier_operator') + debugger if(roleList.value.indexOf('supplier_operator')>-1&&(row.status=='3'||row.status=='7')){ detailAnnexTable.value[1].hiddenDelete = false detailAnnexTable.value[1].hiddenUpload = false diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index 0f01db701..4cd882e4d 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -316,7 +316,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( } }, { - label: '折扣金额', + label: '调整价差', field: 'discountAmount', formatter: accountantFormart, table: {