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

guoyujie

2025-11-17 613e4e92157dd697629dbad17fd091ae37637bc7

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

@@ -76,7 +76,9 @@
let printNumberFc = props.printFc
data.value.printList = JSON.parse(props.printList)
let flowCardCount = ''
const picture = ref([])
onMounted(() => {
      //判断是否是工程打印
      if(props.printProject!=null){
        request.post(`/processCard/getSelectPrintProject/${printProject}/${merges}/${props.flashback}/${props.landingSequence}`).then((res) => {
          if (res.code == 200) {
@@ -87,6 +89,7 @@
          }
        })
      }else{
        //流程卡
        request.post(`/processCard/getSelectPrinting/${merge}/${like}/${merges}/${props.flashback}/${compound}/${props.landingSequence}`, data.value).then((res) => {
          if (res.code == 200) {
            load(res.data.data)
@@ -94,6 +97,10 @@
            ElMessage.warning(res.msg)
            router.push("/login")
          }
        })
        //订单序号dwg图片查询
        request.post("/orderFile/getOrderFilePicture", data.value.printList).then((res) => {
          picture.value = res.data
        })
      }

@@ -292,7 +299,12 @@
              打印人：{{user.user.userName}}   
              时间：{{formattedTime}}
                
              <span style="font-weight: bolder;" v-if="name=='金华福喜天成玻璃有限公司'">
              <span style="font-weight: bolder;" >
                总数量：{{itemFlow.orderQuantity}}
              总面积：{{itemFlow.orderArea}}
              </span>
              &nbsp;
              <span style="font-weight: bolder;" >
                打印总数量：{{totalQuantity}}
              打印总面积：{{totalArea}}
              </span>
@@ -329,7 +341,8 @@
        <td rowspan='2'>图号</td>
        <td rowspan='2'>编号</td>
        <td rowspan="2">小片顺序</td>
        <td rowspan='2' style="width: 90px">宽*高</td>
        <td v-if="name=='浙江巨星嘉泰新材料有限公司'"  rowspan='2' style="width: 90px">宽(弧长)*高</td>
        <td v-else rowspan='2' style="width: 90px">宽*高</td>
        <td rowspan='2' >数量</td>
        <td rowspan='2'>面积</td>
        <td rowspan='2'>周长</td>
@@ -354,7 +367,7 @@
        <td>{{ itemDatile.technology_number }}</td>
        <td>{{ itemDatile.child_width }}</td>
        <td class="item" style="width: 60px;height: 100%;">
          <input v-model="itemDatile.quantity" style="width: 100%;height: 100%"  @keyup="handleSummary()"/>
          <input v-model="itemDatile.quantity" style="width: 100%;height: 100%;font-weight: bold;"  @keyup="handleSummary()"/>
        </td>
        <td>{{ itemDatile.total_area }}</td>
        <td>{{ itemDatile.perimeter }}</td>
@@ -439,7 +452,9 @@

      <tr v-for="(itemtextareas,index) in item.detail" :key="index">
        <td  colspan="31"  style="width: 480px;height: 150px ">
          <div style="width: 100%;height: 100%;text-align: left"><textarea style="height: 99%;width: 99%;border: none;;font-size: 14px;overflow: hidden;text-align: left;vertical-align: middle">{{itemtextareas.processing_note}}</textarea>
          <div v-if="name=='浙江巨星嘉泰新材料有限公司'" style="width: 100%;height: 100%;text-align: left"><textarea style="height: 99%;width: 99%;border: none;;font-size: 16px;font-weight: bold;overflow: hidden;text-align: left;vertical-align: middle">{{itemtextareas.processing_note}}</textarea>
          </div>
          <div v-else style="width: 100%;height: 100%;text-align: left"><textarea style="height: 99%;width: 99%;border: none;;font-size: 14px;overflow: hidden;text-align: left;vertical-align: middle">{{itemtextareas.processing_note}}</textarea>
          </div>
        </td>
      </tr>
@@ -453,7 +468,14 @@
      </tr>
      </tfoot>
    </table>

    <el-image
        class="picture"
        v-for="(item,index) in picture"
        :src="item.imageBase64"
        :preview-src-list="[item.imageBase64]"
        fit="contain"
        style="max-height: 700px;"
    />
  </div>

</template>
@@ -545,6 +567,8 @@
  width: 100%;
  height: 100%;
}

.picture{
  page-break-before: always;
}

</style>