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

廖井涛

7 天以前 70a9b5ca60bafe50da533513f99b990147968a93

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

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

let name=company.companyName
let replenishQRCode=company.replenishQRCode
//去除重复对象
// let uniqueObjects = {};
// // 遍历原始数据数组
@@ -176,7 +177,7 @@
           flowCardCount=produceList.value.length

          handleSummary()
          if (name=='天津北玻玻璃工业技术有限公司（TJBB-QR7.1-01）'){
          if (replenishQRCode == 2){
            handleGetQRCodeTj()//天津扫码枪报工需要合并层号二维码
          }else{
            handleGetQRCode()//拆分层号二维码
@@ -197,9 +198,7 @@

    const mergeTechNumber = detailItem.mergeTechnologyNumber.toString();
    const processId = detailItem.process_id;
    const url = `${processId}/${mergeTechNumber}`;

    const qrcodeData = await QRCode.toDataURL(url);
    detailItem.qrcodeList = [];

    //储存层号
@@ -207,8 +206,12 @@

    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
@@ -275,10 +278,10 @@
      <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>生产流程卡</div>
          <div>({{itemFlow.order_type}})生产流程卡</div>
          <div  style="font-weight: bolder;display: flex;justify-content:space-between">
            <div>
              补片单号：{{itemFlow.patch_id}}&nbsp;&nbsp;&nbsp;
@@ -296,16 +299,16 @@
      </tr>
      <tr v-for="(items,index) in item.detail" :key="index">
        <td class="tdNowrap">客户名称：</td>
        <td colspan="2">{{ items.customer_name }}</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="2+item.processList.length*2"  style="width: 500px">{{ items.process }}</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="2">{{ itemTr.edging_type }}</td>
        <td colspan="3">{{ itemTr.edging_type }}</td>
        <td class="tdNowrap">单片名称：</td>
        <td colspan="8">{{ itemTr.glass_child }}</td>
        <td class="tdNowrap">产品名称：</td>
@@ -314,8 +317,8 @@
      <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>
@@ -339,7 +342,8 @@

      <tr v-for="(itemDatile,index) in item.detailList" :key="index">
        <td>{{ itemDatile.order_number }}</td>
        <td>{{ itemDatile.s01Value }}</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%;">
@@ -348,12 +352,12 @@
        <td>{{ itemDatile.total_area }}</td>
        <td>{{ itemDatile.perimeter }}</td>
        <td>{{ itemDatile.bend_radius }}</td>
        <td>{{ itemDatile.patch_type }}</td>
        <td>{{ itemDatile.patch_reason }}</td>
        <td>{{ itemDatile.patch_processes }}</td>
        <td>{{ itemDatile.responsible_team }}</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>{{ itemDatile.remarks }}</td>
        <td class="tdNowrap">{{ itemDatile.remarks }}</td>
        <template v-for=" n in item.processList.length">
          <td></td>
          <td></td>
@@ -372,18 +376,14 @@
        </td>
      </tr>
      <tr v-for="(itemtextarea,index) in item.detail" :key="index">
        <td colspan="4" rowspan="5" style="width: 480px;height: 100px ">
          <div>

          </div>
        </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="1"></td>
        <template v-for=" n in item.processList.length">
          <td colspan="2"></td>
        </template>
@@ -395,6 +395,8 @@
        <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>
@@ -402,10 +404,12 @@
      <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>
        <td colspan="1"></td>
        <template v-for=" n in item.processList.length">
          <td colspan="2"></td>
        </template>
@@ -430,7 +434,9 @@
      </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%;"><textarea style="height: 99%;width: 99%;border: none;;font-size: 11px;text-align: left">{{itemtextareas.processing_note}}</textarea>
          <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>
@@ -485,7 +491,7 @@
}

.tdNowrap {

  white-space: nowrap;
}

#contentTable tfoot {