guoyujie
2025-03-26 c33e31108bec0e71216ac01966a91e330546611a
部分界面语言替换
11个文件已修改
95 ■■■■ 已修改文件
north-glass-erp/northglass-erp/src/components/sd/order/OrderNumberReportTransfer.vue 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/lang/ar.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/lang/en.js 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/lang/ru.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/lang/zh.js 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/basicData/SearchBasicData.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomer.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomerOrder.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/product/CreateProduct.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/components/sd/order/OrderNumberReportTransfer.vue
@@ -2,6 +2,8 @@
import {ref} from "vue";
import request from "@/utils/request";
import {ElMessage} from "element-plus";
import {useI18n} from "vue-i18n"
const { t } = useI18n()
const props = defineProps({
  transferData:{}
})
@@ -10,14 +12,14 @@
const orderNumberTransferSubmit = () => {
  request.post('/reportingWork/reportingWorkTransfer',props.transferData).then(res => {
    if(res.code === '200' && res.data.data===true){
      ElMessage.success("保存成功")
      ElMessage.success(t('basicData.saveSuccess'))
      emits('orderNumberTransfer')
    }else{
      ElMessage.warning(res.data.msg)
    }
  }).catch(err => {
    ElMessage.error("与mes通讯异常")
    ElMessage.error(t('order.transferPage.errorToMes'))
  })
/*emits('orderNumberTransfer')*/
}
@@ -25,25 +27,25 @@
<template>
  <el-form :model="props.transferData">
    <el-form-item label="原订单号:" label-width="140px">
    <el-form-item :label="$t('order.transferPage.oldOrderId')+':'" label-width="140px">
      <el-text>{{props.transferData.oldOrderId}}</el-text>
    </el-form-item>
    <el-form-item label="原订单序号:" label-width="140px">
    <el-form-item :label="$t('order.transferPage.oldOrderNumber')+':'" label-width="140px">
      <el-text>{{props.transferData.oldOrderNumber}}</el-text>
    </el-form-item>
    <el-form-item label="新订单号:" label-width="140px">
    <el-form-item :label="$t('order.transferPage.newOrderId')+':'" label-width="140px">
      <el-input v-model="props.transferData.newOrderId" autocomplete="off" />
    </el-form-item>
    <el-form-item label="新订单序号:" label-width="140px">
    <el-form-item :label="$t('order.transferPage.newOrderNumber')+':'" label-width="140px">
      <el-input v-model="props.transferData.newOrderNumber" type="number" autocomplete="off" />
    </el-form-item>
    <el-form-item  label-width="140px">
      <el-popconfirm title="确实转移此序号的流程卡报工数据?"
      <el-popconfirm :title="$t('order.transferPage.confirmTitle')"
                     @confirm="orderNumberTransferSubmit()">
        <template #reference>
          <el-button
              type="primary"
              style="margin-left: 268px">确定</el-button>
              style="margin-left: 268px">{{$t('craft.sure')}}</el-button>
        </template>
      </el-popconfirm>
    </el-form-item>
