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

chenlu

2025-09-03 4023713b452b5b990219df3611ea4d72ed558a99

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

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

@@ -381,7 +381,7 @@
        TrademarkAttribute:'商标参数',
        TrademarkOptions:'商标选项',
        xImage:'X轴镜像',
        yImage:'y轴镜像',
        yImage:'Y轴镜像',
        modifyTrademark:'修改商标',
        tag:'打标使能',
        tag2:'二维码打印1',

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

@@ -1,6 +1,6 @@
<template>
  <div>
    <el-button id="button" type="primary" @click="handlePrint" style="position: fixed; top: 90px; right: 20px; padding: 20px; background: #4CAF50; color: white; border: none; border-radius: 5px; cursor: pointer;">
    <el-button id="button" type="primary" @click="handlePrint" style="position: fixed; top: 90px; right: 20px; padding: 20px; background: #409eff; color: white; border: none; border-radius: 5px; cursor: pointer;">
      打印
    </el-button>

@@ -15,7 +15,7 @@
      <el-select v-model="config.type"  style="width: 120px;">
        <el-option v-for="type in linkTypes" :key="type" :value="type" />
      </el-select>
      <el-button id="button" type="primary" @click="handlePrint" style="background: #4CAF50; color: white; border: none; cursor: pointer;">
      <el-button id="button" type="primary" @click="handlePrint" style="background: #409eff; color: white; border: none; cursor: pointer;">
        预览
      </el-button>
    </div>

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

@@ -12,7 +12,7 @@
  

    </div>



    <button @click="submitLayouts" style="position: fixed; top: 90px; right: 20px; padding: 10px; background: #4CAF50; color: white; border: none; border-radius: 5px; cursor: pointer;">

    <button @click="submitLayouts" style="position: fixed; top: 90px; right: 20px; padding: 10px; background: #409eff; color: white; border: none; border-radius: 5px; cursor: pointer;">

      保存OPT

    </button>

  </template>


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

@@ -72,7 +72,7 @@
    </div>



    <!-- 提交按钮 -->

    <button @click="submitLayouts" style="position: fixed; top: 90px; right: 20px; padding: 10px; background: #4CAF50; color: white; border: none; border-radius: 5px; cursor: pointer;">

    <button @click="submitLayouts" style="position: fixed; top: 90px; right: 20px; padding: 10px; background: #409eff; color: white; border: none; border-radius: 5px; cursor: pointer;">

      保存调整

    </button>

  </div>


 north-glass-erp/northglass-erp/src/views/pp/glassOptimizeThirdParty/OptimizeControl.vue

@@ -6,7 +6,7 @@

  </div>
  <button @click="submitLayouts"
    style="position: fixed; bottom: 20px; right: 20px; padding: 10px; background: #4CAF50; color: white; border: none; border-radius: 5px; cursor: pointer;">
    style="position: fixed; bottom: 20px; right: 20px; padding: 10px; background: #409eff; color: white; border: none; border-radius: 5px; cursor: pointer;">
    保存OPT
  </button>
</template>

 north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue

@@ -377,29 +377,6 @@

  trademarkRow.value=row
  trademarkVisible.value= true
  trademarkAttr.value = {
    trademark:trademarkList.value[0].basicName,
    width:trademarkList.value[0].nickname.width ,
    height:trademarkList.value[0].nickname.height,
    xImage:false,
    yImage:false,
    tag:true,
    tag2:true ,
    tag3:false,
    xMargin:30,
    yMargin:30,
    location:t('craft.lowLeft'),
    qrcode1:{
      xMargin:10,
      yMargin:10,
      location:t('craft.lowLeft'),
    },
    qrcode2:{
      xMargin:10,
      yMargin:10,
      location:t('craft.upperRight')
    }
  }
  if(row.icon!=null && row.icon!==''){
    let trademark = JSON.parse(row.icon)
    if(trademark.qrcode2 === undefined){
@@ -417,7 +394,33 @@
      }
    }
    trademarkAttr.value = trademark
  }else{
    trademarkAttr.value = {
      trademark:trademarkList.value[0].basicName,
      width:trademarkList.value[0].nickname.width ,
      height:trademarkList.value[0].nickname.height,
      xImage:false,
      yImage:false,
      tag:true,
      tag2:true ,
      tag3:false,
      xMargin:30,
      yMargin:30,
      location:t('craft.lowLeft'),
      qrcode1:{
        xMargin:10,
        yMargin:10,
        location:t('craft.lowLeft'),
      },
      qrcode2:{
        xMargin:10,
        yMargin:10,
        location:t('craft.upperRight')
      }
    }
  }


  trademarkList.value.forEach(item =>{
    if(item.basicName===trademarkAttr.value.trademark){
      iconNickname.value=item.nickname.data
@@ -606,7 +609,7 @@
      leafer.add(polygon);
    }, 30);

    trademarkAttr.value.location = t('craft.lowLeft')
    //trademarkAttr.value.location = t('craft.lowLeft')
  }else{
    state.value=false
    handleFileUpload()