guoyujie
2025-03-20 0fc1451bd4129e04a8950190f473c9ef0fd82a3f
添加计算方式 使用总金额保留两位小数
6个文件已修改
15 ■■■■ 已修改文件
north-glass-erp/northglass-erp/src/lang/ar.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/lang/en.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/lang/ru.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/lang/zh.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/router/index.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/lang/ar.js
@@ -248,6 +248,7 @@
        oneClickReturn:'一键退回',
        quantityMount:'数量金额',
        allAmount:'面积金额(总金额)',
        msg:{
            productCheck:'الرجاء اختيار منتج',
north-glass-erp/northglass-erp/src/lang/en.js
@@ -248,6 +248,7 @@
        oneClickReturn:'一键退回',
        quantityMount:'Quantity and Amount',
        allAmount:'面积金额(总金额)',
        msg:{
            productCheck:'Please select a product',
north-glass-erp/northglass-erp/src/lang/ru.js
@@ -248,6 +248,7 @@
        oneClickReturn:'一键退回',
        quantityMount:'数量金额',
        allAmount:'面积金额(总金额)',
        msg:{
            productCheck:'Пожалуйста, выберите продукт',
north-glass-erp/northglass-erp/src/lang/zh.js
@@ -248,6 +248,7 @@
        oneClickReturn:'一键退回',
        quantityMount:'数量金额',
        allAmount:'面积金额(总金额)',
        msg:{
            productCheck:'请选择产品',
north-glass-erp/northglass-erp/src/router/index.js
@@ -1217,8 +1217,8 @@
      component: () => import('../views/RegisterView.vue')
    },
    {
      path: '/appDownLoad',
      name: 'appDownLoad',
      path: '/app',
      name: 'app',
      component: () => import('../views/system/app/appDownload.vue')
    }
    
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
@@ -1344,6 +1344,8 @@
     }
     if(titleUploadData.value.calculateType===3){
       row.grossAmount=multiply(row.price ,row.quantity)
     }else if(titleUploadData.value.calculateType===4){
       row.grossAmount=parseFloat(divideAuto(row.width * row.height* row.quantity*row.price,1000000,company.decValue))
     }else{
       row.grossAmount=multiply(row.price , row.computeGrossArea)
     }
@@ -1443,6 +1445,10 @@
    if( !isNaN(item.computeArea*1) && item.computeArea != null ){
      if(titleUploadData.value.calculateType===3){
        item.grossAmount=parseFloat(multiply(item.price , item.quantity))
      }else if(titleUploadData.value.calculateType===4){
        item.grossArea = countArea(item)
        item.computeGrossArea = item.grossArea
        item.grossAmount=parseFloat(divideAuto(item.width * item.height* item.quantity*item.price,1000000,company.decValue))
      }else{
        item.grossArea = countArea(item)
        item.computeGrossArea = item.grossArea
@@ -1657,6 +1663,7 @@
            <el-option :value="1" :label="t('order.areaAmountPerPiece')"/>
            <el-option :value="2" :label="t('order.areaAmountAge')"/>
            <el-option :value="3" :label="t('order.quantityMount')"/>
            <el-option :value="4" :label="t('order.allAmount')"/>
          </el-select>
        </el-col>
        <el-col  :span="2"><el-text>*{{$t('order.salesman')}}:</el-text></el-col>