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

廖井涛

2025-09-03 82bd97c5a0e05c936f62acf28ac4969b351b6d59

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

@@ -251,7 +251,6 @@
              widthList.push(item.childWidth)
              arcList.push(item.arc)
              archRiseList.push(item.archRise)
              console.log(item.archRise)
            })
            widthList = widthList.sort();
            arcList = arcList.sort();
@@ -298,6 +297,8 @@

const trademarkAttr = ref({
  trademark:null,
  width:null,
  height:null,
  xImage:null,
  yImage:null,
  tag:null,
@@ -305,7 +306,17 @@
  tag3:null,
  xMargin:30,
  yMargin:30,
  location:[]
  location:[],
  qrcode1:{
    xMargin:10,
    yMargin:10,
    location:[]
  },
  qrcode2:{
    xMargin:10,
    yMargin:10,
    location:[]
  }

})

@@ -322,7 +333,7 @@
  if (res.code==200){
    trademarkList.value = res.data
    trademarkList.value.forEach(item =>{
      item.basicName
      item.nickname = JSON.parse(item.nickname)
    })

  }
@@ -366,32 +377,53 @@

  trademarkRow.value=row
  trademarkVisible.value= true
  /*Object.keys(trademarkAttr.value).forEach((key) => {
    if(key==='location'){
      trademarkAttr.value[key] = []
    }else if(key==='xMargin' || key==='yMargin'){
      trademarkAttr.value[key] = 30
    }else{
      trademarkAttr.value[key] = ''
  if(row.icon!=null && row.icon!==''){
    let trademark = JSON.parse(row.icon)
    if(trademark.qrcode2 === undefined){
      trademark.width = null
      trademark.height = null
      trademark.qrcode1 = {
        xMargin:10,
        yMargin:10,
        location:t('craft.lowLeft'),
      }
      trademark.qrcode2 = {
        xMargin:10,
        yMargin:10,
        location:t('craft.upperRight')
      }
    }
  })*/
  trademarkAttr.value = {
    trademark:"3C",
    xImage:false,
    yImage:false,
    tag:true,
    tag2:true ,
    tag3:true,
    xMargin:30,
    yMargin:30,
    location:t('craft.lowLeft')
    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')
      }
    }
  }
  if(row.icon!=null){
    trademarkAttr.value = JSON.parse(row.icon)
  }


  trademarkList.value.forEach(item =>{
    if(item.basicName===trademarkAttr.value.trademark){
      iconNickname.value=item.nickname
      iconNickname.value=item.nickname.data
    }
  })

@@ -405,6 +437,7 @@
      exportToDXF()
    }
  }

  rowIndex.value.icon = JSON.stringify(trademarkAttr.value)
  trademarkVisible.value=false
  Object.keys(trademarkAttr.value).forEach((key) => (trademarkAttr.value[key] = ''))
