合并冲突

licp

2024-04-25 a24f5347bfd2331f8a4819b215f79555776534cd

 src/components/view/b1-inspect-order-plan.vue

@@ -229,7 +229,7 @@
                     type: 'text',
                     method: 'handleInspection',
                     disabFun: (row, index) => {
                        return row.userId == null || row.insState == 3
                        return row.userId == null || row.insState == 3 || row.insState == 5
                     }
                  }, {
                     id: '',
@@ -237,7 +237,7 @@
                     type: 'text',
                     method: 'handleConnect',
                     disabFun: (row, index) => {
                        return row.userId == null || row.insState == 3
                        return row.userId == null || row.orderUserId == null || row.insState == 5  || row.insState == 3
                     }
                  },
                  {