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

guoyuji

2024-05-23 e48e9687cc8bee98f5567807c2529cf7c7e9a9f8

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

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

@@ -345,7 +345,7 @@
}
const checkBoxConfig = {
  checkMethod: ({ row }) => {
    if (row['layoutStatus']==='已排版'||row['layoutStatus']==='不可排版'){
    if (row['layoutStatus']==='可排版'||row['layoutStatus']==='已排版'){
      return row.disable
    }else{
      return !row.disable

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

@@ -495,7 +495,7 @@
<!--    复选框修改排版状态-->
    <update id="updateComposing">
        update flow_card as fc
        set fc.layout_status=2
        set fc.layout_status=1
        where fc.process_id = #{processId}
    </update>
</mapper>