@@ -497,12 +530,14 @@
const iconChange = () => {
  trademarkList.value.forEach(item =>{
    if(item.basicName===trademarkAttr.value.trademark){
      iconNickname.value=item.nickname
      iconNickname.value=item.nickname.data
      trademarkAttr.value.width=item.nickname.width
      trademarkAttr.value.height=item.nickname.height
    }
  })
  if(trademarkAttr.value.trademark===company.icon){
  /*if(trademarkAttr.value.trademark===company.icon){
    trademarkAttr.value.xMargin=66
  }
  }*/

}

@@ -574,7 +609,7 @@
      leafer.add(polygon);
    }, 30);

    trademarkAttr.value.location = t('craft.lowLeft')
    //trademarkAttr.value.location = t('craft.lowLeft')
  }else{
    state.value=false
    handleFileUpload()
@@ -800,7 +835,6 @@

          break;
        case 'ELLIPSE':
          console.log(entity)

          const {majorAxisEndPoint, axisRatio} = entity;

@@ -1274,11 +1308,11 @@
        :close-on-click-modal="false"
        :close-on-press-escape="false"
        @closed="handleClosed"
        style="width: 922px;height:443px ;
        style="width: 922px;height:750px;margin-top: 100px ;
        position: relative;" >
      <div style="width: 50%;height: 100%;float: left">
        <el-row style="">
          <el-col :span="4">{{$t('craft.TrademarkOptions')}}:</el-col>
          <el-col :span="5">{{$t('craft.TrademarkOptions')}}:</el-col>
          <el-col :span="6">
            <el-select v-model="trademarkAttr.trademark" @change ="iconChange" filterable>
              <el-option :value="item.basicName" v-for="item in trademarkList" />
@@ -1287,7 +1321,30 @@
        </el-row>

        <el-row>
          <el-col :span="4">{{$t('craft.xImage')}}:</el-col>
          <el-col :span="5">{{$t('craft.location')}}:</el-col>
          <el-col :span="25">
            <el-radio v-model="trademarkAttr.location" v-for="item in trademarkLocation" :label="item"  />
          </el-col>
        </el-row>

        <el-row>
          <el-col :span="5">X:</el-col>
          <el-col :span="6">
            <el-input-number v-model="trademarkAttr.xMargin"/>
          </el-col>
        </el-row>



        <el-row>
          <el-col :span="5">Y:</el-col>
          <el-col :span="6">
            <el-input-number v-model="trademarkAttr.yMargin"/>
          </el-col>
        </el-row>

        <el-row >
          <el-col :span="5">{{$t('craft.xImage')}}:</el-col>
          <el-col :span="6">
            <el-select v-model="trademarkAttr.xImage">
              <el-option :value="true" :label="$t('basicData.true')"/>
@@ -1297,7 +1354,7 @@
        </el-row>

        <el-row>
          <el-col :span="4">{{$t('craft.yImage')}}:</el-col>
          <el-col :span="5">{{$t('craft.yImage')}}:</el-col>
          <el-col :span="6">
            <el-select v-model="trademarkAttr.yImage">
              <el-option :value="true" :label="$t('basicData.true')"/>
@@ -1307,7 +1364,7 @@
        </el-row>

        <el-row>
          <el-col :span="4">{{$t('craft.tag')}}:</el-col>
          <el-col :span="5">{{$t('craft.tag')}}:</el-col>
          <el-col :span="6">
            <el-select v-model="trademarkAttr.tag">
              <el-option :value="true" :label="$t('basicData.true')"/>
@@ -1315,9 +1372,9 @@
            </el-select>
          </el-col>
        </el-row>

        <el-row>
          <el-col :span="4">{{$t('craft.tag2')}}:</el-col>
<!--二维码1-->
        <el-row class="row_item">
          <el-col :span="5">{{$t('craft.tag2')}}:</el-col>
          <el-col :span="6">
            <el-select v-model="trademarkAttr.tag2">
              <el-option :value="true" :label="$t('basicData.true')"/>
@@ -1327,7 +1384,30 @@
        </el-row>

        <el-row>
          <el-col :span="4">{{$t('craft.tag3')}}:</el-col>
          <el-col :span="5">{{$t('craft.qr1Local')}}:</el-col>
          <el-col :span="25">
            <el-radio v-model="trademarkAttr.qrcode1.location" v-for="item in trademarkLocation" :label="item"  />
          </el-col>
        </el-row>

        <el-row>
          <el-col :span="5">X:</el-col>
          <el-col :span="6">
            <el-input-number v-model="trademarkAttr.qrcode1.xMargin"/>
          </el-col>
        </el-row>



        <el-row>
          <el-col :span="5">Y:</el-col>
          <el-col :span="6">
            <el-input-number v-model="trademarkAttr.qrcode1.yMargin"/>
          </el-col>
        </el-row>
<!--二维码2-->
        <el-row class="row_item">
          <el-col :span="5">{{$t('craft.tag3')}}:</el-col>
          <el-col :span="6">
            <el-select v-model="trademarkAttr.tag3">
              <el-option :value="true" :label="$t('basicData.true')"/>
@@ -1337,32 +1417,35 @@
        </el-row>

        <el-row>
          <el-col :span="4">X:</el-col>
          <el-col :span="6">
            <el-input-number v-model="trademarkAttr.xMargin"/>
          </el-col>
        </el-row>

        <el-row>
          <el-col :span="4">Y:</el-col>
          <el-col :span="6">
            <el-input-number v-model="trademarkAttr.yMargin"/>
          </el-col>
        </el-row>

        <el-row>
          <el-col :span="4">{{$t('craft.location')}}:</el-col>
          <el-col :span="5">{{$t('craft.qr2Local')}}:</el-col>
          <el-col :span="25">
            <el-radio v-model="trademarkAttr.location" v-for="item in trademarkLocation" :label="item"  />
            <el-radio v-model="trademarkAttr.qrcode2.location" v-for="item in trademarkLocation" :label="item"  />
          </el-col>
        </el-row>

        <el-row>
          <el-col >
            <el-button @click="changeTrademark" style="float:right;" type="primary" >{{$t('craft.sure')}}</el-button>
            <el-button @click="resetTrademark" style="float:right;margin-right: 0.5rem" type="primary" >{{$t('craft.reset')}}</el-button>
          <el-col :span="5">X:</el-col>
          <el-col :span="6">
            <el-input-number v-model="trademarkAttr.qrcode2.xMargin"/>
          </el-col>
        </el-row>



        <el-row>
          <el-col :span="5">Y:</el-col>
          <el-col :span="6">
            <el-input-number v-model="trademarkAttr.qrcode2.yMargin"/>
          </el-col>
        </el-row>








      </div>
      <div style="width: 404px;height: 254px;border: 2px solid #000;float: left;
      position: relative;display: flex;justify-content: center;align-content: center;">
@@ -1411,6 +1494,14 @@
      <div v-if="enlargementFlag" style="width: 400px;height: 250px;float: left;position: relative;background-color: red">
        <el-image  @dblclick="trademarkenlargement" style="z-index: 9999;max-width: 100%;max-height: 100%" :src="iconNickname"/>
      </div>
      <template #footer style="width: 100%;height: 100%">
                <el-row>
                  <el-col >
                    <el-button @click="changeTrademark" style="float:right;" type="primary" >{{$t('craft.sure')}}</el-button>
                    <el-button @click="resetTrademark" style="float:right;margin-right: 0.5rem" type="primary" >{{$t('craft.reset')}}</el-button>
                  </el-col>
                </el-row>
      </template>
    </el-dialog>
  </div>
</template>
@@ -1468,4 +1559,12 @@
#mains {
  position: relative;
}
:deep(#trademark .el-dialog__body){
  height: 85%;
  width: 100%;
  overflow-y: auto;
}
.row_item{
  margin-top: 30px;
}
</style>