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

chenlu

2025-01-06 8f784646406fd302294328bfc18baf0732110c36

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

 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue

@@ -152,27 +152,43 @@

      <div class="row1" v-if="item.heat_layout_id!==null">

        <div class="cell" v-if="item.heat_layout_id!==null">{{ item.heat_layout_id }}/{{ item.heat_layout_sort }}</div>
<!--        <div class="cell" v-if="item.heat_layout_id!==null"></div>-->
        <span>{{ item.customer_name }}</span>&nbsp;
        <span>{{ item.order_id }}</span>&nbsp;
        <span v-if="item.process.includes('夹胶')">胶片</span>
        <span v-else-if="item.process.includes('中空')">中空</span>
        <span v-else-if="item.process.includes('百叶')">百叶</span>
        <span v-else></span>
        <div class="cell1" v-if="item.stock_id!=null">{{ item.stock_id }}</div>

      </div>
      <div class="row2" v-else>
<!--      <div class="row2" v-else>
        <span>{{ item.customer_name }}</span>&nbsp;
        <span>{{ item.order_id }}</span>&nbsp;
        <span v-if="item.process.includes('夹胶')">胶片</span>
        <span v-else-if="item.process.includes('中空')">中空</span>
        <span v-else-if="item.process.includes('百叶')">百叶</span>
        <span v-else></span>
      </div>
      </div>-->

      <div class="row3" v-if="item.other_columns!=null&&(JSON.parse(item.other_columns).S02!=null)">{{JSON.parse(item.other_columns).S02}}={{item.quantity}}</div>
      <div class="row3" v-else>{{Math.round(item.width)}}x{{Math.round(item.height)}}={{item.quantity}}</div>
      <div class="row3" v-if="item.other_columns!=null&&(JSON.parse(item.other_columns).S02!=null)">
        <span v-if="item.heat_layout_id!==null"  style="font-size: 6pt">
          ({{ item.heat_layout_id }}/{{ item.heat_layout_sort }})
          <template v-if="item.stock_id!=null">
              {{ item.stock_id }}
          </template>
        </span>
        {{JSON.parse(item.other_columns).S02}}={{item.quantity}}
      </div>
      <div class="row3" v-else>
        <span v-if="item.heat_layout_id!==null"  style="font-size: 6pt">
          ({{ item.heat_layout_id }}/{{ item.heat_layout_sort }})
          <template v-if="item.stock_id!=null">
              {{ item.stock_id }}
          </template>
        </span>

        {{Math.round(item.width)}}x{{Math.round(item.height)}}={{item.quantity}}
      </div>
      <div class="row5">
        <span style="white-space: pre-wrap;font-size: 6pt">{{ item.building_number?item.building_number.replace(/\r|\n|\s/g,''):'' }}</span>
        <span v-if="item.bend_radius!=null">R={{item.bend_radius}}</span>
@@ -193,22 +209,36 @@
    <template v-if="type==='3'"  v-for="(item,id) in labelList">
      <div v-if="type==='3'" id="entirety" v-for="n in item.quantity" >

        <div class="row1" v-if="item.heat_layout_id!=null">

          <div class="cell" v-if="item.heat_layout_id!=null">{{ item.heat_layout_id }}/{{ item.heat_layout_sort }}</div>
        <div class="row1" >
<!--          <div class="cell" v-if="item.heat_layout_id!=null">{{ item.heat_layout_id }}/{{ item.heat_layout_sort }}</div>-->
          <span style="font-size: 8pt">{{ item.customer_name }}</span>&nbsp;

          <div class="cell1" v-if="item.stock_id!=null">{{ item.stock_id }}</div>
<!--          <div class="cell1" v-if="item.stock_id!=null">{{ item.stock_id }}</div>-->

        </div>
        <div class="row2" v-else>
<!--        <div class="row2" v-else>
          <span style="font-size: 8pt">{{ item.customer_name }}</span>&nbsp;
        </div>
        </div>-->
        <div class="row2" style="font-size: 8pt" >{{item.order_id}}
          <span style="font-size: 8pt">{{ remarks }}</span>&nbsp;
        </div>
        <div class="row3" v-if="item.other_columns!=null&&(JSON.parse(item.other_columns).S02!=null)">{{JSON.parse(item.other_columns).S02}}={{item.quantity}}</div>
        <div class="row3" v-else>{{Math.round(item.width)}}x{{Math.round(item.height)}}={{item.quantity}}</div>
        <div class="row3" v-if="item.other_columns!=null&&(JSON.parse(item.other_columns).S02!=null)">
          <span v-if="item.heat_layout_id!==null"  style="font-size: 6pt">
          ({{ item.heat_layout_id }}/{{ item.heat_layout_sort }})
          <template v-if="item.stock_id!=null">
              {{ item.stock_id }}
          </template>
        </span>
          {{JSON.parse(item.other_columns).S02}}={{item.quantity}}
        </div>
        <div class="row3" v-else>
          <span v-if="item.heat_layout_id!==null"  style="font-size: 6pt">
            ({{ item.heat_layout_id }}/{{ item.heat_layout_sort }})
            <template v-if="item.stock_id!=null">
                {{ item.stock_id }}
            </template>
          </span>
          {{Math.round(item.width)}}x{{Math.round(item.height)}}={{item.quantity}}
        </div>

        <div class="row5">
          <span style="white-space: pre-wrap;font-size: 8pt">{{ item.building_number?item.building_number.replace(/\r|\n|\s/g,''):'' }}</span>

 north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue

@@ -66,7 +66,11 @@
      break
    }
    case 'edit1' :{
      router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:2 }})
      if(parseInt(print.value)==1){
        router.push({path: '/main/processCard/PrintLabel', query: { projectNo: row.project_no,type:2 }})
      }else{
        router.push({path: '/main/processCard/PrintCustomLabelSemi2', query: { projectNo: row.project_no,type:2 }})
      }
      break
    }
    case 'edit2' :{