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

huang

2024-12-02 911ea91bf388a124e15b6fe4d1884231fe117b07

 north-glass-erp/northglass-erp/src/components/pp/PrintReworkProcess.vue

@@ -194,12 +194,15 @@
      <thead>
      <tr v-for="(itemFlow,index) in item.detail" :key="index">
        <td    colspan="34">
          <div style="float: left;">返片单号：{{itemFlow.patch_id}}</div>

          <div id="bj" style="float: right;font-size: 28px">返 {{ id + 1 }}</div>
          <div>{{ company.companyName }}</div>
          <div>生产流程卡</div>
          <div  style="font-weight: bolder;display: flex;justify-content:space-between">
            <div>打印人：{{user.user.userName}}</div>
            <div>
              返片单号：{{itemFlow.patch_id}}&nbsp;&nbsp;&nbsp;
              打印人：{{user.user.userName}}
            </div>
            <div>
              <span style="font-size: 10px">{{itemFlow.otherRemarks}}</span>&nbsp;&nbsp;
              流程卡号： {{
@@ -213,9 +216,9 @@
        <td class="tdNowrap">客户名称：</td>
        <td colspan="2">{{ items.customer_name }}</td>
        <td class="tdNowrap">项目名称：</td>
        <td colspan="8">{{ items.project }}</td>
        <td colspan="8" style="min-width: 300px;">{{ items.project }}</td>
        <td class="tdNowrap">工艺流程：</td>
        <td colspan="21"  style="width: 500px">{{ items.process }}</td>
        <td :colspan="2+item.processList.length*2"  style="width: 500px">{{ items.process }}</td>
      </tr>
      <tr v-for="(itemTr,index) in item.detail" :key="index">
        <td class="tdNowrap">磨边类型：</td>
@@ -223,7 +226,7 @@
        <td class="tdNowrap">单片名称：</td>
        <td colspan="8">{{ itemTr.glass_child }}</td>
        <td class="tdNowrap">产品名称：</td>
        <td colspan="21">{{ itemTr.product_name }}</td>
        <td :colspan="2+item.processList.length*2">{{ itemTr.product_name }}</td>
      </tr>
      <tr>
        <td rowspan='2'>序号</td>
@@ -243,27 +246,10 @@
        <td v-for="(itemPr,index) in item.processList" :key="index" colspan="2">{{ itemPr.process }}</td>
      </tr>
      <tr>

        <td>{{ company.printLabel.printFlowCard.patch }}</td>
        <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
        <td>{{ company.printLabel.printFlowCard.patch }}</td>
        <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
        <td>{{ company.printLabel.printFlowCard.patch }}</td>
        <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
        <td>{{ company.printLabel.printFlowCard.patch }}</td>
        <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
        <td>{{ company.printLabel.printFlowCard.patch }}</td>
        <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
        <td>{{ company.printLabel.printFlowCard.patch }}</td>
        <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
        <td>{{ company.printLabel.printFlowCard.patch }}</td>
        <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
        <td>{{ company.printLabel.printFlowCard.patch }}</td>
        <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
        <td>{{ company.printLabel.printFlowCard.patch }}</td>
        <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
        <td>{{ company.printLabel.printFlowCard.patch }}</td>
        <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
        <template v-for=" n in item.processList.length">
          <td>{{ company.printLabel.printFlowCard.patch }}</td>
          <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
        </template>
      </tr>
      </thead>
      <tbody>
@@ -285,27 +271,10 @@
        <td>{{ itemDatile.responsible_team }}</td>
        <td>{{ itemDatile.responsible_personnel }}</td>
        <td>{{ itemDatile.remarks }}</td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <template v-for=" n in item.processList.length">
          <td></td>
          <td></td>
        </template>
      </tr>
      </tbody>
      <tfoot>
@@ -332,16 +301,9 @@
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <template v-for=" n in item.processList.length">
          <td colspan="2"></td>
        </template>
      </tr>
      <tr>
        <td>生产日期</td>
@@ -350,16 +312,9 @@
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <template v-for=" n in item.processList.length">
          <td colspan="2"></td>
        </template>
      </tr>
      <tr>
        <td>质检签名</td>
@@ -368,16 +323,9 @@
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <template v-for=" n in item.processList.length">
          <td colspan="2"></td>
        </template>
      </tr>
      <tr>
        <td>原片箱号</td>