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

chenlu

2025-08-11 8bcd0cc77b0c7aa2c00ffd926ee87f1f09a3a3b5

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

@@ -21,7 +21,8 @@


const data = ref({
  printList: []
  printList: [],
  processName:[]
})

let props = defineProps({
@@ -53,6 +54,7 @@
data.value.printList = JSON.parse(props.printList)

let name=company.companyName
let replenishQRCode=company.replenishQRCode
//去除重复对象
// let uniqueObjects = {};
// // 遍历原始数据数组
@@ -71,6 +73,7 @@
  request.post(`/processCard/getSelectPrintingRefund/${merge}/${like}/${mergeTechnologyNumber}`, data.value).then((res) => {
        if (res.code == 200) {
          produceList.value = deepClone(res.data.data)
          data.processName   = res.data.data[0].processNameList
          //处理单片厚度

          for (let j = 0; j < produceList.value.length; j++) {
@@ -93,33 +96,34 @@
            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
              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);
              }
            }
          }
          // 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 => {
@@ -172,9 +176,12 @@

           flowCardCount=produceList.value.length


          handleSummary()
          handleGetQRCode()
          if (replenishQRCode == 2){
            handleGetQRCodeTj()//天津扫码枪报工需要合并层号二维码
          }else{
            handleGetQRCode()//拆分层号二维码
          }
        } else {
          ElMessage.warning(res.msg)
          router.push("/login")
@@ -184,8 +191,40 @@
    }
)


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 = [];

    //储存层号
    const seenTechNumbers = new Set();

    for (let j = 0; j < detailList.length; j++) {
      const techNum = detailList[j].technology_number;

      //有则跳过
      if (seenTechNumbers.has(techNum)) continue;
      const url = `${processId}/${techNum}`;

      const qrcodeData = await QRCode.toDataURL(url);
      detailItem.qrcodeList.push({
        qrcode: qrcodeData,
        technologyNumber: techNum
      });

      seenTechNumbers.add(techNum);
    }
  }
};



const handleGetQRCodeTj = async () => {
  let technologyNumber=''
  for (let i = 0; i < produceList.value.length; i++) {
    const technologyNumber = produceList.value[i].detail[0].mergeTechnologyNumber.toString(); // 转换为字符串以便处理每个字符
@@ -262,7 +301,8 @@
        <td class="tdNowrap">客户名称：</td>
        <td colspan="2">{{ items.customer_name }}</td>
        <td class="tdNowrap">项目名称：</td>
        <td colspan="8" style="min-width: 300px;">{{ items.project }}</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="2+item.processList.length*2"  style="width: 500px">{{ items.process }}</td>
      </tr>