guoyuji
2024-07-19 1f30bc3fcda7667c52733474e4dc6a76fdbc11a8
Merge branch 'master' of http://bore.pub:10439/r/ERP_override
8个文件已修改
80 ■■■■ 已修改文件
north-glass-erp/northglass-erp/src/components/pp/TagStyle.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel1.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi1.vue 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel1.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/components/pp/TagStyle.vue
@@ -49,7 +49,9 @@
  remarks2:'备注2',
  remarks3:'备注3',
  remarks4:'备注4',
  filmNumber:'膜号'
  filmNumber:'膜号',
  bendRadius:'order.bendRadius'
north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue
@@ -141,11 +141,11 @@
      </tr>
      <tr class="title-s">
        <th colspan="2"></th>
        <th colspan="5" >
          <h3 style="margin-left: 25%">生成任务单(成品)</h3>
        <th colspan="2" style="width: 30%"></th>
        <th colspan="5" style="width: 40%;">
          <h3 >生成任务单(成品)</h3>
        </th>
        <th colspan="2" style="text-align: center;font-weight: bold;">订单编号:<span>{{ data.order.orderId }}</span></th>
        <th colspan="2" style="width: 30%;">订单编号:<span>{{ data.order.orderId }}</span></th>
      </tr>
      <tr>
        <th style="text-align: left;border:none;font-weight: bold;font-size: 17px;" colspan="4">
@@ -188,24 +188,24 @@
              <tr class="day-in" v-for="(items, index1) in item.productDetail" :key="index1">
                <td>{{items.orderNumber}}</td>
                <td>{{items.buildingNumber}}</td>
                <td colspan="3" style="font-size: 15px;font-weight: bold;" v-if="items.otherColumns?.S02">{{items.otherColumns?.S02}}</td>
                <td colspan="3" style="font-size: 15px;font-weight: bold;" v-else>{{items.width}}x{{items.height}}</td>
                <td>{{items.quantity}}</td>
                <td>{{items.grossArea.toFixed(2)}}</td>
                <td colspan="3" style="font-size: 20px;font-weight: bold;" v-if="items.otherColumns?.S02">{{items.otherColumns?.S02}}</td>
                <td colspan="3" style="font-size: 20px;font-weight: bold;" v-else>{{items.width}}x{{items.height}}</td>
                <td style="font-size: 20px;font-weight: bold;">{{items.quantity}}</td>
                <td style="font-size: 20px;font-weight: bold;">{{items.grossArea.toFixed(2)}}</td>
                <td colspan="2">{{items.processingNote}}</td>
              </tr>
              <tr class="day-in" >
                <td style="font-size: 15px;font-weight: bold;" colspan="5">小计:</td>
                <td>{{getQuantity(item.productDetail)}}</td>
                <td>{{getArea(item.productDetail)}}</td>
                <td style="font-size: 20px;font-weight: bold;">{{getQuantity(item.productDetail)}}</td>
                <td style="font-size: 20px;font-weight: bold;">{{getArea(item.productDetail)}}</td>
                <td colspan="2"></td>
              </tr>
            </template>
            <tr class="day-in">
              <td style="font-size: 15px;font-weight: bold;" colspan="5">合计:</td>
              <td>{{grossNum.quantity}}</td>
              <td>{{grossNum.grossArea}}</td>
              <td style="font-size: 20px;font-weight: bold;">{{grossNum.quantity}}</td>
              <td style="font-size: 20px;font-weight: bold;">{{grossNum.grossArea}}</td>
              <td colspan="2"></td>
            </tr>
            <tr class="day-in">
