guoyujie
2025-06-12 dbf6e630a59e51c55fab57608c0457326ea7eab4
提交修改切换语言方法,与玻璃图片上传前端新功能
3个文件已修改
1 文件已重命名
1个文件已添加
81 ■■■■■ 已修改文件
north-glass-erp/northglass-erp/src/components/sd/order/UploadPicture.vue 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/lang/index.js 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/lang/kr.js 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/LoginView.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/components/sd/order/UploadPicture.vue
New file
@@ -0,0 +1,46 @@
<script setup lang="ts">
import { ref } from 'vue'
import type { UploadProps, UploadUserFile } from 'element-plus'
const fileList = ref<UploadUserFile[]>([])
const upload = ref()
const emits = defineEmits(['getUploadPicture'])
const handleRemove: UploadProps['onRemove'] = (uploadFile, uploadFiles) => {
  console.log(uploadFile, uploadFiles)
}
const handlePreview: UploadProps['onPreview'] = (file) => {
  console.log(file)
}
const handleChange = (uploadFile, uploadFiles) => {
  emits('getUploadPicture', uploadFile.name)
  upload.value.clearFiles()
}
</script>
<template>
  <el-upload
      v-model:file-list="fileList"
      ref="upload"
      class="upload-demo"
      action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
      :on-preview="handlePreview"
      :on-remove="handleRemove"
      :on-change="handleChange"
      list-type="picture"
      :auto-upload="false"
  >
    <el-button type="primary">Click to upload</el-button>
    <template #tip>
      <div class="el-upload__tip">
        jpg/png files with a size less than 500kb
      </div>
    </template>
  </el-upload>
</template>
<style scoped>
</style>
north-glass-erp/northglass-erp/src/lang/index.js
@@ -9,12 +9,14 @@
import en from "./en"
import ru from "./ru"
import ar from "./ar"
import kr from "@/lang/kr";
let messages = {
    'zh-CN':zh,
    'en-US': en,
    ru: ru,
    ar: ar
    ar: ar,
    kr: kr
}
const i18n = createI18n({
@@ -25,5 +27,5 @@
})
VxeUI.setI18n('zh-CN', zhCN)
VxeUI.setI18n('en-US', enUS)
VxeUI.setLanguage(localStorage.getItem('lang')==='en-US' ? 'en-US' : 'zh-CN')
VxeUI.setLanguage(localStorage.getItem('lang')==='zh-CN' ?  'zh-CN' : 'en-US' )
export default i18n
north-glass-erp/northglass-erp/src/lang/kr.js
north-glass-erp/northglass-erp/src/views/LoginView.vue
@@ -136,6 +136,7 @@
          <el-option value="en-US"  label="English" />
          <el-option value="ru"  label="Русский язык" />
          <el-option value="ar"  label="بالعربية" />
          <el-option value="ko-KR"  label="한국어" />
        </el-select>
        <h2>{{$t('login.SysName')}}</h2>
        <el-form
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
@@ -18,7 +18,8 @@
import footSum from "@/hook/footSum"
import {useI18n} from "vue-i18n"
import {multiply,multiplyAuto,divideAuto} from '@/utils/decimal'
import OrderNumberReportTransfer from "@/components/sd/order/OrderNumberReportTransfer.vue";
import OrderNumberReportTransfer from "@/components/sd/order/OrderNumberReportTransfer.vue"
import UploadPicture from "@/components/sd/order/UploadPicture.vue"
const { t } = useI18n()
let dialogTableVisible = ref(false)
@@ -27,6 +28,7 @@
let otherMoneyVisible = ref(false)
let sizeCheckVisible = ref(false)
let dialogTransferVisible = ref(false)
let uploadPictureVisible = ref(false)
const transferData = ref({
  oldOrderId:null,
  newOrderNumber:null,
@@ -126,7 +128,8 @@
          { code: 'otherMoney', name: t('basicData.otherAmounts'), prefixIcon: 'vxe-icon-chart-bar-x', visible: true, disabled: false },
          { code: 'sizeCheck', name: t('basicData.sizeReview'), prefixIcon: 'vxe-icon-eye-fill', visible: true, disabled: false },
          { code: 'updateOrderId', name: t('searchOrder.updateOrderId'), prefixIcon: 'vxe-icon-eye-fill', visible: true, disabled: false },
          { code: 'reportingTransfer', name: t('searchOrder.reportingTransfer'), prefixIcon: 'vxe-icon-send', visible: true, disabled: true }
          { code: 'reportingTransfer', name: t('searchOrder.reportingTransfer'), prefixIcon: 'vxe-icon-send', visible: true, disabled: true },
          /*{ code: 'uploadPicture', name: '图片上传',  visible: true, }*/
        ]
      ]
    }
@@ -775,6 +778,14 @@
          transferData.value.oldOrderId = titleUploadData.value.orderId
          dialogTransferVisible.value = true
          break
        }
        case 'uploadPicture':{
          const row = xGrid.value.getCurrentRecord()
          if(row===null){
            ElMessage.warning(t('components.pleaseClickToSelectARowFirst'))
            return
          }
          uploadPictureVisible.value= true
        }
      }
    }
@@ -1619,6 +1630,13 @@
      random:Math.random()}})
}
//图片上传名称
const getUploadPicture = (name) => {
  uploadPictureVisible.value = false
  const row = xGrid.value.getCurrentRecord()
  row.otherColumns['S02']=name
}
</script>
<template>
@@ -1899,6 +1917,12 @@
      <order-number-report-transfer :transferData="transferData" @orderNumberTransfer="orderNumberTransfer"/>
    </el-dialog>
    <el-dialog v-model="uploadPictureVisible"
               :close-on-click-modal="false"
               destroy-on-close width="500">
      <upload-picture  @getUploadPicture="getUploadPicture"/>
    </el-dialog>
  </div>
</template>