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

guoyujie

2 天以前 4adce5c0784baf7de2ec62a12dacf207ea2a164e

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

@@ -55,19 +55,7 @@

let name=company.companyName
let replenishQRCode=company.replenishQRCode
//去除重复对象
// let uniqueObjects = {};
// // 遍历原始数据数组
// data.value.printList.forEach(obj => {
//   // 构建一个唯一键，例如 'NG24071502A001_1'
//   let key = `${obj.process_id}_${obj.technology_number}_${obj.order_number}`;
//
//   // 如果该键不存在于 uniqueObjects 中，则将该对象添加到 uniqueObjects 中
//   if (!uniqueObjects[key]) {
//     uniqueObjects[key] = obj;
//   }
// });
// data.value.printList = Object.values(uniqueObjects);

let flowCardCount = null
onMounted(() => {
  request.post(`/processCard/getSelectPrintingRefund/${merge}/${like}/${mergeTechnologyNumber}`, data.value).then((res) => {
@@ -95,43 +83,13 @@
            });
            produceList.value[j].detail[0].weight = sumWeight
          }
          //处理合并打印
          // if (printMerge !== null && printMerge !== undefined && printMerge !== "") {
          //
          //   produceList.value.forEach(item => {
          //     item.detail[0].technologyNumber = printMerge;
          //   });
          //
          //   //合并打印工艺流程处理
          //   if (like == null) {
          //     let process = produceList.value[0].detail[0].process
          //     console.log(process)
          //     let indexOfJiaJiao = process.indexOf('夹胶');
          //     if (indexOfJiaJiao !== -1) {
          //       // 使用 substring 截取 "夹胶" 后面的部分，包括 "夹胶" 本身
          //       let afterJiaJiao = process.substring(indexOfJiaJiao).trim();
          //       produceList.value.forEach(item => {
          //         item.detail[0].process = afterJiaJiao
          //       })
          //     }
          //
          //     let indexOfProceList = produceList.value[0].processList
          //     let getProceList = indexOfProceList.findIndex(item => item.process === '夹胶');
          //
          //     if (getProceList !== -1) {
          //       // 使用 filter 方法过滤出 "夹胶" 及其之后的对象
          //       produceList.value[0].processList = indexOfProceList.filter((item, index) => index >= getProceList);
          //     }
          //   }
          // }


          produceList.value.forEach(item => {
            let technologyNumberMerge = printMerge.split('').join(',');
            item.detail[0].technologyNumberMerge = technologyNumberMerge
          })
          //处理编号列
          //定义存放编号数组
          //定义存放编号数组 天津
          const s01Values = [];
          for (let i = 0; i < produceList.value.length; i++) {
            const s01Values = [];
@@ -152,28 +110,41 @@

          }

          // 使用一个对象来存储合并后的结果
          const mergedData = produceList.value.reduce((acc, item) => {
            const processId = item.detail[0].process_id;
            // detail 为空直接跳过
            const firstDetail = item?.detail?.[0]
            if (!firstDetail) return acc

            // 如果该 process_id 尚未在 acc 中，初始化其数组
            if (!acc[processId]) {
              acc[processId] = {
            const processId = firstDetail.process_id
            const technologyNumber = firstDetail.technologyNumber

            const key = company.printReplenishMerge
                ? processId
                : `${processId}_${technologyNumber}`

            // 初始化分组
            if (!acc[key]) {
              acc[key] = {
                processId,
                technologyNumber,
                processList: item.processList,
                detailList: [],
                detail: item.detail
              };
              }
            }

            // 合并 detailList
            acc[processId].detailList = acc[processId].detailList.concat(item.detailList);
            //  合并 detailList
            if (Array.isArray(item.detailList) && item.detailList.length) {
              acc[key].detailList.push(...item.detailList)
            }

            return acc;
          }, {});
            return acc
          }, {})

          // 将合并后的对象转换回数组
          produceList.value = Object.values(mergedData);

          //if (company.printReplenishMerge){
            produceList.value = Object.values(mergedData);
          //}
           flowCardCount=produceList.value.length

          handleSummary()
@@ -191,12 +162,15 @@
    }
)