@@ -319,6 +319,9 @@
  margin: 0;
  padding: 0;
}
.day-in{
  height: 30px;
}
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel.vue
@@ -124,8 +124,9 @@
}
body {
  font-weight: bolder;
  overflow: hidden;
  font-family: Arial, sans-serif;
  font-size: 10px;
}
#printButton {
@@ -139,7 +140,6 @@
  font-family: 'Microsoft YaHei', '微软雅黑', sans-serif;
  */
  flex-wrap: wrap;
  font-size: 12pt;
  display: flex;
  flex-direction: column;
}
@@ -162,14 +162,11 @@
.row3 {
  text-align: center;
  font-weight: bolder;
  font-size: 22px;
  /*display: flex;
  justify-content:space-evenly;*/
}
.row3 label {
  font-size: 22px;
  margin-top: 28px;
}
@@ -181,7 +178,6 @@
}
label {
  font-weight: bolder;
  /*font-family: 'Microsoft YaHei', '微软雅黑', sans-serif;*/
}
@@ -198,7 +194,6 @@
.contentRow .row1, .contentRow .row2 {
  text-align: left;
  font-weight: bolder;
}
@@ -220,7 +215,6 @@
.printFlowCard_finished1 {
  flex-wrap: wrap;
  font-size: 8pt;
  display: flex;
  flex-direction: column;
}
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel1.vue
@@ -111,7 +111,7 @@
        <span>{{ item.project }}</span>&nbsp;
        <span>{{ item.buildingNumber }}</span>
      </div>
      <div class="row3" v-if="item.other_columns==null||JSON.parse(item.other_columns).S02==null">{{item.width}}*{{item.height}}={{item.quantity}}</div>
      <div class="row3" v-if="item.other_columns==null||JSON.parse(item.other_columns).S02==null">{{item.width}}x{{item.height}}={{item.quantity}}</div>
      <div class="row3" v-else>{{JSON.parse(item.other_columns).S02}}={{item.quantity}}</div>
      <div class="row5">
        <span>{{item.remarks}}</span>&nbsp;
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi1.vue
@@ -111,7 +111,7 @@
        <span>{{ item.project }}</span>&nbsp;
        <span>{{ item.buildingNumber }}</span>
      </div>
      <div class="row3" v-if="item.other_columns==null||JSON.parse(item.other_columns).S02==null">{{item.width}}*{{item.height}}={{item.quantity}}</div>
      <div class="row3" v-if="item.other_columns==null||JSON.parse(item.other_columns).S02==null">{{item.width}}x{{item.height}}={{item.quantity}}</div>
      <div class="row3" v-else>{{JSON.parse(item.other_columns).S02}}={{item.quantity}}</div>
      <div class="row5">
        <span>{{item.remarks}}</span>&nbsp;
@@ -150,19 +150,19 @@
.row1 {
  font-size: 12pt;
  font-weight: bold;
  height: 25px;
  height: 30px;
}
.row1 span {
  font-size: 12pt;
  font-size: 14pt;
}
.row2 {
  font-size: 12pt;
  font-size: 14pt;
  font-weight: bold;
  height: 25px;
  height: 30px;
}
.row2 span {
  font-size: 12pt;
  font-size: 14pt;
}
span {
  font-size: 12pt;
@@ -172,17 +172,18 @@
.row3 {
  margin-top: -5px;
  height: 30px;
  font-size: 20pt;
  font-size: 22pt;
  font-weight: bolder;
  line-height: 30px;
}
.row5 {
  height: 25px;
  height: 40px;
  font-weight: bold;
  font-size: 12pt;
}
.row5 span {
  font-size: 12pt;
  font-size: 14pt;
}
.row6 {
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue
@@ -114,7 +114,7 @@
        <span v-if="item.bend_radius!=null">R={{item.bend_radius}}</span>
      </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)}}*{{Math.round(item.height)}}={{item.quantity}}</div>
      <div class="row3" v-else>{{Math.round(item.width)}}x{{Math.round(item.height)}}={{item.quantity}}</div>
      <div class="row5">
        <span>{{item.glass_child}}</span>&nbsp;
        <span>{{item.processing_note}}</span>
@@ -155,15 +155,15 @@
  height: 35px;
}
.row1 span {
  font-size: 12pt;
  font-size: 14pt;
}
.row2 {
  font-size: 12pt;
  font-weight: bold;
  height: 25px;
  height: 30px;
}
.row2 span {
  font-size: 12pt;
  font-size: 14pt;
}
span {
  font-size: 12pt;
@@ -173,7 +173,7 @@
.row3 {
  margin-top: -5px;
  height: 30px;
  font-size: 20pt;
  font-size: 22pt;
  font-weight: bolder;
  line-height: 30px;
}
@@ -181,10 +181,10 @@
.row5 {
  height: 40px;
  font-weight: bold;
  font-size: 12pt;
  font-size: 14pt;
}
.row5 span {
  font-size: 12pt;
  font-size: 14pt;
}
.row6 {
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue
@@ -135,7 +135,7 @@
        </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)}}*{{Math.round(item.height)}}={{item.quantity}}</div>
        <div class="row3" v-else>{{Math.round(item.width)}}x{{Math.round(item.height)}}={{item.quantity}}</div>
        <div class="row5">
          <span>{{item.project}}</span>&nbsp;
          <span>{{ item.building_number }}</span>
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel1.vue
@@ -110,7 +110,7 @@
        <span>{{ item.project }}</span>&nbsp;
        <span>{{ item.buildingNumber }}</span>
      </div>
      <div class="row3" v-if="item.other_columns==null||JSON.parse(item.other_columns).S02==null">{{item.width}}*{{item.height}}={{item.quantity}}</div>
      <div class="row3" v-if="item.other_columns==null||JSON.parse(item.other_columns).S02==null">{{item.width}}x{{item.height}}={{item.quantity}}</div>
      <div class="row3" v-else>{{JSON.parse(item.other_columns).S02}}={{item.quantity}}</div>
      <div class="row5">
        <span>{{item.remarks}}</span>&nbsp;