Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

chenlu

7 小时以前 a0db8ecfc7f6a560804e94b5834435ce460c00b9

Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

 north-glass-erp/northglass-erp/src/components/sd/order/UploadPicture.vue

@@ -33,6 +33,7 @@
})

onMounted(() => {
  console.log(props.rowIndex)
  getFileList()
})

@@ -120,6 +121,11 @@
      }
    }

    if(!props.rowIndex.orderNumber){
      ElMessage.warning(t("order.msg.pleaseUploadPicture17"))
      return
    }

    if(imgWidth.value ){
      const regex = /^(0|[1-9]\d{0,2}|1000)$/
      if(!regex.test(imgWidth.value)){

 north-glass-erp/northglass-erp/src/lang/ar.js

@@ -346,6 +346,7 @@
            pleaseUploadPicture14:"上传结果",
            pleaseUploadPicture15:"文件已成功转格式",
            pleaseUploadPicture16:"下载",
            pleaseUploadPicture17:"此行新增行,请先保存订单再上传图片",
        },
        preciseMode:'精确模式',
        ambiguityModels:'模糊模式',

 north-glass-erp/northglass-erp/src/lang/en.js

@@ -346,6 +346,7 @@
            pleaseUploadPicture14:"上传结果",
            pleaseUploadPicture15:"文件已成功转格式",
            pleaseUploadPicture16:"下载",
            pleaseUploadPicture17:"此行新增行,请先保存订单再上传图片",
        },
        preciseMode:'精确模式',
        ambiguityModels:'模糊模式',

 north-glass-erp/northglass-erp/src/lang/kr.js

@@ -346,6 +346,7 @@
            pleaseUploadPicture14:"上传结果",
            pleaseUploadPicture15:"文件已成功转格式",
            pleaseUploadPicture16:"下载",
            pleaseUploadPicture17:"此行新增行,请先保存订单再上传图片",
        },
        preciseMode:'精确模式',
        ambiguityModels:'模糊模式',

 north-glass-erp/northglass-erp/src/lang/ru.js

@@ -346,6 +346,7 @@
            pleaseUploadPicture14:"上传结果",
            pleaseUploadPicture15:"文件已成功转格式",
            pleaseUploadPicture16:"下载",
            pleaseUploadPicture17:"此行新增行,请先保存订单再上传图片",
        },
        preciseMode:'精确模式',
        ambiguityModels:'模糊模式',

 north-glass-erp/northglass-erp/src/lang/zh.js

@@ -346,6 +346,7 @@
            pleaseUploadPicture14:"上传结果",
            pleaseUploadPicture15:"文件已成功转格式",
            pleaseUploadPicture16:"下载",
            pleaseUploadPicture17:"此行新增行,请先保存订单再上传图片",
        },
        preciseMode:'精确模式',
        ambiguityModels:'模糊模式',

 north-glass-erp/src/main/java/com/example/erp/service/sd/OrderFileService.java

@@ -71,7 +71,7 @@

    public Object updateOrderFileByOrderNumber(MultipartFile file,String name,String orderId,String orderNumber,Float width,Float height) throws IOException {
       //判断是否规定的格式后缀名
        if(!isAllowedFile(name)){
        if(!isAllowedFile(name) || orderNumber == null || orderId == null){
           return null;
       }