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

廖井涛

2024-07-04 bf29f053bd16c5400e61d9fd7731e697ab85c761

 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProcess.vue

@@ -42,10 +42,11 @@
              item.detail[0].technologyNumber = printMerge;
            });
          }
          let technologyNumberMerge = printMerge.split('').join(',');
          console.log(technologyNumberMerge)
          produceList.value[0].detail[0].technologyNumberMerge = technologyNumberMerge
          console.log(produceList.value[0].detail[0])
          produceList.value.forEach(item =>{
            let technologyNumberMerge = printMerge.split('').join(',');
            item.detail[0].technologyNumberMerge = technologyNumberMerge
          })

          const s01Values = [];
          // 遍历 res.data.numberList 数组，获取每个元素的 S01 值并存储到 s01Values 数组中
          produceList.value[0].detailList.forEach(element => {
@@ -71,7 +72,6 @@
              detail.s01Value = ''; // 如果 s01Values 中的值不足，可以添加默认值或者不进行赋值处理
            }
          });




@@ -202,22 +202,23 @@
        <!--        <td colspan='2'></td>-->
      </tr>
      <tr>
        <td>正品</td>
        <td>次品</td>
        <td>正品</td>
        <td>次品</td>
        <td>正品</td>
        <td>次品</td>
        <td>正品</td>
        <td>次品</td>
        <td>正品</td>
        <td>次品</td>
        <td>正品</td>
        <td>次品</td>
        <td>正品</td>
        <td>次品</td>
        <td>正品</td>
        <td>次品</td>
        
        <td>{{company.printLabel.printFlowCard.patch}}</td>
        <td>{{company.printLabel.printFlowCard.lackOf}}</td>
        <td>{{company.printLabel.printFlowCard.patch}}</td>
        <td>{{company.printLabel.printFlowCard.lackOf}}</td>
        <td>{{company.printLabel.printFlowCard.patch}}</td>
        <td>{{company.printLabel.printFlowCard.lackOf}}</td>
        <td>{{company.printLabel.printFlowCard.patch}}</td>
        <td>{{company.printLabel.printFlowCard.lackOf}}</td>
        <td>{{company.printLabel.printFlowCard.patch}}</td>
        <td>{{company.printLabel.printFlowCard.lackOf}}</td>
        <td>{{company.printLabel.printFlowCard.patch}}</td>
        <td>{{company.printLabel.printFlowCard.lackOf}}</td>
        <td>{{company.printLabel.printFlowCard.patch}}</td>
        <td>{{company.printLabel.printFlowCard.lackOf}}</td>
        <td>{{company.printLabel.printFlowCard.patch}}</td>
        <td>{{company.printLabel.printFlowCard.lackOf}}</td>
      </tr>
      </thead>
      <tbody>
@@ -262,67 +263,48 @@
      </tr>
      <tr v-for="(itemtextarea,index) in item.detail" :key="index">
        <td colspan="6" rowspan="6" style="width: 480px;height: 100px ">
          <div style="width: 100%;height: 100%"><textarea style="height: 99%;width: 99%">{{ itemtextarea.processing_note }}</textarea>
<!--          <div style="width: 100%;height: 100%"><textarea style="height: 99%;width: 99%;font-size: 11px">{{ itemtextarea.processing_note }}</textarea>-->
<!--          </div>-->
          <div style="width: 100%;height: 100%"><textarea style="height: 99%;width: 99%;font-size: 11px">{{company.printLabel.printFlowCard.processingNote(itemtextarea)}}</textarea>
          </div>
        </td>
        <td>完工签名</td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <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>
        <td colspan="2"></td>
      </tr>
      <tr>
        <td>生产日期</td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <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>
        <td colspan="2"></td>
      </tr>
      <tr>
        <td>质检签名</td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <td></td>
        <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>
        <td colspan="2"></td>
      </tr>
      <tr v-for="(qrCodeItem,index) in item.detail" :key="index">
        <td colspan="19">