const techNumberLength = ref()
const qrcodeLength =ref()
const handleGetQRCode = async () => {
  for (let i = 0; i < produceList.value.length; i++) {
    const detailItem = produceList.value[i].detail[0];
    const detailList = produceList.value[i].detailList;

    const mergeTechNumber = detailItem.mergeTechnologyNumber.toString();

    const processId = detailItem.process_id;

    detailItem.qrcodeList = [];
@@ -274,152 +248,143 @@
<template>
<!--  <el-button id="printButton" @click="printFlowCard();">{{ $t('basicData.print') }}</el-button>-->
  <div id="printFlowCard">
    <table v-for="(item,id) in produceList" id="contentTable" :key="id">
      <thead>
      <tr v-for="(itemFlow,index) in item.detail" :key="index">
        <td    colspan="34">
          <div style="float: left;"><img id="img-pic" style="width: 42px;height: 32px" src="@/assets/northGlass.ico" alt=""></div>
          <div id="bj" style="float: right;font-size: 28px">补 {{ id + 1 }}</div>
          <div style="left: 150px">{{ company.companyName }}</div>
          <div>({{itemFlow.order_type}})生产流程卡</div>
          <div  style="font-weight: bolder;display: flex;justify-content:space-between">
            <div>
              补片单号：{{itemFlow.patch_id}}&nbsp;&nbsp;&nbsp;
              打印人：{{user.user.userName}}&nbsp;&nbsp;
              时间：{{formattedTime}}
    <div id="contentDiv" v-for="(item,id) in produceList" :key="id">
      <table  id="contentTable"  style="border-bottom: none;margin-bottom: 20px">
        <thead>
        <tr v-for="(itemFlow,index) in item.detail" :key="index">
          <td colspan="31">
            <div style="float: left;"><img id="img-pic" style="width: 42px;height: 32px" src="@/assets/northGlass.ico" alt=""></div>
            <div id="bj" style="float: right;font-size: 28px">补 {{ id + 1 }}</div>
            <div style="left: 150px">{{ company.companyName }}</div>
            <div>({{itemFlow.order_type}})生产流程卡</div>
            <div  style="font-weight: bolder;display: flex;justify-content:space-between">
              <div>
                补片单号：{{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 }}
              </div>
            </div>
            <div>
              <span v-if="name=='天津北玻玻璃工业技术有限公司（TJBB-QR7.1-01）'" style="font-size: 10px">{{itemFlow.otherRemarks}}</span>
              流程卡号： {{
                itemFlow.process_id
              }}/{{ itemFlow.technologyNumber }} 共 {{ item.count }} 架
            </div>
          </div>
        </td>
      </tr>
      <tr v-for="(items,index) in item.detail" :key="index">
        <td class="tdNowrap">客户名称：</td>
        <td colspan="3">{{ items.customer_name }}</td>
        <td class="tdNowrap">项目名称：</td>
        <td v-if="name=='洛阳北方玻璃技术股份有限公司'" colspan="4" style="min-width: 250px;">{{ items.projectBatch }}</td>
        <td v-else colspan="4" style="min-width: 250px;">{{ items.project }}</td>
        <td class="tdNowrap">工艺流程：</td>
        <td :colspan="4+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>
        <td colspan="3">{{ itemTr.edging_type }}</td>
        <td class="tdNowrap">单片名称：</td>
        <td colspan="8">{{ itemTr.glass_child }}</td>
        <td class="tdNowrap">产品名称：</td>
        <td :colspan="2+item.processList.length*2">{{ itemTr.product_name }}</td>
      </tr>
      <tr>
        <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>
        <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 v-for="(itemPr,index) in item.processList" :key="index" colspan="2">{{ itemPr.process }}</td>
      </tr>
      <tr>
        <template v-for=" n in item.processList.length">
          <td>{{ company.printLabel.printFlowCard.patch }}</td>
          <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
        </template>
      </tr>
      </thead>
      <tbody>
          </td>
        </tr>
        <tr v-for="(items,index) in item.detail" :key="index">
          <td class="tdNowrap">客户名称：</td>
          <td colspan="4">{{ items.customer_name }}</td>
          <td class="tdNowrap">项目名称：</td>
          <td v-if="name=='洛阳北方玻璃技术股份有限公司'" colspan="3" style="min-width: 250px;">{{ items.projectBatch }}</td>
          <td v-else colspan="3" style="min-width: 250px;">{{ items.project }}</td>
          <td class="tdNowrap">工艺流程：</td>
          <td :colspan="5+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>
          <td colspan="4">{{ itemTr.edging_type }}</td>
          <td class="tdNowrap">单片名称：</td>
          <td v-if="!company.processFontSize" colspan="3">{{ itemTr.glass_child }}</td>
          <td v-else-if="itemTr.qrcodeList.length*1>1" colspan="3" >多层合并，详情见产品名称</td>
          <td v-else colspan="3" style="font-size: 18px;">{{ itemTr.glass_child }}</td>
          <td class="tdNowrap">产品名称：</td>
          <td v-if="!company.processFontSize" :colspan="5+item.processList.length*2">{{ itemTr.product_name }}</td>
          <td v-else :colspan="5+item.processList.length*2" style="font-size: 18px;">{{ itemTr.product_name }}</td>
        </tr>
        <tr>
          <td rowspan='2'>序号</td>
          <td rowspan='2'>图号</td>
          <td rowspan='2'>编号</td>
          <td rowspan="2">层号</td>
          <td rowspan='2' class="tdNowrap">宽(弧长)*高</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>
          <td rowspan='2'>班组</td>
          <td rowspan='2'>信息</td>
          <td rowspan='2'>备注</td>
          <td v-for="(itemPr,index) in item.processList" :key="index" colspan="2">{{ itemPr.process }}</td>
        </tr>
        <tr>
          <template v-for=" n in item.processList.length">
            <td>{{ company.printLabel.printFlowCard.patch }}</td>
            <td>{{ company.printLabel.printFlowCard.lackOf }}</td>
          </template>
        </tr>
        </thead>
        <tbody>

      <tr v-for="(itemDatile,index) in item.detailList" :key="index">
        <td>{{ itemDatile.order_number }}</td>
        <td class="tdNowrap" v-if="name=='金华福喜天成玻璃有限公司' || name=='浙江巨星嘉泰新材料有限公司' ">{{ itemDatile.building_number }}</td>
        <td class="tdNowrap" v-else>{{ itemDatile.s01Value }}</td>
        <td>{{ itemDatile.technology_number }}</td>
        <td>{{ itemDatile.child_width }}</td>
        <td class="item" style="width: 5%;height: 100%;">
          <input v-model="itemDatile.quantity" style="width: 100%;height: 100%"  @keyup="handleSummary()"/>
        </td>
        <td>{{ itemDatile.total_area }}</td>
        <td>{{ itemDatile.perimeter }}</td>
        <td>{{ itemDatile.bend_radius }}</td>
        <td class="tdNowrap">{{ itemDatile.patch_type }}</td>
        <td class="tdNowrap">{{ itemDatile.patch_reason }}</td>
        <td class="tdNowrap">{{ itemDatile.patch_processes }}</td>
        <td class="tdNowrap">{{ itemDatile.responsible_team }}</td>
        <td>{{ itemDatile.responsible_personnel }}</td>
        <td class="tdNowrap">{{ itemDatile.remarks }}</td>
        <template v-for=" n in item.processList.length">
          <td></td>
          <td></td>
        </template>
      </tr>
      </tbody>
      <tfoot>
      <tr style="height: 14px">
        <td v-for="(itemsum,index) in item.detail" :key="index" colspan="34">
          数量：
          <label>{{ itemsum.quantity }}</label>
          面积：
          <label>{{ parseFloat(itemsum.gross_area.toFixed(2)) }}</label>
          重量：
          <label>{{ parseFloat(itemsum.weight.toFixed(2)) }}</label>
        </td>
      </tr>
      <tr v-for="(itemtextarea,index) in item.detail" :key="index">
        <td>完工签名</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="1"></td>
        <template v-for=" n in item.processList.length">
        <tr v-for="(itemDatile,index) in item.detailList" :key="index">
          <td>{{ itemDatile.order_number }}</td>
          <td>{{ itemDatile.mapNumber }}</td>
          <td class="tdNowrap" v-if="name=='金华福喜天成玻璃有限公司' || name=='浙江巨星嘉泰新材料有限公司' ">{{ itemDatile.building_number }}</td>
          <td class="tdNowrap" v-else>{{ itemDatile.s01Value }}</td>
          <td>{{ itemDatile.technology_number }}</td>
          <td>{{ itemDatile.child_width }}</td>
          <td class="item" style="width: 5%;height: 100%;">
            <input v-model="itemDatile.quantity" style="width: 100%;height: 100%"  @keyup="handleSummary()"/>
          </td>
          <td>{{ itemDatile.total_area }}</td>
          <td>{{ itemDatile.perimeter }}</td>
          <td>{{ itemDatile.bend_radius }}</td>
          <td class="tdNowrap">{{ itemDatile.patch_type }}</td>
          <td class="tdNowrap">{{ itemDatile.patch_reason }}</td>
          <td class="tdNowrap">{{ itemDatile.patch_processes }}</td>
          <td class="tdNowrap">{{ itemDatile.responsible_team }}</td>
          <td>{{ itemDatile.responsible_personnel }}</td>
          <td class="tdNowrap">{{ itemDatile.remarks }}</td>
          <template v-for=" n in item.processList.length">
            <td></td>
            <td></td>
          </template>
        </tr>
        <tr style="height: 14px">
          <td v-for="(itemsum,index) in item.detail" :key="index" colspan="31">
            数量：
            <label>{{ itemsum.quantity }}</label>
            面积：
            <label>{{ parseFloat(itemsum.gross_area.toFixed(2)) }}</label>
            重量：
            <label>{{ parseFloat(itemsum.weight.toFixed(2)) }}</label>
          </td>
        </tr>
        <tr v-for="(itemtextarea,index) in item.detail" :key="index">
          <td>完工签名</td>
          <td colspan="2"></td>
        </template>
      </tr>
      <tr>
        <td>生产日期</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="1"></td>
        <template v-for=" n in item.processList.length">
          <td colspan="2"></td>
        </template>
      </tr>
      <tr>
        <td>质检签名</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="1"></td>
        <template v-for=" n in item.processList.length">
          <td colspan="2"></td>
        </template>
      </tr>
      <tr>
        <td>原片箱号</td>
        <td colspan="29"></td>
      </tr>
      <tr v-for="(qrCodeItem,index) in item.detail" :key="index">
        <td colspan="30">
          <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>
          <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>
          <td colspan="31"></td>
        </tr>
        <tr v-for="(qrCodeItem,index) in item.detail" :key="index">
          <td colspan="31">
          <span style="display: flex;">
            <span v-for="(qrCodeItems,index) in qrCodeItem.qrcodeList" :key="index" style="display: flex;width: 35%">
            <div class='qrCode' style="width: 80px;height: 80px;">
@@ -430,18 +395,31 @@
            }}</span>
          </span>
          </span>
        </td>
      </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%;text-align: left">
            <textarea v-if="!company.processFontSize" style="height: 99%;width: 99%;border: none;;font-size: 14px;font-weight: bold;overflow: hidden;text-align: left;vertical-align: middle">{{itemtextareas.processing_note}}</textarea>
            <textarea v-else style="height: 99%;width: 99%;border: none;;font-size: 36px;font-weight: bold;overflow: hidden;text-align: left;vertical-align: middle">{{itemtextareas.processing_note}}</textarea>
          </div>
        </td>
      </tr>
      </tfoot>
    </table>
          </td>
        </tr>
        </tbody>
        <tfoot>

        <tr v-for="(itemtextareas,index) in item.detail" :key="index">
          <td  colspan="31"  style="width: 480px;height: 150px ">
            <div style="width: 100%;height: 100%;text-align: left">
              <textarea v-if="!company.processFontSize" style="height: 99%;width: 99%;border: none;;font-size: 14px;font-weight: bold;overflow: hidden;text-align: left;vertical-align: middle">{{itemtextareas.processing_note}}</textarea>
              <textarea v-else style="height: 99%;width: 99%;border: none;;font-size: 36px;font-weight: bold;overflow: hidden;text-align: left;vertical-align: middle">{{itemtextareas.processing_note}}</textarea>
            </div>
          </td>
        </tr>
        <tr style="border-bottom: none">
          <td colspan="31" style="text-align: left;border-bottom: none;">
            <div>
              <span>质检签名：</span>
              <span style="margin-left: 300px">生产签名：</span>
            </div>
          </td>
        </tr>
        </tfoot>
      </table>
    </div>

  </div>

