Merge branch 'master' of http://bore.pub:10439/r/ERP_override

廖井涛

2025-03-25 768e16999a8ce4bb500490ee76c659aa61ea1783

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

@@ -31,6 +31,13 @@
  mergeTechnologyNumber:null
})

//打印时间
const currentTime = new Date();
const formattedTime = currentTime.getFullYear()
    + '-' + (currentTime.getMonth() + 1) + '-'
    + currentTime.getDate() + ' ' + currentTime.getHours() + ':'
    + currentTime.getMinutes();formattedTime

const {currentRoute} = useRouter()
const route = currentRoute.value
const printMerge = props.printMerge
@@ -45,6 +52,7 @@
}
data.value.printList = JSON.parse(props.printList)

let name=company.companyName
//去除重复对象
// let uniqueObjects = {};
// // 遍历原始数据数组
@@ -231,14 +239,18 @@
      <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 style="left: 150px">{{ company.companyName }}</div>
          <div>生产流程卡</div>
          <div  style="font-weight: bolder;display: flex;justify-content:space-between">
            <div>打印人：{{user.user.userName}}</div>
            <div>
              <span style="font-size: 10px">{{itemFlow.otherRemarks}}</span>&nbsp;&nbsp;
              补片单号：{{itemFlow.patch_id}}&nbsp;&nbsp;&nbsp;
              打印人：{{user.user.userName}}&nbsp;&nbsp;
              时间：{{formattedTime}}
            </div>
            <div>
              <span v-if="name=='天津北玻玻璃工业技术有限公司（TJBB-QR7.1-01）'" style="font-size: 10px">{{itemFlow.otherRemarks}}</span>
              流程卡号： {{
                itemFlow.process_id
              }}/{{ itemFlow.technologyNumber }} 共 {{ item.count }} 架
@@ -250,7 +262,7 @@
        <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="2+item.processList.length*2"  style="width: 500px">{{ items.process }}</td>
      </tr>
@@ -270,7 +282,7 @@
        <td rowspan='2'>数量</td>
        <td rowspan='2'>面积</td>
        <td rowspan='2'>周长</td>
        <td rowspan='2'>半径</td>
        <td rowspan='2'>半径/备注</td>
        <td rowspan='2'>类型</td>
        <td rowspan='2'>原因</td>
        <td rowspan='2'>工序</td>
@@ -381,7 +393,7 @@
      </tr>
      <tr v-for="(itemtextareas,index) in item.detail" :key="index">
        <td  colspan="34" rowspan="6" style="width: 99%;height: 150px ">
          <div style="width: 100%;height: 100%;"><textarea style="height: 99%;width: 99%;border: none;;font-size: 12px;text-align: left">{{itemtextareas.processing_note}}</textarea>
          <div style="width: 100%;height: 100%;"><textarea style="height: 99%;width: 99%;border: none;;font-size: 11px;text-align: left">{{itemtextareas.processing_note}}</textarea>
          </div>
        </td>
      </tr>
@@ -416,12 +428,12 @@
}

#contentTable thead {
  font-size: 13px;
  font-size: 12px;
  font-weight: bolder;
}

#contentTable thead div {
  font-size: 15px;
  font-size: 14px;
  font-weight: bolder;
}

@@ -440,7 +452,7 @@
}

#contentTable tfoot {
  font-size: 12px;
  font-size: 11px;
  font-weight: bolder;
}