中英文合并

src/components/rowDrop/index.vue

@@ -59,9 +59,9 @@ const handlecheckedchange = (value: string[]) => {
 }
 
 const reset = () => {
-  ElMessageBox.confirm('重置后，字段设置将恢复初始设置，是否继续?', '提示', {
+  ElMessageBox.confirm(t('ts.重置后，字段设置将恢复初始设置，是否继续?'), t('ts.提示'), {
-    confirmButtonText: '确定',
+    confirmButtonText: t('ts.确定'),
-    cancelButtonText: '取消',
+    cancelButtonText: t('ts.取消'),
     type: 'warning'
   }).then(() => {
     RedisApi.deleteRedis(routeName.value).then(() => {

src/locales/en-US.ts

@@ -659,6 +659,7 @@ export default {
     银行:'Bank',
     币种:'Currency Kind',
     税率:'Tax Rate',
+    '税率(%)':'Tax Rate(%)',
     生效时间:'Effective Time',
     失效时间:'Expiration Time',
     供应商物料代码:'Supplier material code',
@@ -1055,6 +1056,11 @@ export default {
       analysis: 'Analysis',
       workplace: 'Workplace'
     },
+    '重置后，字段设置将恢复初始设置，是否继续?':'After reset, the field Settings will be restored to the initial Settings. Do you want to continue?',
+    提示:'Tip',
+    凭证号:'voucher number',
+    采购价格审批人:'Purchasing price approver',
+    供应商发货单号:'Supplier\'s invoice number'
 
   },
   

src/locales/zh-CN.ts

@@ -659,6 +659,7 @@ export default {
     银行:'银行',
     币种:'币种',
     税率:'税率',
+    '税率(%)':'税率(%)',
     生效时间:'生效时间',
     失效时间:'失效时间',
     供应商物料代码:'供应商物料代码',
@@ -1055,6 +1056,11 @@ export default {
       analysis: '分析页',
       workplace: '工作台'
     },
+    '重置后，字段设置将恢复初始设置，是否继续?':'重置后，字段设置将恢复初始设置，是否继续?',
+    提示:'提示',
+    凭证号:'凭证号',
+    采购价格审批人:'采购价格审批人',
+    供应商发货单号:'供应商发货单号'
 
   },
 

src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue

@@ -294,7 +294,7 @@ const getSearchTableData = async (number,formField,searchField)=>{
       {
         label: t('ts.创建供应商发货申请'),
         name: 'supplierdeliver',
-        hide: isShowMainButton(row, ['1']),
+        hide: isShowMainButton(row, ['3']),
         type: 'primary',
         icon: '',
         color: '',

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

@@ -298,7 +298,7 @@
       defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['1','6']) ,hasPermi: 'wms:supplierinvoice-request-main:open'}), // 打开
       defaultButtons.mainListPlanSubBtn({ hide: isShowMainButton(row, ['1','6']),hasPermi: 'wms:supplierinvoice-request-main:sub' }), // 提交审批
       {
-        label: '采购通过',
+        label: t('ts.采购通过'),
         name: 'purchase_mainPlanSub',
         hide: isShowMainButton(row, ['2','7']),
         type: 'primary',
@@ -307,7 +307,7 @@
         hasPermi: 'wms:supplierinvoice-request-main:app',
         link: true, // 文本展现按钮
       },{
-        label: '采购驳回',
+        label: t('ts.采购驳回'),
         name: 'purchase_mainPlanTur',
         hide: isShowMainButton(row, ['2','7']),
         type: 'danger',
@@ -316,7 +316,7 @@
         hasPermi: 'wms:supplierinvoice-request-main:rej'
       },
       {
-        label: '供应商确认',
+        label: t('ts.供应商确认'),
         name: 'invoice_sent_out',
         hide: isShowMainButton(row, ['8']),
         type: 'danger',
@@ -325,7 +325,7 @@
         hasPermi: 'wms:supplierinvoice-request-main:invoiceSentOut'
       },
       {
-        label: '财务通过',
+        label: t('ts.财务通过'),
         name: 'finance_mainPlanSub',
         hide: isShowMainButton(row, ['4']),
         type: 'primary',
@@ -334,7 +334,7 @@
         hasPermi: 'wms:supplierinvoice-request-main:financeApp',
         link: true, // 文本展现按钮
       },{
-        label: '财务驳回',
+        label: t('ts.财务驳回'),
         name: 'finance_mainPlanTur',
         hide: isShowMainButton(row, ['4']),
         type: 'danger',
@@ -346,7 +346,7 @@
       defaultButtons.mainListPurchasePlanCloBtn({ hasPermi: 'wms:supplierinvoice-request-main:close' ,hide: isShowMainButton(row, ['1','8','6']) }), // 关闭
       // defaultButtons.mainListDeleteBtn({hasPermi:'wms:supplierinvoice-request-main:delete'}), // 删除
       {
-        label: '打印',
+        label: t('ts.打印'),
         name: 'mian_print',
         hide: null,
         type: 'primary',
@@ -634,11 +634,11 @@ const handleImport = () => {
     try {
       if (formType === 'create') {
         if(data.subList.length == 0){
-          message.warning("请添明细数据")
+          message.warning(t('ts.请添明细数据'))
           return;
         }
         if(data.subList.length > 999){
-          message.warning("明细数据条数已超过最大数量限制【999条】")
+          message.warning(t('ts.明细数据条数已超过最大数量限制【999条】'))
           return;
         }
         await SupplierinvoiceRequestMainApi.createSupplierinvoiceRequestMain(data)