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

guoyujie

2025-07-08 7104751e2f26872d4891d01d42ee88cf19715d01

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

@@ -31,7 +31,12 @@
  printList: null,
  printMerge: null,
  printLike: null,
  printProject:null
  printProject:null,
  merges:null,
  printFc:null,
  flashback:null,
  landingSequence:null,
  compound:null
})

const {currentRoute} = useRouter()
@@ -54,15 +59,26 @@
if (like == '') {
  like = null
}
//标记合并的流程卡
let merges = props.merges
if (merges == '') {
  merges = null
}

//指定层同架
let compound = props.compound
if (compound == '') {
  compound = null
}
let name=company.companyName

let printNumberFc = props.printFc
data.value.printList = JSON.parse(props.printList)
let flowCardCount = ''
onMounted(() => {
  console.log(printProject)
      if(props.printProject!=null){
        request.post(`/processCard/getSelectPrintProject/${printProject}`).then((res) => {
        request.post(`/processCard/getSelectPrintProject/${printProject}/${merges}/${props.flashback}/${props.landingSequence}`).then((res) => {
          if (res.code == 200) {
            console.log(res.data.data)
            load(res.data.data)
          } else {
            ElMessage.warning(res.msg)
@@ -70,7 +86,7 @@
          }
        })
      }else{
        request.post(`/processCard/getSelectPrinting/${merge}/${like}`, data.value).then((res) => {
        request.post(`/processCard/getSelectPrinting/${merge}/${like}/${merges}/${props.flashback}/${compound}/${props.landingSequence}`, data.value).then((res) => {
          if (res.code == 200) {
            load(res.data.data)
          } else {
@@ -94,27 +110,33 @@
       technologyNumber = produceList.value[i].detail[0].technologyNumber.toString(); // 转换为字符串以便处理每个字符
    }
    produceList.value[i].detail[0]["qrcodeList"] = []; // 初始化一个空数组用来存储 QR Code
    if (compound == null  ){
      const processId = produceList.value[i].detail[0].process_id;
      const url = `${processId}/${technologyNumber}`
      // 生成 QR Code 并存储到数组中
      const qrcodeData = await QRCode.toDataURL(url);
      produceList.value[i].detail[0]["qrcodeList"].push({
        qrcode: qrcodeData,
        technologyNumber: technologyNumber
      });
    }
    else {
    technologyNumber = compound
     for (let j = 0; j < technologyNumber.length; j++) {
        const processId = produceList.value[i].detail[0].process_id;
        const url = `${processId}/${technologyNumber[j]}`;
        // 生成 QR Code 并存储到数组中
        const qrcodeData = await QRCode.toDataURL(url);
        produceList.value[i].detail[0]["qrcodeList"].push({
          qrcode: qrcodeData,
          technologyNumber: technologyNumber[j]
        });
     }
    }

    const processId = produceList.value[i].detail[0].process_id;
    const url = `${processId}/${technologyNumber}`;
    // 生成 QR Code 并存储到数组中
    const qrcodeData = await QRCode.toDataURL(url);
    produceList.value[i].detail[0]["qrcodeList"].push({
      qrcode: qrcodeData,
      technologyNumber: technologyNumber
    });

    // for (let j = 0; j < technologyNumber.length; j++) {
    //   const processId = produceList.value[i].detail[0].process_id;
    //   const url = `${processId}/${technologyNumber[j]}`;
    //   // 生成 QR Code 并存储到数组中
    //   const qrcodeData = await QRCode.toDataURL(url);
    //   produceList.value[i].detail[0]["qrcodeList"].push({
    //     qrcode: qrcodeData,
    //     technologyNumber: technologyNumber[j]
    //   });
    //
    // }


  }
};

@@ -170,39 +192,39 @@
    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
  //     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
  })
  // produceList.value.forEach(item => {
  //   let technologyNumberMerge = printMerge.split('').join(',');
  //   item.detail[0].technologyNumberMerge = technologyNumberMerge
  // })
  //处理编号列
  //定义存放编号数组
  const s01Values = [];
@@ -253,9 +275,13 @@
      <tr v-for="(itemFlow,index) in item.detail" :key="index">
        <td  colspan="31">
          <div style="float: left;"><input style="border: none;font-size: 28px;width: 70px;margin: 5px  "/></div>
          <div id="bj" style="float: right;font-size: 28px">{{ id + 1 }}</div>
          <div id="bj" v-if="printFc=='true'" style="float: right;font-size: 28px">{{ id + 1 }}</div>
          <div id="bj" v-else style="float: right;font-size: 28px"></div>
          <div>{{ company.companyName }}</div>
          <div>生产流程卡<span v-if="printProject!=null">({{ printProject }})</span></div>
          <div>
            生产流程卡<span style="font-weight: bold" v-if="printProject!=null">({{ printProject }})</span>
            <span style="font-weight: bold" v-if="props.compound!=null">({{ props.compound }}层同架)</span>
          </div>
          <div  style="font-weight: bolder;display: flex;justify-content:space-between">
            <div>
              打印人：{{user.user.userName}} &nbsp;&nbsp;
@@ -267,7 +293,8 @@
              </span>
            </div>
            <div>
              <span v-if="name!='金华福喜天成玻璃有限公司'" style="font-size: 10px">{{itemFlow.otherRemarks}}</span>&nbsp;&nbsp;
              <span v-if="name=='天津北玻玻璃工业技术有限公司（TJBB-QR7.1-01）'" style="font-size: 10px">{{itemFlow.otherRemarks}}</span>&nbsp;&nbsp;
              {{itemFlow.rack}}
              流程卡号： {{
                itemFlow.process_id
              }}/{{ itemFlow.technologyNumber }} 共 {{ item.count }} 架
@@ -373,7 +400,7 @@
      <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%">
            <span v-for="(qrCodeItems,index) in qrCodeItem.qrcodeList" :key="index" style="display: flex;width: 20%">
            <div class='qrCode' style="width: 80px;height: 80px;">
            <img :src=qrCodeItems.qrcode>
          </div>