修改

廖井涛

2024-07-31 8749f38d198645addab1f14c8458f03c3d93df5e

修改

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

@@ -418,7 +418,7 @@
        labelPrinting2:'Label printing 2',
        addAutomatically:'Auto fill',
        selectFill:'Selected fill',
        engineeringPrinting:'工程打印'
        engineeringPrinting:'Engineering Printing'
    },
    reportingWorks:{
        glassNumber:'Code',
@@ -614,7 +614,7 @@
        endOperationOrderNumber:'Transfer sequence number',
        typeClaim:'Take out type',

        pleaseEnterTheBoxNumber:'请输入箱号',
        pleaseEnterTheBoxNumber:'Please enter the box number',


    },
@@ -679,10 +679,12 @@
        money:'Amount',

        pleaseSelectTheSameCustomerProject:'Please select the project for the same customer',
        noMoney:'无金额',
        freightPrice:'运费单价',
        freightQuantity:'运费数量',
        freight:'运费金额',
        noMoney:'No money',
        freightPrice:'Freight Price',
        freightQuantity:'Freight Quantity',
        freight:'Freight Money',

        pleaseMsg1:'订单存在其他金额单价没有填写',

    },
    replenish:{

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

@@ -684,6 +684,7 @@
        freightPrice:'运费单价',
        freightQuantity:'运费数量',
        freight:'运费金额',
        pleaseMsg1:'订单存在其他金额单价没有填写',

    },
    replenish:{

 north-glass-erp/northglass-erp/src/views/mm/mainIngredient/CreateIngredients.vue

@@ -207,10 +207,10 @@

     <el-row  gutter="10" justify="center" >
       <el-col span="4">
         <el-button id="searchButton" type="primary" @click="resetForm" >重置</el-button>
         <el-button id="searchButton" type="primary" @click="resetForm" >{{$t('basicData.empty')}}</el-button>
       </el-col>
       <el-col span="4">
         <el-button id="searchButton" type="primary" @click="submitForm" >保存</el-button>
         <el-button id="searchButton" type="primary" @click="submitForm" >{{$t('basicData.save')}}</el-button>
       </el-col>
     </el-row>
   </el-form>

 north-glass-erp/northglass-erp/src/views/sd/basicData/CreateBasicData.vue

@@ -140,7 +140,7 @@
      basic.value.input=basic.value.input+"mm"
    }
  }
  console.log(basic.value)
  basic.value.input=basic.value.input.trim()
  request.post(`/basicData/addBasicData`, basic.value).then(res => {
    if (res.data) {
      ElMessage.success(t('basicData.msg.saveSuccess'))
@@ -157,7 +157,7 @@
  let submitArr  = props.rowIndex
  submitArr.basicType = basic.value.basicType[0]
  submitArr.basicCategory = basic.value.basicType[1]
  submitArr.basicName = basic.value.input
  submitArr.basicName = basic.value.input.trim()
  submitArr.nickname = basic.value.nickname
  request.post(`/basicData/updateBasicData`, submitArr).then(res => {
    if (res.data) {

 north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue

@@ -415,7 +415,7 @@
               ElMessage.success(t('delivery.deliveryNoteSubmittedSuccessfully'))
               router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
             }else if(res.data===false){
               ElMessage.warning("订单存在其他金额单价没有填写")
               ElMessage.warning(t('delivery.pleaseMsg1'))
             }else{
               ElMessage.warning(t('basicData.msg.saveFail'))
             }

 north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue

@@ -330,6 +330,9 @@
}





</script>

<template>