</template>
@@ -450,12 +428,10 @@
* {
  margin: 0;
  padding: 0;
  text-align: center;
}

#printButton {
  margin-top: -40px;
  width: 100px;
td,input{
  text-align: center;
}

#printFlowCard {
@@ -463,20 +439,23 @@
//font-weight: bolder; height: 600px;
}

#contentDiv {
  width: 100%;
}

#contentTable {
  border-collapse: collapse;
  border: 1px solid black;
  width: 100%;

}

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

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

@@ -487,7 +466,7 @@
}

#contentTable tbody {

  white-space: nowrap;
}

.tdNowrap {
@@ -495,7 +474,7 @@
}

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

@@ -504,28 +483,43 @@
  background: none;
}

.nuber_xx span{
  font-size: 12px;
}


@media print {
  /* 禁用 Chrome 自动页码触发条件 */
  * {
    overflow: visible !important;
    transform: none !important;
    filter: none !important;
  }

  [style*="position: fixed"],
  .fixed,
  .header-fixed {
    position: absolute !important;
  }


  @page {
    size: auto;  /* auto is the initial value */
    margin: 2mm 4mm 0mm 4mm  /* this affects the margin in the printer settings */
    margin: 4mm 5mm 0mm 5mm;  /* this affects the margin in the printer settings */
    @top-right {
      content: none !important;
    }

  }

  tbody {
    display: table-row-group;
  }

  table {
    page-break-before: always;
  }

  table {
    page-break-inside: auto;
  }

  thead {
    display: table-header-group;
    page-break-inside: avoid;
  }

  tfoot {
@@ -538,6 +532,8 @@
  width: 100%;
  height: 100%;
}

.picture{
  page-break-before: always;
}

</style>