添加流程卡上是否显示其它备注配置

chenlu

2024-08-15 a4908aafb0aa9adbc70a006214e7580c626396a5

添加流程卡上是否显示其它备注配置

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

@@ -383,12 +383,23 @@
        </td>

      </tr>
      <tr v-if="company.remarkSwitch=='1'" v-for="(itemremark,index) in item.remarkList" :key="index">
        <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}}

        </td>
      </tr>
      <tr v-for="(itemtextareas,index) in item.detail" :key="index">
        <td  colspan="29" rowspan="6" style="width: 480px;height: 150px ">
        <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>
        </td>
      </tr>

      </tfoot>
    </table>
  </div>
@@ -463,8 +474,9 @@
    page-break-inside: auto;
  }

 #contentTable thead {
   display: table-header-group;
  thead {
    display: table-header-group;
    page-break-inside: avoid;
  }

  tfoot {

 north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java

@@ -165,4 +165,6 @@
    List<Map<String, Object>> selectSortTableMp(String orderId);

    String countFlowCard(String orderId);

    List<Map<String, Object>> remakList(String processId);
}

 north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java

@@ -325,6 +325,7 @@
                itemmap.put("processList", processList);
              //  itemmap.put("numberList", numberList);
                itemmap.put("count", flowCardMapper.countFlowCard(flowCard.getOrderId()));
                itemmap.put("remarkList", flowCardMapper.remakList(flowCard.getProcessId()));
                list.add(itemmap);

            }

 north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml

@@ -2038,4 +2038,17 @@
    <select id="countFlowCard">
        select count(distinct process_id) from flow_card where order_id = #{orderId}
    </select>

    <select id="remakList">
        SELECT
            JSON_UNQUOTE(JSON_EXTRACT(other_columns, '$.S01')) AS S01,
            JSON_UNQUOTE(JSON_EXTRACT(other_columns, '$.S04')) AS S02,
            JSON_UNQUOTE(JSON_EXTRACT(other_columns, '$.S05')) AS S03,
            JSON_UNQUOTE(JSON_EXTRACT(other_columns, '$.S06')) AS S04,
            JSON_UNQUOTE(JSON_EXTRACT(other_columns, '$.S07')) AS S05
        FROM flow_card as fc left join sd.order_detail as od on  fc.order_id = od.order_id
        and fc.order_number = od.order_number
        WHERE fc.process_id=#{processId}
        GROUP BY fc.order_number
    </select>
</mapper>