518合并代码

src/xt_pages/stock/stockQuery.vue

               getCancelCount(scope.row.id)
               }}
            </span>
-           <span v-if="org_id != 9675 || org_id != 3907 || org_id != 9583">
+           <span v-if="org_id != 9675 && org_id != 3907 && org_id != 9583">
                {{getOverFlushInfo(scope.row.xt_warehouse_info)}}
            </span>
          </template>