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

廖井涛

2024-09-10 caf567becb6378f848b3b930821a4b38cb7564a5

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

@@ -25,12 +25,14 @@
let props = defineProps({
  printList:null,
  printMerge:null,
  printLike: null
  printLike: null,
  mergeTechnologyNumber:null
})

const {currentRoute} = useRouter()
const route = currentRoute.value
const printMerge = props.printMerge
let mergeTechnologyNumber=props.mergeTechnologyNumber
let merge=props.printMerge
if (merge == '') {
  merge = null
@@ -54,9 +56,9 @@
//   }
// });
// data.value.printList = Object.values(uniqueObjects);
let flowCardCount = data.value.printList.length
let flowCardCount = null
onMounted(() => {
  request.post(`/processCard/getSelectPrintingRefund/${merge}/${like}`, data.value).then((res) => {
  request.post(`/processCard/getSelectPrintingRefund/${merge}/${like}/${mergeTechnologyNumber}`, data.value).then((res) => {
        if (res.code == 200) {
          produceList.value = deepClone(res.data.data)
          //处理单片厚度
@@ -136,7 +138,31 @@

          }

          //处理同配置打印
          // 使用一个对象来存储合并后的结果
          const mergedData = produceList.value.reduce((acc, item) => {
            const processId = item.detail[0].process_id;

            // 如果该 process_id 尚未在 acc 中，初始化其数组
            if (!acc[processId]) {
              acc[processId] = {
                processList: item.processList,
                detailList: [],
                detail: item.detail
              };
            }

            // 合并 detailList
            acc[processId].detailList = acc[processId].detailList.concat(item.detailList);

            return acc;
          }, {});

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

           flowCardCount=produceList.value.length


          handleSummary()
          handleGetQRCode()
        } else {
@@ -150,22 +176,19 @@


const handleGetQRCode = async () => {
  let technologyNumber=''
  for (let i = 0; i < produceList.value.length; i++) {
    const technologyNumber = produceList.value[i].detail[0].technologyNumber.toString(); // 转换为字符串以便处理每个字符
    const technologyNumber = produceList.value[i].detail[0].mergeTechnologyNumber.toString(); // 转换为字符串以便处理每个字符
    produceList.value[i].detail[0]["qrcodeList"] = []; // 初始化一个空数组用来存储 QR Code

    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
    });
  }
};

@@ -206,7 +229,7 @@
      <thead>
      <tr v-for="(itemFlow,index) in item.detail" :key="index">
        <td    colspan="29">
          <div style="float: left;"><input style="border: none;font-size: 28px;width: 70px;margin: 5px  "/></div>
          <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>
@@ -328,6 +351,7 @@
            次破原因：{{itemtextarea.breakage_reason}}&nbsp;
            责任工序：{{itemtextarea.responsible_process}}&nbsp;
            责任班组：{{itemtextarea.responsible_team}}
            <span v-if="itemtextarea.responsible_personnel!=null">责任信息：{{itemtextarea.responsible_personnel}}</span>
          </div>
        </td>

@@ -395,7 +419,7 @@
      </tr>
      <tr v-for="(itemtextareas,index) in item.detail" :key="index">
        <td  colspan="29" rowspan="6" style="width: 480px;height: 150px ">
          <div style="width: 100%;height: 100%;"><textarea style="height: 99%;width: 99%;border: none;;font-size: 12px">{{itemtextareas.processing_note}}</textarea>
          <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>
        </td>
      </tr>