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

chenlu

2025-08-04 fd98e57555cabf86d056e00d640c2ff14c492d5f

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

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

@@ -260,6 +260,11 @@
        vertical:'竖',
        exportDXF:'导出dxf',
        selectFile:'选择文件',

        ownerForProduction:'生产部门负责人',
        surtax:'附加税',
        valueAddedTax:'增值税',
        cuttingTransport:'运输消减',
        msg:{
            productCheck:'الرجاء اختيار منتج',
            tableLengthNot:'لا توجد بيانات للجدول',
@@ -1234,7 +1239,8 @@
        hollow:'中空',
        process:'工艺',
        addProduce:'选择产品',
        reorder:'转订单'
        reorder:'转订单',
        unit:'元/m²'
    }



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

@@ -260,6 +260,11 @@
        vertical:'vertical',
        exportDXF:'exportDXF',
        selectFile:'选择文件',

        ownerForProduction:'生产部门负责人',
        surtax:'附加税',
        valueAddedTax:'增值税',
        cuttingTransport:'运输消减',
        msg:{
            productCheck:'Please select a product',
            tableLengthNot:'No table data',
@@ -1236,7 +1241,8 @@
        hollow:'hollow',
        process:'process',
        addProduce:'Select product',
        reorder:'reorder'
        reorder:'reorder',
        unit:'元/m²'
    }



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

@@ -260,6 +260,11 @@
        vertical:'세로',
        exportDXF:'dxf 내보내기',
        selectFile:'파일 선택',

        ownerForProduction:'소유',
        surtax:'부가세',
        valueAddedTax:'부가세',
        cuttingTransport:'재단전송',
        transferPage:{
            oldOrderId:'기존 주문 번호',
            newOrderId:'신규 주문 번호',
@@ -1226,26 +1231,27 @@
        user :'사용자 목록',
        role :'역할 권한',
        userPassWord :'비밀번호 변경',
        glassPrice:'玻璃价格',
        glassOptimize:'玻璃优化'
        glassPrice:'유리 가격',
        glassOptimize:'유리 최적화'
    },

    glassPrice:{
        glassPriceComputed:'玻璃报价',
        priceSet:'价格设置',
        priceList:'价格列表',
        glassPriceComputed:'유리 견적',
        priceSet:'가격 설정',
        priceList:'가격 목록',
        msg:{
            error1:'请选择全部参数',
            error2:'此膜系已经存在，请重新选择',
            success:'数据保存成功',
            addProduce:'请先添加产品'
        },
        glass:'玻璃',
        glass:'유리',
        interlayer:'적층 간격재',
        hollow:'중공 간격재',
        process:'작업 절차',
        addProduce:'选择产品',
        reorder:'转订单'
        addProduce:'제품 선택',
        reorder:'이월 주문',
        unit:'메타/m²'
    }



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

@@ -260,6 +260,11 @@
        vertical:'竖',
        exportDXF:'导出dxf',
        selectFile:'选择文件',

        ownerForProduction:'生产部门负责人',
        surtax:'附加税',
        valueAddedTax:'增值税',
        cuttingTransport:'运输消减',
        msg:{
            productCheck:'Пожалуйста, выберите продукт',
            tableLengthNot:'Нет данных таблицы',
@@ -1233,7 +1238,8 @@
        hollow:'中空',
        process:'工艺',
        addProduce:'选择产品',
        reorder:'转订单'
        reorder:'转订单',
        unit:'元/m²'
    }



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

@@ -260,6 +260,11 @@
        vertical:'竖',
        exportDXF:'导出dxf',
        selectFile:'选择文件',

        ownerForProduction:'生产部门负责人',
        surtax:'附加税',
        valueAddedTax:'增值税',
        cuttingTransport:'运输消减',
        transferPage:{
            oldOrderId:'原订单号',
            newOrderId:'新订单号',
@@ -1253,7 +1258,8 @@
        hollow:'中空',
        process:'工艺',
        addProduce:'选择产品',
        reorder:'转订单'
        reorder:'转订单',
        unit:'元/m²'
    }



 north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/SetAmount.vue

@@ -146,12 +146,12 @@
    </div>

    <div style="margin-top: 20px">
      <span>鼠标点击蓝色图形区域可快速设置磨量</span>
      <span>鼠标点击蓝色图形区域可快速设置磨量(mm)</span>
      <el-input-number v-model="controlValue" class="quickset" placeholder="0"
                       controls-position="right" :step="0.1" :min="0"></el-input-number>
      <br>
      <div style="margin-top: 30px">
      <span>成品边长大于等于多少时自动填充(单位: mm)</span>
      <span>成品边长大于等于多少时自动填充(mm)</span>
      <el-checkbox v-model="check" style="margin: 5px 0 0 12px;"/>
      <vxe-input style="width: 100px; height: 40px; margin-left: 5px" v-model="minAutoLenght" placeholder=""/>
      </div>

 north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/SetTrimming.vue

@@ -136,11 +136,11 @@
    </div>

    <div>
      <span>鼠标点击蓝色图形区域可快速设置修边量</span>
      <span>鼠标点击蓝色图形区域可快速设置修边量(mm)</span>
      <el-input-number v-model="controlValue" class="quickset" placeholder="0"
                       controls-position="right" :step="0.1" :min="0"></el-input-number>
                       controls-position="right" :step="1" :min="0"></el-input-number>
      <br>
      <span>查询原片时自动填充(单位: mm)</span>
      <span>查询原片时自动填充(mm)</span>
      <el-checkbox v-model="check" style="margin: 20px 0 0 117px;"/>
    </div>
  </div>

 north-glass-erp/northglass-erp/src/views/sd/glassPrice/pages/Glass.vue

@@ -56,7 +56,7 @@
        controls-position="right"
        :step="0.01"
        :max="99999.99"
        placeholder="元/m²"
        :placeholder="$t('glassPrice.unit')"
        class="delInput"/>
    </el-col>
  </el-row>

 north-glass-erp/northglass-erp/src/views/sd/glassPrice/pages/Hollow.vue

@@ -80,7 +80,7 @@
          controls-position="right"
          :step="0.01"
          :max="99999.99"
          placeholder="元/m²"
          :placeholder="$t('glassPrice.unit')"
          class="delInput"/>
    </el-col>
  </el-row>

 north-glass-erp/northglass-erp/src/views/sd/glassPrice/pages/Interlayer.vue

@@ -80,7 +80,7 @@
          controls-position="right"
          :step="0.01"
          :max="99999.99"
          placeholder="元/m²"
          :placeholder="$t('glassPrice.unit')"
          class="delInput"/>
    </el-col>
  </el-row>

 north-glass-erp/northglass-erp/src/views/sd/glassPrice/pages/Process.vue

@@ -74,7 +74,7 @@
          controls-position="right"
          :step="0.01"
          :max="99999.99"
          placeholder="元/m²"
          :placeholder="$t('glassPrice.unit')"
          class="delInput"/>
    </el-col>
  </el-row>