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

廖井涛

2024-07-25 15fa56463061f1e94140e23e98987aa3131714bf

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

@@ -710,9 +710,7 @@

<template>
  <div style="width: 75%;height: 90%">

    <div class="common-layout" style="width: 100%;height: 100%">

    <div class="common-layout">
      <el-button
          id="searchButton1"
          :icon="ArrowLeftBold"
@@ -835,7 +833,8 @@
}

.common-layout {
  height: 100%;
  width: 99%;
  height: 96%;
}

.header {