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

廖井涛

2024-08-19 1d193f2cc23f54634ef8ed73c11436fbe76bb575

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

@@ -383,19 +383,24 @@
        </td>

      </tr>
      <tr v-if="company.remarkSwitch=='1'" v-for="(itemremark,index) in item.remarkList" :key="index">
      <tr v-if="company.remarkSwitch=='1'">
        <td colspan="29">
          编号：{{itemremark.S01}}&nbsp;&nbsp;
          备注1：{{itemremark.S02}}&nbsp;&nbsp;
          备注2：{{itemremark.S03}}&nbsp;&nbsp;
          备注3：{{itemremark.S04}}&nbsp;&nbsp;
          备注4：{{itemremark.S05}}

         <div style="display: flex;flex-wrap: wrap;">
           <div  v-for="(itemremark,index) in item.remarkList" :key="index">
             <span v-if="!(itemremark.S02==null&&itemremark.S03==null&&itemremark.S04==null&&itemremark.S05==null)">
               编号：{{itemremark.S01}}
             </span>&nbsp;&nbsp;
             <span v-if="itemremark.S02!=null">备注1：{{itemremark.S02}}</span>&nbsp;&nbsp;
             <span v-if="itemremark.S03!=null">备注2：{{itemremark.S03}}</span>&nbsp;&nbsp;
             <span v-if="itemremark.S04!=null">备注3：{{itemremark.S04}}</span>&nbsp;&nbsp;
             <span v-if="itemremark.S05!=null">备注4：{{itemremark.S05}}</span>
           </div>
         </div>
        </td>
      </tr>
      <tr v-for="(itemtextareas,index) in item.detail" :key="index">
        <td  colspan="29"  style="width: 480px;height: 150px ">
          <div style="width: 100%;height: 100%;"><textarea style="height: 99%;width: 99%;border: none;;font-size: 12px;overflow: hidden;">{{itemtextareas.processing_note}}</textarea>
          <div style="width: 100%;height: 100%;text-align: left"><textarea style="height: 99%;width: 99%;border: none;;font-size: 12px;overflow: hidden;text-align: left;vertical-align: middle">{{itemtextareas.processing_note}}</textarea>
          </div>
        </td>
      </tr>
@@ -410,9 +415,10 @@
* {
  margin: 0;
  padding: 0;
}
td,input{
  text-align: center;
}


#printFlowCard {
  text-align: center;
@@ -442,11 +448,11 @@
}

#contentTable tbody {

white-space: nowrap;
}

.tdNowrap {

  white-space: nowrap;
}

#contentTable tfoot {