north-glass-erp/northglass-erp/src/lang/ar.js
@@ -68,6 +68,7 @@
        selected:'选中',
        partiallySelected:'部分选中',
        unchecked :'未选中',
        copy:'复制',
        msg:{
            max255:'أدخل 255 حرفًا كحد أقصى',
            range99999Dec2:
@@ -249,6 +250,7 @@
        quantityMount:'数量金额',
        allAmount:'面积金额(总金额)',
        orderTransfer:'订单报工转移',
        msg:{
            productCheck:'الرجاء اختيار منتج',
@@ -307,6 +309,9 @@
        copyTitle:'نسخ العنوان',
        msgList:{
            checkOrder:'لم يتم العثور على معلومات الطلب، يرجي تحديد الطلب اولاً',
            isOptimize:'此订单已转优化,回退失败!',
            isReportingWork:'此订单已报工,回退失败!',
            isStorage:'此订单已入库,回退失败!',
        },
        updateOrderId:"修改订单号",
        reportingTransfer:'报工转移'
@@ -721,6 +726,9 @@
        customerAbbreviation:'اختصار العميل',
        pleaseEnterTheCustomerAbbreviation:'الرجاء ادخال اختصار العميل',
        msgList:{
            notCustomerInfo:'未查询到客户信息',
        }
    },
    delivery:{
        page:{
north-glass-erp/northglass-erp/src/lang/en.js
@@ -68,6 +68,7 @@
        selected:'selected',
        partiallySelected:'partially selected',
        unchecked :'unchecked',
        copy:'Copy',
        msg:{
            max255:"The value contains a maximum of 255 characters",
            range99999Dec2:
@@ -249,6 +250,7 @@
        quantityMount:'Quantity and Amount',
        allAmount:'面积金额(总金额)',
        orderTransfer:'订单报工转移',
        msg:{
            productCheck:'Please select a product',
@@ -306,7 +308,10 @@
        copy:'Copy',
        copyTitle:'Copy Title',
        msgList:{
            checkOrder:'No order information is found. Please click Order first'
            checkOrder:'No order information is found. Please click Order first',
            isOptimize:'此订单已转优化,回退失败!',
            isReportingWork:'此订单已报工,回退失败!',
            isStorage:'此订单已入库,回退失败!',
        },
        updateOrderId:"修改订单号",
        reportingTransfer:'报工转移'
@@ -721,6 +726,9 @@
        customerAbbreviation:'Customer abbreviation',
        pleaseEnterTheCustomerAbbreviation:'Please enter the customers abbreviation',
        msgList:{
            notCustomerInfo:'未查询到客户信息',
        }
    },
    delivery:{
        page:{
north-glass-erp/northglass-erp/src/lang/ru.js
@@ -68,6 +68,7 @@
        selected:'选中',
        partiallySelected:'部分选中',
        unchecked :'未选中',
        copy:'复制',
        msg:{
            max255:"Введите 255 символов.",
            range99999Dec2:
@@ -249,6 +250,7 @@
        quantityMount:'数量金额',
        allAmount:'面积金额(总金额)',
        orderTransfer:'订单报工转移',
        msg:{
            productCheck:'Пожалуйста, выберите продукт',
@@ -307,6 +309,9 @@
        copyTitle:'Копировать заголовок',
        msgList:{
            checkOrder:'Если информация о заказе не получена, нажмите на заказ.',
            isOptimize:'此订单已转优化,回退失败!',
            isReportingWork:'此订单已报工,回退失败!',
            isStorage:'此订单已入库,回退失败!',
        },
        updateOrderId:"修改订单号",
        reportingTransfer:'报工转移'
@@ -720,6 +725,9 @@
        customerAbbreviation:'Клиенты Сокращения',
        pleaseEnterTheCustomerAbbreviation:'Пожалуйста, введите сокращение клиента.',
        msgList:{
            notCustomerInfo:'未查询到客户信息',
        }
    },
    delivery:{
        page:{
north-glass-erp/northglass-erp/src/lang/zh.js
@@ -68,6 +68,7 @@
        selected:'选中',
        partiallySelected:'部分选中',
        unchecked :'未选中',
        copy:'复制',
        msg:{
            max255:"最多输入255个字符",
            range99999Dec2:
@@ -249,6 +250,16 @@
        quantityMount:'数量金额',
        allAmount:'面积金额(总金额)',
        orderTransfer:'订单报工转移',
        transferPage:{
            oldOrderId:'原订单号',
            newOrderId:'新订单号',
            oldOrderNumber:'原订单序号',
            newOrderNumber:'新订单序号',
            confirmTitle:'确实转移此序号的流程卡报工数据?',
            errorToMes:'与mes通讯异常'
        },
        msg:{
            productCheck:'请选择产品',
@@ -282,8 +293,6 @@
            updateOrderIdErrorDiscrepancyInLength:'输入订单号长度不符',
            updateOrderIdErrorInputNumber:'请输入数字',
            updateOrderIdErrorNotNo1:'不能修改第一个单子',
        }
    },
@@ -308,7 +317,10 @@
        copy:'复制订单',
        copyTitle:'复制表头',
        msgList:{
            checkOrder:'未查询到订单信息,请先单击订单'
            checkOrder:'未查询到订单信息,请先单击订单',
            isOptimize:'此订单已转优化,回退失败!',
            isReportingWork:'此订单已报工,回退失败!',
            isStorage:'此订单已入库,回退失败!',
        },
        updateOrderId:"修改订单号",
        reportingTransfer:'报工转移'
@@ -723,6 +735,9 @@
        customerAbbreviation:'客户简称',
        pleaseEnterTheCustomerAbbreviation:'请输入客户简称',
        msgList:{
            notCustomerInfo:'未查询到客户信息',
        }
    },
    delivery:{
        page:{
north-glass-erp/northglass-erp/src/views/sd/basicData/SearchBasicData.vue
@@ -302,7 +302,7 @@
          </el-col>
        </template>
        <template #add>
          <el-button @click="add" type="primary" style="margin-right: 3px">新增</el-button>
          <el-button @click="add" type="primary" style="margin-right: 3px">{{$t('basicData.insert')}}</el-button>
        </template>
north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomer.vue
@@ -201,8 +201,8 @@
    body: {
      options: [
        [
          { code: 'sheet1', name: '订单', prefixIcon: 'vxe-icon-file-txt', visible: true},
          { code: 'sheet2', name: '发货', prefixIcon: 'vxe-icon-file-txt', visible: true},
          { code: 'sheet1', name: t('orderBasicData.order'), prefixIcon: 'vxe-icon-file-txt', visible: true},
          { code: 'sheet2', name: t('searchOrder.delivery'), prefixIcon: 'vxe-icon-file-txt', visible: true},
        ]
      ]
    }
@@ -260,7 +260,7 @@
      switch (menu.code) {
        case 'sheet1': {
          if(rowClickIndex.value===null){
            ElMessage.warning("未查询到客户信息")
            ElMessage.warning(t('customer.msgList.notCustomerInfo'))//"未查询到客户信息"
            return
          }
          router.push({path: '/main/customer/selectCustomerOrder', query: { id: row.id,type:1 }})
@@ -269,7 +269,7 @@
        }
        case 'sheet2': {
          if(rowClickIndex.value===null){
            ElMessage.warning("未查询到客户信息")
            ElMessage.warning(t('customer.msgList.notCustomerInfo'))
            return
          }
          router.push({path: '/main/customer/selectCustomerOrder', query: { id: row.id,type:2 }})
north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomerOrder.vue
@@ -265,7 +265,7 @@
      const blob = new Blob([res])
      if ('download' in document.createElement('a')) { // 非IE下载
        const elink = document.createElement('a')
        elink.download = `客户订单.xlsx`
        elink.download = `customerOrder.xlsx`
        elink.style.display = 'none'
        elink.href = URL.createObjectURL(blob)
        document.body.appendChild(elink)
@@ -281,7 +281,7 @@
        const blob = new Blob([res])
        if ('download' in document.createElement('a')) { // 非IE下载
          const elink = document.createElement('a')
          elink.download = `客户发货.xlsx`
          elink.download = `customerDelivery.xlsx`
          elink.style.display = 'none'
          elink.href = URL.createObjectURL(blob)
          document.body.appendChild(elink)
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
@@ -766,7 +766,7 @@
        case "reportingTransfer":{
          const row = xGrid.value.getCurrentRecord()
          if(row===null){
            ElMessage.warning("请选择一行数据")
            ElMessage.warning(t('components.pleaseClickToSelectARowFirst'))
            return
          }
          transferData.value.oldOrderNumber = row.orderNumber
@@ -1878,9 +1878,9 @@
<!--    订单报工转移-->
    <el-dialog v-model="dialogTransferVisible"
               title="报工转移"
               width="500"
               destroy-on-close :close-on-click-modal="false">
               :close-on-click-modal="false"
               :title="$t('order.orderTransfer')"
               destroy-on-close width="500">
      <order-number-report-transfer :transferData="transferData" @orderNumberTransfer="orderNumberTransfer"/>
    </el-dialog>
north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue
@@ -390,11 +390,11 @@
              ElMessage.success(t('product.msg.operateSuccess')+'!')
              selectOrderList()
            }else if(res.data==='false1'){
              ElMessage.warning('此订单已转优化,回退失败!')
              ElMessage.warning(t('searchOrder.msgList.isOptimize'))
            }else if(res.data==='false2'){
              ElMessage.warning('此订单已报工,回退失败!')
              ElMessage.warning(t('searchOrder.msgList.isReportingWork'))
            }else if(res.data==='false3'){
              ElMessage.warning('此订单已入库,回退失败!')
              ElMessage.warning(t('searchOrder.msgList.isStorage'))
            }
          })
        })
north-glass-erp/northglass-erp/src/views/sd/product/CreateProduct.vue
@@ -816,7 +816,7 @@
          margin-left: 0.5rem;"
          size="large"
          type="primary"
          round>{{"复制"}}</el-button>
          round>{{$t('basicData.copy')}}</el-button>
      <el-button
          :disabled="productTotal.state===1"
          @click="saveProduct(null)"